Packman Build Service PMBS

Changes of Revision 6

python-scapy.changes Changed

python-scapy.spec Changed

@@ -16,9 +16,14 @@
 # Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
+%if 0%{suse_version} > 1500
+%bcond_without python_sphinx2
+%else
+%bcond_with    python_sphinx2
+%endif
 
 Name:           python-scapy
-Version:        2.4.3
+Version:        2.4.4
 Release:        0
 Summary:        Interactive Packet Manipulation Tool
 License:        GPL-2.0-or-later
@@ -29,7 +34,9 @@
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+%if %{with python_sphinx2}
 BuildRequires:  python3-Sphinx
+%endif
 BuildArch:      noarch
 %python_subpackages
 
@@ -47,13 +54,16 @@
 
 %prep
 %autosetup -p1 -n scapy-%{version}
+
+%build
 # remove shebang
 find scapy -type f -name "*.py" -exec sed -i '/^#!/d' {} \;
 
-%build
 %python_build
+%if %{with python_sphinx2}
 %make_build -C doc/scapy html
-rm doc/scapy/_build/html/.buildinfo doc/scapy/_build/html/_static/_dummy
+rm -fv doc/scapy/_build/html/.buildinfo doc/scapy/_build/html/_static/_dummy
+%endif
 
 %install
 %python_install
@@ -62,7 +72,9 @@
 %files %{python_files}
 %license LICENSE
 %doc README
+%if %{with python_sphinx2}
 %doc doc/scapy/_build/html
+%endif
 %python3_only %{_bindir}/UTscapy
 %python3_only %{_bindir}/scapy
 %{_mandir}/man1/scapy.1%{?ext_man}

scapy-2.4.3.tar.gz/.appveyor Deleted

scapy-2.4.3.tar.gz/.appveyor/InstallNpcap.ps1 Deleted

@@ -1,48 +0,0 @@
-# Install Npcap on the machine.
-
-# Config:
-$npcap_oem_file = "npcap-0.99-r9-oem.exe"
-
-# Note: because we need the /S option (silent), this script has two cases:
-#  - The script is runned from a master build, then use the secure variable 'npcap_oem_key' which will be available
-#    to decode the very recent npcap install oem file and use it
-#  - The script is runned from a PR, then use the provided archived 0.96 version, which is the last public one to
-#    provide support for the /S option
-
-Try
-{
-    # Check that the key is defined (build mode)
-    $user, $pass = (Get-ChildItem Env:npcap_oem_key).Value.replace("`"", "").split(",")
-    if(!$user -Or !$pass){
-        Throw (New-Object System.Exception)
-    }
-    $file = $PSScriptRoot+"\"+$npcap_oem_file
-    # Download oem file using (super) secret credentials
-    $pair = "${user}:${pass}"
-    $encodedCreds = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($pair))
-    $basicAuthValue = "Basic $encodedCreds"
-    $headers = @{ Authorization = $basicAuthValue }
-    $secpasswd = ConvertTo-SecureString $pass -AsPlainText -Force
-    $credential = New-Object System.Management.Automation.PSCredential($user, $secpasswd)
-    Invoke-WebRequest -uri (-join("https://nmap.org/npcap/oem/dist/",$npcap_oem_file)) -OutFile $file -Headers $headers -Credential $credential
-}
-Catch
-{
-    $file = $PSScriptRoot+"\npcap-0.96.exe"
-    # Download the 0.96 file from nmap servers
-    wget "https://nmap.org/npcap/dist/npcap-0.96.exe" -UseBasicParsing -OutFile $file
-    # Now let's check its checksum
-    $_chksum = $(CertUtil -hashfile $file SHA256)[1] -replace " ",""
-    if ($_chksum -ne "83667e1306fdcf7f9967c10277b36b87e50ee8812e1ee2bb9443bdd065dc04a1"){
-        echo "Checksums does NOT match !"
-        exit
-    } else {
-        echo "Checksums matches !"
-    }
-}
-echo "Installing:"
-echo $file
-
-# Run installer
-Start-Process $file -ArgumentList "/loopback_support=yes /S" -wait
-echo "Npcap installation completed"

scapy-2.4.3.tar.gz/.coveragerc Deleted

scapy-2.4.3.tar.gz/.travis Deleted

scapy-2.4.3.tar.gz/.travis/codespell_ignore.txt Deleted

scapy-2.4.3.tar.gz/.travis/install.sh Deleted

scapy-2.4.3.tar.gz/.travis/test.sh Deleted

scapy-2.4.3.tar.gz/doc/scapy/graphics/animations/animation-scapy-python-can-cansocket.svg Deleted

@@ -1,44 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="terminal" baseProfile="full" viewBox="0 0 640 410" width="640" version="1.1">
-    <defs>
-        <termtosvg:template_settings xmlns:termtosvg="https://github.com/nbedos/termtosvg">
-            <termtosvg:screen_geometry columns="80" rows="24"/>
-        </termtosvg:template_settings>
-        <style type="text/css" id="generated-style"><![CDATA[:root {
-            --animation-duration: 25681ms;
-        }
-        
-        #screen {
-                font-family: 'DejaVu Sans Mono', monospace;
-                font-style: normal;
-                font-size: 14px;
-            }
-
-        text {
-            dominant-baseline: text-before-edge;
-            white-space: pre;
-        }]]></style>
-        <style type="text/css" id="user-style">
-            /* gjm8 color theme (source: https://terminal.sexy/) */
-            .foreground {fill: #c5c5c5;}
-            .background {fill: #1c1c1c;}
-            .color0 {fill: #1c1c1c;}
-            .color1 {fill: #ff005b;}
-            .color2 {fill: #cee318;}
-            .color3 {fill: #ffe755;}
-            .color4 {fill: #048ac7;}
-            .color5 {fill: #833c9f;}
-            .color6 {fill: #0ac1cd;}
-            .color7 {fill: #e5e5e5;}
-            .color8 {fill: #1c1c1c;}
-            .color9 {fill: #ff005b;}
-            .color10 {fill: #cee318;}
-            .color11 {fill: #ffe755;}
-            .color12 {fill: #048ac7;}
-            .color13 {fill: #833c9f;}
-            .color14 {fill: #0ac1cd;}
-            .color15 {fill: #e5e5e5;}
-        </style>
-    </defs>
-    <svg id="screen" width="640" viewBox="0 0 640 408" preserveAspectRatio="xMidYMin meet">
-        <rect class="background" height="100%" width="100%" x="0" y="0"/><defs><g id="g1"><text class="background" textLength="8" x="0"> </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="0" y="17"/><use y="17" xlink:href="#g1"/><animate attributeName="display" begin="0ms; anim_last.end" dur="250ms" from="inline" to="inline"/></g><defs><g id="g2"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="8" x="32"> </text><text class="foreground" textLength="600" x="40">                                                                           </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="32" y="340"/><use y="340" xlink:href="#g2"/><animate attributeName="display" begin="250ms; anim_last.end+250ms" dur="29ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="340"/><use y="340" xlink:href="#g2"/><animate attributeName="display" begin="279ms; anim_last.end+279ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g3"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="608" x="32">                                                                            </text></g></defs><defs><g id="g4"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="background" textLength="8" x="152"> </text><text class="foreground" font-weight="bold" textLength="480" x="160">                                                            </text></g></defs><g display="none"><use y="340" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="152" y="357"/><use y="357" xlink:href="#g4"/><animate attributeName="display" begin="529ms; anim_last.end+529ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g5"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="56" x="32">sock.re</text><text class="background" textLength="8" x="88">c</text><text class="foreground" textLength="544" x="96">v()                                                                 </text></g></defs><defs><g id="g6"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="8" x="152">c</text><text class="background" textLength="8" x="160"> </text><text class="foreground" font-weight="bold" textLength="472" x="168">                                                           </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="88" y="340"/><use y="340" xlink:href="#g5"/><rect class="foreground" height="17" width="8" x="160" y="357"/><use y="357" xlink:href="#g6"/><animate attributeName="display" begin="779ms; anim_last.end+779ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g7"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="40" x="32">load_</text><text class="background" textLength="16" x="72">co</text><text class="foreground" textLength="48" x="88">ntrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g8"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="16" x="152">co</text><text class="background" textLength="8" x="168"> </text><text class="foreground" font-weight="bold" textLength="464" x="176">                                                          </text></g></defs><g display="none"><rect class="foreground" height="17" width="16" x="72" y="340"/><use y="340" xlink:href="#g7"/><rect class="foreground" height="17" width="8" x="168" y="357"/><use y="357" xlink:href="#g8"/><animate attributeName="display" begin="1029ms; anim_last.end+1029ms" dur="117ms" from="inline" to="inline"/></g><defs><g id="g9"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="40" x="32">load_</text><text class="background" textLength="24" x="72">con</text><text class="foreground" textLength="40" x="96">trib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g10"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="24" x="152">con</text><text class="background" textLength="8" x="176"> </text><text class="foreground" font-weight="bold" textLength="456" x="184">                                                         </text></g></defs><g display="none"><rect class="foreground" height="17" width="24" x="72" y="340"/><use y="340" xlink:href="#g9"/><rect class="foreground" height="17" width="8" x="176" y="357"/><use y="357" xlink:href="#g10"/><animate attributeName="display" begin="1146ms; anim_last.end+1146ms" dur="132ms" from="inline" to="inline"/></g><defs><g id="g11"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="32" x="32">conf</text><text class="foreground" textLength="80" x="64">.contribs[</text><text fill="#af5f00" textLength="88" x="144">'CANSocket'</text><text class="foreground" textLength="40" x="232">] = {</text><text fill="#af5f00" textLength="128" x="272">'use-python-can'</text><text class="foreground" textLength="16" x="400">: </text><text fill="#008700" font-weight="bold" textLength="32" x="416">True</text><text class="foreground" textLength="192" x="448">}                       </text></g></defs><defs><g id="g12"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="32" x="152">conf</text><text class="background" textLength="8" x="184"> </text><text class="foreground" font-weight="bold" textLength="448" x="192">                                                        </text></g></defs><g display="none"><rect class="foreground" height="17" width="32" x="32" y="340"/><use y="340" xlink:href="#g11"/><rect class="foreground" height="17" width="8" x="184" y="357"/><use y="357" xlink:href="#g12"/><animate attributeName="display" begin="1278ms; anim_last.end+1278ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g13"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="8" x="32">c</text><text class="foreground" textLength="104" x="40">onf.contribs[</text><text fill="#af5f00" textLength="88" x="144">'CANSocket'</text><text class="foreground" textLength="40" x="232">] = {</text><text fill="#af5f00" textLength="128" x="272">'use-python-can'</text><text class="foreground" textLength="16" x="400">: </text><text fill="#008700" font-weight="bold" textLength="32" x="416">True</text><text class="foreground" textLength="192" x="448">}                       </text></g></defs><defs><g id="g14"><text class="foreground" textLength="640" x="0">                                                                                </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="32" y="340"/><use y="340" xlink:href="#g13"/><use y="357" xlink:href="#g14"/><animate attributeName="display" begin="1528ms; anim_last.end+1528ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g2"/><animate attributeName="display" begin="1778ms; anim_last.end+1778ms" dur="16ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g2"/><animate attributeName="display" begin="1794ms; anim_last.end+1794ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="357" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="152" y="374"/><use y="374" xlink:href="#g4"/><animate attributeName="display" begin="2044ms; anim_last.end+2044ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g15"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="392" x="32">sock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><defs><g id="g16"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="64" x="48">, can_fi</text><text class="background" textLength="8" x="112">l</text><text class="foreground" textLength="56" x="120">ters=[{</text><text fill="#af5f00" textLength="64" x="176">'can_id'</text><text class="foreground" textLength="8" x="240">:</text><text fill="#008700" textLength="40" x="248">0x100</text><text class="foreground" textLength="16" x="288">, </text><text fill="#af5f00" textLength="80" x="304">'can_mask'</text><text class="foreground" textLength="8" x="384">:</text><text fill="#008700" textLength="40" x="392">0x700</text><text class="foreground" textLength="208" x="432">}]))                      </text></g></defs><defs><g id="g17"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="8" x="152">l</text><text class="background" textLength="8" x="160"> </text><text class="foreground" font-weight="bold" textLength="472" x="168">                                                           </text></g></defs><g display="none"><use y="357" xlink:href="#g15"/><rect class="foreground" height="17" width="8" x="112" y="374"/><use y="374" xlink:href="#g16"/><rect class="foreground" height="17" width="8" x="160" y="391"/><use y="391" xlink:href="#g17"/><animate attributeName="display" begin="2294ms; anim_last.end+2294ms" dur="187ms" from="inline" to="inline"/></g><defs><g id="g18"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="16" x="32">lo</text><text class="foreground" textLength="88" x="48">ad_contrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g19"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="16" x="152">lo</text><text class="background" textLength="8" x="168"> </text><text class="foreground" font-weight="bold" textLength="464" x="176">                                                          </text></g></defs><g display="none"><rect class="foreground" height="17" width="16" x="32" y="357"/><use y="357" xlink:href="#g18"/><rect class="foreground" height="17" width="8" x="168" y="391"/><use y="391" xlink:href="#g19"/><animate attributeName="display" begin="2481ms; anim_last.end+2481ms" dur="87ms" from="inline" to="inline"/></g><defs><g id="g20"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="24" x="32">loa</text><text class="foreground" textLength="80" x="56">d_contrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g21"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="24" x="152">loa</text><text class="background" textLength="8" x="176"> </text><text class="foreground" font-weight="bold" textLength="456" x="184">                                                         </text></g></defs><g display="none"><rect class="foreground" height="17" width="24" x="32" y="357"/><use y="357" xlink:href="#g20"/><rect class="foreground" height="17" width="8" x="176" y="391"/><use y="391" xlink:href="#g21"/><animate attributeName="display" begin="2568ms; anim_last.end+2568ms" dur="161ms" from="inline" to="inline"/></g><defs><g id="g22"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="32" x="32">load</text><text class="foreground" textLength="72" x="64">_contrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><g display="none"><rect class="foreground" height="17" width="32" x="32" y="357"/><use y="357" xlink:href="#g22"/><animate attributeName="display" begin="2729ms; anim_last.end+2729ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g14"/><animate attributeName="display" begin="2481ms; anim_last.end+2481ms" dur="498ms" from="inline" to="inline"/></g><defs><g id="g23"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="32" x="152">load</text><text class="background" textLength="8" x="184"> </text><text class="foreground" font-weight="bold" textLength="448" x="192">                                                        </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g23"/><animate attributeName="display" begin="2729ms; anim_last.end+2729ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g24"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="8" x="32">l</text><text class="foreground" textLength="96" x="40">oad_contrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g24"/><use y="374" xlink:href="#g14"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="2979ms; anim_last.end+2979ms" dur="181ms" from="inline" to="inline"/></g><defs><g id="g25"><text class="background" textLength="8" x="0"> </text><text class="foreground" textLength="632" x="8">                                                                               </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="0" y="374"/><use y="374" xlink:href="#g25"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="3160ms; anim_last.end+3160ms" dur="22ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="374"/><use y="374" xlink:href="#g2"/><animate attributeName="display" begin="3182ms; anim_last.end+3182ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g26"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="8" x="32">i</text><text class="background" textLength="8" x="40"> </text><text class="foreground" textLength="592" x="48">                                                                          </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="40" y="374"/><use y="374" xlink:href="#g26"/><animate attributeName="display" begin="3432ms; anim_last.end+3432ms" dur="159ms" from="inline" to="inline"/></g><defs><g id="g27"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="16" x="32">im</text><text class="background" textLength="8" x="48"> </text><text class="foreground" textLength="584" x="56">                                                                         </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="48" y="374"/><use y="374" xlink:href="#g27"/><animate attributeName="display" begin="3591ms; anim_last.end+3591ms" dur="117ms" from="inline" to="inline"/></g><defs><g id="g28"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="24" x="32">imp</text><text class="background" textLength="8" x="56"> </text><text class="foreground" textLength="576" x="64">                                                                        </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="56" y="374"/><use y="374" xlink:href="#g28"/><animate attributeName="display" begin="3708ms; anim_last.end+3708ms" dur="10ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="56" y="374"/><use y="374" xlink:href="#g28"/><animate attributeName="display" begin="3718ms; anim_last.end+3718ms" dur="114ms" from="inline" to="inline"/></g><defs><g id="g29"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="32" x="32">impo</text><text class="background" textLength="8" x="64"> </text><text class="foreground" textLength="568" x="72">                                                                       </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="64" y="374"/><use y="374" xlink:href="#g29"/><animate attributeName="display" begin="3832ms; anim_last.end+3832ms" dur="161ms" from="inline" to="inline"/></g><defs><g id="g30"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="40" x="32">impor</text><text class="background" textLength="8" x="72"> </text><text class="foreground" textLength="560" x="80">                                                                      </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="72" y="374"/><use y="374" xlink:href="#g30"/><animate attributeName="display" begin="3993ms; anim_last.end+3993ms" dur="191ms" from="inline" to="inline"/></g><defs><g id="g31"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="48" x="32">import</text><text class="background" textLength="8" x="80"> </text><text class="foreground" textLength="552" x="88">                                                                     </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="80" y="374"/><use y="374" xlink:href="#g31"/><animate attributeName="display" begin="4184ms; anim_last.end+4184ms" dur="92ms" from="inline" to="inline"/></g><defs><g id="g32"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#008700" font-weight="bold" textLength="48" x="32">import</text><text class="foreground" textLength="8" x="80"> </text><text class="background" textLength="8" x="88"> </text><text class="foreground" textLength="544" x="96">                                                                    </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="88" y="374"/><use y="374" xlink:href="#g32"/><animate attributeName="display" begin="4276ms; anim_last.end+4276ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g33"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#008700" font-weight="bold" textLength="48" x="32">import</text><text class="foreground" textLength="8" x="80"> </text><text fill="#0087d7" font-weight="bold" textLength="8" x="88">c</text><text class="background" textLength="8" x="96"> </text><text class="foreground" textLength="536" x="104">                                                                   </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="96" y="374"/><use y="374" xlink:href="#g33"/><animate attributeName="display" begin="4526ms; anim_last.end+4526ms" dur="109ms" from="inline" to="inline"/></g><defs><g id="g34"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#008700" font-weight="bold" textLength="48" x="32">import</text><text class="foreground" textLength="8" x="80"> </text><text fill="#0087d7" font-weight="bold" textLength="16" x="88">ca</text><text class="background" textLength="8" x="104"> </text><text class="foreground" textLength="528" x="112">                                                                  </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="104" y="374"/><use y="374" xlink:href="#g34"/><animate attributeName="display" begin="4635ms; anim_last.end+4635ms" dur="86ms" from="inline" to="inline"/></g><defs><g id="g35"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#008700" font-weight="bold" textLength="48" x="32">import</text><text class="foreground" textLength="8" x="80"> </text><text fill="#0087d7" font-weight="bold" textLength="24" x="88">can</text><text class="background" textLength="8" x="112"> </text><text class="foreground" textLength="520" x="120">                                                                 </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="112" y="374"/><use y="374" xlink:href="#g35"/><animate attributeName="display" begin="4721ms; anim_last.end+4721ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="3182ms; anim_last.end+3182ms" dur="1789ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="4971ms; anim_last.end+4971ms" dur="15ms" from="inline" to="inline"/></g><defs><g id="g36"><text class="foreground" textLength="536" x="0">INFO: Can't import PyX. Won't be able to use psdump() or pdfdump().</text></g></defs><g display="none"><use y="0" xlink:href="#g36"/><animate attributeName="display" begin="0ms; anim_last.end" dur="5236ms" from="inline" to="inline"/></g><defs><g id="g37"><text class="color10" font-weight="bold" textLength="304" x="0">                                      </text></g></defs><defs><g id="g38"><text class="color10" font-weight="bold" textLength="304" x="0">                     aSPY//YASa       </text></g></defs><defs><g id="g39"><text class="color10" font-weight="bold" textLength="304" x="0">             apyyyyCY//////////YCa    </text><text class="color12" font-weight="bold" textLength="32" x="304">   |</text></g></defs><defs><g id="g40"><text class="color10" font-weight="bold" textLength="304" x="0">            sY//////YSpcs  scpCY//Pp  </text><text class="color12" font-weight="bold" textLength="168" x="304">   | Welcome to Scapy</text></g></defs><defs><g id="g41"><text class="color10" font-weight="bold" textLength="304" x="0"> ayp ayyyyyyySCP//Pp           syY//C </text><text class="color12" font-weight="bold" textLength="200" x="304">   | Version 2.4.0.dev689</text></g></defs><defs><g id="g42"><text class="color10" font-weight="bold" textLength="304" x="0"> AYAsAYYYYYYYY///Ps              cY//S</text><text class="color12" font-weight="bold" textLength="32" x="304">   |</text></g></defs><defs><g id="g43"><text class="color10" font-weight="bold" textLength="304" x="0">         pCCCCY//p          cSSps y//Y</text><text class="color12" font-weight="bold" textLength="288" x="304">   | https://github.com/secdev/scapy</text></g></defs><defs><g id="g44"><text class="color10" font-weight="bold" textLength="304" x="0">         SPPPP///a          pP///AC//Y</text><text class="color12" font-weight="bold" textLength="32" x="304">   |</text></g></defs><defs><g id="g45"><text class="color10" font-weight="bold" textLength="304" x="0">              A//A            cyP////C</text><text class="color12" font-weight="bold" textLength="112" x="304">   | Have fun!</text></g></defs><defs><g id="g46"><text class="color10" font-weight="bold" textLength="304" x="0">              p///Ac            sC///a</text><text class="color12" font-weight="bold" textLength="32" x="304">   |</text></g></defs><defs><g id="g47"><text class="color10" font-weight="bold" textLength="304" x="0">              P////YCpc           A//A</text><text class="color12" font-weight="bold" textLength="312" x="304">   | Craft packets like it is your last</text></g></defs><defs><g id="g48"><text class="color10" font-weight="bold" textLength="304" x="0">       scccccp///pSP///p          p//Y</text><text class="color12" font-weight="bold" textLength="144" x="304">   | day on earth.</text></g></defs><defs><g id="g49"><text class="color10" font-weight="bold" textLength="304" x="0">      sY/////////y  caa           S//P</text><text class="color12" font-weight="bold" textLength="288" x="304">   |                      -- Lao-Tze</text></g></defs><defs><g id="g50"><text class="color10" font-weight="bold" textLength="304" x="0">       cayCyayP//Ya              pY/Ya</text><text class="color12" font-weight="bold" textLength="32" x="304">   |</text></g></defs><defs><g id="g51"><text class="color10" font-weight="bold" textLength="304" x="0">        sY/PsY////YCc          aC//Yp </text></g></defs><defs><g id="g52"><text class="color10" font-weight="bold" textLength="304" x="0">         sc  sccaCY//PCypaapyCP//YSs  </text></g></defs><defs><g id="g53"><text class="color10" font-weight="bold" textLength="304" x="0">                  spCPY//////YPSps    </text></g></defs><defs><g id="g54"><text class="color10" font-weight="bold" textLength="304" x="0">                       ccaacs         </text></g></defs><defs><g id="g55"><text class="color10" font-weight="bold" textLength="304" x="0">                                      </text><text class="foreground" textLength="160" x="304"> using IPython 7.1.1</text></g></defs><g display="none"><use y="17" xlink:href="#g37"/><use y="34" xlink:href="#g38"/><use y="51" xlink:href="#g39"/><use y="68" xlink:href="#g40"/><use y="85" xlink:href="#g41"/><use y="102" xlink:href="#g42"/><use y="119" xlink:href="#g43"/><use y="136" xlink:href="#g44"/><use y="153" xlink:href="#g45"/><use y="170" xlink:href="#g46"/><use y="187" xlink:href="#g47"/><use y="204" xlink:href="#g48"/><use y="221" xlink:href="#g49"/><use y="238" xlink:href="#g50"/><use y="255" xlink:href="#g51"/><use y="272" xlink:href="#g52"/><use y="289" xlink:href="#g53"/><use y="306" xlink:href="#g54"/><use y="323" xlink:href="#g55"/><animate attributeName="display" begin="250ms; anim_last.end+250ms" dur="4986ms" from="inline" to="inline"/></g><defs><g id="g56"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="112" x="32">conf.contribs[</text><text fill="#af5f00" textLength="88" x="144">'CANSocket'</text><text class="foreground" textLength="40" x="232">] = {</text><text fill="#af5f00" textLength="128" x="272">'use-python-can'</text><text class="foreground" textLength="16" x="400">: </text><text fill="#008700" font-weight="bold" textLength="32" x="416">True</text><text class="foreground" textLength="192" x="448">}                       </text></g></defs><g display="none"><use y="340" xlink:href="#g56"/><animate attributeName="display" begin="1778ms; anim_last.end+1778ms" dur="3458ms" from="inline" to="inline"/></g><defs><g id="g57"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="104" x="32">load_contrib(</text><text fill="#af5f00" textLength="88" x="136">"cansocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><g display="none"><use y="357" xlink:href="#g57"/><animate attributeName="display" begin="3160ms; anim_last.end+3160ms" dur="2076ms" from="inline" to="inline"/></g><defs><g id="g58"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#008700" font-weight="bold" textLength="48" x="32">import</text><text class="foreground" textLength="8" x="80"> </text><text fill="#0087d7" font-weight="bold" textLength="24" x="88">can</text><text class="foreground" textLength="528" x="112">                                                                  </text></g></defs><g display="none"><use y="374" xlink:href="#g58"/><animate attributeName="display" begin="4971ms; anim_last.end+4971ms" dur="265ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="4986ms; anim_last.end+4986ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="152" y="391"/><use y="391" xlink:href="#g4"/><animate attributeName="display" begin="5236ms; anim_last.end+5236ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g59"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="104" x="32">load_contrib(</text><text fill="#af5f00" textLength="32" x="136">"can</text><text class="background" textLength="8" x="168">s</text><text fill="#af5f00" textLength="48" x="176">ocket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g60"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="8" x="152">s</text><text class="background" textLength="8" x="160"> </text><text class="foreground" font-weight="bold" textLength="472" x="168">                                                           </text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="8" x="168" y="374"/><use y="374" xlink:href="#g59"/><rect class="foreground" height="17" width="8" x="160" y="391"/><use y="391" xlink:href="#g60"/><animate attributeName="display" begin="5486ms; anim_last.end+5486ms" dur="92ms" from="inline" to="inline"/></g><defs><g id="g61"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="104" x="32">load_contrib(</text><text fill="#af5f00" textLength="32" x="136">"can</text><text class="background" textLength="16" x="168">so</text><text fill="#af5f00" textLength="40" x="184">cket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g62"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="16" x="152">so</text><text class="background" textLength="8" x="168"> </text><text class="foreground" font-weight="bold" textLength="464" x="176">                                                          </text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="16" x="168" y="374"/><use y="374" xlink:href="#g61"/><rect class="foreground" height="17" width="8" x="168" y="391"/><use y="391" xlink:href="#g62"/><animate attributeName="display" begin="5578ms; anim_last.end+5578ms" dur="105ms" from="inline" to="inline"/></g><defs><g id="g63"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="104" x="32">load_contrib(</text><text fill="#af5f00" textLength="32" x="136">"can</text><text class="background" textLength="24" x="168">soc</text><text fill="#af5f00" textLength="32" x="192">ket"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g64"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="24" x="152">soc</text><text class="background" textLength="8" x="176"> </text><text class="foreground" font-weight="bold" textLength="456" x="184">                                                         </text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="24" x="168" y="374"/><use y="374" xlink:href="#g63"/><rect class="foreground" height="17" width="8" x="176" y="391"/><use y="391" xlink:href="#g64"/><animate attributeName="display" begin="5683ms; anim_last.end+5683ms" dur="97ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g37"/><use y="17" xlink:href="#g38"/><use y="34" xlink:href="#g39"/><use y="51" xlink:href="#g40"/><use y="68" xlink:href="#g41"/><use y="85" xlink:href="#g42"/><use y="102" xlink:href="#g43"/><use y="119" xlink:href="#g44"/><use y="136" xlink:href="#g45"/><use y="153" xlink:href="#g46"/><use y="170" xlink:href="#g47"/><use y="187" xlink:href="#g48"/><use y="204" xlink:href="#g49"/><use y="221" xlink:href="#g50"/><use y="238" xlink:href="#g51"/><use y="255" xlink:href="#g52"/><use y="272" xlink:href="#g53"/><use y="289" xlink:href="#g54"/><use y="306" xlink:href="#g55"/><use y="323" xlink:href="#g56"/><use y="340" xlink:href="#g57"/><use y="357" xlink:href="#g58"/><animate attributeName="display" begin="5236ms; anim_last.end+5236ms" dur="794ms" from="inline" to="inline"/></g><defs><g id="g65"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="104" x="32">load_contrib(</text><text fill="#af5f00" textLength="32" x="136">"can</text><text class="background" textLength="32" x="168">sock</text><text fill="#af5f00" textLength="24" x="200">et"</text><text class="foreground" textLength="416" x="224">)                                                   </text></g></defs><defs><g id="g66"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="32" x="152">sock</text><text class="background" textLength="8" x="184"> </text><text class="foreground" font-weight="bold" textLength="448" x="192">                                                        </text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="32" x="168" y="374"/><use y="374" xlink:href="#g65"/><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g66"/><animate attributeName="display" begin="5780ms; anim_last.end+5780ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g67"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="40" x="32">sock </text><text class="foreground" textLength="352" x="72">= CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><defs><g id="g68"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="40" x="152">sock </text><text class="background" textLength="8" x="192"> </text><text class="foreground" font-weight="bold" textLength="440" x="200">                                                       </text></g></defs><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g67"/><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g68"/><animate attributeName="display" begin="6030ms; anim_last.end+6030ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g69"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="48" x="32">sock =</text><text class="foreground" textLength="344" x="80"> CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><defs><g id="g70"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="48" x="152">sock =</text><text class="background" textLength="8" x="200"> </text><text class="foreground" font-weight="bold" textLength="432" x="208">                                                      </text></g></defs><g display="none"><rect class="foreground" height="17" width="48" x="32" y="357"/><use y="357" xlink:href="#g69"/><rect class="foreground" height="17" width="8" x="200" y="391"/><use y="391" xlink:href="#g70"/><animate attributeName="display" begin="6280ms; anim_last.end+6280ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g71"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="128" x="48">, can_filters=[{</text><text fill="#af5f00" textLength="64" x="176">'can_id'</text><text class="foreground" textLength="8" x="240">:</text><text fill="#008700" textLength="40" x="248">0x100</text><text class="foreground" textLength="16" x="288">, </text><text fill="#af5f00" textLength="80" x="304">'can_mask'</text><text class="foreground" textLength="8" x="384">:</text><text fill="#008700" textLength="40" x="392">0x700</text><text class="foreground" textLength="208" x="432">}]))                      </text></g></defs><g display="none"><use y="374" xlink:href="#g71"/><animate attributeName="display" begin="6030ms; anim_last.end+6030ms" dur="750ms" from="inline" to="inline"/></g><defs><g id="g72"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="56" x="152">sock = </text><text class="background" textLength="8" x="208"> </text><text class="foreground" font-weight="bold" textLength="424" x="216">                                                     </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="6530ms; anim_last.end+6530ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g73"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="592" x="48">))                                                                        </text></g></defs><g display="none"><use y="374" xlink:href="#g73"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="6780ms; anim_last.end+6780ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g74"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="128" x="48">, can_filters=[{</text><text fill="#af5f00" textLength="64" x="176">'can_id'</text><text class="foreground" textLength="8" x="240">:</text><text fill="#008700" textLength="40" x="248">0x100</text><text class="foreground" textLength="152" x="288"> | CAN_INV_FILTER, </text><text fill="#af5f00" textLength="80" x="440">'can_mask'</text><text class="foreground" textLength="8" x="520">:</text><text fill="#008700" textLength="40" x="528">0x700</text><text class="foreground" textLength="72" x="568">}]))     </text></g></defs><g display="none"><use y="374" xlink:href="#g74"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="7030ms; anim_last.end+7030ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g71"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="7280ms; anim_last.end+7280ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g75"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="56" x="32">sock = </text><text class="foreground" textLength="336" x="88">CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect class="foreground" height="17" width="56" x="32" y="357"/><use y="357" xlink:href="#g75"/><animate attributeName="display" begin="6530ms; anim_last.end+6530ms" dur="1250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g73"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="7530ms; anim_last.end+7530ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g76"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="8" x="32">s</text><text class="foreground" textLength="384" x="40">ock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g76"/><use y="374" xlink:href="#g73"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="7780ms; anim_last.end+7780ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="8030ms; anim_last.end+8030ms" dur="19ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g38"/><use y="17" xlink:href="#g39"/><use y="34" xlink:href="#g40"/><use y="51" xlink:href="#g41"/><use y="68" xlink:href="#g42"/><use y="85" xlink:href="#g43"/><use y="102" xlink:href="#g44"/><use y="119" xlink:href="#g45"/><use y="136" xlink:href="#g46"/><use y="153" xlink:href="#g47"/><use y="170" xlink:href="#g48"/><use y="187" xlink:href="#g49"/><use y="204" xlink:href="#g50"/><use y="221" xlink:href="#g51"/><use y="238" xlink:href="#g52"/><use y="255" xlink:href="#g53"/><use y="272" xlink:href="#g54"/><use y="289" xlink:href="#g55"/><use y="306" xlink:href="#g56"/><use y="323" xlink:href="#g57"/><use y="340" xlink:href="#g58"/><animate attributeName="display" begin="6030ms; anim_last.end+6030ms" dur="2269ms" from="inline" to="inline"/></g><g display="none"><use y="357" xlink:href="#g15"/><use y="374" xlink:href="#g73"/><animate attributeName="display" begin="8030ms; anim_last.end+8030ms" dur="269ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="8049ms; anim_last.end+8049ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g39"/><use y="17" xlink:href="#g40"/><use y="34" xlink:href="#g41"/><use y="51" xlink:href="#g42"/><use y="68" xlink:href="#g43"/><use y="85" xlink:href="#g44"/><use y="102" xlink:href="#g45"/><use y="119" xlink:href="#g46"/><use y="136" xlink:href="#g47"/><use y="153" xlink:href="#g48"/><use y="170" xlink:href="#g49"/><use y="187" xlink:href="#g50"/><use y="204" xlink:href="#g51"/><use y="221" xlink:href="#g52"/><use y="238" xlink:href="#g53"/><use y="255" xlink:href="#g54"/><use y="272" xlink:href="#g55"/><use y="289" xlink:href="#g56"/><use y="306" xlink:href="#g57"/><use y="323" xlink:href="#g58"/><use y="340" xlink:href="#g15"/><use y="357" xlink:href="#g73"/><use y="374" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="152" y="391"/><use y="391" xlink:href="#g4"/><animate attributeName="display" begin="8299ms; anim_last.end+8299ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g77"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="392" x="32">sock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="8" x="424">'</text><text class="background" textLength="8" x="432">s</text><text fill="#af5f00" textLength="72" x="440">ocketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="8" x="432" y="357"/><use y="357" xlink:href="#g77"/><rect class="foreground" height="17" width="8" x="160" y="391"/><use y="391" xlink:href="#g60"/><animate attributeName="display" begin="8549ms; anim_last.end+8549ms" dur="100ms" from="inline" to="inline"/></g><defs><g id="g78"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="392" x="32">sock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="8" x="424">'</text><text class="background" textLength="16" x="432">so</text><text fill="#af5f00" textLength="64" x="448">cketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="16" x="432" y="357"/><use y="357" xlink:href="#g78"/><rect class="foreground" height="17" width="8" x="168" y="391"/><use y="391" xlink:href="#g62"/><animate attributeName="display" begin="8649ms; anim_last.end+8649ms" dur="81ms" from="inline" to="inline"/></g><defs><g id="g79"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="392" x="32">sock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="8" x="424">'</text><text class="background" textLength="24" x="432">soc</text><text fill="#af5f00" textLength="56" x="456">ketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="24" x="432" y="357"/><use y="357" xlink:href="#g79"/><rect class="foreground" height="17" width="8" x="176" y="391"/><use y="391" xlink:href="#g64"/><animate attributeName="display" begin="8730ms; anim_last.end+8730ms" dur="139ms" from="inline" to="inline"/></g><defs><g id="g80"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="392" x="32">sock = CANSocket(iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="8" x="424">'</text><text class="background" textLength="32" x="432">sock</text><text fill="#af5f00" textLength="48" x="464">etcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><g display="none"><rect fill="#af5f00" height="17" width="32" x="432" y="357"/><use y="357" xlink:href="#g80"/><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g66"/><animate attributeName="display" begin="8869ms; anim_last.end+8869ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g67"/><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g68"/><animate attributeName="display" begin="9119ms; anim_last.end+9119ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect fill="#af5f00" height="17" width="32" x="432" y="357"/><use y="357" xlink:href="#g80"/><animate attributeName="display" begin="9369ms; anim_last.end+9369ms" dur="240ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g73"/><animate attributeName="display" begin="8549ms; anim_last.end+8549ms" dur="1060ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g66"/><animate attributeName="display" begin="9369ms; anim_last.end+9369ms" dur="240ms" from="inline" to="inline"/></g><defs><g id="g81"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="40" x="32">sock.</text><text class="foreground" textLength="568" x="72">recv()                                                                 </text></g></defs><defs><g id="g82"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="40" x="152">sock.</text><text class="background" textLength="8" x="192"> </text><text class="foreground" font-weight="bold" textLength="440" x="200">                                                       </text></g></defs><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g81"/><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g82"/><animate attributeName="display" begin="9609ms; anim_last.end+9609ms" dur="161ms" from="inline" to="inline"/></g><defs><g id="g83"><text class="foreground" font-weight="bold" textLength="152" x="0">I-search backward: </text><text class="foreground" textLength="48" x="152">sock. </text><text class="background" textLength="8" x="200"> </text><text class="foreground" font-weight="bold" textLength="432" x="208">                                                      </text></g></defs><g display="none"><use y="357" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="200" y="391"/><use y="391" xlink:href="#g83"/><animate attributeName="display" begin="9770ms; anim_last.end+9770ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g81"/><animate attributeName="display" begin="10020ms; anim_last.end+10020ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g14"/><animate attributeName="display" begin="9609ms; anim_last.end+9609ms" dur="661ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g82"/><animate attributeName="display" begin="10020ms; anim_last.end+10020ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g84"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="8" x="32">s</text><text class="foreground" textLength="600" x="40">ock.recv()                                                                 </text></g></defs><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g84"/><use y="374" xlink:href="#g14"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="10270ms; anim_last.end+10270ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="374"/><use y="374" xlink:href="#g25"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="10520ms; anim_last.end+10520ms" dur="10ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="10530ms; anim_last.end+10530ms" dur="13ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="10543ms; anim_last.end+10543ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g40"/><use y="17" xlink:href="#g41"/><use y="34" xlink:href="#g42"/><use y="51" xlink:href="#g43"/><use y="68" xlink:href="#g44"/><use y="85" xlink:href="#g45"/><use y="102" xlink:href="#g46"/><use y="119" xlink:href="#g47"/><use y="136" xlink:href="#g48"/><use y="153" xlink:href="#g49"/><use y="170" xlink:href="#g50"/><use y="187" xlink:href="#g51"/><use y="204" xlink:href="#g52"/><use y="221" xlink:href="#g53"/><use y="238" xlink:href="#g54"/><use y="255" xlink:href="#g55"/><use y="272" xlink:href="#g56"/><use y="289" xlink:href="#g57"/><use y="306" xlink:href="#g58"/><use y="323" xlink:href="#g15"/><use y="340" xlink:href="#g73"/><animate attributeName="display" begin="8549ms; anim_last.end+8549ms" dur="2494ms" from="inline" to="inline"/></g><defs><g id="g85"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="608" x="32">sock.recv()                                                                 </text></g></defs><g display="none"><use y="357" xlink:href="#g85"/><animate attributeName="display" begin="10520ms; anim_last.end+10520ms" dur="523ms" from="inline" to="inline"/></g><defs><g id="g86"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x26c</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">6</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="88" x="296">'\x0b#`CEV'</text><text class="foreground" textLength="256" x="384"> |&gt;                             </text></g></defs><g display="none"><use y="374" xlink:href="#g86"/><animate attributeName="display" begin="10530ms; anim_last.end+10530ms" dur="513ms" from="inline" to="inline"/></g><defs><g id="g87"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="72" x="32">sock.recv</text><text fill="#000000" textLength="16" x="104">()</text><text class="background" textLength="8" x="120"> </text><text class="foreground" textLength="512" x="128">                                                                </text></g></defs><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="10793ms; anim_last.end+10793ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="11043ms; anim_last.end+11043ms" dur="18ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="11061ms; anim_last.end+11061ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g88"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x7a1</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">6</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="160" x="296">'\x92\xacJ\x18o\x9d'</text><text class="foreground" textLength="184" x="456"> |&gt;                    </text></g></defs><g display="none"><use y="0" xlink:href="#g42"/><use y="17" xlink:href="#g43"/><use y="34" xlink:href="#g44"/><use y="51" xlink:href="#g45"/><use y="68" xlink:href="#g46"/><use y="85" xlink:href="#g47"/><use y="102" xlink:href="#g48"/><use y="119" xlink:href="#g49"/><use y="136" xlink:href="#g50"/><use y="153" xlink:href="#g51"/><use y="170" xlink:href="#g52"/><use y="187" xlink:href="#g53"/><use y="204" xlink:href="#g54"/><use y="221" xlink:href="#g55"/><use y="238" xlink:href="#g56"/><use y="255" xlink:href="#g57"/><use y="272" xlink:href="#g58"/><use y="289" xlink:href="#g15"/><use y="306" xlink:href="#g73"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g86"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g88"/><animate attributeName="display" begin="11043ms; anim_last.end+11043ms" dur="516ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="11311ms; anim_last.end+11311ms" dur="248ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="11559ms; anim_last.end+11559ms" dur="15ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g43"/><use y="17" xlink:href="#g44"/><use y="34" xlink:href="#g45"/><use y="51" xlink:href="#g46"/><use y="68" xlink:href="#g47"/><use y="85" xlink:href="#g48"/><use y="102" xlink:href="#g49"/><use y="119" xlink:href="#g50"/><use y="136" xlink:href="#g51"/><use y="153" xlink:href="#g52"/><use y="170" xlink:href="#g53"/><use y="187" xlink:href="#g54"/><use y="204" xlink:href="#g55"/><use y="221" xlink:href="#g56"/><use y="238" xlink:href="#g57"/><use y="255" xlink:href="#g58"/><use y="272" xlink:href="#g15"/><use y="289" xlink:href="#g73"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g86"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g88"/><use y="374" xlink:href="#g85"/><animate attributeName="display" begin="11559ms; anim_last.end+11559ms" dur="41ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="11574ms; anim_last.end+11574ms" dur="26ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="11600ms; anim_last.end+11600ms" dur="25ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="11625ms; anim_last.end+11625ms" dur="203ms" from="inline" to="inline"/></g><defs><g id="g89"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x4a3</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">5</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="80" x="296">'\xa6sud@'</text><text class="foreground" textLength="264" x="376"> |&gt;                              </text></g></defs><g display="none"><use y="0" xlink:href="#g44"/><use y="17" xlink:href="#g45"/><use y="34" xlink:href="#g46"/><use y="51" xlink:href="#g47"/><use y="68" xlink:href="#g48"/><use y="85" xlink:href="#g49"/><use y="102" xlink:href="#g50"/><use y="119" xlink:href="#g51"/><use y="136" xlink:href="#g52"/><use y="153" xlink:href="#g53"/><use y="170" xlink:href="#g54"/><use y="187" xlink:href="#g55"/><use y="204" xlink:href="#g56"/><use y="221" xlink:href="#g57"/><use y="238" xlink:href="#g58"/><use y="255" xlink:href="#g15"/><use y="272" xlink:href="#g73"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g86"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g88"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g89"/><animate attributeName="display" begin="11600ms; anim_last.end+11600ms" dur="478ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="11828ms; anim_last.end+11828ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="12078ms; anim_last.end+12078ms" dur="14ms" from="inline" to="inline"/></g><defs><g id="g90"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x6c8</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">8</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="224" x="296">'\xd29n\x00\x01\xc1\xc7\x13'</text><text class="foreground" textLength="120" x="520"> |&gt;            </text></g></defs><g display="none"><use y="0" xlink:href="#g46"/><use y="17" xlink:href="#g47"/><use y="34" xlink:href="#g48"/><use y="51" xlink:href="#g49"/><use y="68" xlink:href="#g50"/><use y="85" xlink:href="#g51"/><use y="102" xlink:href="#g52"/><use y="119" xlink:href="#g53"/><use y="136" xlink:href="#g54"/><use y="153" xlink:href="#g55"/><use y="170" xlink:href="#g56"/><use y="187" xlink:href="#g57"/><use y="204" xlink:href="#g58"/><use y="221" xlink:href="#g15"/><use y="238" xlink:href="#g73"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g86"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g88"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g89"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g90"/><animate attributeName="display" begin="12078ms; anim_last.end+12078ms" dur="264ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="12092ms; anim_last.end+12092ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g3"/><rect class="foreground" height="17" width="8" x="152" y="391"/><use y="391" xlink:href="#g4"/><animate attributeName="display" begin="12342ms; anim_last.end+12342ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="374"/><use y="374" xlink:href="#g84"/><rect class="foreground" height="17" width="8" x="160" y="391"/><use y="391" xlink:href="#g60"/><animate attributeName="display" begin="12592ms; anim_last.end+12592ms" dur="171ms" from="inline" to="inline"/></g><defs><g id="g91"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="16" x="32">so</text><text class="foreground" textLength="592" x="48">ck.recv()                                                                 </text></g></defs><g display="none"><rect class="foreground" height="17" width="16" x="32" y="374"/><use y="374" xlink:href="#g91"/><rect class="foreground" height="17" width="8" x="168" y="391"/><use y="391" xlink:href="#g62"/><animate attributeName="display" begin="12763ms; anim_last.end+12763ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g92"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="24" x="32">soc</text><text class="foreground" textLength="584" x="56">k.recv()                                                                 </text></g></defs><g display="none"><rect class="foreground" height="17" width="24" x="32" y="374"/><use y="374" xlink:href="#g92"/><rect class="foreground" height="17" width="8" x="176" y="391"/><use y="391" xlink:href="#g64"/><animate attributeName="display" begin="13013ms; anim_last.end+13013ms" dur="128ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g47"/><use y="17" xlink:href="#g48"/><use y="34" xlink:href="#g49"/><use y="51" xlink:href="#g50"/><use y="68" xlink:href="#g51"/><use y="85" xlink:href="#g52"/><use y="102" xlink:href="#g53"/><use y="119" xlink:href="#g54"/><use y="136" xlink:href="#g55"/><use y="153" xlink:href="#g56"/><use y="170" xlink:href="#g57"/><use y="187" xlink:href="#g58"/><use y="204" xlink:href="#g15"/><use y="221" xlink:href="#g73"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g86"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g88"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g89"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g90"/><animate attributeName="display" begin="12342ms; anim_last.end+12342ms" dur="929ms" from="inline" to="inline"/></g><defs><g id="g93"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="background" textLength="32" x="32">sock</text><text class="foreground" textLength="576" x="64">.recv()                                                                 </text></g></defs><g display="none"><rect class="foreground" height="17" width="32" x="32" y="374"/><use y="374" xlink:href="#g93"/><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g66"/><animate attributeName="display" begin="13141ms; anim_last.end+13141ms" dur="130ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g67"/><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g68"/><animate attributeName="display" begin="13271ms; anim_last.end+13271ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g73"/><animate attributeName="display" begin="13271ms; anim_last.end+13271ms" dur="500ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="200" y="391"/><use y="391" xlink:href="#g70"/><animate attributeName="display" begin="13521ms; anim_last.end+13521ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="48" x="32" y="357"/><use y="357" xlink:href="#g69"/><animate attributeName="display" begin="13521ms; anim_last.end+13521ms" dur="500ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g71"/><rect class="foreground" height="17" width="8" x="200" y="391"/><use y="391" xlink:href="#g70"/><animate attributeName="display" begin="13771ms; anim_last.end+13771ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g76"/><use y="374" xlink:href="#g71"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="14021ms; anim_last.end+14021ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="14271ms; anim_last.end+14271ms" dur="20ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g48"/><use y="17" xlink:href="#g49"/><use y="34" xlink:href="#g50"/><use y="51" xlink:href="#g51"/><use y="68" xlink:href="#g52"/><use y="85" xlink:href="#g53"/><use y="102" xlink:href="#g54"/><use y="119" xlink:href="#g55"/><use y="136" xlink:href="#g56"/><use y="153" xlink:href="#g57"/><use y="170" xlink:href="#g58"/><use y="187" xlink:href="#g15"/><use y="204" xlink:href="#g73"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g86"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g88"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g89"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g90"/><animate attributeName="display" begin="13271ms; anim_last.end+13271ms" dur="1270ms" from="inline" to="inline"/></g><g display="none"><use y="357" xlink:href="#g15"/><use y="374" xlink:href="#g71"/><animate attributeName="display" begin="14271ms; anim_last.end+14271ms" dur="270ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="14291ms; anim_last.end+14291ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g94"><text class="color12" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text class="foreground" textLength="128" x="32">sock = CANSocket</text><text fill="#000000" textLength="8" x="160">(</text><text class="foreground" textLength="256" x="168">iface=can.interface.Bus(bustype=</text><text fill="#af5f00" textLength="88" x="424">'socketcan'</text><text class="foreground" textLength="80" x="512">, channel=</text><text fill="#af5f00" textLength="48" x="592">'vcan0</text></g></defs><defs><g id="g95"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="128" x="48">, can_filters=[{</text><text fill="#af5f00" textLength="64" x="176">'can_id'</text><text class="foreground" textLength="8" x="240">:</text><text fill="#008700" textLength="40" x="248">0x100</text><text class="foreground" textLength="16" x="288">, </text><text fill="#af5f00" textLength="80" x="304">'can_mask'</text><text class="foreground" textLength="8" x="384">:</text><text fill="#008700" textLength="40" x="392">0x700</text><text class="foreground" textLength="24" x="432">}])</text><text fill="#000000" textLength="8" x="456">)</text><text class="background" textLength="8" x="464"> </text><text class="foreground" textLength="168" x="472">                     </text></g></defs><g display="none"><rect fill="#afd7d7" height="17" width="8" x="160" y="374"/><use y="374" xlink:href="#g94"/><rect fill="#afd7d7" height="17" width="8" x="456" y="391"/><rect class="foreground" height="17" width="8" x="464" y="391"/><use y="391" xlink:href="#g95"/><animate attributeName="display" begin="14541ms; anim_last.end+14541ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="374"/><rect class="foreground" height="17" width="8" x="120" y="374"/><use y="374" xlink:href="#g87"/><animate attributeName="display" begin="14791ms; anim_last.end+14791ms" dur="33ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g49"/><use y="17" xlink:href="#g50"/><use y="34" xlink:href="#g51"/><use y="51" xlink:href="#g52"/><use y="68" xlink:href="#g53"/><use y="85" xlink:href="#g54"/><use y="102" xlink:href="#g55"/><use y="119" xlink:href="#g56"/><use y="136" xlink:href="#g57"/><use y="153" xlink:href="#g58"/><use y="170" xlink:href="#g15"/><use y="187" xlink:href="#g73"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g86"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g88"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g89"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g90"/><use y="340" xlink:href="#g15"/><use y="357" xlink:href="#g71"/><animate attributeName="display" begin="14541ms; anim_last.end+14541ms" dur="533ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="374"/><rect class="foreground" height="17" width="8" x="120" y="374"/><use y="374" xlink:href="#g87"/><animate attributeName="display" begin="14824ms; anim_last.end+14824ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="14791ms; anim_last.end+14791ms" dur="283ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="15074ms; anim_last.end+15074ms" dur="14ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="15088ms; anim_last.end+15088ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g96"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x161</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">0</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="16" x="296">''</text><text class="foreground" textLength="328" x="312"> |&gt;                                      </text></g></defs><g display="none"><use y="0" xlink:href="#g50"/><use y="17" xlink:href="#g51"/><use y="34" xlink:href="#g52"/><use y="51" xlink:href="#g53"/><use y="68" xlink:href="#g54"/><use y="85" xlink:href="#g55"/><use y="102" xlink:href="#g56"/><use y="119" xlink:href="#g57"/><use y="136" xlink:href="#g58"/><use y="153" xlink:href="#g15"/><use y="170" xlink:href="#g73"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g86"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g88"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g89"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g90"/><use y="323" xlink:href="#g15"/><use y="340" xlink:href="#g71"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g96"/><animate attributeName="display" begin="15074ms; anim_last.end+15074ms" dur="514ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="15338ms; anim_last.end+15338ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="15588ms; anim_last.end+15588ms" dur="228ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g51"/><use y="17" xlink:href="#g52"/><use y="34" xlink:href="#g53"/><use y="51" xlink:href="#g54"/><use y="68" xlink:href="#g55"/><use y="85" xlink:href="#g56"/><use y="102" xlink:href="#g57"/><use y="119" xlink:href="#g58"/><use y="136" xlink:href="#g15"/><use y="153" xlink:href="#g73"/><use y="170" xlink:href="#g85"/><use y="187" xlink:href="#g86"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g88"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g89"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g90"/><use y="306" xlink:href="#g15"/><use y="323" xlink:href="#g71"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g96"/><use y="374" xlink:href="#g85"/><animate attributeName="display" begin="15588ms; anim_last.end+15588ms" dur="239ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="15816ms; anim_last.end+15816ms" dur="11ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="15827ms; anim_last.end+15827ms" dur="14ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="15841ms; anim_last.end+15841ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g97"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x148</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">7</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="168" x="296">'\xed\x82r\x08-r\x97'</text><text class="foreground" textLength="176" x="464"> |&gt;                   </text></g></defs><g display="none"><use y="0" xlink:href="#g52"/><use y="17" xlink:href="#g53"/><use y="34" xlink:href="#g54"/><use y="51" xlink:href="#g55"/><use y="68" xlink:href="#g56"/><use y="85" xlink:href="#g57"/><use y="102" xlink:href="#g58"/><use y="119" xlink:href="#g15"/><use y="136" xlink:href="#g73"/><use y="153" xlink:href="#g85"/><use y="170" xlink:href="#g86"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g88"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g89"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g90"/><use y="289" xlink:href="#g15"/><use y="306" xlink:href="#g71"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g96"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g97"/><animate attributeName="display" begin="15827ms; anim_last.end+15827ms" dur="514ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="16091ms; anim_last.end+16091ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g53"/><use y="17" xlink:href="#g54"/><use y="34" xlink:href="#g55"/><use y="51" xlink:href="#g56"/><use y="68" xlink:href="#g57"/><use y="85" xlink:href="#g58"/><use y="102" xlink:href="#g15"/><use y="119" xlink:href="#g73"/><use y="136" xlink:href="#g85"/><use y="153" xlink:href="#g86"/><use y="170" xlink:href="#g85"/><use y="187" xlink:href="#g88"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g89"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g90"/><use y="272" xlink:href="#g15"/><use y="289" xlink:href="#g71"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g96"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g97"/><use y="374" xlink:href="#g85"/><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="16341ms; anim_last.end+16341ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g98"><text class="color1" textLength="600" x="0">---------------------------------------------------------------------------</text><text class="foreground" textLength="40" x="600">     </text></g></defs><defs><g id="g99"><text class="color1" textLength="184" x="0">CANSocketTimeoutElapsed</text><text class="foreground" textLength="416" x="184">                   Traceback (most recent call last)</text></g></defs><defs><g id="g100"><text class="color2" textLength="248" x="0">&lt;ipython-input-12-fd469247fe8f&gt;</text><text class="foreground" textLength="32" x="248"> in </text><text class="color6" textLength="64" x="280">&lt;module&gt;</text></g></defs><defs><g id="g101"><text class="color2" textLength="56" x="0">----&gt; 1</text><text class="color1" textLength="8" x="56"> </text><text class="foreground" textLength="32" x="64">sock</text><text class="color4" textLength="8" x="96">.</text><text class="foreground" textLength="32" x="104">recv</text><text class="color4" textLength="16" x="136">()</text></g></defs><defs><g id="g102"><text class="color2" textLength="640" x="0">/usr/lib/python3.7/site-packages/scapy-2.4.0.dev689-py3.7.egg/scapy/contrib/cans</text></g></defs><defs><g id="g103"><text class="color2" textLength="152" x="0">ocket_python_can.py</text><text class="foreground" textLength="32" x="152"> in </text><text class="color6" textLength="32" x="184">recv</text><text class="color4" textLength="48" x="216">(self)</text></g></defs><defs><g id="g104"><text class="color10" font-weight="bold" textLength="56" x="0">     44</text><text class="foreground" textLength="104" x="56">         msg </text><text class="color4" textLength="8" x="160">=</text><text class="foreground" textLength="40" x="168"> self</text><text class="color4" textLength="8" x="208">.</text><text class="foreground" textLength="40" x="216">iface</text><text class="color4" textLength="8" x="256">.</text><text class="foreground" textLength="32" x="264">recv</text><text class="color4" textLength="8" x="296">(</text><text class="foreground" textLength="56" x="304">timeout</text><text class="color4" textLength="8" x="360">=</text><text class="color6" textLength="8" x="368">1</text><text class="color4" textLength="8" x="376">)</text></g></defs><defs><g id="g105"><text class="color10" font-weight="bold" textLength="56" x="0">     45</text><text class="foreground" textLength="72" x="56">         </text><text class="color2" textLength="16" x="128">if</text><text class="foreground" textLength="40" x="144"> msg </text><text class="color2" textLength="16" x="184">is</text><text class="foreground" textLength="8" x="200"> </text><text class="color2" textLength="32" x="208">None</text><text class="color4" textLength="8" x="240">:</text></g></defs><defs><g id="g106"><text class="color2" textLength="56" x="0">---&gt; 46</text><text class="color1" textLength="104" x="56">             </text><text class="color2" textLength="40" x="160">raise</text><text class="foreground" textLength="192" x="200"> CANSocketTimeoutElapsed</text></g></defs><defs><g id="g107"><text class="color10" font-weight="bold" textLength="56" x="0">     47</text><text class="foreground" textLength="408" x="56">         frame = CAN(identifier=msg.arbitration_id,</text></g></defs><g display="none"><use y="0" xlink:href="#g88"/><use y="17" xlink:href="#g85"/><use y="34" xlink:href="#g89"/><use y="51" xlink:href="#g85"/><use y="68" xlink:href="#g90"/><use y="85" xlink:href="#g15"/><use y="102" xlink:href="#g71"/><use y="119" xlink:href="#g85"/><use y="136" xlink:href="#g96"/><use y="153" xlink:href="#g85"/><use y="170" xlink:href="#g97"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g98"/><use y="221" xlink:href="#g99"/><use y="238" xlink:href="#g100"/><use y="255" xlink:href="#g101"/><use y="289" xlink:href="#g102"/><use y="306" xlink:href="#g103"/><use y="323" xlink:href="#g104"/><use y="340" xlink:href="#g105"/><use y="357" xlink:href="#g106"/><use y="374" xlink:href="#g107"/><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g1"/><animate attributeName="display" begin="16591ms; anim_last.end+16591ms" dur="12ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="16603ms; anim_last.end+16603ms" dur="28ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="16631ms; anim_last.end+16631ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g108"><text class="color10" font-weight="bold" textLength="56" x="0">     48</text><text class="foreground" textLength="216" x="56">                     length</text><text class="color4" textLength="8" x="272">=</text><text class="foreground" textLength="24" x="280">msg</text><text class="color4" textLength="8" x="304">.</text><text class="foreground" textLength="24" x="312">dlc</text><text class="color4" textLength="8" x="336">,</text></g></defs><defs><g id="g109"><text class="color1" textLength="184" x="0">CANSocketTimeoutElapsed</text><text class="foreground" textLength="16" x="184">: </text></g></defs><g display="none"><use y="0" xlink:href="#g85"/><use y="17" xlink:href="#g90"/><use y="34" xlink:href="#g15"/><use y="51" xlink:href="#g71"/><use y="68" xlink:href="#g85"/><use y="85" xlink:href="#g96"/><use y="102" xlink:href="#g85"/><use y="119" xlink:href="#g97"/><use y="136" xlink:href="#g85"/><use y="153" xlink:href="#g98"/><use y="170" xlink:href="#g99"/><use y="187" xlink:href="#g100"/><use y="204" xlink:href="#g101"/><use y="238" xlink:href="#g102"/><use y="255" xlink:href="#g103"/><use y="272" xlink:href="#g104"/><use y="289" xlink:href="#g105"/><use y="306" xlink:href="#g106"/><use y="323" xlink:href="#g107"/><use y="340" xlink:href="#g108"/><use y="374" xlink:href="#g109"/><animate attributeName="display" begin="16603ms; anim_last.end+16603ms" dur="451ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="16881ms; anim_last.end+16881ms" dur="173ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="17054ms; anim_last.end+17054ms" dur="19ms" from="inline" to="inline"/></g><defs><g id="g110"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x18b</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">8</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="200" x="296">"'\x92\xc3k\xca\x16\xf5u"</text><text class="foreground" textLength="144" x="496"> |&gt;               </text></g></defs><g display="none"><use y="0" xlink:href="#g15"/><use y="17" xlink:href="#g71"/><use y="34" xlink:href="#g85"/><use y="51" xlink:href="#g96"/><use y="68" xlink:href="#g85"/><use y="85" xlink:href="#g97"/><use y="102" xlink:href="#g85"/><use y="119" xlink:href="#g98"/><use y="136" xlink:href="#g99"/><use y="153" xlink:href="#g100"/><use y="170" xlink:href="#g101"/><use y="204" xlink:href="#g102"/><use y="221" xlink:href="#g103"/><use y="238" xlink:href="#g104"/><use y="255" xlink:href="#g105"/><use y="272" xlink:href="#g106"/><use y="289" xlink:href="#g107"/><use y="306" xlink:href="#g108"/><use y="340" xlink:href="#g109"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g110"/><animate attributeName="display" begin="17054ms; anim_last.end+17054ms" dur="269ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="17073ms; anim_last.end+17073ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="152" y="391"/><use y="391" xlink:href="#g4"/><animate attributeName="display" begin="17323ms; anim_last.end+17323ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g3"/><animate attributeName="display" begin="17323ms; anim_last.end+17323ms" dur="500ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="152" y="391"/><use y="391" xlink:href="#g4"/><animate attributeName="display" begin="17573ms; anim_last.end+17573ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="374"/><use y="374" xlink:href="#g84"/><rect class="foreground" height="17" width="8" x="160" y="391"/><use y="391" xlink:href="#g60"/><animate attributeName="display" begin="17823ms; anim_last.end+17823ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="16" x="32" y="374"/><use y="374" xlink:href="#g91"/><rect class="foreground" height="17" width="8" x="168" y="391"/><use y="391" xlink:href="#g62"/><animate attributeName="display" begin="18073ms; anim_last.end+18073ms" dur="168ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="24" x="32" y="374"/><use y="374" xlink:href="#g92"/><rect class="foreground" height="17" width="8" x="176" y="391"/><use y="391" xlink:href="#g64"/><animate attributeName="display" begin="18241ms; anim_last.end+18241ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g71"/><use y="17" xlink:href="#g85"/><use y="34" xlink:href="#g96"/><use y="51" xlink:href="#g85"/><use y="68" xlink:href="#g97"/><use y="85" xlink:href="#g85"/><use y="102" xlink:href="#g98"/><use y="119" xlink:href="#g99"/><use y="136" xlink:href="#g100"/><use y="153" xlink:href="#g101"/><use y="187" xlink:href="#g102"/><use y="204" xlink:href="#g103"/><use y="221" xlink:href="#g104"/><use y="238" xlink:href="#g105"/><use y="255" xlink:href="#g106"/><use y="272" xlink:href="#g107"/><use y="289" xlink:href="#g108"/><use y="323" xlink:href="#g109"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g110"/><animate attributeName="display" begin="17323ms; anim_last.end+17323ms" dur="1418ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="32" x="32" y="374"/><use y="374" xlink:href="#g93"/><rect class="foreground" height="17" width="8" x="184" y="391"/><use y="391" xlink:href="#g66"/><animate attributeName="display" begin="18491ms; anim_last.end+18491ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="40" x="32" y="357"/><use y="357" xlink:href="#g67"/><rect class="foreground" height="17" width="8" x="192" y="391"/><use y="391" xlink:href="#g68"/><animate attributeName="display" begin="18741ms; anim_last.end+18741ms" dur="188ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="48" x="32" y="357"/><use y="357" xlink:href="#g69"/><rect class="foreground" height="17" width="8" x="200" y="391"/><use y="391" xlink:href="#g70"/><animate attributeName="display" begin="18929ms; anim_last.end+18929ms" dur="94ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g71"/><animate attributeName="display" begin="18741ms; anim_last.end+18741ms" dur="532ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="19023ms; anim_last.end+19023ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g73"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="19273ms; anim_last.end+19273ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g71"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="19523ms; anim_last.end+19523ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g73"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="19773ms; anim_last.end+19773ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="56" x="32" y="357"/><use y="357" xlink:href="#g75"/><animate attributeName="display" begin="19023ms; anim_last.end+19023ms" dur="1250ms" from="inline" to="inline"/></g><g display="none"><use y="374" xlink:href="#g74"/><rect class="foreground" height="17" width="8" x="208" y="391"/><use y="391" xlink:href="#g72"/><animate attributeName="display" begin="20023ms; anim_last.end+20023ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="357"/><use y="357" xlink:href="#g76"/><use y="374" xlink:href="#g74"/><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="20273ms; anim_last.end+20273ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="20523ms; anim_last.end+20523ms" dur="25ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g85"/><use y="17" xlink:href="#g96"/><use y="34" xlink:href="#g85"/><use y="51" xlink:href="#g97"/><use y="68" xlink:href="#g85"/><use y="85" xlink:href="#g98"/><use y="102" xlink:href="#g99"/><use y="119" xlink:href="#g100"/><use y="136" xlink:href="#g101"/><use y="170" xlink:href="#g102"/><use y="187" xlink:href="#g103"/><use y="204" xlink:href="#g104"/><use y="221" xlink:href="#g105"/><use y="238" xlink:href="#g106"/><use y="255" xlink:href="#g107"/><use y="272" xlink:href="#g108"/><use y="306" xlink:href="#g109"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g110"/><animate attributeName="display" begin="18741ms; anim_last.end+18741ms" dur="2057ms" from="inline" to="inline"/></g><g display="none"><use y="357" xlink:href="#g15"/><use y="374" xlink:href="#g74"/><animate attributeName="display" begin="20523ms; anim_last.end+20523ms" dur="275ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="20548ms; anim_last.end+20548ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g111"><text class="color12" font-weight="bold" textLength="40" x="0">...: </text><text fill="#af5f00" textLength="8" x="40">'</text><text class="foreground" textLength="128" x="48">, can_filters=[{</text><text fill="#af5f00" textLength="64" x="176">'can_id'</text><text class="foreground" textLength="8" x="240">:</text><text fill="#008700" textLength="40" x="248">0x100</text><text class="foreground" textLength="152" x="288"> | CAN_INV_FILTER, </text><text fill="#af5f00" textLength="80" x="440">'can_mask'</text><text class="foreground" textLength="8" x="520">:</text><text fill="#008700" textLength="40" x="528">0x700</text><text class="foreground" textLength="24" x="568">}])</text><text fill="#000000" textLength="8" x="592">)</text><text class="background" textLength="8" x="600"> </text><text class="foreground" textLength="32" x="608">    </text></g></defs><g display="none"><rect fill="#afd7d7" height="17" width="8" x="160" y="374"/><use y="374" xlink:href="#g94"/><rect fill="#afd7d7" height="17" width="8" x="592" y="391"/><rect class="foreground" height="17" width="8" x="600" y="391"/><use y="391" xlink:href="#g111"/><animate attributeName="display" begin="20798ms; anim_last.end+20798ms" dur="195ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="374"/><rect class="foreground" height="17" width="8" x="120" y="374"/><use y="374" xlink:href="#g87"/><animate attributeName="display" begin="20993ms; anim_last.end+20993ms" dur="14ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g96"/><use y="17" xlink:href="#g85"/><use y="34" xlink:href="#g97"/><use y="51" xlink:href="#g85"/><use y="68" xlink:href="#g98"/><use y="85" xlink:href="#g99"/><use y="102" xlink:href="#g100"/><use y="119" xlink:href="#g101"/><use y="153" xlink:href="#g102"/><use y="170" xlink:href="#g103"/><use y="187" xlink:href="#g104"/><use y="204" xlink:href="#g105"/><use y="221" xlink:href="#g106"/><use y="238" xlink:href="#g107"/><use y="255" xlink:href="#g108"/><use y="289" xlink:href="#g109"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g110"/><use y="340" xlink:href="#g15"/><use y="357" xlink:href="#g74"/><animate attributeName="display" begin="20798ms; anim_last.end+20798ms" dur="459ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="374"/><rect class="foreground" height="17" width="8" x="120" y="374"/><use y="374" xlink:href="#g87"/><animate attributeName="display" begin="21007ms; anim_last.end+21007ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="391" xlink:href="#g14"/><animate attributeName="display" begin="20993ms; anim_last.end+20993ms" dur="264ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="21257ms; anim_last.end+21257ms" dur="18ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="21275ms; anim_last.end+21275ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g112"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x686</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">2</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="56" x="296">'\x1b}'</text><text class="foreground" textLength="288" x="352"> |&gt;                                 </text></g></defs><g display="none"><use y="0" xlink:href="#g85"/><use y="17" xlink:href="#g97"/><use y="34" xlink:href="#g85"/><use y="51" xlink:href="#g98"/><use y="68" xlink:href="#g99"/><use y="85" xlink:href="#g100"/><use y="102" xlink:href="#g101"/><use y="136" xlink:href="#g102"/><use y="153" xlink:href="#g103"/><use y="170" xlink:href="#g104"/><use y="187" xlink:href="#g105"/><use y="204" xlink:href="#g106"/><use y="221" xlink:href="#g107"/><use y="238" xlink:href="#g108"/><use y="272" xlink:href="#g109"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g110"/><use y="323" xlink:href="#g15"/><use y="340" xlink:href="#g74"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g112"/><animate attributeName="display" begin="21257ms; anim_last.end+21257ms" dur="518ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="21525ms; anim_last.end+21525ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g1"/><animate attributeName="display" begin="21775ms; anim_last.end+21775ms" dur="11ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="21786ms; anim_last.end+21786ms" dur="10ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="21796ms; anim_last.end+21796ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g113"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x680</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">8</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="128" x="296">'&gt;0\x8b.\xc8leI'</text><text class="foreground" textLength="216" x="424"> |&gt;                        </text></g></defs><g display="none"><use y="0" xlink:href="#g85"/><use y="17" xlink:href="#g98"/><use y="34" xlink:href="#g99"/><use y="51" xlink:href="#g100"/><use y="68" xlink:href="#g101"/><use y="102" xlink:href="#g102"/><use y="119" xlink:href="#g103"/><use y="136" xlink:href="#g104"/><use y="153" xlink:href="#g105"/><use y="170" xlink:href="#g106"/><use y="187" xlink:href="#g107"/><use y="204" xlink:href="#g108"/><use y="238" xlink:href="#g109"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g110"/><use y="289" xlink:href="#g15"/><use y="306" xlink:href="#g74"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g112"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g113"/><animate attributeName="display" begin="21775ms; anim_last.end+21775ms" dur="521ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="22046ms; anim_last.end+22046ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="22296ms; anim_last.end+22296ms" dur="15ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="22311ms; anim_last.end+22311ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g114"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x417</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">4</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="96" x="296">'A\xe4\x81.'</text><text class="foreground" textLength="248" x="392"> |&gt;                            </text></g></defs><g display="none"><use y="0" xlink:href="#g99"/><use y="17" xlink:href="#g100"/><use y="34" xlink:href="#g101"/><use y="68" xlink:href="#g102"/><use y="85" xlink:href="#g103"/><use y="102" xlink:href="#g104"/><use y="119" xlink:href="#g105"/><use y="136" xlink:href="#g106"/><use y="153" xlink:href="#g107"/><use y="170" xlink:href="#g108"/><use y="204" xlink:href="#g109"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g110"/><use y="255" xlink:href="#g15"/><use y="272" xlink:href="#g74"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g112"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g113"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g114"/><animate attributeName="display" begin="22296ms; anim_last.end+22296ms" dur="489ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="22561ms; anim_last.end+22561ms" dur="224ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="22785ms; anim_last.end+22785ms" dur="18ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g100"/><use y="17" xlink:href="#g101"/><use y="51" xlink:href="#g102"/><use y="68" xlink:href="#g103"/><use y="85" xlink:href="#g104"/><use y="102" xlink:href="#g105"/><use y="119" xlink:href="#g106"/><use y="136" xlink:href="#g107"/><use y="153" xlink:href="#g108"/><use y="187" xlink:href="#g109"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g110"/><use y="238" xlink:href="#g15"/><use y="255" xlink:href="#g74"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g112"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g113"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g114"/><use y="374" xlink:href="#g85"/><animate attributeName="display" begin="22785ms; anim_last.end+22785ms" dur="39ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="22803ms; anim_last.end+22803ms" dur="21ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="22824ms; anim_last.end+22824ms" dur="29ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="22853ms; anim_last.end+22853ms" dur="242ms" from="inline" to="inline"/></g><defs><g id="g115"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x322</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">8</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="200" x="296">'\x1b+=\x04\xad\x8f\xf4C'</text><text class="foreground" textLength="144" x="496"> |&gt;               </text></g></defs><g display="none"><use y="0" xlink:href="#g101"/><use y="34" xlink:href="#g102"/><use y="51" xlink:href="#g103"/><use y="68" xlink:href="#g104"/><use y="85" xlink:href="#g105"/><use y="102" xlink:href="#g106"/><use y="119" xlink:href="#g107"/><use y="136" xlink:href="#g108"/><use y="170" xlink:href="#g109"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g110"/><use y="221" xlink:href="#g15"/><use y="238" xlink:href="#g74"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g112"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g113"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g114"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g115"/><animate attributeName="display" begin="22824ms; anim_last.end+22824ms" dur="521ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="23095ms; anim_last.end+23095ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="23345ms; anim_last.end+23345ms" dur="14ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="23359ms; anim_last.end+23359ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g116"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x5ca</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">4</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="96" x="296">'\x83W\xceM'</text><text class="foreground" textLength="248" x="392"> |&gt;                            </text></g></defs><g display="none"><use y="0" xlink:href="#g102"/><use y="17" xlink:href="#g103"/><use y="34" xlink:href="#g104"/><use y="51" xlink:href="#g105"/><use y="68" xlink:href="#g106"/><use y="85" xlink:href="#g107"/><use y="102" xlink:href="#g108"/><use y="136" xlink:href="#g109"/><use y="153" xlink:href="#g85"/><use y="170" xlink:href="#g110"/><use y="187" xlink:href="#g15"/><use y="204" xlink:href="#g74"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g112"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g113"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g114"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g115"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g116"/><animate attributeName="display" begin="23345ms; anim_last.end+23345ms" dur="495ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="23609ms; anim_last.end+23609ms" dur="231ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="23840ms; anim_last.end+23840ms" dur="18ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g103"/><use y="17" xlink:href="#g104"/><use y="34" xlink:href="#g105"/><use y="51" xlink:href="#g106"/><use y="68" xlink:href="#g107"/><use y="85" xlink:href="#g108"/><use y="119" xlink:href="#g109"/><use y="136" xlink:href="#g85"/><use y="153" xlink:href="#g110"/><use y="170" xlink:href="#g15"/><use y="187" xlink:href="#g74"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g112"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g113"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g114"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g115"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g116"/><use y="374" xlink:href="#g85"/><animate attributeName="display" begin="23840ms; anim_last.end+23840ms" dur="32ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="23858ms; anim_last.end+23858ms" dur="14ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="23872ms; anim_last.end+23872ms" dur="31ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="23903ms; anim_last.end+23903ms" dur="216ms" from="inline" to="inline"/></g><defs><g id="g117"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x3bf</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">1</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="24" x="296">'j'</text><text class="foreground" textLength="320" x="320"> |&gt;                                     </text></g></defs><g display="none"><use y="0" xlink:href="#g104"/><use y="17" xlink:href="#g105"/><use y="34" xlink:href="#g106"/><use y="51" xlink:href="#g107"/><use y="68" xlink:href="#g108"/><use y="102" xlink:href="#g109"/><use y="119" xlink:href="#g85"/><use y="136" xlink:href="#g110"/><use y="153" xlink:href="#g15"/><use y="170" xlink:href="#g74"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g112"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g113"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g114"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g115"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g116"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g117"/><animate attributeName="display" begin="23872ms; anim_last.end+23872ms" dur="497ms" from="inline" to="inline"/></g><g display="none"><rect fill="#afd7d7" height="17" width="16" x="104" y="391"/><rect class="foreground" height="17" width="8" x="120" y="391"/><use y="391" xlink:href="#g87"/><animate attributeName="display" begin="24119ms; anim_last.end+24119ms" dur="250ms" from="inline" to="inline"/></g><g display="none"><use y="0" xlink:href="#g105"/><use y="17" xlink:href="#g106"/><use y="34" xlink:href="#g107"/><use y="51" xlink:href="#g108"/><use y="85" xlink:href="#g109"/><use y="102" xlink:href="#g85"/><use y="119" xlink:href="#g110"/><use y="136" xlink:href="#g15"/><use y="153" xlink:href="#g74"/><use y="170" xlink:href="#g85"/><use y="187" xlink:href="#g112"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g113"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g114"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g115"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g116"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g117"/><use y="374" xlink:href="#g85"/><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="24369ms; anim_last.end+24369ms" dur="10ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g1"/><animate attributeName="display" begin="24379ms; anim_last.end+24379ms" dur="11ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="24390ms; anim_last.end+24390ms" dur="41ms" from="inline" to="inline"/></g><defs><g id="g118"><text class="foreground" textLength="8" x="0">&lt;</text><text class="color9" font-weight="bold" textLength="24" x="8">CAN</text><text class="foreground" textLength="16" x="32">  </text><text class="color4" textLength="80" x="48">identifier</text><text class="foreground" textLength="8" x="128">=</text><text class="color5" textLength="40" x="136">0x3ba</text><text class="foreground" textLength="8" x="176"> </text><text class="color4" textLength="48" x="184">length</text><text class="foreground" textLength="8" x="232">=</text><text class="color5" textLength="8" x="240">4</text><text class="foreground" textLength="8" x="248"> </text><text class="color4" textLength="32" x="256">data</text><text class="foreground" textLength="8" x="288">=</text><text class="color5" textLength="120" x="296">'\x8di\x8d\x1e'</text><text class="foreground" textLength="224" x="416"> |&gt;                         </text></g></defs><g display="none"><use y="0" xlink:href="#g106"/><use y="17" xlink:href="#g107"/><use y="34" xlink:href="#g108"/><use y="68" xlink:href="#g109"/><use y="85" xlink:href="#g85"/><use y="102" xlink:href="#g110"/><use y="119" xlink:href="#g15"/><use y="136" xlink:href="#g74"/><use y="153" xlink:href="#g85"/><use y="170" xlink:href="#g112"/><use y="187" xlink:href="#g85"/><use y="204" xlink:href="#g113"/><use y="221" xlink:href="#g85"/><use y="238" xlink:href="#g114"/><use y="255" xlink:href="#g85"/><use y="272" xlink:href="#g115"/><use y="289" xlink:href="#g85"/><use y="306" xlink:href="#g116"/><use y="323" xlink:href="#g85"/><use y="340" xlink:href="#g117"/><use y="357" xlink:href="#g85"/><use y="374" xlink:href="#g118"/><animate attributeName="display" begin="24379ms; anim_last.end+24379ms" dur="302ms" from="inline" to="inline"/></g><g display="none"><rect class="foreground" height="17" width="8" x="32" y="391"/><use y="391" xlink:href="#g2"/><animate attributeName="display" begin="24431ms; anim_last.end+24431ms" dur="250ms" from="inline" to="inline"/></g><defs><g id="g119"><text fill="#878787" font-weight="bold" textLength="32" x="0">&gt;&gt;&gt; </text><text fill="#878787" textLength="608" x="32">                                                                            </text></g></defs><g display="none"><use y="0" xlink:href="#g107"/><use y="17" xlink:href="#g108"/><use y="51" xlink:href="#g109"/><use y="68" xlink:href="#g85"/><use y="85" xlink:href="#g110"/><use y="102" xlink:href="#g15"/><use y="119" xlink:href="#g74"/><use y="136" xlink:href="#g85"/><use y="153" xlink:href="#g112"/><use y="170" xlink:href="#g85"/><use y="187" xlink:href="#g113"/><use y="204" xlink:href="#g85"/><use y="221" xlink:href="#g114"/><use y="238" xlink:href="#g85"/><use y="255" xlink:href="#g115"/><use y="272" xlink:href="#g85"/><use y="289" xlink:href="#g116"/><use y="306" xlink:href="#g85"/><use y="323" xlink:href="#g117"/><use y="340" xlink:href="#g85"/><use y="357" xlink:href="#g118"/><use y="374" xlink:href="#g119"/><rect class="foreground" height="17" width="8" x="0" y="391"/><use y="391" xlink:href="#g25"/><animate attributeName="display" begin="24681ms; anim_last.end+24681ms" dur="1000ms" from="inline" to="inline" id="anim_last"/></g></svg>
-</svg>
\ No newline at end of file

scapy-2.4.3.tar.gz/run_scapy_py2 Deleted

scapy-2.4.3.tar.gz/run_scapy_py2.bat Deleted

scapy-2.4.3.tar.gz/run_scapy_py3 Deleted

scapy-2.4.3.tar.gz/run_scapy_py3.bat Deleted

scapy-2.4.3.tar.gz/scapy/contrib/automotive/someip_sd.py Deleted

@@ -1,350 +0,0 @@
-#! /usr/bin/env python
-
-# MIT License
-
-# Copyright (c) 2018 Jose Amores
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# This file is part of Scapy
-# See http://www.secdev.org/projects/scapy for more information
-# Copyright (C) Sebastian Baar <sebastian.baar@gmx.de>
-# This program is published under a GPLv2 license
-
-# scapy.contrib.description = SOME/IP Service Discovery
-# scapy.contrib.status = loads
-
-import ctypes
-import collections
-import struct
-
-from scapy.packet import Packet, Raw
-from scapy.fields import ByteField, BitField, ShortField, \
-    X3BytesField, IntField, ByteEnumField, StrField, IPField, \
-    FieldLenField, PacketListField
-from scapy.contrib.automotive.someip import SOMEIP
-from scapy.layers.inet6 import IP6Field
-from scapy.compat import orb
-
-
-class _SDPacketBase(Packet):
-    """ base class to be used among all SD Packet definitions."""
-    # use this dictionary to set default values for desired fields (mostly on
-    # subclasses where not all fields are defined locally)
-    # - key : field_name, value : desired value
-    # - it will be used from 'init_fields' function, upon packet initialization
-    #
-    # example : _defaults =
-    #  {'field_1_name':field_1_value,'field_2_name':field_2_value}
-    _defaults = {}
-
-    def _set_defaults(self):
-        for key in self._defaults:
-            try:
-                self.get_field(key)
-            except KeyError:
-                pass
-            else:
-                self.setfieldval(key, self._defaults[key])
-
-    def init_fields(self):
-        super(_SDPacketBase, self).init_fields()
-        self._set_defaults()
-
-
-# SD ENTRY
-#  - Service
-#  - EventGroup
-class _SDEntry(_SDPacketBase):
-    TYPE_FMT = ">B"
-    TYPE_PAYLOAD_I = 0
-    TYPE_SRV_FINDSERVICE = 0x00
-    TYPE_SRV_OFFERSERVICE = 0x01
-    TYPE_SRV = (TYPE_SRV_FINDSERVICE, TYPE_SRV_OFFERSERVICE)
-    TYPE_EVTGRP_SUBSCRIBE = 0x06
-    TYPE_EVTGRP_SUBSCRIBE_ACK = 0x07
-    TYPE_EVTGRP = (TYPE_EVTGRP_SUBSCRIBE, TYPE_EVTGRP_SUBSCRIBE_ACK)
-    OVERALL_LEN = 16
-
-    fields_desc = [
-        ByteField("type", 0),
-        ByteField("index_1", 0),
-        ByteField("index_2", 0),
-        BitField("n_opt_1", 0, 4),
-        BitField("n_opt_2", 0, 4),
-        ShortField("srv_id", 0),
-        ShortField("inst_id", 0),
-        ByteField("major_ver", 0),
-        X3BytesField("ttl", 0)
-    ]
-
-    def guess_payload_class(self, payload):
-        pl_type = orb(payload[_SDEntry.TYPE_PAYLOAD_I])
-
-        if (pl_type in _SDEntry.TYPE_SRV):
-            return (SDEntry_Service)
-        elif (pl_type in _SDEntry.TYPE_EVTGRP):
-            return (SDEntry_EventGroup)
-
-
-class SDEntry_Service(_SDEntry):
-    _defaults = {"type": _SDEntry.TYPE_SRV_FINDSERVICE}
-
-    name = "Service Entry"
-    fields_desc = [
-        _SDEntry,
-        IntField("minor_ver", 0)
-    ]
-
-
-class SDEntry_EventGroup(_SDEntry):
-    _defaults = {"type": _SDEntry.TYPE_EVTGRP_SUBSCRIBE}
-
-    name = "Eventgroup Entry"
-    fields_desc = [
-        _SDEntry,
-        BitField("res", 0, 12),
-        BitField("cnt", 0, 4),
-        ShortField("eventgroup_id", 0)
-    ]
-
-
-# SD Option
-#  - Configuration
-#  - LoadBalancing
-# - IPv4 EndPoint
-# - IPv6 EndPoint
-
-# - IPv4 MultiCast
-# - IPv6 MultiCast
-# - IPv4 EndPoint
-# - IPv6 EndPoint
-class _SDOption(_SDPacketBase):
-    CFG_TYPE = 0x01
-    CFG_OVERALL_LEN = 4
-    LOADBALANCE_TYPE = 0x02
-    LOADBALANCE_LEN = 0x05
-    LOADBALANCE_OVERALL_LEN = 8
-    IP4_ENDPOINT_TYPE = 0x04
-    IP4_ENDPOINT_LEN = 0x0009
-    IP4_MCAST_TYPE = 0x14
-    IP4_MCAST_LEN = 0x0009
-    IP4_SDENDPOINT_TYPE = 0x24
-    IP4_SDENDPOINT_LEN = 0x0009
-    IP4_OVERALL_LEN = 12
-    IP6_ENDPOINT_TYPE = 0x06
-    IP6_ENDPOINT_LEN = 0x0015
-    IP6_MCAST_TYPE = 0x16
-    IP6_MCAST_LEN = 0x0015
-    IP6_SDENDPOINT_TYPE = 0x26
-    IP6_SDENDPOINT_LEN = 0x0015
-    IP6_OVERALL_LEN = 24
-
-    def guess_payload_class(self, payload):
-        pl_type = orb(payload[2])
-
-        return {
-            _SDOption.CFG_TYPE: SDOption_Config,
-            self.LOADBALANCE_TYPE: SDOption_LoadBalance,
-            self.IP4_ENDPOINT_TYPE: SDOption_IP4_EndPoint,
-            self.IP4_MCAST_TYPE: SDOption_IP4_Multicast,
-            self.IP4_SDENDPOINT_TYPE: SDOption_IP4_SD_EndPoint,
-            self.IP6_ENDPOINT_TYPE: SDOption_IP6_EndPoint,
-            self.IP6_MCAST_TYPE: SDOption_IP6_Multicast,
-            self.IP6_SDENDPOINT_TYPE: SDOption_IP6_SD_EndPoint
-        }.get(pl_type, Raw)
-
-
-class _SDOption_Header(_SDOption):
-    fields_desc = [
-        ShortField("len", None),
-        ByteField("type", 0),
-        ByteField("res_hdr", 0)
-    ]
-
-
-class _SDOption_Tail(_SDOption):
-    fields_desc = [
-        ByteField("res_tail", 0),
-        ByteEnumField("l4_proto", 0x06, {0x06: "TCP", 0x11: "UDP"}),
-        ShortField("port", 0)
-    ]
-
-
-class _SDOption_IP4(_SDOption):
-    fields_desc = [
-        _SDOption_Header,
-        IPField("addr", "0.0.0.0"),
-        _SDOption_Tail
-    ]
-
-
-class _SDOption_IP6(_SDOption):
-    fields_desc = [
-        _SDOption_Header,
-        IP6Field("addr", "2001:cdba:0000:0000:0000:0000:3257:9652"),
-        _SDOption_Tail
-    ]
-
-
-class SDOption_Config(_SDOption):
-    LEN_OFFSET = 0x01
-
-    name = "Config Option"
-    _defaults = {'type': _SDOption.CFG_TYPE}
-    fields_desc = [
-        _SDOption_Header,
-        StrField("cfg_str", "")
-    ]
-
-    def post_build(self, pkt, pay):
-        length = self.len
-        if (length is None):
-            length = len(self.cfg_str) + self.LEN_OFFSET
-            pkt = struct.pack("!H", length) + pkt[2:]
-        return (pkt + pay)
-
-
-class SDOption_LoadBalance(_SDOption):
-    name = "LoadBalance Option"
-    _defaults = {'type': _SDOption.LOADBALANCE_TYPE,
-                 'len': _SDOption.LOADBALANCE_LEN}
-    fields_desc = [
-        _SDOption_Header,
-        ShortField("priority", 0),
-        ShortField("weight", 0)
-    ]
-
-
-class SDOption_IP4_EndPoint(_SDOption_IP4):
-    name = "IP4 EndPoint Option"
-    _defaults = {'type': _SDOption.IP4_ENDPOINT_TYPE,
-                 'len': _SDOption.IP4_ENDPOINT_LEN}
-
-
-class SDOption_IP4_Multicast(_SDOption_IP4):
-    name = "IP4 Multicast Option"
-    _defaults = {'type': _SDOption.IP4_MCAST_TYPE,
-                 'len': _SDOption.IP4_MCAST_LEN}
-
-
-class SDOption_IP4_SD_EndPoint(_SDOption_IP4):
-    name = "IP4 SDEndPoint Option"
-    _defaults = {'type': _SDOption.IP4_SDENDPOINT_TYPE,
-                 'len': _SDOption.IP4_SDENDPOINT_LEN}
-
-
-class SDOption_IP6_EndPoint(_SDOption_IP6):
-    name = "IP6 EndPoint Option"
-    _defaults = {'type': _SDOption.IP6_ENDPOINT_TYPE,
-                 'len': _SDOption.IP6_ENDPOINT_LEN}
-
-
-class SDOption_IP6_Multicast(_SDOption_IP6):
-    name = "IP6 Multicast Option"
-    _defaults = {'type': _SDOption.IP6_MCAST_TYPE,
-                 'len': _SDOption.IP6_MCAST_LEN}
-
-
-class SDOption_IP6_SD_EndPoint(_SDOption_IP6):
-    name = "IP6 SDEndPoint Option"
-    _defaults = {'type': _SDOption.IP6_SDENDPOINT_TYPE,
-                 'len': _SDOption.IP6_SDENDPOINT_LEN}
-
-
-##
-# SD PACKAGE DEFINITION
-##
-class SD(_SDPacketBase):
-    """
-    SD Packet
-
-    NOTE :   when adding 'entries' or 'options', do not use list.append()
-        method but create a new list
-    e.g. :  p = SD()
-            p.option_array = [SDOption_Config(),SDOption_IP6_EndPoint()]
-    """
-    SOMEIP_MSGID_SRVID = 0xffff
-    SOMEIP_MSGID_SUBID = 0x1
-    SOMEIP_MSGID_EVENTID = 0x100
-    SOMEIP_PROTO_VER = 0x01
-    SOMEIP_IFACE_VER = 0x01
-    SOMEIP_MSG_TYPE = SOMEIP.TYPE_NOTIFICATION
-
-    name = "SD"
-    _sdFlag = collections.namedtuple('Flag', 'mask offset')
-    FLAGSDEF = {
-        "REBOOT": _sdFlag(mask=0x80, offset=7),
-        "UNICAST": _sdFlag(mask=0x40, offset=6)
-    }
-
-    name = "SD"
-    fields_desc = [
-        ByteField("flags", 0),
-        X3BytesField("res", 0),
-        FieldLenField("len_entry_array", None,
-                      length_of="entry_array", fmt="!I"),
-        PacketListField("entry_array", None, cls=_SDEntry,
-                        length_from=lambda pkt: pkt.len_entry_array),
-        FieldLenField("len_option_array", None,
-                      length_of="option_array", fmt="!I"),
-        PacketListField("option_array", None, cls=_SDOption,
-                        length_from=lambda pkt: pkt.len_option_array)
-    ]
-
-    def get_flag(self, name):
-        name = name.upper()
-        if (name in self.FLAGSDEF):
-            return ((self.flags & self.FLAGSDEF[name].mask) >>
-                    self.FLAGSDEF[name].offset)
-        else:
-            return None
-
-    def set_flag(self, name, value):
-        name = name.upper()
-        if (name in self.FLAGSDEF):
-            self.flags = (self.flags &
-                          (ctypes.c_ubyte(~self.FLAGSDEF[name].mask).value)) \
-                | ((value & 0x01) << self.FLAGSDEF[name].offset)
-
-    def set_entryArray(self, entry_list):
-        if (isinstance(entry_list, list)):
-            self.entry_array = entry_list
-        else:
-            self.entry_array = [entry_list]
-
-    def set_optionArray(self, option_list):
-        if (isinstance(option_list, list)):
-            self.option_array = option_list
-        else:
-            self.option_array = [option_list]
-
-    def get_someip(self, stacked=False):
-        p = SOMEIP()
-        p.msg_id.srv_id = SD.SOMEIP_MSGID_SRVID
-        p.msg_id.sub_id = SD.SOMEIP_MSGID_SUBID
-        p.msg_id.event_id = SD.SOMEIP_MSGID_EVENTID
-        p.proto_ver = SD.SOMEIP_PROTO_VER
-        p.iface_ver = SD.SOMEIP_IFACE_VER
-        p.msg_type = SD.SOMEIP_MSG_TYPE
-
-        if (stacked):
-            return (p / self)
-        else:
-            return (p)

scapy-2.4.3.tar.gz/scapy/contrib/scada/iec104/iec104.py Deleted

@@ -1,645 +0,0 @@
-# This file is part of Scapy
-# See http://www.secdev.org/projects/scapy for more information
-# Copyright (C) Thomas Tannhaeuser <hecke@naberius.de>
-# This program is published under a GPLv2 license
-#
-# scapy.contrib.description = IEC-60870-5-104 APCI / APDU layer definitions
-# scapy.contrib.status = loads
-
-"""
-    IEC 60870-5-104
-    ~~~~~~~~~~~~~~~
-
-    :description:
-
-        This module provides the IEC 60870-5-104 (common short name: iec104)
-        layer, the information objects and related information element
-        definitions.
-
-        normative references:
-            - IEC 60870-5-4:1994 (atomic base types / data format)
-            - IEC 60870-5-101:2003 (information elements (sec. 7.2.6) and
-              ASDU definition (sec. 7.3))
-            - IEC 60870-5-104:2006 (information element TSC (sec. 8.8, p. 44))
-
-    :TODO:
-        - add allowed direction to IO attributes
-          (but this could be derived from the name easily <--> )
-        - information elements / objects need more testing
-          (e.g. on live traffic w comparison against tshark)
-
-    :NOTES:
-        - bit and octet numbering is used as in the related standards
-          (they usually start with index one instead of zero)
-        - some of the information objects are only valid for IEC 60870-5-101 -
-          so usually they should never appear on the network as iec101 uses
-          serial connections. I added them if decoding of those messages is
-          needed cause one goes to implement a iec101<-->iec104 gateway or
-          hits such a gateway that acts not standard conform (e.g. by
-          forwarding 101 messages to a 104 network)
-"""
-
-from scapy.compat import orb
-
-from scapy.contrib.scada.iec104.iec104_fields import LEThreeBytesField, \
-    IEC104SequenceNumber
-from scapy.contrib.scada.iec104.iec104_information_objects import \
-    IEC104_IO_NAMES, IEC104_IO_WITH_IOA_CLASSES, \
-    IEC104_IO_CLASSES, IEC104_IO_ID_C_RD_NA_1, IEC104_IO_C_RD_NA_1
-
-from scapy.config import conf
-from scapy.contrib.scada.iec104.iec104_information_objects import \
-    IEC104_IO_Packet
-from scapy.error import warning, Scapy_Exception
-from scapy.fields import ByteField, BitField, ByteEnumField, PacketListField, \
-    BitEnumField, XByteField, FieldLenField, LEShortField, BitFieldLenField
-
-from scapy.layers.inet import TCP
-from scapy.packet import Raw
-from scapy.packet import Packet, bind_layers
-
-IEC_104_IANA_PORT = 2404
-
-# direction - from the central station to the substation
-IEC104_CONTROL_DIRECTION = 0
-IEC104_CENTRAL_2_SUB_DIR = IEC104_CONTROL_DIRECTION
-
-# direction - from the substation to the central station
-IEC104_MONITOR_DIRECTION = 1
-IEC104_SUB_2_CENTRAL_DIR = IEC104_MONITOR_DIRECTION
-
-IEC104_DIRECTIONS = {
-    IEC104_MONITOR_DIRECTION: 'monitor direction (sub -> central)',
-    IEC104_CONTROL_DIRECTION: 'control direction (central -> sub)',
-}
-
-# COT - cause of transmission
-IEC104_COT_UNDEFINED = 0
-IEC104_COT_CYC = 1
-IEC104_COT_BACK = 2
-IEC104_COT_SPONT = 3
-IEC104_COT_INIT = 4
-IEC104_COT_REQ = 5
-IEC104_COT_ACT = 6
-IEC104_COT_ACTCON = 7
-IEC104_COT_DEACT = 8
-IEC104_COT_DEACTCON = 9
-IEC104_COT_ACTTERM = 10
-IEC104_COT_RETREM = 11
-IEC104_COT_RETLOC = 12
-IEC104_COT_FILE = 13
-IEC104_COT_RESERVED_14 = 14
-IEC104_COT_RESERVED_15 = 15
-IEC104_COT_RESERVED_16 = 16
-IEC104_COT_RESERVED_17 = 17
-IEC104_COT_RESERVED_18 = 18
-IEC104_COT_RESERVED_19 = 19
-IEC104_COT_INROGEN = 20
-IEC104_COT_INRO1 = 21
-IEC104_COT_INRO2 = 22
-IEC104_COT_INRO3 = 23
-IEC104_COT_INRO4 = 24
-IEC104_COT_INRO5 = 25
-IEC104_COT_INRO6 = 26
-IEC104_COT_INRO7 = 27
-IEC104_COT_INRO8 = 28
-IEC104_COT_INRO9 = 29
-IEC104_COT_INRO10 = 30
-IEC104_COT_INRO11 = 31
-IEC104_COT_INRO12 = 32
-IEC104_COT_INRO13 = 33
-IEC104_COT_INRO14 = 34
-IEC104_COT_INRO15 = 35
-IEC104_COT_INRO16 = 36
-IEC104_COT_REQCOGEN = 37
-IEC104_COT_REQCO1 = 38
-IEC104_COT_REQCO2 = 39
-IEC104_COT_REQCO3 = 40
-IEC104_COT_REQCO4 = 41
-IEC104_COT_RESERVED_42 = 42
-IEC104_COT_RESERVED_43 = 43
-IEC104_COT_UNKNOWN_TYPE_CODE = 44
-IEC104_COT_UNKNOWN_TRANSMIT_REASON = 45
-IEC104_COT_UNKNOWN_COMMON_ADDRESS_OF_ASDU = 46
-IEC104_COT_UNKNOWN_ADDRESS_OF_INFORMATION_OBJECT = 47
-IEC104_COT_PRIVATE_48 = 48
-IEC104_COT_PRIVATE_49 = 49
-IEC104_COT_PRIVATE_50 = 50
-IEC104_COT_PRIVATE_51 = 51
-IEC104_COT_PRIVATE_52 = 52
-IEC104_COT_PRIVATE_53 = 53
-IEC104_COT_PRIVATE_54 = 54
-IEC104_COT_PRIVATE_55 = 55
-IEC104_COT_PRIVATE_56 = 56
-IEC104_COT_PRIVATE_57 = 57
-IEC104_COT_PRIVATE_58 = 58
-IEC104_COT_PRIVATE_59 = 59
-IEC104_COT_PRIVATE_60 = 60
-IEC104_COT_PRIVATE_61 = 61
-IEC104_COT_PRIVATE_62 = 62
-IEC104_COT_PRIVATE_63 = 63
-
-CAUSE_OF_TRANSMISSIONS = {
-    IEC104_COT_UNDEFINED: 'undefined',
-    IEC104_COT_CYC: 'cyclic (per/cyc)',
-    IEC104_COT_BACK: 'background (back)',
-    IEC104_COT_SPONT: 'spontaneous (spont)',
-    IEC104_COT_INIT: 'initialized (init)',
-    IEC104_COT_REQ: 'request (req)',
-    IEC104_COT_ACT: 'activation (act)',
-    IEC104_COT_ACTCON: 'activation confirmed (actcon)',
-    IEC104_COT_DEACT: 'activation canceled (deact)',
-    IEC104_COT_DEACTCON: 'activation cancellation confirmed (deactcon)',
-    IEC104_COT_ACTTERM: 'activation finished (actterm)',
-    IEC104_COT_RETREM: 'feedback caused by remote command (retrem)',
-    IEC104_COT_RETLOC: 'feedback caused by local command (retloc)',
-    IEC104_COT_FILE: 'file transfer (file)',
-    IEC104_COT_RESERVED_14: 'reserved_14',
-    IEC104_COT_RESERVED_15: 'reserved_15',
-    IEC104_COT_RESERVED_16: 'reserved_16',
-    IEC104_COT_RESERVED_17: 'reserved_17',
-    IEC104_COT_RESERVED_18: 'reserved_18',
-    IEC104_COT_RESERVED_19: 'reserved_19',
-    IEC104_COT_INROGEN: 'queried by station (inrogen)',
-    IEC104_COT_INRO1: 'queried by query to group 1 (inro1)',
-    IEC104_COT_INRO2: 'queried by query to group 2 (inro2)',
-    IEC104_COT_INRO3: 'queried by query to group 3 (inro3)',
-    IEC104_COT_INRO4: 'queried by query to group 4 (inro4)',
-    IEC104_COT_INRO5: 'queried by query to group 5 (inro5)',
-    IEC104_COT_INRO6: 'queried by query to group 6 (inro6)',
-    IEC104_COT_INRO7: 'queried by query to group 7 (inro7)',
-    IEC104_COT_INRO8: 'queried by query to group 8 (inro8)',
-    IEC104_COT_INRO9: 'queried by query to group 9 (inro9)',
-    IEC104_COT_INRO10: 'queried by query to group 10 (inro10)',
-    IEC104_COT_INRO11: 'queried by query to group 11 (inro11)',
-    IEC104_COT_INRO12: 'queried by query to group 12 (inro12)',
-    IEC104_COT_INRO13: 'queried by query to group 13 (inro13)',
-    IEC104_COT_INRO14: 'queried by query to group 14 (inro14)',
-    IEC104_COT_INRO15: 'queried by query to group 15 (inro15)',
-    IEC104_COT_INRO16: 'queried by query to group 16 (inro16)',
-    IEC104_COT_REQCOGEN: 'queried by counter general interrogation (reqcogen)',
-    IEC104_COT_REQCO1: 'queried by query to counter group 1 (reqco1)',
-    IEC104_COT_REQCO2: 'queried by query to counter group 2 (reqco2)',
-    IEC104_COT_REQCO3: 'queried by query to counter group 3 (reqco3)',
-    IEC104_COT_REQCO4: 'queried by query to counter group 4 (reqco4)',
-    IEC104_COT_RESERVED_42: 'reserved_42',
-    IEC104_COT_RESERVED_43: 'reserved_43',
-    IEC104_COT_UNKNOWN_TYPE_CODE: 'unknown type code',
-    IEC104_COT_UNKNOWN_TRANSMIT_REASON: 'unknown transmit reason',
-    IEC104_COT_UNKNOWN_COMMON_ADDRESS_OF_ASDU:
-        'unknown common address of ASDU',
-    IEC104_COT_UNKNOWN_ADDRESS_OF_INFORMATION_OBJECT:
-        'unknown address of information object',
-    IEC104_COT_PRIVATE_48: 'private_48',
-    IEC104_COT_PRIVATE_49: 'private_49',
-    IEC104_COT_PRIVATE_50: 'private_50',
-    IEC104_COT_PRIVATE_51: 'private_51',
-    IEC104_COT_PRIVATE_52: 'private_52',
-    IEC104_COT_PRIVATE_53: 'private_53',
-    IEC104_COT_PRIVATE_54: 'private_54',
-    IEC104_COT_PRIVATE_55: 'private_55',
-    IEC104_COT_PRIVATE_56: 'private_56',
-    IEC104_COT_PRIVATE_57: 'private_57',
-    IEC104_COT_PRIVATE_58: 'private_58',
-    IEC104_COT_PRIVATE_59: 'private_59',
-    IEC104_COT_PRIVATE_60: 'private_60',
-    IEC104_COT_PRIVATE_61: 'private_61',
-    IEC104_COT_PRIVATE_62: 'private_62',
-    IEC104_COT_PRIVATE_63: 'private_63'
-}
-
-IEC104_APDU_TYPE_UNKNOWN = 0x00
-IEC104_APDU_TYPE_I_SEQ_IOA = 0x01
-IEC104_APDU_TYPE_I_SINGLE_IOA = 0x02
-IEC104_APDU_TYPE_U = 0x03
-IEC104_APDU_TYPE_S = 0x04
-
-
-def _iec104_apci_type_from_packet(data):
-    """
-    the type of the message is encoded in octet 1..4
-
-                 oct 1, bit 1   2       oct 3, bit 1
-    I Message               0  1|0                 0
-    S Message               1   0                  0
-    U Message               1   1                  0
-
-
-    see EN 60870-5-104:2006, sec. 5 (p. 13, fig. 6,7,8)
-    """
-
-    oct_1 = orb(data[2])
-    oct_3 = orb(data[4])
-
-    oct_1_bit_1 = bool(oct_1 & 1)
-    oct_1_bit_2 = bool(oct_1 & 2)
-    oct_3_bit_1 = bool(oct_3 & 1)
-
-    if oct_1_bit_1 is False and oct_3_bit_1 is False:
-        if len(data) < 8:
-            return IEC104_APDU_TYPE_UNKNOWN
-
-        is_seq_ioa = ((orb(data[7]) & 0x80) == 0x80)
-
-        if is_seq_ioa:
-            return IEC104_APDU_TYPE_I_SEQ_IOA
-        else:
-            return IEC104_APDU_TYPE_I_SINGLE_IOA
-
-    if oct_1_bit_1 and oct_1_bit_2 is False and oct_3_bit_1 is False:
-        return IEC104_APDU_TYPE_S
-
-    if oct_1_bit_1 and oct_1_bit_2 and oct_3_bit_1 is False:
-        return IEC104_APDU_TYPE_U
-
-    return IEC104_APDU_TYPE_UNKNOWN
-
-
-class IEC104_APDU(Packet):
-    """
-    basic Application Protocol Data Unit definition used by S/U/I messages
-    """
-
-    def guess_payload_class(self, payload):
-
-        payload_len = len(payload)
-
-        if payload_len < 6:
-            return self.default_payload_class(payload)
-
-        if orb(payload[0]) != 0x68:
-            self.default_payload_class(payload)
-
-        # the length field contains the number of bytes starting from the
-        # first control octet
-        apdu_length = 2 + orb(payload[1])
-
-        if payload_len < apdu_length:
-            warning(
-                'invalid len of APDU. given len: {} available len: {}'.format(
-                    apdu_length, payload_len))
-            return self.default_payload_class(payload)
-
-        apdu_type = _iec104_apci_type_from_packet(payload)
-
-        return IEC104_APDU_CLASSES.get(apdu_type,
-                                       self.default_payload_class(payload))
-
-    @classmethod
-    def dispatch_hook(cls, _pkt=None, *args, **kargs):
-        """
-        detect type of the message by checking packet data
-        :param _pkt: raw bytes of the packet layer data to be checked
-        :param args: unused
-        :param kargs: unused
-        :return: class of the detected message type
-        """
-
-        if _iec104_is_i_apdu_seq_ioa(_pkt):
-            return IEC104_I_Message_SeqIOA
-
-        if _iec104_is_i_apdu_single_ioa(_pkt):
-            return IEC104_I_Message_SingleIOA
-
-        if _iec104_is_u_apdu(_pkt):
-            return IEC104_U_Message
-
-        if _iec104_is_s_apdu(_pkt):
-            return IEC104_S_Message
-
-        return Raw
-
-
-class IEC104_S_Message(IEC104_APDU):
-    """
-    message used for ack of received I-messages
-    """
-    name = 'IEC-104 S APDU'
-
-    fields_desc = [
-
-        XByteField('start', 0x68),
-        ByteField("apdu_length", 4),
-
-        ByteField('octet_1', 0x01),
-        ByteField('octet_2', 0),
-        IEC104SequenceNumber('rx_seq_num', 0),
-    ]
-
-
-class IEC104_U_Message(IEC104_APDU):
-    """
-    message used for connection tx control (start/stop)  and monitoring (test)
-    """
-    name = 'IEC-104 U APDU'
-
-    fields_desc = [
-
-        XByteField('start', 0x68),
-        ByteField("apdu_length", 4),
-
-        BitField('testfr_con', 0, 1),
-        BitField('testfr_act', 0, 1),
-        BitField('stopdt_con', 0, 1),
-        BitField('stopdt_act', 0, 1),
-        BitField('startdt_con', 0, 1),
-        BitField('startdt_act', 0, 1),
-        BitField('octet_1_1_2', 3, 2),
-
-        ByteField('octet_2', 0),
-        ByteField('octet_3', 0),
-        ByteField('octet_4', 0)
-    ]
-
-
-def _i_msg_io_dispatcher_sequence(pkt, next_layer_data):
-    """
-    get the type id and return the matching ASDU instance
-    """
-    next_layer_class_type = IEC104_IO_CLASSES.get(pkt.type_id, conf.raw_layer)
-
-    return next_layer_class_type(next_layer_data)
-
-
-def _i_msg_io_dispatcher_single(pkt, next_layer_data):
-    """
-    get the type id and return the matching ASDU instance
-    (information object address + regular ASDU information object fields)
-    """
-    next_layer_class_type = IEC104_IO_WITH_IOA_CLASSES.get(pkt.type_id,
-                                                           conf.raw_layer)
-
-    return next_layer_class_type(next_layer_data)
-
-
-class IEC104ASDUPacketListField(PacketListField):
-    """
-    used to add a list of information objects to an I-message
-    """
-    def m2i(self, pkt, m):
-        """
-        add calling layer instance to the cls()-signature
-        :param pkt: calling layer instance
-        :param m: raw data forming the next layer
-        :return: instance of the class representing the next layer
-        """
-        return self.cls(pkt, m)
-
-
-class IEC104_I_Message_StructureException(Scapy_Exception):
-    """
-    Exception raised if payload is not of type Information Object
-    """
-    pass
-
-
-class IEC104_I_Message(IEC104_APDU):
-    """
-    message used for transmitting data (APDU - Application Protocol Data Unit)
-
-    APDU: MAGIC + APCI + ASDU
-    MAGIC: 0x68
-    APCI : Control Information (rx/tx seq/ack numbers)
-    ASDU : Application Service Data Unit - information object related data
-
-    see EN 60870-5-104:2006, sec. 5 (p. 12)
-    """
-    name = 'IEC-104 I APDU'
-
-    IEC_104_MAGIC = 0x68  # dec -> 104
-
-    SQ_FLAG_SINGLE = 0
-    SQ_FLAG_SEQUENCE = 1
-
-    SQ_FLAGS = {
-        SQ_FLAG_SINGLE: 'single',
-        SQ_FLAG_SEQUENCE: 'sequence'
-    }
-
-    TEST_DISABLED = 0
-    TEST_ENABLED = 1
-
-    TEST_FLAGS = {
-        TEST_DISABLED: 'disabled',
-        TEST_ENABLED: 'enabled'
-    }
-
-    ACK_POSITIVE = 0
-    ACK_NEGATIVE = 1
-
-    ACK_FLAGS = {
-        ACK_POSITIVE: 'positive',
-        ACK_NEGATIVE: 'negative'
-    }
-
-    fields_desc = []
-
-    def __init__(self, _pkt=b"", post_transform=None, _internal=0,
-                 _underlayer=None, **fields):
-
-        super(IEC104_I_Message, self).__init__(_pkt=_pkt,
-                                               post_transform=post_transform,
-                                               _internal=_internal,
-                                               _underlayer=_underlayer,
-                                               **fields)
-
-        if 'io' in fields and fields['io']:
-            self._information_object_update(fields['io'])
-
-    def _information_object_update(self, io_instances):
-        """
-        set the type_id in the ASDU header based on the given information
-        object (io) and check for valid structure
-        :param io_instances: information object
-        """
-
-        if not isinstance(io_instances, list):
-            io_instances = [io_instances]
-
-        first_io = io_instances[0]
-        first_io_class = first_io.__class__
-
-        if not issubclass(first_io_class, IEC104_IO_Packet):
-            raise IEC104_I_Message_StructureException(
-                'information object payload must be a subclass of '
-                'IEC104_IO_Packet')
-
-        self.type_id = first_io.iec104_io_type_id()
-
-        # ensure all io elements within the ASDU share the same class type
-        for io_inst in io_instances[1:]:
-            if io_inst.__class__ != first_io_class:
-                raise IEC104_I_Message_StructureException(
-                    'each information object within the ASDU must be of '
-                    'the same class type (first io: {}, '
-                    'current io: {})'.format(first_io_class._name,
-                                             io_inst._name))
-
-
-class IEC104_I_Message_SeqIOA(IEC104_I_Message):
-    """
-    all information objects share a base information object address field
-
-    sq = 1, see EN 60870-5-101:2003, sec. 7.2.2.1 (p. 33)
-    """
-    name = 'IEC-104 I APDU (Seq IOA)'
-
-    fields_desc = [
-        # APCI
-        XByteField('start', IEC104_I_Message.IEC_104_MAGIC),
-        FieldLenField("apdu_length", None, fmt="!B", length_of='io',
-                      adjust=lambda pkt, x: x + 13),
-
-        IEC104SequenceNumber('tx_seq_num', 0),
-        IEC104SequenceNumber('rx_seq_num', 0),
-
-        # ASDU
-        ByteEnumField('type_id', 0, IEC104_IO_NAMES),
-
-        BitEnumField('sq', IEC104_I_Message.SQ_FLAG_SEQUENCE, 1,
-                     IEC104_I_Message.SQ_FLAGS),
-        BitFieldLenField('num_io', None, 7, count_of='io'),
-
-        BitEnumField('test', 0, 1, IEC104_I_Message.TEST_FLAGS),
-        BitEnumField('ack', 0, 1, IEC104_I_Message.ACK_FLAGS),
-        BitEnumField('cot', 0, 6, CAUSE_OF_TRANSMISSIONS),
-
-        ByteField('origin_address', 0),
-
-        LEShortField('common_asdu_address', 0),
-
-        LEThreeBytesField('information_object_address', 0),
-
-        IEC104ASDUPacketListField('io',
-                                  conf.raw_layer(),
-                                  _i_msg_io_dispatcher_sequence,
-                                  length_from=lambda pkt: pkt.apdu_length - 13)
-    ]
-
-    def post_dissect(self, s):
-        if self.type_id == IEC104_IO_ID_C_RD_NA_1:
-
-            # IEC104_IO_ID_C_RD_NA_1 has no payload. we will add the layer
-            # manually to the stack right now. we do this num_io times
-            # as - even if it makes no sense - someone could decide
-            # to add more than one read commands in a sequence...
-            setattr(self, 'io', [IEC104_IO_C_RD_NA_1()] * self.num_io)
-
-        return s
-
-
-class IEC104_I_Message_SingleIOA(IEC104_I_Message):
-    """
-    every information object contains an individual information object
-    address field
-
-    sq = 0, see EN 60870-5-101:2003, sec. 7.2.2.1 (p. 33)
-    """
-    name = 'IEC-104 I APDU (single IOA)'
-
-    fields_desc = [
-        # APCI
-        XByteField('start', IEC104_I_Message.IEC_104_MAGIC),
-        FieldLenField("apdu_length", None, fmt="!B", length_of='io',
-                      adjust=lambda pkt, x: x + 10),
-
-        IEC104SequenceNumber('tx_seq_num', 0),
-        IEC104SequenceNumber('rx_seq_num', 0),
-
-        # ASDU
-        ByteEnumField('type_id', 0, IEC104_IO_NAMES),
-
-        BitEnumField('sq', IEC104_I_Message.SQ_FLAG_SINGLE, 1,
-                     IEC104_I_Message.SQ_FLAGS),
-        BitFieldLenField('num_io', None, 7, count_of='io'),
-
-        BitEnumField('test', 0, 1, IEC104_I_Message.TEST_FLAGS),
-        BitEnumField('ack', 0, 1, IEC104_I_Message.ACK_FLAGS),
-        BitEnumField('cot', 0, 6, CAUSE_OF_TRANSMISSIONS),
-
-        ByteField('origin_address', 0),
-
-        LEShortField('common_asdu_address', 0),
-
-        IEC104ASDUPacketListField('io',
-                                  conf.raw_layer(),
-                                  _i_msg_io_dispatcher_single,
-                                  length_from=lambda pkt: pkt.apdu_length - 10)
-    ]
-
-
-IEC104_APDU_CLASSES = {
-    IEC104_APDU_TYPE_UNKNOWN: conf.raw_layer,
-    IEC104_APDU_TYPE_I_SEQ_IOA: IEC104_I_Message_SeqIOA,
-    IEC104_APDU_TYPE_I_SINGLE_IOA: IEC104_I_Message_SingleIOA,
-    IEC104_APDU_TYPE_U: IEC104_U_Message,
-    IEC104_APDU_TYPE_S: IEC104_S_Message
-}
-
-
-def _iec104_is_i_apdu_seq_ioa(payload):
-    len_payload = len(payload)
-    if len_payload < 6:
-        return False
-
-    if orb(payload[0]) != 0x68 or (
-            orb(payload[1]) + 2) > len_payload or len_payload < 8:
-        return False
-
-    return IEC104_APDU_TYPE_I_SEQ_IOA == _iec104_apci_type_from_packet(payload)
-
-
-def _iec104_is_i_apdu_single_ioa(payload):
-    len_payload = len(payload)
-    if len_payload < 6:
-        return False
-
-    if orb(payload[0]) != 0x68 or (
-            orb(payload[1]) + 2) > len_payload or len_payload < 8:
-        return False
-
-    return IEC104_APDU_TYPE_I_SINGLE_IOA == _iec104_apci_type_from_packet(
-        payload)
-
-
-def _iec104_is_u_apdu(payload):
-    if len(payload) < 6:
-        return False
-
-    if orb(payload[0]) != 0x68 or orb(payload[1]) != 4:
-        return False
-
-    return IEC104_APDU_TYPE_U == _iec104_apci_type_from_packet(payload)
-
-
-def _iec104_is_s_apdu(payload):
-    if len(payload) < 6:
-        return False
-
-    if orb(payload[0]) != 0x68 or orb(payload[1]) != 4:
-        return False
-
-    return IEC104_APDU_TYPE_S == _iec104_apci_type_from_packet(payload)
-
-
-def iec104_decode(payload):
-    """
-    can be used to dissect payload of a TCP connection
-    :param payload: the application layer data (IEC104-APDU(s))
-    :return: iec104 (I/U/S) message instance, conf.raw_layer() if unknown
-    """
-
-    if _iec104_is_i_apdu_seq_ioa(payload):
-        return IEC104_I_Message_SeqIOA(payload)
-    elif _iec104_is_i_apdu_single_ioa(payload):
-        return IEC104_I_Message_SingleIOA(payload)
-    elif _iec104_is_s_apdu(payload):
-        return IEC104_S_Message(payload)
-    elif _iec104_is_u_apdu(payload):
-        return IEC104_U_Message(payload)
-    else:
-        return conf.raw_layer(payload)
-
-
-bind_layers(TCP, IEC104_APDU, sport=IEC_104_IANA_PORT)
-bind_layers(TCP, IEC104_APDU, dport=IEC_104_IANA_PORT)

scapy-2.4.3.tar.gz/scapy/modules/winpcapy.py Deleted

@@ -1,789 +0,0 @@
-# Original license
-#-------------------------------------------------------------------------------  # noqa: E501
-# Name:        winpcapy.py
-#
-# Author:      Massimo Ciani
-#
-# Created:     01/09/2009
-# Copyright:   (c) Massimo Ciani 2009
-#
-#-------------------------------------------------------------------------------  # noqa: E501
-# Modified for scapy's usage - Mainly to support Npcap/Monitor mode
-
-# This file is part of Scapy
-# See http://www.secdev.org/projects/scapy for more information
-# This program is published under a GPLv2 license
-
-from ctypes import *
-from ctypes.util import find_library
-import sys, os
-from scapy.consts import WINDOWS
-
-HAVE_REMOTE = False
-
-if WINDOWS:
-    # Try to load Npcap, or Winpcap
-    HAVE_REMOTE=True
-    SOCKET = c_uint
-    npcap_folder = os.environ["WINDIR"] + "\\System32\\Npcap"
-    if os.path.exists(npcap_folder):
-        # Try to load npcap
-        os.environ['PATH'] = npcap_folder + ";" + os.environ['PATH']
-        # Set DLL directory priority
-        windll.kernel32.SetDllDirectoryW(npcap_folder)
-        # Packet.dll is unused, but needs to overwrite the winpcap one if it exists  # noqa: E501
-        cdll.LoadLibrary(npcap_folder + "\\Packet.dll")
-        _lib = cdll.LoadLibrary(npcap_folder + "\\wpcap.dll")
-    else:
-        _lib=CDLL("wpcap.dll")
-    del npcap_folder
-else:
-    # Try to load libpcap
-    SOCKET = c_int
-    _lib_name = find_library("pcap")
-    if not _lib_name:
-        raise OSError("Cannot fine libpcap.so library")
-    _lib=CDLL(_lib_name)
-    
-
-##
-## misc
-##
-u_short = c_ushort
-bpf_int32 = c_int
-u_int = c_int
-bpf_u_int32 = u_int
-pcap = c_void_p
-pcap_dumper = c_void_p
-u_char = c_ubyte
-FILE = c_void_p
-STRING = c_char_p
-
-class bpf_insn(Structure):
-    _fields_=[("code",c_ushort),
-              ("jt",c_ubyte),
-              ("jf",c_ubyte),
-              ("k",bpf_u_int32)]
-    
-class bpf_program(Structure):
-    pass
-bpf_program._fields_ = [('bf_len', u_int),
-                        ('bf_insns', POINTER(bpf_insn))]
-
-class bpf_version(Structure):
-    _fields_=[("bv_major",c_ushort),
-              ("bv_minor",c_ushort)]
-
-
-class timeval(Structure):
-    pass
-timeval._fields_ = [('tv_sec', c_long),
-                    ('tv_usec', c_long)]
-
-## sockaddr is used by pcap_addr.
-## For example if sa_family==socket.AF_INET then we need cast
-## with sockaddr_in 
-if WINDOWS:
-    class sockaddr(Structure):
-        _fields_ = [("sa_family", c_ushort),
-                    ("sa_data", c_ubyte * 14)]
-
-    class sockaddr_in(Structure):
-        _fields_ = [("sin_family", c_ushort),
-                    ("sin_port", c_uint16),
-                    ("sin_addr", 4 * c_ubyte)]
-
-    class sockaddr_in6(Structure):
-        _fields_ = [("sin6_family", c_ushort),
-                    ("sin6_port", c_uint16),
-                    ("sin6_flowinfo", c_uint32),
-                    ("sin6_addr", 16 * c_ubyte),
-                    ("sin6_scope", c_uint32)]
-else:
-    class sockaddr(Structure):
-        _fields_ = [("sa_len", c_ubyte),
-                    ("sa_family",c_ubyte),
-                    ("sa_data",c_ubyte * 14)]
-
-    class sockaddr_in(Structure):
-        _fields_ = [("sin_len", c_ubyte),
-                    ("sin_family", c_ubyte),
-                    ("sin_port", c_uint16),
-                    ("sin_addr", 4 * c_ubyte),
-                    ("sin_zero", 8 * c_char)]
-
-    class sockaddr_in6(Structure):
-        _fields_ = [("sin6_len", c_ubyte),
-                    ("sin6_family", c_ubyte),
-                    ("sin6_port", c_uint16),
-                    ("sin6_flowinfo", c_uint32),
-                    ("sin6_addr", 16 * c_ubyte),
-                    ("sin6_scope", c_uint32)]
-
-    class sockaddr_dl(Structure):
-        _fields_ = [("sdl_len", c_ubyte),
-                    ("sdl_family", c_ubyte),
-                    ("sdl_index", c_ushort),
-                    ("sdl_type", c_ubyte),
-                    ("sdl_nlen", c_ubyte),
-                    ("sdl_alen", c_ubyte),
-                    ("sdl_slen", c_ubyte),
-                    ("sdl_data", 46 * c_ubyte)]
-##
-## END misc
-##
-
-##
-## Data Structures
-##
-
-## struct   pcap_file_header
-##  Header of a libpcap dump file.
-class pcap_file_header(Structure):
-    _fields_ = [('magic', bpf_u_int32),
-                ('version_major', u_short),
-                ('version_minor', u_short),
-                ('thiszone', bpf_int32),
-                ('sigfigs', bpf_u_int32),
-                ('snaplen', bpf_u_int32),
-                ('linktype', bpf_u_int32)]
-
-## struct   pcap_pkthdr
-##  Header of a packet in the dump file.
-class pcap_pkthdr(Structure):
-    _fields_ = [('ts', timeval),
-                ('caplen', bpf_u_int32),
-                ('len', bpf_u_int32)]
-
-## struct   pcap_stat
-##  Structure that keeps statistical values on an interface.
-class pcap_stat(Structure):
-    pass
-### _fields_ list in Structure is final.
-### We need a temp list
-_tmpList = [("ps_recv", c_uint), ("ps_drop", c_uint), ("ps_ifdrop", c_uint)]
-if HAVE_REMOTE:
-    _tmpList.append(("ps_capt",c_uint))
-    _tmpList.append(("ps_sent",c_uint))
-    _tmpList.append(("ps_netdrop",c_uint))
-pcap_stat._fields_=_tmpList
-
-## struct   pcap_addr
-##  Representation of an interface address, used by pcap_findalldevs().
-class pcap_addr(Structure):
-    pass
-pcap_addr._fields_ = [('next', POINTER(pcap_addr)),
-                      ('addr', POINTER(sockaddr)),
-                      ('netmask', POINTER(sockaddr)),
-                      ('broadaddr', POINTER(sockaddr)),
-                      ('dstaddr', POINTER(sockaddr))]
-
-## struct   pcap_if
-##  Item in a list of interfaces, used by pcap_findalldevs().
-class pcap_if(Structure):
-    pass
-pcap_if._fields_ = [('next', POINTER(pcap_if)),
-                    ('name', STRING),
-                    ('description', STRING),
-                    ('addresses', POINTER(pcap_addr)),
-                    ('flags', bpf_u_int32)]
-
-##
-## END Data Structures
-##
-
-##
-## Defines
-##
-
-##define  PCAP_VERSION_MAJOR   2
-#   Major libpcap dump file version.
-PCAP_VERSION_MAJOR = 2 
-##define  PCAP_VERSION_MINOR   4
-#   Minor libpcap dump file version.
-PCAP_VERSION_MINOR = 4 
-##define  PCAP_ERRBUF_SIZE   256
-#   Size to use when allocating the buffer that contains the libpcap errors.
-PCAP_ERRBUF_SIZE = 256 
-##define  PCAP_IF_LOOPBACK   0x00000001
-#   interface is loopback
-PCAP_IF_LOOPBACK = 1 
-##define  MODE_CAPT   0
-#   Capture mode, to be used when calling pcap_setmode().
-MODE_CAPT = 0
-##define  MODE_STAT   1
-#   Statistical mode, to be used when calling pcap_setmode().
-MODE_STAT = 1
-
-##
-## END Defines
-##
-
-##
-## Typedefs
-##
-
-#typedef int  bpf_int32 (already defined)
-#   32-bit integer
-#typedef u_int  bpf_u_int32 (already defined)
-#   32-bit unsigned integer
-#typedef struct pcap  pcap_t
-#   Descriptor of an open capture instance. This structure is opaque to the user, that handles its content through the functions provided by wpcap.dll.  # noqa: E501
-pcap_t = pcap
-#typedef struct pcap_dumper   pcap_dumper_t
-#   libpcap savefile descriptor.
-pcap_dumper_t = pcap_dumper
-#typedef struct pcap_if   pcap_if_t
-#   Item in a list of interfaces, see pcap_if.
-pcap_if_t = pcap_if
-#typedef struct pcap_addr   pcap_addr_t
-#   Representation of an interface address, see pcap_addr.
-pcap_addr_t = pcap_addr
-
-##
-## END Typedefs
-##
-
-
-
-
-
-# values for enumeration 'pcap_direction_t'
-#pcap_direction_t = c_int # enum
-
-##
-## Unix-compatible Functions
-## These functions are part of the libpcap library, and therefore work both on Windows and on Linux.   # noqa: E501
-##
-
-#typedef void(* pcap_handler )(u_char *user, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data)  # noqa: E501
-#   Prototype of the callback function that receives the packets.
-## This one is defined from programmer
-pcap_handler=CFUNCTYPE(None,POINTER(c_ubyte),POINTER(pcap_pkthdr),POINTER(c_ubyte))  # noqa: E501
-
-#pcap_t *   pcap_open_live (const char *device, int snaplen, int promisc, int to_ms, char *ebuf)  # noqa: E501
-#   Open a live capture from the network.
-pcap_open_live = _lib.pcap_open_live
-pcap_open_live.restype = POINTER(pcap_t)
-pcap_open_live.argtypes = [STRING, c_int, c_int, c_int, STRING]
-
-#pcap_t *   pcap_open_dead (int linktype, int snaplen)
-#   Create a pcap_t structure without starting a capture.
-pcap_open_dead = _lib.pcap_open_dead
-pcap_open_dead.restype = POINTER(pcap_t)
-pcap_open_dead.argtypes = [c_int, c_int]
-
-#pcap_t *   pcap_open_offline (const char *fname, char *errbuf)
-#   Open a savefile in the tcpdump/libpcap format to read packets.
-pcap_open_offline = _lib.pcap_open_offline
-pcap_open_offline.restype = POINTER(pcap_t)
-pcap_open_offline.argtypes = [STRING, STRING]
-
-try:  # NPCAP ONLY function
-    #int pcap_set_rfmon (pcap_t *p)
-    #   sets whether monitor mode should be set on a capture handle when the handle is activated.  # noqa: E501
-    pcap_set_rfmon = _lib.pcap_set_rfmon
-    pcap_set_rfmon.restype = c_int
-    pcap_set_rfmon.argtypes = [POINTER(pcap_t), c_int]
-
-    #int pcap_create (pcap_t *p)
-    #   create a packet capture handle to look at packets on the network.
-    pcap_create = _lib.pcap_create
-    pcap_create.restype = POINTER(pcap_t)
-    pcap_create.argtypes = [STRING, STRING]
-
-    #int pcap_set_snaplen(pcap_t *p, int snaplen)
-    #   set the snapshot length for a not-yet-activated capture handle
-    pcap_set_snaplen = _lib.pcap_set_snaplen
-    pcap_set_snaplen.restype = c_int
-    pcap_set_snaplen.argtypes = [POINTER(pcap_t), c_int]
-
-    #int pcap_set_promisc(pcap_t *p, int promisc)
-    #   set promiscuous mode for a not-yet-activated capture handle
-    pcap_set_promisc = _lib.pcap_set_promisc
-    pcap_set_promisc.restype = c_int
-    pcap_set_promisc.argtypes = [POINTER(pcap_t), c_int]
-
-    #int pcap_set_timeout(pcap_t *p, int to_ms)
-    #   set the packet buffer timeout for a not-yet-activated capture handle
-    pcap_set_timeout = _lib.pcap_set_timeout
-    pcap_set_timeout.restype = c_int
-    pcap_set_timeout.argtypes = [POINTER(pcap_t), c_int]
-
-    #int pcap_activate(pcap_t *p)
-    #   activate a capture handle
-    pcap_activate = _lib.pcap_activate
-    pcap_activate.restype = c_int
-    pcap_activate.argtypes = [POINTER(pcap_t)]
-except AttributeError:
-    pass
-
-#pcap_dumper_t *   pcap_dump_open (pcap_t *p, const char *fname)
-#   Open a file to write packets.
-pcap_dump_open = _lib.pcap_dump_open
-pcap_dump_open.restype = POINTER(pcap_dumper_t)
-pcap_dump_open.argtypes = [POINTER(pcap_t), STRING]
-
-#int pcap_setnonblock (pcap_t *p, int nonblock, char *errbuf)
-#   Switch between blocking and nonblocking mode.
-pcap_setnonblock = _lib.pcap_setnonblock
-pcap_setnonblock.restype = c_int
-pcap_setnonblock.argtypes = [POINTER(pcap_t), c_int, STRING]
-
-#int pcap_getnonblock (pcap_t *p, char *errbuf)
-#   Get the "non-blocking" state of an interface.
-pcap_getnonblock = _lib.pcap_getnonblock
-pcap_getnonblock.restype = c_int
-pcap_getnonblock.argtypes = [POINTER(pcap_t), STRING]
-
-#int pcap_findalldevs (pcap_if_t **alldevsp, char *errbuf)
-#   Construct a list of network devices that can be opened with pcap_open_live().  # noqa: E501
-pcap_findalldevs = _lib.pcap_findalldevs
-pcap_findalldevs.restype = c_int
-pcap_findalldevs.argtypes = [POINTER(POINTER(pcap_if_t)), STRING]
-
-#void pcap_freealldevs (pcap_if_t *alldevsp)
-#   Free an interface list returned by pcap_findalldevs().
-pcap_freealldevs = _lib.pcap_freealldevs
-pcap_freealldevs.restype = None
-pcap_freealldevs.argtypes = [POINTER(pcap_if_t)]
-
-#char *   pcap_lookupdev (char *errbuf)
-#   Return the first valid device in the system.
-pcap_lookupdev = _lib.pcap_lookupdev
-pcap_lookupdev.restype = STRING
-pcap_lookupdev.argtypes = [STRING]
-
-#int pcap_lookupnet (const char *device, bpf_u_int32 *netp, bpf_u_int32 *maskp, char *errbuf)  # noqa: E501
-#   Return the subnet and netmask of an interface.
-pcap_lookupnet = _lib.pcap_lookupnet
-pcap_lookupnet.restype = c_int
-pcap_lookupnet.argtypes = [STRING, POINTER(bpf_u_int32), POINTER(bpf_u_int32), STRING]  # noqa: E501
-
-#int pcap_dispatch (pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-#   Collect a group of packets.
-pcap_dispatch = _lib.pcap_dispatch
-pcap_dispatch.restype = c_int
-pcap_dispatch.argtypes = [POINTER(pcap_t), c_int, pcap_handler, POINTER(u_char)]  # noqa: E501
-
-#int pcap_loop (pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-#   Collect a group of packets.
-pcap_loop = _lib.pcap_loop
-pcap_loop.restype = c_int
-pcap_loop.argtypes = [POINTER(pcap_t), c_int, pcap_handler, POINTER(u_char)]
-
-#u_char *   pcap_next (pcap_t *p, struct pcap_pkthdr *h)
-#   Return the next available packet.
-pcap_next = _lib.pcap_next
-pcap_next.restype = POINTER(u_char)
-pcap_next.argtypes = [POINTER(pcap_t), POINTER(pcap_pkthdr)]
-
-#int pcap_next_ex (pcap_t *p, struct pcap_pkthdr **pkt_header, const u_char **pkt_data)  # noqa: E501
-#   Read a packet from an interface or from an offline capture.
-pcap_next_ex = _lib.pcap_next_ex
-pcap_next_ex.restype = c_int
-pcap_next_ex.argtypes = [POINTER(pcap_t), POINTER(POINTER(pcap_pkthdr)), POINTER(POINTER(u_char))]  # noqa: E501
-
-#void pcap_breakloop (pcap_t *)
-#   set a flag that will force pcap_dispatch() or pcap_loop() to return rather than looping.  # noqa: E501
-pcap_breakloop = _lib.pcap_breakloop
-pcap_breakloop.restype = None
-pcap_breakloop.argtypes = [POINTER(pcap_t)]
-
-#int pcap_sendpacket (pcap_t *p, u_char *buf, int size)
-#   Send a raw packet.
-pcap_sendpacket = _lib.pcap_sendpacket
-pcap_sendpacket.restype = c_int
-#pcap_sendpacket.argtypes = [POINTER(pcap_t), POINTER(u_char), c_int]
-pcap_sendpacket.argtypes = [POINTER(pcap_t), c_void_p, c_int]
-
-#void pcap_dump (u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
-#   Save a packet to disk.
-pcap_dump = _lib.pcap_dump
-pcap_dump.restype = None
-pcap_dump.argtypes = [POINTER(pcap_dumper_t), POINTER(pcap_pkthdr), POINTER(u_char)]  # noqa: E501
-
-#long pcap_dump_ftell (pcap_dumper_t *)
-#   Return the file position for a "savefile".
-pcap_dump_ftell = _lib.pcap_dump_ftell
-pcap_dump_ftell.restype = c_long
-pcap_dump_ftell.argtypes = [POINTER(pcap_dumper_t)]
-
-#int pcap_compile (pcap_t *p, struct bpf_program *fp, char *str, int optimize, bpf_u_int32 netmask)  # noqa: E501
-#   Compile a packet filter, converting an high level filtering expression (see Filtering expression syntax) in a program that can be interpreted by the kernel-level filtering engine.  # noqa: E501
-pcap_compile = _lib.pcap_compile
-pcap_compile.restype = c_int
-pcap_compile.argtypes = [POINTER(pcap_t), POINTER(bpf_program), STRING, c_int, bpf_u_int32]  # noqa: E501
-
-#int pcap_compile_nopcap (int snaplen_arg, int linktype_arg, struct bpf_program *program, char *buf, int optimize, bpf_u_int32 mask)  # noqa: E501
-#   Compile a packet filter without the need of opening an adapter. This function converts an high level filtering expression (see Filtering expression syntax) in a program that can be interpreted by the kernel-level filtering engine.  # noqa: E501
-pcap_compile_nopcap = _lib.pcap_compile_nopcap
-pcap_compile_nopcap.restype = c_int
-pcap_compile_nopcap.argtypes = [c_int, c_int, POINTER(bpf_program), STRING, c_int, bpf_u_int32]  # noqa: E501
-
-#int pcap_setfilter (pcap_t *p, struct bpf_program *fp)
-#   Associate a filter to a capture.
-pcap_setfilter = _lib.pcap_setfilter
-pcap_setfilter.restype = c_int
-pcap_setfilter.argtypes = [POINTER(pcap_t), POINTER(bpf_program)]
-
-#void pcap_freecode (struct bpf_program *fp)
-#   Free a filter.
-pcap_freecode = _lib.pcap_freecode
-pcap_freecode.restype = None
-pcap_freecode.argtypes = [POINTER(bpf_program)]
-
-#int pcap_datalink (pcap_t *p)
-#   Return the link layer of an adapter.
-pcap_datalink = _lib.pcap_datalink
-pcap_datalink.restype = c_int
-pcap_datalink.argtypes = [POINTER(pcap_t)]
-
-#int pcap_list_datalinks (pcap_t *p, int **dlt_buf)
-#   list datalinks
-pcap_list_datalinks = _lib.pcap_list_datalinks
-pcap_list_datalinks.restype = c_int
-#pcap_list_datalinks.argtypes = [POINTER(pcap_t), POINTER(POINTER(c_int))]
-
-#int pcap_set_datalink (pcap_t *p, int dlt)
-#   Set the current data link type of the pcap descriptor to the type specified by dlt. -1 is returned on failure.  # noqa: E501
-pcap_set_datalink = _lib.pcap_set_datalink
-pcap_set_datalink.restype = c_int
-pcap_set_datalink.argtypes = [POINTER(pcap_t), c_int]
-
-#int pcap_datalink_name_to_val (const char *name)
-#   Translates a data link type name, which is a DLT_ name with the DLT_ removed, to the corresponding data link type value. The translation is case-insensitive. -1 is returned on failure.  # noqa: E501
-pcap_datalink_name_to_val = _lib.pcap_datalink_name_to_val
-pcap_datalink_name_to_val.restype = c_int
-pcap_datalink_name_to_val.argtypes = [STRING]
-
-#const char *   pcap_datalink_val_to_name (int dlt)
-#   Translates a data link type value to the corresponding data link type name. NULL is returned on failure.  # noqa: E501
-pcap_datalink_val_to_name = _lib.pcap_datalink_val_to_name
-pcap_datalink_val_to_name.restype = STRING
-pcap_datalink_val_to_name.argtypes = [c_int]
-
-#const char *   pcap_datalink_val_to_description (int dlt)
-#   Translates a data link type value to a short description of that data link type. NULL is returned on failure.  # noqa: E501
-pcap_datalink_val_to_description = _lib.pcap_datalink_val_to_description
-pcap_datalink_val_to_description.restype = STRING
-pcap_datalink_val_to_description.argtypes = [c_int]
-
-#int pcap_snapshot (pcap_t *p)
-#   Return the dimension of the packet portion (in bytes) that is delivered to the application.  # noqa: E501
-pcap_snapshot = _lib.pcap_snapshot
-pcap_snapshot.restype = c_int
-pcap_snapshot.argtypes = [POINTER(pcap_t)]
-
-#int pcap_is_swapped (pcap_t *p)
-#   returns true if the current savefile uses a different byte order than the current system.  # noqa: E501
-pcap_is_swapped = _lib.pcap_is_swapped
-pcap_is_swapped.restype = c_int
-pcap_is_swapped.argtypes = [POINTER(pcap_t)]
-
-#int pcap_major_version (pcap_t *p)
-#   return the major version number of the pcap library used to write the savefile.  # noqa: E501
-pcap_major_version = _lib.pcap_major_version
-pcap_major_version.restype = c_int
-pcap_major_version.argtypes = [POINTER(pcap_t)]
-
-#int pcap_minor_version (pcap_t *p)
-#   return the minor version number of the pcap library used to write the savefile.  # noqa: E501
-pcap_minor_version = _lib.pcap_minor_version
-pcap_minor_version.restype = c_int
-pcap_minor_version.argtypes = [POINTER(pcap_t)]
-
-#FILE *   pcap_file (pcap_t *p)
-#   Return the standard stream of an offline capture.
-pcap_file=_lib.pcap_file
-pcap_file.restype = FILE
-pcap_file.argtypes = [POINTER(pcap_t)]
-
-#int pcap_stats (pcap_t *p, struct pcap_stat *ps)
-#   Return statistics on current capture.
-pcap_stats = _lib.pcap_stats
-pcap_stats.restype = c_int
-pcap_stats.argtypes = [POINTER(pcap_t), POINTER(pcap_stat)]
-
-#void pcap_perror (pcap_t *p, char *prefix)
-#   print the text of the last pcap library error on stderr, prefixed by prefix.  # noqa: E501
-pcap_perror = _lib.pcap_perror
-pcap_perror.restype = None
-pcap_perror.argtypes = [POINTER(pcap_t), STRING]
-
-#char *   pcap_geterr (pcap_t *p)
-#   return the error text pertaining to the last pcap library error.
-pcap_geterr = _lib.pcap_geterr
-pcap_geterr.restype = STRING
-pcap_geterr.argtypes = [POINTER(pcap_t)]
-
-#char *   pcap_strerror (int error)
-#   Provided in case strerror() isn't available.
-pcap_strerror = _lib.pcap_strerror
-pcap_strerror.restype = STRING
-pcap_strerror.argtypes = [c_int]
-
-#const char *   pcap_lib_version (void)
-#   Returns a pointer to a string giving information about the version of the libpcap library being used; note that it contains more information than just a version number.  # noqa: E501
-pcap_lib_version = _lib.pcap_lib_version
-pcap_lib_version.restype = STRING
-pcap_lib_version.argtypes = []
-
-#void pcap_close (pcap_t *p)
-#   close the files associated with p and deallocates resources.
-pcap_close = _lib.pcap_close
-pcap_close.restype = None
-pcap_close.argtypes = [POINTER(pcap_t)]
-
-#FILE *   pcap_dump_file (pcap_dumper_t *p)
-#   return the standard I/O stream of the 'savefile' opened by pcap_dump_open().  # noqa: E501
-pcap_dump_file=_lib.pcap_dump_file
-pcap_dump_file.restype=FILE
-pcap_dump_file.argtypes= [POINTER(pcap_dumper_t)]
-
-#int pcap_dump_flush (pcap_dumper_t *p)
-#   Flushes the output buffer to the ``savefile,'' so that any packets written with pcap_dump() but not yet written to the ``savefile'' will be written. -1 is returned on error, 0 on success.  # noqa: E501
-pcap_dump_flush = _lib.pcap_dump_flush
-pcap_dump_flush.restype = c_int
-pcap_dump_flush.argtypes = [POINTER(pcap_dumper_t)]
-
-#void pcap_dump_close (pcap_dumper_t *p)
-#   Closes a savefile. 
-pcap_dump_close = _lib.pcap_dump_close
-pcap_dump_close.restype = None
-pcap_dump_close.argtypes = [POINTER(pcap_dumper_t)]
-
-if not WINDOWS:
-    #int pcap_get_selectable_fd(pcap_t, *p)
-    #   Returns, on UNIX, a file descriptor number for a file descriptor on which one can do a select(), poll(). -1 is returned if no such descriptor exists.  # noqa: E501
-    pcap_get_selectable_fd = _lib.pcap_get_selectable_fd
-    pcap_get_selectable_fd.restype = c_int    
-    pcap_get_selectable_fd.argtypes = [POINTER(pcap_t)]
-
-###########################################
-## Windows-specific Extensions
-## The functions in this section extend libpcap to offer advanced functionalities  # noqa: E501
-## (like remote packet capture, packet buffer size variation or high-precision packet injection).  # noqa: E501
-## However, at the moment they can be used only in Windows.
-###########################################
-if WINDOWS:
-    HANDLE = c_void_p
-    
-    ##############
-    ## Identifiers related to the new source syntax
-    ##############
-    #define   PCAP_SRC_FILE   2
-    #define   PCAP_SRC_IFLOCAL   3
-    #define   PCAP_SRC_IFREMOTE   4
-    #Internal representation of the type of source in use (file, remote/local interface).  # noqa: E501
-    PCAP_SRC_FILE = 2
-    PCAP_SRC_IFLOCAL = 3
-    PCAP_SRC_IFREMOTE = 4
-    
-    ##############
-    ## Strings related to the new source syntax
-    ##############
-    #define   PCAP_SRC_FILE_STRING   "file://"
-    #define   PCAP_SRC_IF_STRING   "rpcap://"
-    #String that will be used to determine the type of source in use (file, remote/local interface).  # noqa: E501
-    PCAP_SRC_FILE_STRING="file://"
-    PCAP_SRC_IF_STRING="rpcap://"
-    
-    ##############
-    ## Flags defined in the pcap_open() function
-    ##############
-    # define  PCAP_OPENFLAG_PROMISCUOUS   1
-    #   Defines if the adapter has to go in promiscuous mode.
-    PCAP_OPENFLAG_PROMISCUOUS=1
-    # define  PCAP_OPENFLAG_DATATX_UDP   2
-    #   Defines if the data transfer (in case of a remote capture) has to be done with UDP protocol.  # noqa: E501
-    PCAP_OPENFLAG_DATATX_UDP=2
-    # define  PCAP_OPENFLAG_NOCAPTURE_RPCAP   4
-    PCAP_OPENFLAG_NOCAPTURE_RPCAP=4
-    #   Defines if the remote probe will capture its own generated traffic.
-    # define  PCAP_OPENFLAG_NOCAPTURE_LOCAL   8
-    PCAP_OPENFLAG_NOCAPTURE_LOCAL = 8
-    # define  PCAP_OPENFLAG_MAX_RESPONSIVENESS   16
-    #   This flag configures the adapter for maximum responsiveness.
-    PCAP_OPENFLAG_MAX_RESPONSIVENESS=16
-    
-    ##############
-    ## Sampling methods defined in the pcap_setsampling() function
-    ##############
-    # define  PCAP_SAMP_NOSAMP   0
-    # No sampling has to be done on the current capture.
-    PCAP_SAMP_NOSAMP=0
-    # define  PCAP_SAMP_1_EVERY_N   1
-    # It defines that only 1 out of N packets must be returned to the user.
-    PCAP_SAMP_1_EVERY_N=1
-    #define   PCAP_SAMP_FIRST_AFTER_N_MS   2
-    # It defines that we have to return 1 packet every N milliseconds.
-    PCAP_SAMP_FIRST_AFTER_N_MS=2
-    
-    ##############
-    ## Authentication methods supported by the RPCAP protocol
-    ##############
-    # define  RPCAP_RMTAUTH_NULL   0
-    # It defines the NULL authentication.
-    RPCAP_RMTAUTH_NULL=0
-    # define  RPCAP_RMTAUTH_PWD   1
-    # It defines the username/password authentication.
-    RPCAP_RMTAUTH_PWD=1
-    
-
-    ##############
-    ## Remote struct and defines
-    ##############
-    # define  PCAP_BUF_SIZE   1024
-    # Defines the maximum buffer size in which address, port, interface names are kept.  # noqa: E501
-    PCAP_BUF_SIZE = 1024
-    # define  RPCAP_HOSTLIST_SIZE   1024
-    # Maximum length of an host name (needed for the RPCAP active mode).
-    RPCAP_HOSTLIST_SIZE = 1024
-    
-    class pcap_send_queue(Structure):
-        _fields_=[("maxlen",c_uint),
-                  ("len",c_uint),
-                  ("buffer",c_char_p)]
-        
-    ## struct   pcap_rmtauth
-    ## This structure keeps the information needed to autheticate the user on a remote machine  # noqa: E501
-    class pcap_rmtauth(Structure):
-        _fields_=[("type",c_int),
-                  ("username",c_char_p),
-                  ("password",c_char_p)]
-    
-    ## struct   pcap_samp
-    ## This structure defines the information related to sampling    
-    class pcap_samp(Structure):
-        _fields_=[("method",c_int),
-                  ("value",c_int)]
-
-    #PAirpcapHandle   pcap_get_airpcap_handle (pcap_t *p)
-    #   Returns the AirPcap handler associated with an adapter. This handler can be used to change the wireless-related settings of the CACE Technologies AirPcap wireless capture adapters.  # noqa: E501
-    
-    #bool pcap_offline_filter (struct bpf_program *prog, const struct pcap_pkthdr *header, const u_char *pkt_data)  # noqa: E501
-    #   Returns if a given filter applies to an offline packet.
-    pcap_offline_filter = _lib.pcap_offline_filter
-    pcap_offline_filter.restype = c_bool
-    pcap_offline_filter.argtypes = [POINTER(bpf_program),POINTER(pcap_pkthdr),POINTER(u_char)]  # noqa: E501
-    
-    #int pcap_live_dump (pcap_t *p, char *filename, int maxsize, int maxpacks)
-    #   Save a capture to file.
-    pcap_live_dump = _lib.pcap_live_dump
-    pcap_live_dump.restype = c_int
-    pcap_live_dump.argtypes = [POINTER(pcap_t), POINTER(c_char), c_int,c_int]
-    
-    #int pcap_live_dump_ended (pcap_t *p, int sync)
-    #   Return the status of the kernel dump process, i.e. tells if one of the limits defined with pcap_live_dump() has been reached.  # noqa: E501
-    pcap_live_dump_ended = _lib.pcap_live_dump_ended
-    pcap_live_dump_ended.restype = c_int
-    pcap_live_dump_ended.argtypes = [POINTER(pcap_t), c_int]
-    
-    #struct pcap_stat *  pcap_stats_ex (pcap_t *p, int *pcap_stat_size)
-    #   Return statistics on current capture.
-    pcap_stats_ex = _lib.pcap_stats_ex
-    pcap_stats_ex.restype = POINTER(pcap_stat)
-    pcap_stats_ex.argtypes = [POINTER(pcap_t), POINTER(c_int)]
-    
-    #int pcap_setbuff (pcap_t *p, int dim)
-    #   Set the size of the kernel buffer associated with an adapter.
-    pcap_setbuff = _lib.pcap_setbuff
-    pcap_setbuff.restype = c_int
-    pcap_setbuff.argtypes = [POINTER(pcap_t), c_int]
-    
-    #int pcap_setmode (pcap_t *p, int mode)
-    #   Set the working mode of the interface p to mode.
-    pcap_setmode = _lib.pcap_setmode
-    pcap_setmode.restype = c_int
-    pcap_setmode.argtypes = [POINTER(pcap_t), c_int]
-    
-    #int pcap_setmintocopy (pcap_t *p, int size)
-    #   Set the minimum amount of data received by the kernel in a single call.
-    pcap_setmintocopy = _lib.pcap_setmintocopy
-    pcap_setmintocopy.restype = c_int
-    pcap_setmintocopy.argtype = [POINTER(pcap_t), c_int]
-    
-    #HANDLE pcap_getevent (pcap_t *p)
-    #   Return the handle of the event associated with the interface p.
-    pcap_getevent = _lib.pcap_getevent
-    pcap_getevent.restype = HANDLE
-    pcap_getevent.argtypes = [POINTER(pcap_t)]
-
-    #pcap_send_queue *  pcap_sendqueue_alloc (u_int memsize)
-    #   Allocate a send queue.
-    pcap_sendqueue_alloc = _lib.pcap_sendqueue_alloc
-    pcap_sendqueue_alloc.restype = POINTER(pcap_send_queue)
-    pcap_sendqueue_alloc.argtypes = [c_uint]
-    
-    #void pcap_sendqueue_destroy (pcap_send_queue *queue)
-    #   Destroy a send queue.
-    pcap_sendqueue_destroy = _lib.pcap_sendqueue_destroy
-    pcap_sendqueue_destroy.restype = None
-    pcap_sendqueue_destroy.argtypes = [POINTER(pcap_send_queue)]
-    
-    #int pcap_sendqueue_queue (pcap_send_queue *queue, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data)  # noqa: E501
-    #   Add a packet to a send queue.
-    pcap_sendqueue_queue = _lib.pcap_sendqueue_queue
-    pcap_sendqueue_queue.restype = c_int
-    pcap_sendqueue_queue.argtypes = [POINTER(pcap_send_queue), POINTER(pcap_pkthdr), POINTER(u_char)]  # noqa: E501
-    
-    #u_int pcap_sendqueue_transmit (pcap_t *p, pcap_send_queue *queue, int sync)  # noqa: E501
-    #   Send a queue of raw packets to the network.
-    pcap_sendqueue_transmit = _lib.pcap_sendqueue_transmit
-    pcap_sendqueue_transmit.retype = u_int
-    pcap_sendqueue_transmit.argtypes = [POINTER(pcap_t), POINTER(pcap_send_queue), c_int]  # noqa: E501
-    
-    #int pcap_findalldevs_ex (char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf)  # noqa: E501
-    #   Create a list of network devices that can be opened with pcap_open().
-    pcap_findalldevs_ex = _lib.pcap_findalldevs_ex
-    pcap_findalldevs_ex.retype = c_int
-    pcap_findalldevs_ex.argtypes = [STRING, POINTER(pcap_rmtauth), POINTER(POINTER(pcap_if_t)), STRING]  # noqa: E501
-    
-    #int pcap_createsrcstr (char *source, int type, const char *host, const char *port, const char *name, char *errbuf)  # noqa: E501
-    #   Accept a set of strings (host name, port, ...), and it returns the complete source string according to the new format (e.g. 'rpcap://1.2.3.4/eth0').  # noqa: E501
-    pcap_createsrcstr = _lib.pcap_createsrcstr
-    pcap_createsrcstr.restype = c_int
-    pcap_createsrcstr.argtypes = [STRING, c_int, STRING, STRING, STRING, STRING]  # noqa: E501
-    
-    #int pcap_parsesrcstr (const char *source, int *type, char *host, char *port, char *name, char *errbuf)  # noqa: E501
-    #   Parse the source string and returns the pieces in which the source can be split.  # noqa: E501
-    pcap_parsesrcstr = _lib.pcap_parsesrcstr
-    pcap_parsesrcstr.retype = c_int
-    pcap_parsesrcstr.argtypes = [STRING, POINTER(c_int), STRING, STRING, STRING, STRING]  # noqa: E501
-    
-    #pcap_t *   pcap_open (const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf)  # noqa: E501
-    #   Open a generic source in order to capture / send (WinPcap only) traffic.  # noqa: E501
-    pcap_open = _lib.pcap_open
-    pcap_open.restype = POINTER(pcap_t)
-    pcap_open.argtypes = [STRING, c_int, c_int, c_int, POINTER(pcap_rmtauth), STRING]  # noqa: E501
-    
-    #struct pcap_samp *  pcap_setsampling (pcap_t *p)
-    #   Define a sampling method for packet capture.
-    pcap_setsampling = _lib.pcap_setsampling
-    pcap_setsampling.restype = POINTER(pcap_samp)
-    pcap_setsampling.argtypes = [POINTER(pcap_t)]
-    
-    #SOCKET pcap_remoteact_accept (const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf)  # noqa: E501
-    #   Block until a network connection is accepted (active mode only).
-    pcap_remoteact_accept = _lib.pcap_remoteact_accept
-    pcap_remoteact_accept.restype = SOCKET
-    pcap_remoteact_accept.argtypes = [STRING, STRING, STRING, STRING, POINTER(pcap_rmtauth), STRING]  # noqa: E501
-    
-    #int pcap_remoteact_close (const char *host, char *errbuf)
-    #   Drop an active connection (active mode only).
-    pcap_remoteact_close = _lib.pcap_remoteact_close
-    pcap_remoteact_close.restypes = c_int
-    pcap_remoteact_close.argtypes = [STRING, STRING]
-    
-    #void pcap_remoteact_cleanup ()
-    #   Clean the socket that is currently used in waiting active connections.
-    pcap_remoteact_cleanup = _lib.pcap_remoteact_cleanup
-    pcap_remoteact_cleanup.restypes = None
-    pcap_remoteact_cleanup.argtypes = []
-    
-    #int pcap_remoteact_list (char *hostlist, char sep, int size, char *errbuf)
-    #   Return the hostname of the host that have an active connection with us (active mode only).   # noqa: E501
-    pcap_remoteact_list = _lib.pcap_remoteact_list
-    pcap_remoteact_list.restype = c_int
-    pcap_remoteact_list.argtypes = [STRING, c_char, c_int, STRING]

scapy-2.4.3.tar.gz/test/contrib/automotive/someip_sd.uts Deleted

@@ -1,381 +0,0 @@
-# MIT License
-
-# Copyright (c) 2018 Jose Amores
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# This file is part of Scapy
-# See http://www.secdev.org/projects/scapy for more information
-# Copyright (C) Sebastian Baar <sebastian.baar@gmx.de>
-# This program is published under a GPLv2 license
-
-#########
-#########
-
-+ SD Entry Service
-
-=load module
-
-load_contrib("automotive.someip_sd")
-
-= Check packet length
-
-p = SDEntry_Service()
-assert(len(bytes(p)) == SDEntry_Service.OVERALL_LEN)
-
-= Check fields setting
-
-p.type = SDEntry_Service.TYPE_SRV_OFFERSERVICE
-p.index_1 = 0x11
-p.index_2 = 0x22
-p.srv_id = 0x3333
-p.inst_id = 0x4444
-p.major_ver = 0x55
-p.ttl = 0x666666
-p.minor_ver = 0xdeadbeef
-p_str = bytes(p)
-bin_str = b"\x01\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\xde\xad\xbe\xef"
-
-assert(p_str == bin_str)
-
-= Check fields setting2
-
-p = SDEntry_Service()
-p.n_opt_1 = 0xf1
-p.n_opt_2 = 0xf2
-p_str = bytes(p)
-bin_str = b"\x00\x00\x00\x12\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-assert(p_str == bin_str)
-assert(len(p_str) == SDEntry_Service.OVERALL_LEN)
-
-= Check payload guess
-
-p_entry_srv = SDEntry_Service()
-
-assert(SDEntry_Service().guess_payload_class(bytes(p_entry_srv)) ==
-       SDEntry_Service)
-
-= Check SDEntry_Service
-
-p = SDEntry_Service(
-    b"\x01\x22\x33\x00\x44\x44\x55\x55\x66\x77\x77\x77\xde\xad\xbe\xef")
-
-assert(p.type == SDEntry_Service.TYPE_SRV_OFFERSERVICE)
-assert(p.index_1 == 0x22)
-assert(p.index_2 == 0x33)
-assert(p.srv_id == 0x4444)
-assert(p.inst_id == 0x5555)
-assert(p.major_ver == 0x66)
-assert(p.ttl == 0x777777)
-assert(p.minor_ver == 0xdeadbeef)
-
-+ SD Entry Eventgroup
-
-= Check packet length
-
-p = SDEntry_EventGroup()
-
-assert(len(bytes(p)) == SDEntry_EventGroup.OVERALL_LEN)
-
-= Check fields setting
-
-p.index_1 = 0x11
-p.index_2 = 0x22
-p.srv_id = 0x3333
-p.inst_id = 0x4444
-p.major_ver = 0x55
-p.ttl = 0x666666
-p.cnt = 0x7
-p.eventgroup_id = 0x8888
-p_str = bytes(p)
-bin_str = b"\x06\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\x00\x07\x88\x88"
-
-assert(p_str == bin_str)
-
-= Check payload guess
-p_entry_evtgrp = SDEntry_EventGroup()
-
-assert(SDEntry_EventGroup().guess_payload_class(
-    bytes(p_entry_evtgrp)) == SDEntry_EventGroup)
-
-+ SD Option Config
-
-= Check pkg type
-
-p = SDOption_Config()
-
-assert(p.type == 0x01)
-
-= Check length without payload
-
-assert(len(bytes(p)) == 4)
-
-= Check add payload and check length
-import binascii
-p.cfg_str = binascii.hexlify(b"5abc=x7def=1230")
-
-assert(bytes(p) == b"\x00\x1f\x01\x00" +
-       binascii.hexlify(b"5abc=x7def=1230"))
-
-= Check payload guess
-
-assert(SDOption_Config().guess_payload_class(bytes(p)) == SDOption_Config)
-
-= Check SDEntry_EventGroup
-
-p = SDEntry_EventGroup(
-    b"\x06\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\x00\x07\x88\x88")
-
-assert(p.index_1 == 0x11)
-assert(p.index_2 == 0x22)
-assert(p.srv_id == 0x3333)
-assert(p.inst_id == 0x4444)
-assert(p.major_ver == 0x55)
-assert(p.ttl == 0x666666)
-assert(p.cnt == 0x7)
-assert(p.eventgroup_id == 0x8888)
-
-+ SD Option Load Balance
-
-= Check pkg type & lengths(static and overall)
-
-p = SDOption_LoadBalance()
-
-assert(p.type == 0x02)
-assert(p.len == 0x05)
-assert(len(bytes(p)) == 8)
-
-= Check payload guess
-
-assert(SDOption_LoadBalance().guess_payload_class(
-    bytes(p)) == SDOption_LoadBalance)
-
-= Check SDOption_LoadBalance
-
-p = SDOption_LoadBalance(b'\x00\x05\x02\x01\x00\x02\x00\x03')
-
-assert(p.type == 0x02)
-assert(p.len == 0x05)
-assert(p.res_hdr == 0x01)
-assert(p.priority == 0x02)
-assert(p.weight == 0x03)
-
-+SD Option IP4 Endpoint
-
-= Check pkg type & length
-
-p = SDOption_IP4_EndPoint()
-
-assert(p.type == 0x04)
-assert(p.len == 0x0009)
-
-= Check payload guess
-
-assert(SDOption_IP4_EndPoint().guess_payload_class(
-    bytes(p)) == SDOption_IP4_EndPoint)
-
-= Check SDOption_IP4_EndPoint
-
-p = SDOption_IP4_EndPoint(b'\x00\x09\x04')
-
-assert(p.type == 0x04)
-assert(p.len == 0x0009)
-
-+SD Option IP4 Multicast
-
-= Check pkg type & length
-
-p = SDOption_IP4_Multicast()
-
-assert(p.type == 0x14)
-assert(p.len == 0x0009)
-
-= Payload guess
-
-assert(SDOption_IP4_Multicast().guess_payload_class(
-    bytes(p)) == SDOption_IP4_Multicast)
-
-= Check SDOption_IP4_Multicast
-
-p = SDOption_IP4_Multicast(b'\x00\x09\x14')
-
-assert(p.type == 0x14)
-assert(p.len == 0x0009)
-
-+SD OPTION IP4 SD EndPoint
-
-= Check pkg type & length
-
-p = SDOption_IP4_SD_EndPoint()
-
-assert(p.type == 0x24)
-assert(p.len == 0x0009)
-
-= Check payload guess
-
-assert(SDOption_IP4_SD_EndPoint().guess_payload_class(
-    bytes(p)) == SDOption_IP4_SD_EndPoint)
-
-= Check SDOption_IP4_SD_EndPoint
-
-p = SDOption_IP4_SD_EndPoint(b'\x00\x09\x24')
-
-assert(p.type == 0x24)
-assert(p.len == 0x0009)
-
-+SD Option IP6 End Point
-
-= Check pkg type & length
-
-p = SDOption_IP6_EndPoint()
-
-assert(p.type == 0x06)
-assert(p.len == 0x0015)
-
-= Check payload guess
-
-assert(SDOption_IP6_EndPoint().guess_payload_class(
-    bytes(p)) == SDOption_IP6_EndPoint)
-
-= Check SDOption_IP6_EndPoint
-
-p = SDOption_IP6_EndPoint(b'\x00\x15\x06')
-
-assert(p.type == 0x06)
-assert(p.len == 0x0015)
-
-+SD Option IP6 Multicast
-
-= Check pkg type & length
-
-p = SDOption_IP6_Multicast()
-
-assert(p.type == 0x16)
-assert(p.len == 0x0015)
-
-= Check payload guess
-
-assert(SDOption_IP6_Multicast().guess_payload_class(
-    bytes(p)) == SDOption_IP6_Multicast)
-
-= Check SDOption_IP6_Multicast
-p = SDOption_IP6_Multicast(b'\x00\x15\x16')
-
-assert(p.type == 0x16)
-assert(p.len == 0x0015)
-
-+SD OPTION IP6 SD EndPoint
-
-= Check pkg type & length
-
-p = SDOption_IP6_SD_EndPoint()
-
-assert(p.type == 0x26)
-assert(p.len == 0x015)
-
-= Check payload guess
-
-assert(SDOption_IP6_SD_EndPoint().guess_payload_class(
-    bytes(p)) == SDOption_IP6_SD_EndPoint)
-
-= Check SDOption_IP6_SD_EndPoint
-
-p = SDOption_IP6_SD_EndPoint(b'\x00\x15\x26')
-
-assert(p.type == 0x26)
-assert(p.len == 0x0015)
-
-+ SD Flags
-
-= Check the flags
-
-p = SD()
-
-p.set_flag("REBOOT", 1)
-
-assert(p.flags == 0x80)
-
-p.set_flag("REBOOT", 0)
-
-assert(p.flags == 0x00)
-
-p.set_flag("UNICAST", 1)
-
-assert(p.flags == 0x40)
-
-p.set_flag("UNICAST", 0)
-
-assert(p.flags == 0x00)
-
-p.set_flag("REBOOT", 1)
-p.set_flag("UNICAST", 1)
-
-assert(p.flags == 0xc0)
-
-+SD Get Someip Packet
-
-= Check someip packet
-
-p_sd = SD()
-sd_len = bytes(p_sd)
-
-p_someip = p_sd.get_someip()
-
-assert(len(bytes(p_someip)) == SOMEIP._OVERALL_LEN_NOPAYLOAD)
-
-p = p_sd.get_someip(stacked=True)
-
-assert(len(bytes(p)) == SOMEIP._OVERALL_LEN_NOPAYLOAD + 12)
-
-+ SD
-
-= Check length of package without entries nor options
-
-p = SD()
-
-assert(len(bytes(p)) == 12)
-
-= Check entries to array and size check
-
-p.set_entryArray([SDEntry_Service(), SDEntry_EventGroup()])
-
-assert(struct.unpack("!L", bytes(p)[4:8])[0] == 32)
-
-p.set_entryArray([])
-
-assert(struct.unpack("!L", bytes(p)[4:8])[0] == 0)
-
-= Check Options to array and size check
-
-p.set_optionArray([SDOption_IP4_EndPoint(), SDOption_IP4_EndPoint()])
-
-assert(struct.unpack("!L", bytes(p)[8:12])[0] == 24)
-
-p.set_optionArray([])
-
-assert(struct.unpack("!L", bytes(p)[8:12])[0] == 0)
-
-= Check Entries & Options to array and size check
-
-p.set_entryArray([SDEntry_Service(), SDEntry_EventGroup()])
-p.set_optionArray([SDOption_IP4_EndPoint(), SDOption_IP4_EndPoint()])
-
-assert(struct.unpack("!L", bytes(p)[4:8])[0] == 32)
-assert(struct.unpack("!L", bytes(p)[40:44])[0] == 24)

scapy-2.4.3.tar.gz/test/run_tests_py2 Deleted

scapy-2.4.3.tar.gz/test/run_tests_py2.bat Deleted

scapy-2.4.3.tar.gz/test/run_tests_py3 Deleted

scapy-2.4.3.tar.gz/test/run_tests_py3.bat Deleted

scapy-2.4.3.tar.gz/.appveyor.yml -> scapy-2.4.4.tar.gz/.appveyor.yml Changed

scapy-2.4.4.tar.gz/.config Added

scapy-2.4.4.tar.gz/.config/appveyor Added

scapy-2.4.4.tar.gz/.config/appveyor/InstallNpcap.ps1 Added

@@ -0,0 +1,48 @@
+# Install Npcap on the machine.
+
+# Config:
+$npcap_oem_file = "npcap-0.9997-oem.exe"
+
+# Note: because we need the /S option (silent), this script has two cases:
+#  - The script is runned from a master build, then use the secure variable 'npcap_oem_key' which will be available
+#    to decode the very recent npcap install oem file and use it
+#  - The script is runned from a PR, then use the provided archived 0.96 version, which is the last public one to
+#    provide support for the /S option
+
+if (Test-Path Env:npcap_oem_key){  # Key is here: on master
+    echo "Using Npcap OEM version"
+    # Unpack the key
+    $user, $pass = (Get-ChildItem Env:npcap_oem_key).Value.replace("`"", "").split(",")
+    if(!$user -Or !$pass){
+        Throw (New-Object System.Exception)
+    }
+    $file = $PSScriptRoot+"\"+$npcap_oem_file
+    # Download oem file using (super) secret credentials
+    $pair = "${user}:${pass}"
+    $encodedCreds = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($pair))
+    $basicAuthValue = "Basic $encodedCreds"
+    $headers = @{ Authorization = $basicAuthValue }
+    $secpasswd = ConvertTo-SecureString $pass -AsPlainText -Force
+    $credential = New-Object System.Management.Automation.PSCredential($user, $secpasswd)
+    Invoke-WebRequest -uri (-join("https://nmap.org/npcap/oem/dist/",$npcap_oem_file)) -OutFile $file -Headers $headers -Credential $credential
+} else {  # No key: PRs
+    echo "Using backup 0.96"
+    $file = $PSScriptRoot+"\npcap-0.96.exe"
+    # Download the 0.96 file from nmap servers
+    wget "https://nmap.org/npcap/dist/npcap-0.96.exe" -UseBasicParsing -OutFile $file
+    # Now let's check its checksum
+    $_chksum = $(CertUtil -hashfile $file SHA256)[1] -replace " ",""
+    if ($_chksum -ne "83667e1306fdcf7f9967c10277b36b87e50ee8812e1ee2bb9443bdd065dc04a1"){
+        echo "Checksums does NOT match !"
+        exit
+    } else {
+        echo "Checksums matches !"
+    }
+}
+echo ('Installing: ' + $file)
+
+# Run installer
+Start-Process $file -ArgumentList "/loopback_support=yes /S" -wait
+if($?) {
+    echo "Npcap installation completed"
+}

scapy-2.4.4.tar.gz/.config/appveyor/InstallWindumpNpcap.ps1 Changed

scapy-2.4.4.tar.gz/.config/ci Added

scapy-2.4.4.tar.gz/.config/ci/install.sh Added

@@ -0,0 +1,38 @@
+#!/bin/bash
+# Install on osx
+if [ "$OSTYPE" = "darwin"* ] || [ "$TRAVIS_OS_NAME" = "osx" ]
+then
+  if [ ! -z $SCAPY_USE_PCAPDNET ]
+  then
+    brew update
+    brew install libdnet libpcap
+  fi
+fi
+
+# Install wireshark data, ifconfig & vcan
+if [ "$OSTYPE" = "linux-gnu" ] || [ "$TRAVIS_OS_NAME" = "linux" ]
+then
+  sudo apt-get update
+  sudo apt-get -qy install tshark net-tools || exit 1
+  sudo apt-get -qy install can-utils build-essential linux-headers-$(uname -r) linux-modules-extra-$(uname -r) || exit 1
+fi
+
+# Make sure libpcap is installed
+if [ ! -z $SCAPY_USE_PCAPDNET ]
+then
+  sudo apt-get -qy install libpcap-dev  || exit 1
+fi
+
+# On Travis, "osx" dependencies are installed in .travis.yml
+if [ "$TRAVIS_OS_NAME" != "osx" ]
+then
+  # Update pip & setuptools (tox uses those)
+  python -m pip install --upgrade pip setuptools --ignore-installed
+
+  # Make sure tox is installed and up to date
+  python -m pip install -U tox --ignore-installed
+fi
+
+# Dump Environment (so that we can check PATH, UT_FLAGS, etc.)
+openssl version
+set

scapy-2.4.4.tar.gz/.config/ci/test.sh Added

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# test.sh
+# Usage:
+#   ./test.sh [tox version] [both/root/non_root (default root)]
+# Example:
+#   ./test.sh 3.7 both
+
+if [ "$OSTYPE" = "linux-gnu" ] || [ "$TRAVIS_OS_NAME" = "linux" ]
+then
+  # Linux
+  OSTOX="linux"
+  UT_FLAGS=" -K tshark" # TODO: also test as root ?
+  # check vcan
+  sudo modprobe -n -v vcan
+  if [[ $? -ne 0 ]]
+  then
+    # The vcan module is currently unavailable on Travis-CI xenial builds
+    UT_FLAGS+=" -K vcan_socket"
+  fi
+elif [ "$OSTYPE" = "darwin"* ] || [ "$TRAVIS_OS_NAME" = "osx" ]
+then
+  OSTOX="osx"
+  UT_FLAGS=" -K tcpdump"
+fi
+
+# pypy
+if python --version 2>&1 | grep -q PyPy
+then
+  UT_FLAGS+=" -K not_pypy"
+fi
+
+# Create version tag (github actions)
+PY_VERSION="py${1//./}"
+PY_VERSION=${PY_VERSION/pypypy/pypy}
+TESTVER="$PY_VERSION-$OSTOX"
+
+# Chose whether to run root or non_root
+SCAPY_TOX_CHOSEN=${2}
+if [ "${SCAPY_TOX_CHOSEN}" == "" ]
+then
+  case ${PY_VERSION} in
+    py27|py38)
+      SCAPY_TOX_CHOSEN="both"
+      ;;
+    *)
+      SCAPY_TOX_CHOSEN="root"
+  esac
+fi
+
+if [ -z $TOXENV ]
+then
+  case ${SCAPY_TOX_CHOSEN} in
+    both)
+      export TOXENV="${TESTVER}_non_root,${TESTVER}_root"
+      ;;
+    root)
+      export TOXENV="${TESTVER}_root"
+      ;;
+    *)
+      export TOXENV="${TESTVER}_non_root"
+      ;;
+  esac
+fi
+
+# Dump vars (the others were already dumped in install.sh)
+echo UT_FLAGS=$UT_FLAGS
+echo TOXENV=$TOXENV
+
+# Launch Scapy unit tests
+tox -- ${UT_FLAGS} || exit 1
+
+# Start Scapy in interactive mode
+TEMPFILE=$(mktemp)
+cat <<EOF > "${TEMPFILE}"
+print("Scapy on %s" % sys.version)
+sys.exit()
+EOF
+echo "DEBUG: TEMPFILE=${TEMPFILE}"
+./run_scapy -H -c "${TEMPFILE}" || exit 1

scapy-2.4.4.tar.gz/.config/codespell_ignore.txt Added

scapy-2.4.4.tar.gz/.config/mypy Added

scapy-2.4.4.tar.gz/.config/mypy/mypy.ini Added

scapy-2.4.4.tar.gz/.config/mypy/mypy_check.py Added

@@ -0,0 +1,52 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Philippe Biondi <phil@secdev.org>
+# Copyright (C) Gabriel Potter <gabriel@potter.fr>
+# This program is published under a GPLv2 license
+
+"""
+Performs Static typing checks over Scapy's codebase
+"""
+
+# IMPORTANT NOTE
+#
+# Because we are rolling out mypy tests progressively,
+# we currently use --follow-imports=skip. This means that
+# mypy doesn't check consistency between the imports (different files).
+#
+# Once each file has been processed individually, we'll remove that to
+# check the inconsistencies across the files
+
+import io
+import os
+import sys
+
+from mypy.main import main as mypy_main
+
+# Load files
+
+localdir = os.path.split(__file__)[0]
+
+with io.open(os.path.join(localdir, "mypy_enabled.txt")) as fd:
+    FILES = [l.strip() for l in fd.readlines() if l.strip() and l[0] != "#"]
+
+if not FILES:
+    print("No files specified. Arborting")
+    sys.exit(0)
+
+# Generate mypy arguments
+
+ARGS = [
+    "--py2",
+    "--follow-imports=skip",
+    "--config-file=" + os.path.abspath(
+        os.path.join(
+            localdir,
+            "mypy.ini"
+        )
+    )
+] + [os.path.abspath(f) for f in FILES]
+
+# Run mypy over the files
+
+mypy_main(None, sys.stdout, sys.stderr, ARGS)

scapy-2.4.4.tar.gz/.config/mypy/mypy_deployment_stats.py Added

@@ -0,0 +1,51 @@
+# This file is part of Scapy
+# See https://scapy.net for more information
+# Copyright (C) Gabriel Potter <gabriel@potter.fr>
+# This program is published under a GPLv2 license
+
+"""
+Generate MyPy deployment stats
+"""
+
+import os
+import io
+import glob
+from collections import defaultdict
+
+# Parse config file
+
+localdir = os.path.split(__file__)[0]
+
+with io.open(os.path.join(localdir, "mypy_enabled.txt")) as fd:
+    FILES = [l.strip() for l in fd.readlines() if l.strip() and l[0] != "#"]
+
+# Scan Scapy
+
+ALL_FILES = [
+     "".join(x.partition("scapy/")[1:]) for x in
+     glob.iglob('../../scapy/**/*.py', recursive=True)
+]
+
+# Process
+
+TOTAL = len(ALL_FILES)
+ENABLED = 0
+MODULES = defaultdict(lambda: (0, []))
+
+for f in ALL_FILES:
+    parts = f.split("/")
+    if len(parts) > 2:
+        mod = parts[1]
+    else:
+        mod = "[main]"
+    e, l = MODULES[mod]
+    if f in FILES:
+        ENABLED += 1
+        e += 1
+    l.append(f)
+    MODULES[mod] = (e, l)
+
+print("*The numbers correspond to the amount of files processed*")
+print("**MyPy Support: %.2f%%**" % (ENABLED / TOTAL * 100))
+for mod, dat in MODULES.items():
+    print("- `%s`: %.2f%%" % (mod, dat[0] / len(dat[1]) * 100))

scapy-2.4.4.tar.gz/.config/mypy/mypy_enabled.txt Added

scapy-2.4.4.tar.gz/.github/FUNDING.yml Added

scapy-2.4.3.tar.gz/.github/ISSUE_TEMPLATE.md -> scapy-2.4.4.tar.gz/.github/ISSUE_TEMPLATE.md Changed

@@ -1,4 +1,5 @@
-#### Things to consider
+
 
 #### Brief description
 
-> describe the main issue in one sentence
-> if possible, describe what components / protocols could be affected by the issue (e.g. wrpcap() + IPv6, it is likely this also affects XXX)
+
+
 
 #### Environment
 
@@ -19,20 +21,20 @@
 -   Python version: `e.g. 3.5`
 -   Operating System: `e.g. Minix 3.4`
 
-> if needed - further information to get a picture of your setup (e.g. a sketch of your network setup)
+
 
 #### How to reproduce
 
-> step-by-step explanation or a short script, may reference section 'Related resources'
+
 
 #### Actual result
 
-> dump results that outline the issue, please format your code
+
 
 #### Expected result
 
-> describe the expected result and outline the difference to the actual one, could also be a screen shot (e.g. wireshark)
+
 
 #### Related resources
 
-> traces / sample pcaps (stripped to the relevant frames), related standards, RFCs or other resources
+

scapy-2.4.3.tar.gz/.github/PULL_REQUEST_TEMPLATE.md -> scapy-2.4.4.tar.gz/.github/PULL_REQUEST_TEMPLATE.md Changed

@@ -1,16 +1,17 @@
-This is just a checklist to guide you. You can remove it safely.
+
 
 **Checklist:**
 
--   [ ] If you are new to Scapy: I have checked <https://github.com/secdev/scapy/blob/master/CONTRIBUTING.md> (esp. section submitting-pull-requests)
+-   [ ] If you are new to Scapy: I have checked [CONTRIBUTING.md](https://github.com/secdev/scapy/blob/master/CONTRIBUTING.md) (esp. section submitting-pull-requests)
 -   [ ] I squashed commits belonging together
 -   [ ] I added unit tests or explained why they are not relevant
 -   [ ] I executed the regression tests for Python2 and Python3 (using `tox` or, `cd test && ./run_tests_py2, cd test && ./run_tests_py3`)
+-   [ ] If the PR is still not finished, please create a [Draft Pull Request](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 
-> brief description what this PR will do, e.g. fixes broken dissection of XXX
+
 
-> if required - short explanation why you fixed something in a way that may look more complicated as it actually is
+
 
-fixes #xxx (add issue number here if appropriate, else remove this line)
+fixes #xxx

scapy-2.4.4.tar.gz/.github/codecov.yml Changed

scapy-2.4.4.tar.gz/.github/workflows Added

scapy-2.4.4.tar.gz/.github/workflows/unittests.yml Added

@@ -0,0 +1,74 @@
+name: Scapy unit tests
+
+on: [push, pull_request]
+
+jobs:
+  health:
+    name: Code health check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Scapy
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install tox
+        run: pip install tox
+      - name: Run flake8 tests
+        run: tox -e flake8
+      - name: Run codespell
+        run: tox -e spell
+      - name: Run twine check
+        run: tox -e twine
+  docs:
+    name: Build doc
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Scapy
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install tox
+        run: pip install tox
+      - name: Build docs
+        run: tox -e docs
+  mypy:
+    name: Type hints check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Scapy
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install tox
+        run: pip install tox
+      - name: Run mypy
+        run: tox -e mypy
+
+  # Github Actions block ICMP. We can still use it for non root tests
+  utscapy:
+    name: Non-sudo unit tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [2.7, pypy2, pypy3, 3.5, 3.6, 3.7, 3.8]
+    steps:
+      - name: Checkout Scapy
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Tox and any other packages
+        run: ./.config/ci/install.sh
+      - name: Run Tox
+        run: ./.config/ci/test.sh ${{ matrix.python }} non_root
+      - name: Codecov
+        uses: codecov/codecov-action@v1
+        with:
+            file: /home/runner/work/scapy/scapy/.coverage

scapy-2.4.3.tar.gz/.gitignore -> scapy-2.4.4.tar.gz/.gitignore Changed

scapy-2.4.4.tar.gz/.readthedocs.yml Added

scapy-2.4.3.tar.gz/.travis.yml -> scapy-2.4.4.tar.gz/.travis.yml Changed

@@ -1,136 +1,75 @@
 language: python
+dist: bionic  # OpenSSL 1.1.1
+cache:
+  directories:
+  - $HOME/.cache/pip
+  - .tox
 
-matrix:
+jobs:
     include:
-        # PEP 8 checks, build doc and grammar spelling check
-        - os: linux
-          python: 3.6
-          env:
-            - TOXENV=flake8,twine,docs,spell
-       
-        # Run as a regular user
-        - os: linux
-          python: 2.7
-          env:
-            - TOXENV=py27-linux_non_root,codecov
-
+        # Run linux as root (non root tested by github ci)
         - os: linux
           python: 2.7
           env:
-            - TOXENV=py27-linux_non_root_old-cryptography,codecov
-
-        - os: linux
-          python: 3.4
-          env:
-            - TOXENV=py34-linux_non_root,codecov
-
-        - os: linux
-          python: 3.5
-          env:
-            - TOXENV=py35-linux_non_root,codecov
-
-        - os: linux
-          python: 3.6
-          env:
-            - TOXENV=py36-linux_non_root,codecov
-
-        - os: linux
-          dist: xenial
-          python: 3.7
-          env:
-            - TOXENV=py37-linux_non_root,codecov
+            - TOXENV=py27-linux_root,codecov
 
         - os: linux
-          python: pypy
+          python: pypy2
           env:
-            - TOXENV=pypy-linux_non_root,codecov
+            - TOXENV=pypy-linux_root,codecov
 
         - os: linux
           python: pypy3
           env:
-            - TOXENV=pypy3-linux_non_root,codecov
-
-        - os: osx
-          language: generic
-          env:
-            - TOXENV=py27-bsd_non_root,codecov
+            - TOXENV=pypy3-linux_root,codecov
 
-        # Run as root
         - os: linux
-          python: 2.7
+          python: 3.8
           env:
-            - TOXENV=py27-linux_root,codecov
+            - TOXENV=py38-linux_root,codecov
 
-        - os: linux
-          python: pypy
+        # run OSX
+        - os: osx
+          osx_image: xcode9.3
+          language: shell
+          before_install:
+              - python --version
+              - pip install --upgrade --ignore-installed --user pip tox setuptools
           env:
-            - TOXENV=pypy-linux_root,codecov
-
-# Note: a bug in pypy3 <= 5.10.1 prevents from using Scapy to inject packets
-#       see https://bitbucket.org/pypy/pypy/issues/2787/pypy3-sockname-error
-#        - os: linux
-#          python: pypy3
-#          env:
-#            - TOXENV=pypy3-linux_root,codecov
+            - TOXENV=py27-bsd_non_root,py27-bsd_root,codecov
 
-        - os: linux
-          python: 3.4
+        - os: osx
+          osx_image: xcode10.2
+          language: shell
+          before_install:
+              - python3 --version
+              - pip3 install --upgrade --ignore-installed pip tox setuptools
           env:
-            - TOXENV=py34-linux_root,codecov
+            - TOXENV=py37-bsd_non_root,py37-bsd_root,codecov
 
+        # run custom root tests
+        # isotp
         - os: linux
-          python: 3.5
+          python: 3.8
           env:
-            - TOXENV=py35-linux_root,codecov
+            - TOXENV=py38-isotp_kernel_module,codecov
 
+        # libpcap
         - os: linux
-          python: 3.6
-          env:
-            - TOXENV=py36-linux_root,codecov
-
-        - language: python
-          dist: xenial
-          python: 3.7
+          python: 3.8
           env:
-            - TOXENV=py37-linux_root,codecov
+            - SCAPY_USE_PCAPDNET=yes TOXENV=py38-linux_root,codecov
 
+        # warnings/deprecations
         - os: linux
-          python: 2.7
-          virtualenv:
-            system_site_packages: true
-          env:
-            - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes TOXENV=py27-pcapdnet_root,codecov
-        
-        - os: linux
-          python: 3.6
+          python: 3.8
           env:
-            - SCAPY_SUDO=sudo TOXENV=py36-isotp_kernel_module,codecov
-
-        - os: osx
-          language: generic
-          env:
-            - TOXENV=py27-bsd_root,codecov
-
-        - os: osx
-          language: generic
-          env:
-            - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes TOXENV=py27-pcapdnet_root,codecov
-
-        - os: osx
-          language: generic
-          env:
-            - TOXENV=py36-bsd_non_root,py36-bsd_root,codecov
-
+            - SCAPY_PY_OPTS="-Werror -X tracemalloc=25" TOXENV=py38-linux_root
     allow_failures:
-        # Other root tests
-        # Test scapy against all warnings
-        - os: linux
-          python: 3.6
-          env:
-            - TOXENV=linux_warnings
+      - env: SCAPY_PY_OPTS="-Werror -X tracemalloc=25" TOXENV=py38-linux_root
 
 install:
-  - bash .travis/install.sh
+  - bash .config/ci/install.sh
   - python -c "from scapy.all import conf; print(repr(conf))"
 
-script: bash .travis/test.sh
+script: bash .config/ci/test.sh

scapy-2.4.3.tar.gz/CONTRIBUTING.md -> scapy-2.4.4.tar.gz/CONTRIBUTING.md Changed

@@ -19,8 +19,8 @@
 [labeled "contributions wanted"](https://github.com/secdev/scapy/labels/contributions%20wanted), or look at the [contributions roadmap](https://github.com/secdev/scapy/issues/399)
 
 If you have any ideas of useful contributions that you cannot (or do
-not want to) do yourself, open an issue and use the label
-"contributions wanted".
+not want to) do yourself, open an issue and include
+"contributions wanted" in the title.
 
 Once you have chosen a contribution, open an issue to let other people
 know you're working on it (or assign the existing issue to yourself)
@@ -30,11 +30,6 @@
 
 ## Reporting issues
 
-### Questions
-
-It is OK so submit issues to ask questions (more than OK,
-encouraged). There is a label "question" that you can use for that.
-
 ### Bugs
 
 If you have installed Scapy through a package manager (from your Linux
@@ -42,16 +37,14 @@
 development code, and check that the bug still exists before
 submitting an issue.
 
-Please label your issues "bug".
-
 If you're not sure whether a behavior is a bug or not, submit an issue
 and ask, don't be shy!
 
 ### Enhancements / feature requests
 
 If you want a feature in Scapy, but cannot implement it yourself or
-want some hints on how to do that, open an issue with label
-"enhancement".
+want some hints on how to do that, open an issue and include
+"enhancement" in the title.
 
 Explain if possible the API you would like to have (e.g., give examples
 of function calls, packet creations, etc.).
@@ -60,12 +53,8 @@
 
 ### Coding style & conventions
 
-First, Scapy "legacy" code contains a lot of code that do not comply
-with the following recommendations, but we try to comply with some
-guidelines for new code.
-
 -   The code should be PEP-8 compliant; you can check your code with
-    [pep8](https://pypi.python.org/pypi/pep8).
+    [pep8](https://pypi.python.org/pypi/pep8) and the command `tox -e flake8`
 
 -   [Pylint](http://www.pylint.org/) can help you write good Python
     code (even if respecting Pylint rules is sometimes either too hard

scapy-2.4.3.tar.gz/README.md -> scapy-2.4.4.tar.gz/README.md Changed

@@ -6,14 +6,14 @@
 
 # Scapy
 
-[![Travis Build Status](https://travis-ci.com/secdev/scapy.svg?branch=master)](https://travis-ci.com/secdev/scapy)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/secdev/scapy?svg=true)](https://ci.appveyor.com/project/secdev/scapy)
-[![Codecov Status](https://codecov.io/gh/secdev/scapy/branch/master/graph/badge.svg)](https://codecov.io/gh/secdev/scapy)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/30ee6772bb264a689a2604f5cdb0437b)](https://www.codacy.com/app/secdev/scapy)
+[![Travis Build Status](https://travis-ci.com/secdev/scapy.svg?branch=master)](https://travis-ci.com/secdev/scapy) 
+[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/os03daotfja0wtp7/branch/master?svg=true)](https://ci.appveyor.com/project/secdev/scapy/branch/master) 
+[![Codecov Status](https://codecov.io/gh/secdev/scapy/branch/master/graph/badge.svg)](https://codecov.io/gh/secdev/scapy) 
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/30ee6772bb264a689a2604f5cdb0437b)](https://www.codacy.com/app/secdev/scapy) 
 [![PyPI Version](https://img.shields.io/pypi/v/scapy.svg)](https://pypi.python.org/pypi/scapy/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/scapy.svg)](https://pypi.python.org/pypi/scapy/)
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](LICENSE)
-[![Join the chat at https://gitter.im/secdev/scapy](https://badges.gitter.im/secdev/scapy.svg)](https://gitter.im/secdev/scapy)
+[![Join the chat at https://gitter.im/secdev/scapy](https://badges.gitter.im/secdev/scapy.svg)](https://gitter.im/secdev/scapy) 
 
 Scapy is a powerful Python-based interactive packet manipulation program and
 library.
@@ -31,7 +31,7 @@
 techniques (VLAN hopping+ARP cache poisoning, VoIP decoding on WEP protected
 channel, ...), etc.
 
-Scapy supports Python 2.7 and Python 3 (3.4 to 3.7). It's intended to
+Scapy supports Python 2.7 and Python 3 (3.4 to 3.8). It's intended to
 be cross platform, and runs on many different platforms (Linux, OSX,
 \*BSD, and Windows).
 
@@ -42,7 +42,7 @@
 
 ### Shell demo
 
-![Scapy install demo](https://secdev.github.io/img/animation-scapy-install.svg)
+![Scapy install demo](https://secdev.github.io/files/doc/animation-scapy-install.svg)
 
 Scapy can easily be used as an interactive shell to interact with the network.
 The following example shows how to send an ICMP Echo Request message to

scapy-2.4.3.tar.gz/doc/notebooks/Scapy in 15 minutes.ipynb -> scapy-2.4.4.tar.gz/doc/notebooks/Scapy in 15 minutes.ipynb Changed

@@ -20,7 +20,7 @@
    "source": [
     "[Scapy](http://www.secdev.org/projects/scapy) is a powerful Python-based interactive packet manipulation program and library. It can be used to forge or decode packets for a wide number of protocols, send them on the wire, capture them, match requests and replies, and much more.\n",
     "\n",
-    "This iPython notebook provides a short tour of the main Scapy features. It assumes that you are familiar with networking terminology. All examples where built using the development version from [https://github.com/secdev/scapy](https://github.com/secdev/scapy), and tested on Linux. They should work as well on OS X, and other BSD.\n",
+    "This iPython notebook provides a short tour of the main Scapy features. It assumes that you are familiar with networking terminology. All examples were built using the development version from [https://github.com/secdev/scapy](https://github.com/secdev/scapy), and tested on Linux. They should work as well on OS X, and other BSD.\n",
     "\n",
     "The current documentation is available on [http://scapy.readthedocs.io/](http://scapy.readthedocs.io/) !"
    ]
@@ -56,7 +56,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "2_ Adanced firewalking using IP options is sometimes useful to perform network enumeration. Here is more complicate one-liner:"
+    "2_ Advanced firewalking using IP options is sometimes useful to perform network enumeration. Here is a more complicated one-liner:"
    ]
   },
   {
@@ -89,7 +89,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### Now that, we've got your attention, let's start the tutorial !"
+    "#### Now that we've got your attention, let's start the tutorial !"
    ]
   },
   {
@@ -103,7 +103,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The easiest way to try Scapy is to clone the github repository, then launch the `run_scapy` script as root. The following examples can be pasted on the Scapy prompt. There is no need to install any external Python modules."
+    "The easiest way to try Scapy is to clone the github repository, then launch the `run_scapy` script as root. The following examples can be pasted at the Scapy prompt. There is no need to install any external Python modules."
    ]
   },
   {
@@ -239,7 +239,7 @@
    "source": [
     "There are not many differences with the previous example. However, Scapy used the specific destination to perform some magic tricks !\n",
     "\n",
-    "Using internal mechanisms (such as DNS resolution, routing table and ARP resolution), Scapy has automatically set fields necessary to send the packet. This fields can of course be accessed and displayed."
+    "Using internal mechanisms (such as DNS resolution, routing table and ARP resolution), Scapy has automatically set fields necessary to send the packet. These fields can of course be accessed and displayed."
    ]
   },
   {
@@ -334,7 +334,7 @@
    "source": [
     "Currently, you know how to build packets with Scapy. The next step is to send them over the network !\n",
     "\n",
-    "The `sr1()` function sends a packet and return the corresponding answer. `srp1()` does the same for layer two packets, i.e. Ethernet. If you are only interested in sending packets `send()` is your friend.\n",
+    "The `sr1()` function sends a packet and returns the corresponding answer. `srp1()` does the same for layer two packets, i.e. Ethernet. If you are only interested in sending packets `send()` is your friend.\n",
     "\n",
     "As an example, we can use the DNS protocol to get www.example.com IPv4 address."
    ]
@@ -366,7 +366,7 @@
     }
    ],
    "source": [
-    "sr1(IP(dst=\"8.8.8.8\")/UDP()/DNS(qd=DNSQR()))\n",
+    "p = sr1(IP(dst=\"8.8.8.8\")/UDP()/DNS(qd=DNSQR()))\n",
     "p[DNS].an"
    ]
   },
@@ -485,7 +485,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Sniffing the network is a straightforward as sending and receiving packets. The `sniff()` function returns a list of Scapy packets, that can be manipulated as previously described."
+    "Sniffing the network is as straightforward as sending and receiving packets. The `sniff()` function returns a list of Scapy packets, that can be manipulated as previously described."
    ]
   },
   {

scapy-2.4.4.tar.gz/doc/scapy/_ext Added

scapy-2.4.4.tar.gz/doc/scapy/_ext/scapy_doc.py Added

@@ -0,0 +1,159 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Gabriel Potter <gabriel@potter.fr>
+# This program is published under a GPLv2 license
+
+"""
+A Sphinx Extension for Scapy's doc preprocessing
+"""
+
+import subprocess
+import os
+from scapy.packet import Packet, _pkt_ls, rfc
+
+from sphinx.ext.autodoc import AttributeDocumenter
+
+# Utils
+
+def generate_rest_table(items):
+    """
+    Generates a ReST table from a list of tuples
+    """
+    lengths = [max(len(y) for y in x) for x in zip(*items)]
+    sep = "+%s+" % "+".join("-" * x for x in lengths)
+    sized = "|%s|" % "|".join("{:%ss}" % x for x in lengths)
+    output = []
+    for i in items:
+        output.append(sep)
+        output.append(sized.format(*i))
+    output.append(sep)
+    return output
+
+
+def tab(items):
+    """
+    Tabulize a generator.
+    """
+    for i in items:
+        # Tabs are 3-wide in autodoc
+        yield "   " + i
+
+
+def class_ref(cls):
+    """
+    Get Sphinx reference to a class
+    """
+    return ":class:`~%s`" % (
+        cls.__module__ + '.' + cls.__name__
+    )
+
+
+def get_fields_desc(obj):
+    """
+    Create a readable documentation for fields_desc
+    """
+    output = []
+    for value in _pkt_ls(obj):
+        fname, cls, clsne, dflt, long_attrs = value
+        output.append(
+            (
+                "**%s**" % fname,
+                class_ref(cls) + ((" " + clsne) if clsne else ""),
+                "``%s``" % repr(dflt)
+            )
+        )
+    if output:
+        output = list(
+            tab(
+                generate_rest_table(output)
+            )
+        )
+        # Add header
+        output.insert(0, ".. table:: %s fields" % obj.__name__)
+        output.insert(1, "   :widths: grid")
+        output.insert(2, "   ")
+        # Add RFC-like graph
+        try:
+            graph = list(tab(rfc(obj, ret=True).split("\n")))
+        except AttributeError:
+            return output
+        s = "Display RFC-like schema"
+        graph.insert(0, ".. raw:: html")
+        graph.insert(1, "")
+        graph.insert(2, "   <details><summary>%s</summary><code><pre>" % s)
+        graph.append("   </pre></code></details>")
+        graph.append("")
+        return graph + output
+    return output
+
+# Documenter
+
+class AttrsDocumenter(AttributeDocumenter):
+    """
+    Mock of AttributeDocumenter to handle Scapy settings
+    """
+
+    def add_directive_header(self, *args, **kwargs):
+        def call_parent():
+            """Calls the super.super.add_directive_header"""
+            super(AttributeDocumenter, self).add_directive_header(
+                *args, **kwargs
+            )
+        sourcename = self.get_sourcename()
+        # Custom additions
+        if issubclass(self.parent, Packet):
+            # Packet
+            if self.object_name == "fields_desc":
+                # Display custom field table
+                call_parent()
+                table = list(tab(get_fields_desc(self.parent)))
+                if table:
+                    self.add_line("   ", sourcename)
+                    for line in table:
+                        self.add_line(line, sourcename)
+                    self.add_line("   ", sourcename)
+                return
+            elif self.object_name == "payload_guess":
+                # Display list of possible children
+                call_parent()
+                children = sorted(set(class_ref(x[1]) for x in self.object))
+                if children:
+                    lines = [
+                        "",
+                        "Possible sublayers:",
+                        ", ".join(children),
+                        ""
+                    ]
+                    for line in tab(lines):
+                        self.add_line(line, sourcename)
+                return
+            elif self.object_name in ["aliastypes"]:
+                # Ignore
+                call_parent()
+                return
+        # The field is unknown: continue normally
+        super(AttrsDocumenter, self).add_directive_header(*args, **kwargs)
+
+# Setup
+
+def builder_inited_handler(app): 
+    """Generate API tree"""
+    if int(os.environ.get("SCAPY_APITREE", True)):
+        subprocess.call(['tox', '-e', 'apitree'])
+
+
+def setup(app):
+    """
+    Entry point of the scapy_doc extension.
+
+    Called by sphinx while booting up.
+    """
+    app.add_autodocumenter(AttrsDocumenter, override=True)
+    app.connect('builder-inited', builder_inited_handler)
+
+    # Dummy. We won't publish this
+    return {
+        'version': '1.0',
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }

scapy-2.4.3.tar.gz/doc/scapy/advanced_usage.rst -> scapy-2.4.4.tar.gz/doc/scapy/advanced_usage.rst Changed

@@ -795,14 +795,43 @@
 PipeTools
 =========
 
-Pipetool is a smart piping system allowing to perform complex stream data management. There are various differences between PipeTools and Automatons:
+Scapy's ``pipetool`` is a smart piping system allowing to perform complex stream data management.
 
-- PipeTools have no states: data is always sent following the same pattern
-- PipeTools are not based on sockets but can handle more varied sources of data (and outputs) such as user input, pcap input (but also sniffing)
-- PipeTools are not class-based, but rather implemented by manually linking all their parts. That has drawbacks but allows to dynamically add a Source, Drain while running, and set multiple drains for the same source
+The goal is to create a sequence of steps with one or several inputs and one or several outputs, with a bunch of blocks in between.
+PipeTools can handle varied sources of data (and outputs) such as user input, pcap input, sniffing, wireshark...
+A pipe system is implemented by manually linking all its parts. It is possible to dynamically add an element while running or set multiple drains for the same source.
 
 .. note:: Pipetool default objects are located inside ``scapy.pipetool``
 
+Demo: sniff, anonymize, send to Wireshark
+-----------------------------------------
+
+The following code will sniff packets on the default interface, anonymize the source and destination IP addresses and pipe it all into Wireshark. Useful when posting online examples, for instance.
+
+.. code-block:: python3
+
+    source = SniffSource(iface=conf.iface)
+    wire = WiresharkSink()
+    def transf(pkt):
+        if not pkt or IP not in pkt:
+            return pkt
+        pkt[IP].src = "1.1.1.1"
+        pkt[IP].dst = "2.2.2.2"
+        return pkt
+
+    source > TransformDrain(transf) > wire
+    p = PipeEngine(source)
+    p.start()
+    p.wait_and_stop()
+
+The engine is pretty straightforward:
+
+.. image:: graphics/pipetool_demo.svg
+
+Let's run it:
+
+.. image:: https://scapy.net/files/doc/pipetool_demo.gif
+
 Class Types
 -----------
 
@@ -812,72 +841,80 @@
 - ``Drains``
 - ``Sinks``
 
-They are executed and handled by a ``PipeEngine`` object.
+They are executed and handled by a :class:`~scapy.pipetool.PipeEngine` object.
 
 When running, a pipetool engine waits for any available data from the Source, and send it in the Drains linked to it.
 The data then goes from Drains to Drains until it arrives in a Sink, the final state of this data.
 
-Here is a basic demo of what the PipeTool system can do
+Let's see with a basic demo how to build a pipetool system.
 
 .. image:: graphics/pipetool_engine.png
 
 For instance, this engine was generated with this code:
 
->>> s = CLIFeeder()
->>> s2 = CLIHighFeeder()
->>> d1 = Drain()
->>> d2 = TransformDrain(lambda x: x[::-1])
->>> si1 = ConsoleSink()
->>> si2 = QueueSink()
->>> 
->>> s > d1
->>> d1 > si1
->>> d1 > si2
->>> 
->>> s2 >> d1
->>> d1 >> d2
->>> d2 >> si1
->>> 
->>> p = PipeEngine()
->>> p.add(s)
->>> p.add(s2)
->>> p.graph(target="> the_above_image.png")
-
-Let's start our PipeEngine:
-
->>> p.start()
-
-Now, let's play with it:
-
->>> s.send("foo")
->'foo'
->>> s2.send("bar")
->>'rab'
->>> s.send("i like potato")
->'i like potato'
->>> print(si2.recv(), ":", si2.recv())
-foo : i like potato
+.. code:: pycon
+
+    >>> s = CLIFeeder()
+    >>> s2 = CLIHighFeeder()
+    >>> d1 = Drain()
+    >>> d2 = TransformDrain(lambda x: x[::-1])
+    >>> si1 = ConsoleSink()
+    >>> si2 = QueueSink()
+    >>> 
+    >>> s > d1
+    >>> d1 > si1
+    >>> d1 > si2
+    >>> 
+    >>> s2 >> d1
+    >>> d1 >> d2
+    >>> d2 >> si1
+    >>> 
+    >>> p = PipeEngine()
+    >>> p.add(s)
+    >>> p.add(s2)
+    >>> p.graph(target="> the_above_image.png")
+
+``start()`` is used to start the :class:`~scapy.pipetool.PipeEngine`:
+
+.. code:: pycon
+
+    >>> p.start()
+
+Now, let's play with it by sending some input data
+
+.. code:: pycon
+
+    >>> s.send("foo")
+    >'foo'
+    >>> s2.send("bar")
+    >>'rab'
+    >>> s.send("i like potato")
+    >'i like potato'
+    >>> print(si2.recv(), ":", si2.recv())
+    foo : i like potato
 
 Let's study what happens here:
 
-- there are two canals in a PipeEngine, a lower one and a higher one. Some Sources write on the lower one, some on the higher one and some on both.
-- most sources can be linked to any drain, on both lower and higher canals. The use of `>` indicates a link on the low canal, and `>>` on the higher one.
-- when we send some data in `s`, which is on the lower canal, as shown above, it goes through the `Drain` then is sent to the `QueueSink` and to the `ConsoleSink`
-- when we send some data in `s2`, it goes through the Drain, then the TransformDrain where the data is reversed (see the lambda), before being sent to `ConsoleSink` only. This explains why we only have the data of the lower sources inside the QueueSink: the higher one has not been linked.
+- there are **two canals** in a :class:`~scapy.pipetool.PipeEngine`, a lower one and a higher one. Some Sources write on the lower one, some on the higher one and some on both.
+- most sources can be linked to any drain, on both lower and higher canals. The use of ``>`` indicates a link on the low canal, and ``>>`` on the higher one.
+- when we send some data in ``s``, which is on the lower canal, as shown above, it goes through the :class:`~scapy.pipetool.Drain` then is sent to the :class:`~.scapy.pipetool.QueueSink` and to the :class:`~scapy.pipetool.ConsoleSink`
+- when we send some data in ``s2``, it goes through the Drain, then the TransformDrain where the data is reversed (see the lambda), before being sent to :class:`~scapy.pipetool.ConsoleSink` only. This explains why we only have the data of the lower sources inside the QueueSink: the higher one has not been linked.
 
 Most of the sinks receive from both lower and upper canals. This is verifiable using the `help(ConsoleSink)`
 
->>> help(ConsoleSink)
-Help on class ConsoleSink in module scapy.pipetool:
-class ConsoleSink(Sink)
- |  Print messages on low and high entries
- |     +-------+
- |  >>-|--.    |->>
- |     | print |
- |   >-|--'    |->
- |     +-------+
- |
- [...]
+.. code:: pycon
+
+    >>> help(ConsoleSink)
+    Help on class ConsoleSink in module scapy.pipetool:
+    class ConsoleSink(Sink)
+     |  Print messages on low and high entries
+     |     +-------+
+     |  >>-|--.    |->>
+     |     | print |
+     |   >-|--'    |->
+     |     +-------+
+     |
+     [...]
 
 
 Sources
@@ -893,24 +930,28 @@
 
 For any of those class, have a look at ``help([theclass])`` to get more information or the required parameters.
 
-- CLIFeeder : a source especially used in interactive software. its ``send(data)`` generates the event data on the lower canal
-- CLIHighFeeder : same than CLIFeeder, but writes on the higher canal
-- PeriodicSource : Generate messages periodically on the low canal.
-- AutoSource: the default source, that must be extended to create custom sources. 
+- :class:`~scapy.pipetool.CLIFeeder` : a source especially used in interactive software. its ``send(data)`` generates the event data on the lower canal
+- :class:`~scapy.pipetool.CLIHighFeeder` : same than CLIFeeder, but writes on the higher canal
+- :class:`~scapy.pipetool.PeriodicSource` : Generate messages periodically on the low canal.
+- :class:`~scapy.pipetool.AutoSource`: the default source, that must be extended to create custom sources. 
 
 Create a custom Source
 ~~~~~~~~~~~~~~~~~~~~~~
 
-To create a custom source, one must extend the ``AutoSource`` class.
+To create a custom source, one must extend the :class:`~scapy.pipetool.AutoSource` class.
+
+.. note::
 
-Do NOT use the default ``Source`` class except if you are really sure of what you are doing: it is only used internally, and is missing some implementation. The ``AutoSource`` is made to be used.
+    Do NOT use the default :class:`~scapy.pipetool.Source` class except if you are really sure of what you are doing: it is only used internally, and is missing some implementation. The :class:`~scapy.pipetool.AutoSource` is made to be used.
 
 
 To send data through it, the object must call its ``self._gen_data(msg)`` or ``self._gen_high_data(msg)`` functions, which send the data into the PipeEngine.
 
-The Source should also (if possible), set ``self.is_exhausted`` to ``True`` when empty, to allow the clean stop of the ``PipeEngine``. If the source is infinite, it will need a force-stop (see PipeEngine below)
+The Source should also (if possible), set ``self.is_exhausted`` to ``True`` when empty, to allow the clean stop of the :class:`~scapy.pipetool.PipeEngine`. If the source is infinite, it will need a force-stop (see PipeEngine below)
+
+For instance, here is how :class:`~scapy.pipetool.CLIHighFeeder` is implemented:
 
-For instance, here is how CLIHighFeeder is implemented::
+.. code:: python3
 
     class CLIFeeder(CLIFeeder):
         def send(self, msg):
@@ -927,21 +968,21 @@
 Drains need to be linked on the entry that you are using. It can be either on the lower one (using ``>``) or the upper one (using ``>>``).
 See the basic example above.
 
-- Drain : the most basic Drain possible. Will pass on both low and high entry if linked properly.
-- TransformDrain : Apply a function to messages on low and high entry
-- UpDrain : Repeat messages from low entry to high exit
-- DownDrain : Repeat messages from high entry to low exit
+- :class:`~scapy.pipetool.Drain` : the most basic Drain possible. Will pass on both low and high entry if linked properly.
+- :class:`~scapy.pipetool.TransformDrain` : Apply a function to messages on low and high entry
+- :class:`~scapy.pipetool.UpDrain` : Repeat messages from low entry to high exit
+- :class:`~scapy.pipetool.DownDrain` : Repeat messages from high entry to low exit
 
 Create a custom Drain
 ~~~~~~~~~~~~~~~~~~~~~
 
-To create a custom drain, one must extend the ``Drain`` class.
+To create a custom drain, one must extend the :class:`~scapy.pipetool.Drain` class.
 
-A ``Drain`` object will receive data from the lower canal in its ``push`` method, and from the higher canal from its ``high_push`` method.
+A :class:`~scapy.pipetool.Drain` object will receive data from the lower canal in its ``push`` method, and from the higher canal from its ``high_push`` method.
 
 To send the data back into the next linked Drain / Sink, it must call the ``self._send(msg)`` or ``self._high_send(msg)`` methods.
 
-For instance, here is how TransformDrain is implemented::
+For instance, here is how :class:`~scapy.pipetool.TransformDrain` is implemented::
 
     class TransformDrain(Drain):
         def __init__(self, f, name=None):
@@ -957,161 +998,27 @@
 
 Sinks are destinations for messages.
 
-A :py:class:`Sink` receives data like a :py:class:`Drain`, but doesn't send any
+A :py:class:`~scapy.pipetool.Sink` receives data like a :py:class:`~scapy.pipetool.Drain`, but doesn't send any
 messages after it.
 
-Messages on the low entry come from :py:meth:`~Sink.push`, and messages on the
-high entry come from :py:meth:`~Sink.high_push`.
-
-Default Sink classes
-~~~~~~~~~~~~~~~~~~~~
-
-.. py:class:: Sink
-
-    Does nothing; interface to extend for custom sinks.
-
-    All sinks have the following constructor parameters:
-
-    :param name: a human-readable name for the element
-    :type name: str
-
-    All sinks should implement at least one of these methods:
-
-    .. py:method:: push
-
-        Called by :py:class:`PipeEngine` when there is a new message for the
-        low entry.
-
-        :param msg: The message data
-        :returns: None
-        :rtype: None
-
-    .. py:method:: high_push
-
-        Called by :py:class:`PipeEngine` when there is a new message for the
-        high entry.
-
-        :param msg: The message data
-        :returns: None
-        :rtype: None
-
-.. py:class:: ConsoleSink
-
-    Prints messages on the low and high entries to ``stdout``.
-
-.. py:class:: RawConsoleSink
-
-    Prints messages on the low and high entries, using :py:func:`os.write`.
+Messages on the low entry come from :py:meth:`~scapy.pipetool.Sink.push`, and messages on the
+high entry come from :py:meth:`~scapy.pipetool.Sink.high_push`.
 
-    :param newlines: Include a new-line character after printing each packet.
-                     Defaults to True.
-    :type newlines: bool
-
-.. py:class:: TermSink
-
-    Prints messages on the low and high entries, on a separate terminal (xterm
-    or cmd).
-
-    :param keepterm: Leaves the terminal window open after :py:meth:`~Pipe.stop`
-                     is called. Defaults to True.
-    :type keepterm: bool
-    :param newlines: Include a new-line character after printing each packet.
-                     Defaults to True.
-    :type newlines: bool
-    :param openearly: Automatically starts the terminal when the constructor is
-                      called, rather than waiting for :py:meth:`~Pipe.start`.
-                      Defaults to True.
-    :type openearly: bool
-
-.. py:class:: QueueSink
-
-    Collects messages on the low and high entries into a :py:class:`Queue`.
-
-    Messages are dequeued with :py:meth:`recv`.
-
-    Both high and low entries share the same :py:class:`Queue`.
-
-    .. py:method:: recv
-
-        Reads the next message from the queue.
-
-        If no message is available in the queue, returns None.
-
-        :param block: Blocks execution until a packet is available in the queue.
-                      Defaults to True.
-        :type block: bool
-        :param timeout: Controls how long to wait if ``block=True``. If None
-                        (the default), this method will wait forever. If a
-                        non-negative number, this is a number of seconds to
-                        wait before giving up (and returning None).
-        :type timeout: None, int or float
-
-.. py:class:: WiresharkSink
-
-    Streams :py:class:`Packet` from the low entry to Wireshark.
-
-    Packets are written into a ``pcap`` stream (like :py:class:`WrpcapSink`),
-    and streamed to a new Wireshark process on its ``stdin``.
-
-    Wireshark is run with the ``-ki -`` arguments, which cause it to treat
-    ``stdin`` as a capture device.  Arguments in :py:attr:`args` will be
-    appended after this.
-
-    Extends :py:mod:`WrpcapSink`.
-
-    :param linktype: See :py:attr:`WrpcapSink.linktype`.
-    :type linktype: None or int
-    :param args: See :py:attr:`args`.
-    :type args: None or list[str]
-
-    .. py:attribute:: args
-
-        Additional arguments for the Wireshark process.
-
-        This must be either ``None`` (the default), or a ``list`` of ``str``.
-
-        This attribute has no effect after calling :py:meth:`PipeEngine.start`.
-
-        See :manpage:`wireshark(1)` for more details.
-
-.. py:class:: WrpcapSink
-
-    Writes :py:class:`Packet` on the low entry to a ``pcap`` file.
-
-    Ignores all messages on the high entry.
-
-    .. note::
-
-        Due to limitations of the ``pcap`` format, all packets **must** be of
-        the same link type. This class will not mutate packets to conform with
-        the expected link type.
-
-    :param fname: Filename to write packets to.
-    :type fname: str
-    :param linktype: See :py:attr:`linktype`.
-    :type linktype: None or int
-
-    .. py:attribute:: linktype
-
-        Set an explicit link-type (``DLT_``) for packets.  This must be an
-        ``int`` or ``None``.
-
-        This is the same as the :py:func:`wrpcap` ``linktype`` parameter.
-
-        If ``None`` (the default), the linktype will be auto-detected on the
-        first packet. This field will *not* be updated with the result of this
-        auto-detection.
-
-        This attribute has no effect after calling :py:meth:`PipeEngine.start`.
+Default Sinks classes
+~~~~~~~~~~~~~~~~~~~~~
 
+- :class:`~scapy.pipetool.ConsoleSink` : Print messages on low and high entries to ``stdout``
+- :class:`~scapy.pipetool.RawConsoleSink` : Print messages on low and high entries, using os.write
+- :class:`~scapy.pipetool.TermSink` : Prints messages on the low and high entries, on a separate terminal
+- :class:`~scapy.pipetool.QueueSink` : Collects messages on the low and high entries into a :py:class:`Queue`
 
 Create a custom Sink
 ~~~~~~~~~~~~~~~~~~~~
 
-To create a custom sink, one must extend :py:class:`Sink` and implement
-:py:meth:`~Sink.push` and/or :py:meth:`~Sink.high_push`.
+To create a custom sink, one must extend :py:class:`~scapy.pipetool.Sink` and implement
+:py:meth:`~scapy.pipetool.Sink.push` and/or :py:meth:`~scapy.pipetool.Sink.high_push`.
 
-This is a simplified version of :py:class:`ConsoleSink`:
+This is a simplified version of :py:class:`~scapy.pipetool.ConsoleSink`:
 
 .. code-block:: python3
 
@@ -1149,11 +1056,11 @@
     >>> a2 >> b
     >>> a2.send("hello")
 
-Because ``b`` (:py:class:`Drain`) and ``c`` (:py:class:`ConsoleSink`) are not
+Because ``b`` (:py:class:`~scapy.pipetool.Drain`) and ``c`` (:py:class:`scapy.pipetool.ConsoleSink`) are not
 linked on the high entry.
 
-However, using a :py:class:`DownDrain` would bring the high messages from
-:py:class:`CLIHighFeeder` to the lower channel:
+However, using a :py:class:`~scapy.pipetool.DownDrain` would bring the high messages from
+:py:class:`~scapy.pipetool.CLIHighFeeder` to the lower channel:
 
 .. code-block:: pycon
 
@@ -1166,14 +1073,14 @@
 The PipeEngine class
 --------------------
 
-The ``PipeEngine`` class is the core class of the Pipetool system. It must be initialized and passed the list of all Sources.
+The :class:`~scapy.pipetool.PipeEngine` class is the core class of the Pipetool system. It must be initialized and passed the list of all Sources.
 
 There are two ways of passing sources:
 
 - during initialization: ``p = PipeEngine(source1, source2, ...)``
 - using the ``add(source)`` method
 
-A ``PipeEngine`` class must be started with ``.start()`` function. It may be force-stopped with the ``.stop()``, or cleanly stopped with ``.wait_and_stop()``
+A :class:`~scapy.pipetool.PipeEngine` class must be started with ``.start()`` function. It may be force-stopped with the ``.stop()``, or cleanly stopped with ``.wait_and_stop()``
 
 A clean stop only works if the Sources is exhausted (has no data to send left).
 
@@ -1186,14 +1093,14 @@
 
 Now that you know the default PipeTool objects, here are some more advanced ones, based on packet functionalities.
 
-- SniffSource : Read packets from an interface and send them to low exit.
-- RdpcapSource : Read packets from a PCAP file send them to low exit.
-- InjectSink : Packets received on low input are injected (sent) to an interface
-- WrpcapSink : Packets received on low input are written to PCAP file
-- UDPDrain : UDP payloads received on high entry are sent over UDP (complicated, have a look at ``help(UDPDrain)``)
-- FDSourceSink : Use a file descriptor as source and sink
-- TCPConnectPipe : TCP connect to addr:port and use it as source and sink
-- TCPListenPipe : TCP listen on [addr:]port and use the first connection as source and sink (complicated, have a look at ``help(TCPListenPipe)``)
+- :class:`~scapy.scapypipes.SniffSource` : Read packets from an interface and send them to low exit.
+- :class:`~scapy.scapypipes.RdpcapSource` : Read packets from a PCAP file send them to low exit.
+- :class:`~scapy.scapypipes.InjectSink` : Packets received on low input are injected (sent) to an interface
+- :class:`~scapy.scapypipes.WrpcapSink` : Packets received on low input are written to PCAP file
+- :class:`~scapy.scapypipes.UDPDrain` : UDP payloads received on high entry are sent over UDP (complicated, have a look at ``help(UDPDrain)``)
+- :class:`~scapy.scapypipes.FDSourceSink` : Use a file descriptor as source and sink
+- :class:`~scapy.scapypipes.TCPConnectPipe`: TCP connect to addr:port and use it as source and sink
+- :class:`~scapy.scapypipes.TCPListenPipe` : TCP listen on [addr:]port and use the first connection as source and sink (complicated, have a look at ``help(TCPListenPipe)``)
 
 Triggering
 ----------
@@ -1202,29 +1109,31 @@
 
 Trigger Drains are special drains, that on receiving data not only pass it by but also send a "Trigger" input, that is received and handled by the next triggered drain (if it exists).
 
-For example, here is a basic TriggerDrain usage:
-
->>> a = CLIFeeder()
->>> d = TriggerDrain(lambda msg: True) # Pass messages and trigger when a condition is met
->>> d2 = TriggeredValve()
->>> s = ConsoleSink()
->>> a > d > d2 > s
->>> d ^ d2 # Link the triggers
->>> p = PipeEngine(s)
->>> p.start()
-INFO: Pipe engine thread started.
->>> 
->>> a.send("this will be printed")
->'this will be printed'
->>> a.send("this won't, because the valve was switched")
->>> a.send("this will, because the valve was switched again")
->'this will, because the valve was switched again'
->>> p.stop()
+For example, here is a basic :class:`~scapy.scapypipes.TriggerDrain` usage:
+
+.. code:: pycon
+
+    >>> a = CLIFeeder()
+    >>> d = TriggerDrain(lambda msg: True) # Pass messages and trigger when a condition is met
+    >>> d2 = TriggeredValve()
+    >>> s = ConsoleSink()
+    >>> a > d > d2 > s
+    >>> d ^ d2 # Link the triggers
+    >>> p = PipeEngine(s)
+    >>> p.start()
+    INFO: Pipe engine thread started.
+    >>> 
+    >>> a.send("this will be printed")
+    >'this will be printed'
+    >>> a.send("this won't, because the valve was switched")
+    >>> a.send("this will, because the valve was switched again")
+    >'this will, because the valve was switched again'
+    >>> p.stop()
 
 Several triggering Drains exist, they are pretty explicit. It is highly recommended to check the doc using ``help([the class])``
 
-- TriggeredMessage : Send a preloaded message when triggered and trigger in chain
-- TriggerDrain : Pass messages and trigger when a condition is met
-- TriggeredValve : Let messages alternatively pass or not, changing on trigger
-- TriggeredQueueingValve : Let messages alternatively pass or queued, changing on trigger
-- TriggeredSwitch : Let messages alternatively high or low, changing on trigger
+- :class:`~scapy.scapypipes.TriggeredMessage` : Send a preloaded message when triggered and trigger in chain
+- :class:`~scapy.scapypipes.TriggerDrain` : Pass messages and trigger when a condition is met
+- :class:`~scapy.scapypipes.TriggeredValve` : Let messages alternatively pass or not, changing on trigger
+- :class:`~scapy.scapypipes.TriggeredQueueingValve` : Let messages alternatively pass or queued, changing on trigger
+- :class:`~scapy.scapypipes.TriggeredSwitch` : Let messages alternatively high or low, changing on trigger

scapy-2.4.3.tar.gz/doc/scapy/build_dissect.rst -> scapy-2.4.4.tar.gz/doc/scapy/build_dissect.rst Changed

scapy-2.4.3.tar.gz/doc/scapy/conf.py -> scapy-2.4.4.tar.gz/doc/scapy/conf.py Changed

@@ -21,18 +21,29 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('../../'))
+sys.path.append(os.path.abspath('_ext'))
 
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-# needs_sphinx = '1.0'
+needs_sphinx = '2.2.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.napoleon',
+    'scapy_doc'
+]
+
+# Autodoc configuration
+autodoc_inherit_docstrings = False
+autodoc_default_options = {
+    'undoc-members': True
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -56,9 +67,9 @@
 # built documents.
 from scapy import VERSION, VERSION_MAIN
 # The short X.Y version.
-version = VERSION_MAIN
+release = VERSION_MAIN
 # The full version, including alpha/beta/rc tags.
-release = VERSION
+version = VERSION
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

scapy-2.4.3.tar.gz/doc/scapy/development.rst -> scapy-2.4.4.tar.gz/doc/scapy/development.rst Changed

scapy-2.4.3.tar.gz/doc/scapy/extending.rst -> scapy-2.4.4.tar.gz/doc/scapy/extending.rst Changed

scapy-2.4.4.tar.gz/doc/scapy/graphics/animations/animation-scapy-isotpscan.svg Added

@@ -0,0 +1,44 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="terminal" baseProfile="full" viewBox="0 0 960 512" width="960" version="1.1">
+    <defs>
+        <termtosvg:template_settings xmlns:termtosvg="https://github.com/nbedos/termtosvg">
+            <termtosvg:screen_geometry columns="120" rows="30"/>
+        </termtosvg:template_settings>
+        <style type="text/css" id="generated-style"><![CDATA[:root {
+            --animation-duration: 54538ms;
+        }
+        
+        #screen {
+                font-family: 'DejaVu Sans Mono', monospace;
+                font-style: normal;
+                font-size: 14px;
+            }
+
+        text {
+            dominant-baseline: text-before-edge;
+            white-space: pre;
+        }]]></style>
+        <style type="text/css" id="user-style">
+            /* gjm8 color theme (source: https://terminal.sexy/) */
+            .foreground {fill: #c5c5c5;}
+            .background {fill: #1c1c1c;}
+            .color0 {fill: #1c1c1c;}
+            .color1 {fill: #ff005b;}
+            .color2 {fill: #cee318;}
+            .color3 {fill: #ffe755;}
+            .color4 {fill: #048ac7;}
+            .color5 {fill: #833c9f;}
+            .color6 {fill: #0ac1cd;}
+            .color7 {fill: #e5e5e5;}
+            .color8 {fill: #1c1c1c;}
+            .color9 {fill: #ff005b;}
+            .color10 {fill: #cee318;}
+            .color11 {fill: #ffe755;}
+            .color12 {fill: #048ac7;}
+            .color13 {fill: #833c9f;}
+            .color14 {fill: #0ac1cd;}
+            .color15 {fill: #e5e5e5;}
+        </style>
+    </defs>
+    <svg id="screen" width="960" viewBox="0 0 960 510" preserveAspectRatio="xMidYMin meet">
+        <rect class="background" height="100%" width="100%" x="0" y="0"/><defs><g id="g1"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" class="background"> </text><text x="128" textLength="832" class="foreground">                                                                                                        </text></g></defs><g display="none"><rect x="120" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="17"/><animate attributeName="display" from="inline" to="inline" begin="0ms; anim_last.end" dur="500ms"/></g><defs><g id="g2"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" font-weight="bold" class="color9">p</text><text x="128" textLength="8" class="background">y</text><text x="136" textLength="680" fill="#555555">thon3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="128" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g2" y="17"/><animate attributeName="display" from="inline" to="inline" begin="500ms; anim_last.end+500ms" dur="500ms"/></g><defs><g id="g3"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="color9">pt</text><text x="136" textLength="8" class="background"> </text><text x="144" textLength="816" class="foreground">                                                                                                      </text></g></defs><g display="none"><rect x="136" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g3" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1000ms; anim_last.end+1000ms" dur="37ms"/></g><defs><g id="g4"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="color9">pt</text><text x="136" textLength="8" class="background">a</text><text x="144" textLength="16" fill="#555555">r </text><text x="160" textLength="800" class="foreground">                                                                                                    </text></g></defs><g display="none"><rect x="136" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g4" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1037ms; anim_last.end+1037ms" dur="473ms"/></g><defs><g id="g5"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" font-weight="bold" class="color9">p</text><text x="128" textLength="8" class="background"> </text><text x="136" textLength="824" class="foreground">                                                                                                       </text></g></defs><g display="none"><rect x="128" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g5" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1510ms; anim_last.end+1510ms" dur="208ms"/></g><defs><g id="g6"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="color9">py</text><text x="136" textLength="8" class="background">t</text><text x="144" textLength="672" fill="#555555">hon3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="136" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g6" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1718ms; anim_last.end+1718ms" dur="111ms"/></g><defs><g id="g7"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="24" font-weight="bold" class="color9">pyt</text><text x="144" textLength="8" class="background">h</text><text x="152" textLength="664" font-weight="bold" fill="#555555">on3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="144" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g7" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1829ms; anim_last.end+1829ms" dur="96ms"/></g><defs><g id="g8"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="color9">pyth</text><text x="152" textLength="8" class="background">o</text><text x="160" textLength="656" font-weight="bold" fill="#555555">n3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="152" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g8" y="17"/><animate attributeName="display" from="inline" to="inline" begin="1925ms; anim_last.end+1925ms" dur="104ms"/></g><defs><g id="g9"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="40" font-weight="bold" class="color9">pytho</text><text x="160" textLength="8" class="background">n</text><text x="168" textLength="648" font-weight="bold" fill="#555555">3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="160" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g9" y="17"/><animate attributeName="display" from="inline" to="inline" begin="2029ms; anim_last.end+2029ms" dur="127ms"/></g><defs><g id="g10"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="48" font-weight="bold" class="foreground">python</text><text x="168" textLength="8" class="background">3</text><text x="176" textLength="640" fill="#555555"> -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="168" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g10" y="17"/><animate attributeName="display" from="inline" to="inline" begin="2156ms; anim_last.end+2156ms" dur="500ms"/></g><defs><g id="g11"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="background"> </text><text x="184" textLength="632" fill="#555555">-m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="176" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g11" y="17"/><animate attributeName="display" from="inline" to="inline" begin="2656ms; anim_last.end+2656ms" dur="392ms"/></g><defs><g id="g12"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="background">-</text><text x="192" textLength="624" fill="#555555">m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="184" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g12" y="17"/><animate attributeName="display" from="inline" to="inline" begin="3048ms; anim_last.end+3048ms" dur="120ms"/></g><defs><g id="g13"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="color6">-</text><text x="192" textLength="8" class="background">m</text><text x="200" textLength="616" fill="#555555"> scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="192" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g13" y="17"/><animate attributeName="display" from="inline" to="inline" begin="3168ms; anim_last.end+3168ms" dur="287ms"/></g><defs><g id="g14"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="background"> </text><text x="208" textLength="608" fill="#555555">scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="200" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g14" y="17"/><animate attributeName="display" from="inline" to="inline" begin="3455ms; anim_last.end+3455ms" dur="160ms"/></g><defs><g id="g15"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="8" class="background">s</text><text x="216" textLength="600" fill="#555555">capy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="208" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g15" y="17"/><animate attributeName="display" from="inline" to="inline" begin="3615ms; anim_last.end+3615ms" dur="500ms"/></g><defs><g id="g16"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="8" text-decoration="underline" class="color6">s</text><text x="216" textLength="8" class="background">c</text><text x="224" textLength="592" fill="#555555">apy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="216" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g16" y="17"/><animate attributeName="display" from="inline" to="inline" begin="4115ms; anim_last.end+4115ms" dur="184ms"/></g><defs><g id="g17"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="16" text-decoration="underline" class="color6">sc</text><text x="224" textLength="8" class="background">a</text><text x="232" textLength="584" fill="#555555">py.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="224" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g17" y="17"/><animate attributeName="display" from="inline" to="inline" begin="4299ms; anim_last.end+4299ms" dur="95ms"/></g><defs><g id="g18"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="24" class="color6">sca</text><text x="232" textLength="8" class="background">p</text><text x="240" textLength="576" fill="#555555">y.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="232" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g18" y="17"/><animate attributeName="display" from="inline" to="inline" begin="4394ms; anim_last.end+4394ms" dur="112ms"/></g><defs><g id="g19"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="32" class="color6">scap</text><text x="240" textLength="8" class="background">y</text><text x="248" textLength="568" fill="#555555">.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="240" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g19" y="17"/><animate attributeName="display" from="inline" to="inline" begin="4506ms; anim_last.end+4506ms" dur="207ms"/></g><defs><g id="g20"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="40" class="color6">scapy</text><text x="248" textLength="8" class="background">.</text><text x="256" textLength="560" fill="#555555">tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="248" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g20" y="17"/><animate attributeName="display" from="inline" to="inline" begin="4713ms; anim_last.end+4713ms" dur="292ms"/></g><defs><g id="g21"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="40" class="color6">scapy</text><text x="248" textLength="8" class="foreground"> </text><text x="256" textLength="8" class="background"> </text><text x="264" textLength="696" class="foreground">                                                                                       </text></g></defs><g display="none"><rect x="256" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g21" y="17"/><animate attributeName="display" from="inline" to="inline" begin="5005ms; anim_last.end+5005ms" dur="500ms"/></g><defs><g id="g22"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="40" class="color6">scapy</text><text x="248" textLength="8" class="background"> </text><text x="256" textLength="704" class="foreground">                                                                                        </text></g></defs><g display="none"><rect x="248" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g22" y="17"/><animate attributeName="display" from="inline" to="inline" begin="5505ms; anim_last.end+5505ms" dur="288ms"/></g><defs><g id="g23"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="48" class="color6">scapy.</text><text x="256" textLength="8" class="background">t</text><text x="264" textLength="552" fill="#555555">ools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="256" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g23" y="17"/><animate attributeName="display" from="inline" to="inline" begin="5793ms; anim_last.end+5793ms" dur="209ms"/></g><defs><g id="g24"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="136" font-weight="bold" class="foreground">python3 -m scapy.</text><text x="256" textLength="8" class="background">t</text><text x="264" textLength="552" fill="#555555">ools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="120" y="17" width="136" height="17" class="color0"/><rect x="256" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g24" y="17"/><animate attributeName="display" from="inline" to="inline" begin="6002ms; anim_last.end+6002ms" dur="101ms"/></g><g display="none"><rect x="256" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g23" y="17"/><animate attributeName="display" from="inline" to="inline" begin="6103ms; anim_last.end+6103ms" dur="500ms"/></g><defs><g id="g25"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="background"> </text><text x="824" textLength="136" class="foreground">                 </text></g></defs><g display="none"><rect x="816" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g25" y="17"/><animate attributeName="display" from="inline" to="inline" begin="6603ms; anim_last.end+6603ms" dur="500ms"/></g><defs><g id="g26"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="8" class="color6">-</text><text x="808" textLength="8" class="background"> </text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><rect x="808" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g26" y="17"/><animate attributeName="display" from="inline" to="inline" begin="7103ms; anim_last.end+7103ms" dur="500ms"/></g><defs><g id="g27"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-h</text><text x="816" textLength="8" class="background"> </text><text x="824" textLength="136" class="foreground">                 </text></g></defs><g display="none"><rect x="816" y="17" width="8" height="17" class="foreground"/><use xlink:href="#g27" y="17"/><animate attributeName="display" from="inline" to="inline" begin="7603ms; anim_last.end+7603ms" dur="337ms"/></g><defs><g id="g28"><text x="0" textLength="376" class="foreground">Welcome to fish, the friendly interactive shell</text></g></defs><g display="none"><use xlink:href="#g28" y="0"/><animate attributeName="display" from="inline" to="inline" begin="0ms; anim_last.end" dur="8440ms"/></g><defs><g id="g29"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-h</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><defs><g id="g30"><text x="0" textLength="8" class="background"> </text></g></defs><g display="none"><use xlink:href="#g29" y="17"/><rect x="0" y="34" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="34"/><animate attributeName="display" from="inline" to="inline" begin="7940ms; anim_last.end+7940ms" dur="500ms"/></g><g display="none"><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="8440ms; anim_last.end+8440ms" dur="80ms"/></g><g display="none"><rect x="120" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="493"/><animate attributeName="display" from="inline" to="inline" begin="8520ms; anim_last.end+8520ms" dur="500ms"/></g><g display="none"><rect x="816" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g27" y="493"/><animate attributeName="display" from="inline" to="inline" begin="9020ms; anim_last.end+9020ms" dur="350ms"/></g><g display="none"><rect x="808" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g26" y="493"/><animate attributeName="display" from="inline" to="inline" begin="9370ms; anim_last.end+9370ms" dur="111ms"/></g><defs><g id="g31"><text x="0" textLength="592" class="foreground">                          see examples below. Any python-can interface can</text></g></defs><defs><g id="g32"><text x="0" textLength="400" class="foreground">                          be provided. Please see:</text></g></defs><defs><g id="g33"><text x="0" textLength="504" class="foreground">                          https://python-can.readthedocs.io for</text></g></defs><defs><g id="g34"><text x="0" textLength="424" class="foreground">                          further interface examples.</text></g></defs><defs><g id="g35"><text x="0" textLength="360" class="foreground">    -b, --bitrate         python-can bitrate.</text></g></defs><defs><g id="g36"><text x="0" textLength="184" class="foreground">    optional arguments:</text></g></defs><defs><g id="g37"><text x="0" textLength="456" class="foreground">    -h, --help            show this help message and exit</text></g></defs><defs><g id="g38"><text x="0" textLength="504" class="foreground">    -n NOISE_LISTEN_TIME, --noise_listen_time NOISE_LISTEN_TIME</text></g></defs><defs><g id="g39"><text x="0" textLength="528" class="foreground">                          Seconds listening for noise before scan.</text></g></defs><defs><g id="g40"><text x="0" textLength="336" class="foreground">    -t SNIFF_TIME, --sniff_time SNIFF_TIME</text></g></defs><defs><g id="g41"><text x="0" textLength="600" class="foreground">                          Duration in milliseconds a sniff is waiting for a</text></g></defs><defs><g id="g42"><text x="0" textLength="384" class="foreground">                          flow-control response.</text></g></defs><defs><g id="g43"><text x="0" textLength="496" class="foreground">    -x, --extended        Scan with ISOTP extended addressing.</text></g></defs><defs><g id="g44"><text x="0" textLength="512" class="foreground">    -C, --piso            Print 'Copy&amp;Paste'-ready ISOTPSockets.</text></g></defs><defs><g id="g45"><text x="0" textLength="464" class="foreground">    -v, --verbose         Display information during scan.</text></g></defs><defs><g id="g46"><text x="0" textLength="152" class="foreground">    Example of use:</text></g></defs><defs><g id="g47"><text x="0" textLength="184" class="foreground">    Python2 or Windows:</text></g></defs><defs><g id="g48"><text x="0" textLength="960" class="foreground">    python2 -m scapy.tools.automotive.isotpscanner --interface=pcan --channel=PCAN_USBBUS1 --bitrate=250000 --start 0 --</text></g></defs><defs><g id="g49"><text x="0" textLength="56" class="foreground">end 100</text></g></defs><defs><g id="g50"><text x="0" textLength="944" class="foreground">    python2 -m scapy.tools.automotive.isotpscanner --interface vector --channel 0 --bitrate 250000 --start 0 --end 100</text></g></defs><defs><g id="g51"><text x="0" textLength="960" class="foreground">    python2 -m scapy.tools.automotive.isotpscanner --interface socketcan --channel=can0 --bitrate=250000 --start 0 --end</text></g></defs><defs><g id="g52"><text x="0" textLength="32" class="foreground"> 100</text></g></defs><defs><g id="g53"><text x="0" textLength="168" class="foreground">    Python3 on Linux:</text></g></defs><defs><g id="g54"><text x="0" textLength="688" class="foreground">    python3 -m scapy.tools.automotive.isotpscanner --channel can0 --start 0 --end 100 </text></g></defs><g display="none"><use xlink:href="#g31" y="0"/><use xlink:href="#g32" y="17"/><use xlink:href="#g33" y="34"/><use xlink:href="#g34" y="51"/><use xlink:href="#g35" y="68"/><use xlink:href="#g36" y="102"/><use xlink:href="#g37" y="119"/><use xlink:href="#g38" y="136"/><use xlink:href="#g39" y="153"/><use xlink:href="#g40" y="170"/><use xlink:href="#g41" y="187"/><use xlink:href="#g42" y="204"/><use xlink:href="#g43" y="221"/><use xlink:href="#g44" y="238"/><use xlink:href="#g45" y="255"/><use xlink:href="#g46" y="289"/><use xlink:href="#g47" y="323"/><use xlink:href="#g48" y="340"/><use xlink:href="#g49" y="357"/><use xlink:href="#g50" y="374"/><use xlink:href="#g51" y="391"/><use xlink:href="#g52" y="408"/><use xlink:href="#g53" y="442"/><use xlink:href="#g54" y="459"/><animate attributeName="display" from="inline" to="inline" begin="8440ms; anim_last.end+8440ms" dur="1233ms"/></g><g display="none"><rect x="816" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g25" y="493"/><animate attributeName="display" from="inline" to="inline" begin="9481ms; anim_last.end+9481ms" dur="192ms"/></g><defs><g id="g55"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="144" class="foreground">                  </text></g></defs><g display="none"><use xlink:href="#g32" y="0"/><use xlink:href="#g33" y="17"/><use xlink:href="#g34" y="34"/><use xlink:href="#g35" y="51"/><use xlink:href="#g36" y="85"/><use xlink:href="#g37" y="102"/><use xlink:href="#g38" y="119"/><use xlink:href="#g39" y="136"/><use xlink:href="#g40" y="153"/><use xlink:href="#g41" y="170"/><use xlink:href="#g42" y="187"/><use xlink:href="#g43" y="204"/><use xlink:href="#g44" y="221"/><use xlink:href="#g45" y="238"/><use xlink:href="#g46" y="272"/><use xlink:href="#g47" y="306"/><use xlink:href="#g48" y="323"/><use xlink:href="#g49" y="340"/><use xlink:href="#g50" y="357"/><use xlink:href="#g51" y="374"/><use xlink:href="#g52" y="391"/><use xlink:href="#g53" y="425"/><use xlink:href="#g54" y="442"/><use xlink:href="#g55" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="9673ms; anim_last.end+9673ms" dur="500ms"/></g><defs><g id="g56"><text x="0" textLength="208" class="foreground">Start scan (0x700 - 0x7ff)</text></g></defs><defs><g id="g57"><text x="0" textLength="232" class="foreground">Filtering background noise...</text></g></defs><g display="none"><use xlink:href="#g34" y="0"/><use xlink:href="#g35" y="17"/><use xlink:href="#g36" y="51"/><use xlink:href="#g37" y="68"/><use xlink:href="#g38" y="85"/><use xlink:href="#g39" y="102"/><use xlink:href="#g40" y="119"/><use xlink:href="#g41" y="136"/><use xlink:href="#g42" y="153"/><use xlink:href="#g43" y="170"/><use xlink:href="#g44" y="187"/><use xlink:href="#g45" y="204"/><use xlink:href="#g46" y="238"/><use xlink:href="#g47" y="272"/><use xlink:href="#g48" y="289"/><use xlink:href="#g49" y="306"/><use xlink:href="#g50" y="323"/><use xlink:href="#g51" y="340"/><use xlink:href="#g52" y="357"/><use xlink:href="#g53" y="391"/><use xlink:href="#g54" y="408"/><use xlink:href="#g55" y="442"/><use xlink:href="#g56" y="459"/><use xlink:href="#g57" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="10173ms; anim_last.end+10173ms" dur="500ms"/></g><defs><g id="g58"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x701 when testing identifier 0x700</text></g></defs><g display="none"><use xlink:href="#g35" y="0"/><use xlink:href="#g36" y="34"/><use xlink:href="#g37" y="51"/><use xlink:href="#g38" y="68"/><use xlink:href="#g39" y="85"/><use xlink:href="#g40" y="102"/><use xlink:href="#g41" y="119"/><use xlink:href="#g42" y="136"/><use xlink:href="#g43" y="153"/><use xlink:href="#g44" y="170"/><use xlink:href="#g45" y="187"/><use xlink:href="#g46" y="221"/><use xlink:href="#g47" y="255"/><use xlink:href="#g48" y="272"/><use xlink:href="#g49" y="289"/><use xlink:href="#g50" y="306"/><use xlink:href="#g51" y="323"/><use xlink:href="#g52" y="340"/><use xlink:href="#g53" y="374"/><use xlink:href="#g54" y="391"/><use xlink:href="#g55" y="425"/><use xlink:href="#g56" y="442"/><use xlink:href="#g57" y="459"/><use xlink:href="#g58" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="10673ms; anim_last.end+10673ms" dur="500ms"/></g><defs><g id="g59"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x707 when testing identifier 0x709</text></g></defs><g display="none"><use xlink:href="#g36" y="17"/><use xlink:href="#g37" y="34"/><use xlink:href="#g38" y="51"/><use xlink:href="#g39" y="68"/><use xlink:href="#g40" y="85"/><use xlink:href="#g41" y="102"/><use xlink:href="#g42" y="119"/><use xlink:href="#g43" y="136"/><use xlink:href="#g44" y="153"/><use xlink:href="#g45" y="170"/><use xlink:href="#g46" y="204"/><use xlink:href="#g47" y="238"/><use xlink:href="#g48" y="255"/><use xlink:href="#g49" y="272"/><use xlink:href="#g50" y="289"/><use xlink:href="#g51" y="306"/><use xlink:href="#g52" y="323"/><use xlink:href="#g53" y="357"/><use xlink:href="#g54" y="374"/><use xlink:href="#g55" y="408"/><use xlink:href="#g56" y="425"/><use xlink:href="#g57" y="442"/><use xlink:href="#g58" y="459"/><use xlink:href="#g59" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="11173ms; anim_last.end+11173ms" dur="10ms"/></g><g display="none"><use xlink:href="#g36" y="0"/><use xlink:href="#g37" y="17"/><use xlink:href="#g38" y="34"/><use xlink:href="#g39" y="51"/><use xlink:href="#g40" y="68"/><use xlink:href="#g41" y="85"/><use xlink:href="#g42" y="102"/><use xlink:href="#g43" y="119"/><use xlink:href="#g44" y="136"/><use xlink:href="#g45" y="153"/><use xlink:href="#g46" y="187"/><use xlink:href="#g47" y="221"/><use xlink:href="#g48" y="238"/><use xlink:href="#g49" y="255"/><use xlink:href="#g50" y="272"/><use xlink:href="#g51" y="289"/><use xlink:href="#g52" y="306"/><use xlink:href="#g53" y="340"/><use xlink:href="#g54" y="357"/><use xlink:href="#g55" y="391"/><use xlink:href="#g56" y="408"/><use xlink:href="#g57" y="425"/><use xlink:href="#g58" y="442"/><use xlink:href="#g59" y="459"/><use xlink:href="#g59" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="11183ms; anim_last.end+11183ms" dur="500ms"/></g><defs><g id="g60"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x788 when testing identifier 0x71c</text></g></defs><g display="none"><use xlink:href="#g37" y="0"/><use xlink:href="#g38" y="17"/><use xlink:href="#g39" y="34"/><use xlink:href="#g40" y="51"/><use xlink:href="#g41" y="68"/><use xlink:href="#g42" y="85"/><use xlink:href="#g43" y="102"/><use xlink:href="#g44" y="119"/><use xlink:href="#g45" y="136"/><use xlink:href="#g46" y="170"/><use xlink:href="#g47" y="204"/><use xlink:href="#g48" y="221"/><use xlink:href="#g49" y="238"/><use xlink:href="#g50" y="255"/><use xlink:href="#g51" y="272"/><use xlink:href="#g52" y="289"/><use xlink:href="#g53" y="323"/><use xlink:href="#g54" y="340"/><use xlink:href="#g55" y="374"/><use xlink:href="#g56" y="391"/><use xlink:href="#g57" y="408"/><use xlink:href="#g58" y="425"/><use xlink:href="#g59" y="442"/><use xlink:href="#g59" y="459"/><use xlink:href="#g60" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="11683ms; anim_last.end+11683ms" dur="500ms"/></g><defs><g id="g61"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x745 when testing identifier 0x799</text></g></defs><g display="none"><use xlink:href="#g38" y="0"/><use xlink:href="#g39" y="17"/><use xlink:href="#g40" y="34"/><use xlink:href="#g41" y="51"/><use xlink:href="#g42" y="68"/><use xlink:href="#g43" y="85"/><use xlink:href="#g44" y="102"/><use xlink:href="#g45" y="119"/><use xlink:href="#g46" y="153"/><use xlink:href="#g47" y="187"/><use xlink:href="#g48" y="204"/><use xlink:href="#g49" y="221"/><use xlink:href="#g50" y="238"/><use xlink:href="#g51" y="255"/><use xlink:href="#g52" y="272"/><use xlink:href="#g53" y="306"/><use xlink:href="#g54" y="323"/><use xlink:href="#g55" y="357"/><use xlink:href="#g56" y="374"/><use xlink:href="#g57" y="391"/><use xlink:href="#g58" y="408"/><use xlink:href="#g59" y="425"/><use xlink:href="#g59" y="442"/><use xlink:href="#g60" y="459"/><use xlink:href="#g61" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="12183ms; anim_last.end+12183ms" dur="500ms"/></g><defs><g id="g62"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x703 when testing identifier 0x7aa</text></g></defs><g display="none"><use xlink:href="#g39" y="0"/><use xlink:href="#g40" y="17"/><use xlink:href="#g41" y="34"/><use xlink:href="#g42" y="51"/><use xlink:href="#g43" y="68"/><use xlink:href="#g44" y="85"/><use xlink:href="#g45" y="102"/><use xlink:href="#g46" y="136"/><use xlink:href="#g47" y="170"/><use xlink:href="#g48" y="187"/><use xlink:href="#g49" y="204"/><use xlink:href="#g50" y="221"/><use xlink:href="#g51" y="238"/><use xlink:href="#g52" y="255"/><use xlink:href="#g53" y="289"/><use xlink:href="#g54" y="306"/><use xlink:href="#g55" y="340"/><use xlink:href="#g56" y="357"/><use xlink:href="#g57" y="374"/><use xlink:href="#g58" y="391"/><use xlink:href="#g59" y="408"/><use xlink:href="#g59" y="425"/><use xlink:href="#g60" y="442"/><use xlink:href="#g61" y="459"/><use xlink:href="#g62" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="12683ms; anim_last.end+12683ms" dur="500ms"/></g><defs><g id="g63"><text x="0" textLength="640" class="foreground">[+] Found flow-control frame from identifier 0x7bb when testing identifier 0x7cc</text></g></defs><g display="none"><use xlink:href="#g40" y="0"/><use xlink:href="#g41" y="17"/><use xlink:href="#g42" y="34"/><use xlink:href="#g43" y="51"/><use xlink:href="#g44" y="68"/><use xlink:href="#g45" y="85"/><use xlink:href="#g46" y="119"/><use xlink:href="#g47" y="153"/><use xlink:href="#g48" y="170"/><use xlink:href="#g49" y="187"/><use xlink:href="#g50" y="204"/><use xlink:href="#g51" y="221"/><use xlink:href="#g52" y="238"/><use xlink:href="#g53" y="272"/><use xlink:href="#g54" y="289"/><use xlink:href="#g55" y="323"/><use xlink:href="#g56" y="340"/><use xlink:href="#g57" y="357"/><use xlink:href="#g58" y="374"/><use xlink:href="#g59" y="391"/><use xlink:href="#g59" y="408"/><use xlink:href="#g60" y="425"/><use xlink:href="#g61" y="442"/><use xlink:href="#g62" y="459"/><use xlink:href="#g63" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="13183ms; anim_last.end+13183ms" dur="500ms"/></g><defs><g id="g64"><text x="0" textLength="48" class="foreground">Scan: </text></g></defs><defs><g id="g65"><text x="0" textLength="288" class="foreground">Found 6 ISOTP-FlowControl Packet(s):</text></g></defs><defs><g id="g66"><text x="0" textLength="232" class="foreground">Send to ID:             0x700</text></g></defs><defs><g id="g67"><text x="0" textLength="232" class="foreground">Received ID:            0x701</text></g></defs><defs><g id="g68"><text x="0" textLength="784" class="foreground">Message:                &lt;CAN  flags= identifier=0x701 length=3 reserved=196608 data='0\x00\x00' |&gt;</text></g></defs><defs><g id="g69"><text x="0" textLength="80" class="foreground">No Padding</text></g></defs><defs><g id="g70"><text x="0" textLength="232" class="foreground">Send to ID:             0x709</text></g></defs><defs><g id="g71"><text x="0" textLength="232" class="foreground">Received ID:            0x707</text></g></defs><defs><g id="g72"><text x="0" textLength="904" class="foreground">Message:                &lt;CAN  flags= identifier=0x707 length=8 reserved=0 data='0\x00\x00\xaa\xaa\xaa\xaa\xaa' |&gt;</text></g></defs><defs><g id="g73"><text x="0" textLength="120" class="foreground">Padding enabled</text></g></defs><defs><g id="g74"><text x="0" textLength="232" class="foreground">Send to ID:             0x71c</text></g></defs><defs><g id="g75"><text x="0" textLength="232" class="foreground">Received ID:            0x788</text></g></defs><defs><g id="g76"><text x="0" textLength="744" class="foreground">Message:                &lt;CAN  flags= identifier=0x788 length=3 reserved=0 data='0\x00\x00' |&gt;</text></g></defs><defs><g id="g77"><text x="0" textLength="232" class="foreground">Send to ID:             0x799</text></g></defs><defs><g id="g78"><text x="0" textLength="232" class="foreground">Received ID:            0x745</text></g></defs><defs><g id="g79"><text x="0" textLength="944" class="foreground">Message:                &lt;CAN  flags= identifier=0x745 length=8 reserved=196608 data='0\x00\x00\xaa\xaa\xaa\xaa\xaa' |&gt;</text></g></defs><defs><g id="g80"><text x="0" textLength="232" class="foreground">Send to ID:             0x7aa</text></g></defs><defs><g id="g81"><text x="0" textLength="232" class="foreground">Received ID:            0x703</text></g></defs><defs><g id="g82"><text x="0" textLength="904" class="foreground">Message:                &lt;CAN  flags= identifier=0x703 length=8 reserved=0 data='0\x00\x00\xaa\xaa\xaa\xaa\xaa' |&gt;</text></g></defs><defs><g id="g83"><text x="0" textLength="232" class="foreground">Send to ID:             0x7cc</text></g></defs><defs><g id="g84"><text x="0" textLength="40" class="foreground">Recei</text><text x="40" textLength="8" class="background"> </text></g></defs><g display="none"><use xlink:href="#g64" y="0"/><use xlink:href="#g65" y="34"/><use xlink:href="#g66" y="51"/><use xlink:href="#g67" y="68"/><use xlink:href="#g68" y="85"/><use xlink:href="#g69" y="102"/><use xlink:href="#g70" y="136"/><use xlink:href="#g71" y="153"/><use xlink:href="#g72" y="170"/><use xlink:href="#g73" y="187"/><use xlink:href="#g74" y="221"/><use xlink:href="#g75" y="238"/><use xlink:href="#g76" y="255"/><use xlink:href="#g69" y="272"/><use xlink:href="#g77" y="306"/><use xlink:href="#g78" y="323"/><use xlink:href="#g79" y="340"/><use xlink:href="#g73" y="357"/><use xlink:href="#g80" y="391"/><use xlink:href="#g81" y="408"/><use xlink:href="#g82" y="425"/><use xlink:href="#g73" y="442"/><use xlink:href="#g83" y="476"/><rect x="40" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g84" y="493"/><animate attributeName="display" from="inline" to="inline" begin="13683ms; anim_last.end+13683ms" dur="36ms"/></g><g display="none"><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="13719ms; anim_last.end+13719ms" dur="69ms"/></g><g display="none"><rect x="120" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="493"/><animate attributeName="display" from="inline" to="inline" begin="13788ms; anim_last.end+13788ms" dur="500ms"/></g><defs><g id="g85"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" font-weight="bold" class="color9">e</text><text x="128" textLength="8" class="background">x</text><text x="136" textLength="16" fill="#555555">it</text><text x="152" textLength="808" class="foreground">                                                                                                     </text></g></defs><g display="none"><rect x="128" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g85" y="493"/><animate attributeName="display" from="inline" to="inline" begin="14288ms; anim_last.end+14288ms" dur="183ms"/></g><defs><g id="g86"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="color9">ec</text><text x="136" textLength="8" class="background">h</text><text x="144" textLength="432" fill="#555555">o "if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="384" class="foreground">                                                </text></g></defs><g display="none"><rect x="136" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g86" y="493"/><animate attributeName="display" from="inline" to="inline" begin="14471ms; anim_last.end+14471ms" dur="64ms"/></g><defs><g id="g87"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="24" font-weight="bold" class="color9">ech</text><text x="144" textLength="8" class="background">o</text><text x="152" textLength="424" font-weight="bold" fill="#555555"> "if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="384" class="foreground">                                                </text></g></defs><g display="none"><rect x="144" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g87" y="493"/><animate attributeName="display" from="inline" to="inline" begin="14535ms; anim_last.end+14535ms" dur="64ms"/></g><defs><g id="g88"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="foreground">echo</text><text x="152" textLength="8" class="background"> </text><text x="160" textLength="416" fill="#555555">"if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="384" class="foreground">                                                </text></g></defs><g display="none"><rect x="152" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g88" y="493"/><animate attributeName="display" from="inline" to="inline" begin="14599ms; anim_last.end+14599ms" dur="500ms"/></g><defs><g id="g89"><text x="0" textLength="232" class="foreground">Received ID:            0x7bb</text></g></defs><defs><g id="g90"><text x="0" textLength="792" class="foreground">Message:                &lt;CAN  flags= identifier=0x7bb length=3 reserved=9633791 data='0\x00\x00' |&gt;</text></g></defs><g display="none"><use xlink:href="#g67" y="0"/><use xlink:href="#g68" y="17"/><use xlink:href="#g69" y="34"/><use xlink:href="#g70" y="68"/><use xlink:href="#g71" y="85"/><use xlink:href="#g72" y="102"/><use xlink:href="#g73" y="119"/><use xlink:href="#g74" y="153"/><use xlink:href="#g75" y="170"/><use xlink:href="#g76" y="187"/><use xlink:href="#g69" y="204"/><use xlink:href="#g77" y="238"/><use xlink:href="#g78" y="255"/><use xlink:href="#g79" y="272"/><use xlink:href="#g73" y="289"/><use xlink:href="#g80" y="323"/><use xlink:href="#g81" y="340"/><use xlink:href="#g82" y="357"/><use xlink:href="#g73" y="374"/><use xlink:href="#g83" y="408"/><use xlink:href="#g89" y="425"/><use xlink:href="#g90" y="442"/><use xlink:href="#g69" y="459"/><animate attributeName="display" from="inline" to="inline" begin="13719ms; anim_last.end+13719ms" dur="1875ms"/></g><defs><g id="g91"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="foreground">echo</text><text x="152" textLength="8" class="foreground"> </text><text x="160" textLength="416" class="color3">"if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="8" class="background"> </text><text x="584" textLength="376" class="foreground">                                               </text></g></defs><g display="none"><rect x="576" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g91" y="493"/><animate attributeName="display" from="inline" to="inline" begin="15099ms; anim_last.end+15099ms" dur="495ms"/></g><g display="none"><rect x="120" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="493"/><animate attributeName="display" from="inline" to="inline" begin="15594ms; anim_last.end+15594ms" dur="500ms"/></g><g display="none"><rect x="576" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g91" y="493"/><animate attributeName="display" from="inline" to="inline" begin="16094ms; anim_last.end+16094ms" dur="500ms"/></g><g display="none"><rect x="816" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g25" y="493"/><animate attributeName="display" from="inline" to="inline" begin="16594ms; anim_last.end+16594ms" dur="500ms"/></g><defs><g id="g92"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="8" class="background"> </text><text x="832" textLength="128" class="foreground">                </text></g></defs><g display="none"><rect x="824" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g92" y="493"/><animate attributeName="display" from="inline" to="inline" begin="17094ms; anim_last.end+17094ms" dur="304ms"/></g><defs><g id="g93"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="8" class="color6">-</text><text x="832" textLength="8" class="background">C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="832" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g93" y="493"/><animate attributeName="display" from="inline" to="inline" begin="17398ms; anim_last.end+17398ms" dur="319ms"/></g><defs><g id="g94"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="16" class="color6">-c</text><text x="840" textLength="8" class="background"> </text><text x="848" textLength="112" class="foreground">              </text></g></defs><g display="none"><rect x="840" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g94" y="493"/><animate attributeName="display" from="inline" to="inline" begin="17717ms; anim_last.end+17717ms" dur="500ms"/></g><defs><g id="g95"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="8" class="color6">-</text><text x="832" textLength="8" class="background"> </text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="832" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g95" y="493"/><animate attributeName="display" from="inline" to="inline" begin="18217ms; anim_last.end+18217ms" dur="136ms"/></g><defs><g id="g96"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="foreground">echo</text><text x="152" textLength="8" class="foreground"> </text><text x="160" textLength="416" class="color3">"if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="384" class="foreground">                                                </text></g></defs><defs><g id="g97"><text x="0" textLength="400" class="foreground">if you are lazy, get a copy and paste ready output</text></g></defs><g display="none"><use xlink:href="#g69" y="0"/><use xlink:href="#g70" y="34"/><use xlink:href="#g71" y="51"/><use xlink:href="#g72" y="68"/><use xlink:href="#g73" y="85"/><use xlink:href="#g74" y="119"/><use xlink:href="#g75" y="136"/><use xlink:href="#g76" y="153"/><use xlink:href="#g69" y="170"/><use xlink:href="#g77" y="204"/><use xlink:href="#g78" y="221"/><use xlink:href="#g79" y="238"/><use xlink:href="#g73" y="255"/><use xlink:href="#g80" y="289"/><use xlink:href="#g81" y="306"/><use xlink:href="#g82" y="323"/><use xlink:href="#g73" y="340"/><use xlink:href="#g83" y="374"/><use xlink:href="#g89" y="391"/><use xlink:href="#g90" y="408"/><use xlink:href="#g69" y="425"/><use xlink:href="#g96" y="459"/><use xlink:href="#g97" y="476"/><animate attributeName="display" from="inline" to="inline" begin="15594ms; anim_last.end+15594ms" dur="3094ms"/></g><defs><g id="g98"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="16" class="color6">-C</text><text x="840" textLength="8" class="background"> </text><text x="848" textLength="112" class="foreground">              </text></g></defs><g display="none"><rect x="840" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g98" y="493"/><animate attributeName="display" from="inline" to="inline" begin="18353ms; anim_last.end+18353ms" dur="335ms"/></g><defs><g id="g99"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="280" class="color6">scapy.tools.automotive.isotpscanner</text><text x="488" textLength="8" class="foreground"> </text><text x="496" textLength="72" class="color6">--channel</text><text x="568" textLength="8" class="foreground"> </text><text x="576" textLength="40" class="color6">vcan0</text><text x="616" textLength="8" class="foreground"> </text><text x="624" textLength="56" class="color6">--start</text><text x="680" textLength="8" class="foreground"> </text><text x="688" textLength="24" class="color6">700</text><text x="712" textLength="8" class="foreground"> </text><text x="720" textLength="40" class="color6">--end</text><text x="760" textLength="8" class="foreground"> </text><text x="768" textLength="24" class="color6">7ff</text><text x="792" textLength="8" class="foreground"> </text><text x="800" textLength="16" class="color6">-v</text><text x="816" textLength="8" class="foreground"> </text><text x="824" textLength="16" class="color6">-C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><use xlink:href="#g70" y="17"/><use xlink:href="#g71" y="34"/><use xlink:href="#g72" y="51"/><use xlink:href="#g73" y="68"/><use xlink:href="#g74" y="102"/><use xlink:href="#g75" y="119"/><use xlink:href="#g76" y="136"/><use xlink:href="#g69" y="153"/><use xlink:href="#g77" y="187"/><use xlink:href="#g78" y="204"/><use xlink:href="#g79" y="221"/><use xlink:href="#g73" y="238"/><use xlink:href="#g80" y="272"/><use xlink:href="#g81" y="289"/><use xlink:href="#g82" y="306"/><use xlink:href="#g73" y="323"/><use xlink:href="#g83" y="357"/><use xlink:href="#g89" y="374"/><use xlink:href="#g90" y="391"/><use xlink:href="#g69" y="408"/><use xlink:href="#g96" y="442"/><use xlink:href="#g97" y="459"/><use xlink:href="#g99" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="18688ms; anim_last.end+18688ms" dur="500ms"/></g><g display="none"><use xlink:href="#g71" y="0"/><use xlink:href="#g72" y="17"/><use xlink:href="#g73" y="34"/><use xlink:href="#g74" y="68"/><use xlink:href="#g75" y="85"/><use xlink:href="#g76" y="102"/><use xlink:href="#g69" y="119"/><use xlink:href="#g77" y="153"/><use xlink:href="#g78" y="170"/><use xlink:href="#g79" y="187"/><use xlink:href="#g73" y="204"/><use xlink:href="#g80" y="238"/><use xlink:href="#g81" y="255"/><use xlink:href="#g82" y="272"/><use xlink:href="#g73" y="289"/><use xlink:href="#g83" y="323"/><use xlink:href="#g89" y="340"/><use xlink:href="#g90" y="357"/><use xlink:href="#g69" y="374"/><use xlink:href="#g96" y="408"/><use xlink:href="#g97" y="425"/><use xlink:href="#g99" y="442"/><use xlink:href="#g56" y="459"/><use xlink:href="#g57" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="19188ms; anim_last.end+19188ms" dur="500ms"/></g><g display="none"><use xlink:href="#g72" y="0"/><use xlink:href="#g73" y="17"/><use xlink:href="#g74" y="51"/><use xlink:href="#g75" y="68"/><use xlink:href="#g76" y="85"/><use xlink:href="#g69" y="102"/><use xlink:href="#g77" y="136"/><use xlink:href="#g78" y="153"/><use xlink:href="#g79" y="170"/><use xlink:href="#g73" y="187"/><use xlink:href="#g80" y="221"/><use xlink:href="#g81" y="238"/><use xlink:href="#g82" y="255"/><use xlink:href="#g73" y="272"/><use xlink:href="#g83" y="306"/><use xlink:href="#g89" y="323"/><use xlink:href="#g90" y="340"/><use xlink:href="#g69" y="357"/><use xlink:href="#g96" y="391"/><use xlink:href="#g97" y="408"/><use xlink:href="#g99" y="425"/><use xlink:href="#g56" y="442"/><use xlink:href="#g57" y="459"/><use xlink:href="#g58" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="19688ms; anim_last.end+19688ms" dur="500ms"/></g><g display="none"><use xlink:href="#g74" y="17"/><use xlink:href="#g75" y="34"/><use xlink:href="#g76" y="51"/><use xlink:href="#g69" y="68"/><use xlink:href="#g77" y="102"/><use xlink:href="#g78" y="119"/><use xlink:href="#g79" y="136"/><use xlink:href="#g73" y="153"/><use xlink:href="#g80" y="187"/><use xlink:href="#g81" y="204"/><use xlink:href="#g82" y="221"/><use xlink:href="#g73" y="238"/><use xlink:href="#g83" y="272"/><use xlink:href="#g89" y="289"/><use xlink:href="#g90" y="306"/><use xlink:href="#g69" y="323"/><use xlink:href="#g96" y="357"/><use xlink:href="#g97" y="374"/><use xlink:href="#g99" y="391"/><use xlink:href="#g56" y="408"/><use xlink:href="#g57" y="425"/><use xlink:href="#g58" y="442"/><use xlink:href="#g59" y="459"/><use xlink:href="#g59" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="20188ms; anim_last.end+20188ms" dur="500ms"/></g><g display="none"><use xlink:href="#g74" y="0"/><use xlink:href="#g75" y="17"/><use xlink:href="#g76" y="34"/><use xlink:href="#g69" y="51"/><use xlink:href="#g77" y="85"/><use xlink:href="#g78" y="102"/><use xlink:href="#g79" y="119"/><use xlink:href="#g73" y="136"/><use xlink:href="#g80" y="170"/><use xlink:href="#g81" y="187"/><use xlink:href="#g82" y="204"/><use xlink:href="#g73" y="221"/><use xlink:href="#g83" y="255"/><use xlink:href="#g89" y="272"/><use xlink:href="#g90" y="289"/><use xlink:href="#g69" y="306"/><use xlink:href="#g96" y="340"/><use xlink:href="#g97" y="357"/><use xlink:href="#g99" y="374"/><use xlink:href="#g56" y="391"/><use xlink:href="#g57" y="408"/><use xlink:href="#g58" y="425"/><use xlink:href="#g59" y="442"/><use xlink:href="#g59" y="459"/><use xlink:href="#g60" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="20688ms; anim_last.end+20688ms" dur="500ms"/></g><g display="none"><use xlink:href="#g75" y="0"/><use xlink:href="#g76" y="17"/><use xlink:href="#g69" y="34"/><use xlink:href="#g77" y="68"/><use xlink:href="#g78" y="85"/><use xlink:href="#g79" y="102"/><use xlink:href="#g73" y="119"/><use xlink:href="#g80" y="153"/><use xlink:href="#g81" y="170"/><use xlink:href="#g82" y="187"/><use xlink:href="#g73" y="204"/><use xlink:href="#g83" y="238"/><use xlink:href="#g89" y="255"/><use xlink:href="#g90" y="272"/><use xlink:href="#g69" y="289"/><use xlink:href="#g96" y="323"/><use xlink:href="#g97" y="340"/><use xlink:href="#g99" y="357"/><use xlink:href="#g56" y="374"/><use xlink:href="#g57" y="391"/><use xlink:href="#g58" y="408"/><use xlink:href="#g59" y="425"/><use xlink:href="#g59" y="442"/><use xlink:href="#g60" y="459"/><use xlink:href="#g61" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="21188ms; anim_last.end+21188ms" dur="500ms"/></g><g display="none"><use xlink:href="#g76" y="0"/><use xlink:href="#g69" y="17"/><use xlink:href="#g77" y="51"/><use xlink:href="#g78" y="68"/><use xlink:href="#g79" y="85"/><use xlink:href="#g73" y="102"/><use xlink:href="#g80" y="136"/><use xlink:href="#g81" y="153"/><use xlink:href="#g82" y="170"/><use xlink:href="#g73" y="187"/><use xlink:href="#g83" y="221"/><use xlink:href="#g89" y="238"/><use xlink:href="#g90" y="255"/><use xlink:href="#g69" y="272"/><use xlink:href="#g96" y="306"/><use xlink:href="#g97" y="323"/><use xlink:href="#g99" y="340"/><use xlink:href="#g56" y="357"/><use xlink:href="#g57" y="374"/><use xlink:href="#g58" y="391"/><use xlink:href="#g59" y="408"/><use xlink:href="#g59" y="425"/><use xlink:href="#g60" y="442"/><use xlink:href="#g61" y="459"/><use xlink:href="#g62" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="21688ms; anim_last.end+21688ms" dur="500ms"/></g><g display="none"><use xlink:href="#g69" y="0"/><use xlink:href="#g77" y="34"/><use xlink:href="#g78" y="51"/><use xlink:href="#g79" y="68"/><use xlink:href="#g73" y="85"/><use xlink:href="#g80" y="119"/><use xlink:href="#g81" y="136"/><use xlink:href="#g82" y="153"/><use xlink:href="#g73" y="170"/><use xlink:href="#g83" y="204"/><use xlink:href="#g89" y="221"/><use xlink:href="#g90" y="238"/><use xlink:href="#g69" y="255"/><use xlink:href="#g96" y="289"/><use xlink:href="#g97" y="306"/><use xlink:href="#g99" y="323"/><use xlink:href="#g56" y="340"/><use xlink:href="#g57" y="357"/><use xlink:href="#g58" y="374"/><use xlink:href="#g59" y="391"/><use xlink:href="#g59" y="408"/><use xlink:href="#g60" y="425"/><use xlink:href="#g61" y="442"/><use xlink:href="#g62" y="459"/><use xlink:href="#g63" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="22188ms; anim_last.end+22188ms" dur="500ms"/></g><g display="none"><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="22688ms; anim_last.end+22688ms" dur="132ms"/></g><g display="none"><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="22820ms; anim_last.end+22820ms" dur="10ms"/></g><g display="none"><rect x="120" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="493"/><animate attributeName="display" from="inline" to="inline" begin="22830ms; anim_last.end+22830ms" dur="500ms"/></g><defs><g id="g100"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" font-weight="bold" class="color9">p</text><text x="128" textLength="8" class="background">y</text><text x="136" textLength="704" fill="#555555">thon3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="128" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g100" y="493"/><animate attributeName="display" from="inline" to="inline" begin="23330ms; anim_last.end+23330ms" dur="296ms"/></g><defs><g id="g101"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="color9">py</text><text x="136" textLength="8" class="background">t</text><text x="144" textLength="696" font-weight="bold" fill="#555555">hon3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="136" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g101" y="493"/><animate attributeName="display" from="inline" to="inline" begin="23626ms; anim_last.end+23626ms" dur="500ms"/></g><defs><g id="g102"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="24" font-weight="bold" class="color9">pyt</text><text x="144" textLength="8" class="background">h</text><text x="152" textLength="688" font-weight="bold" fill="#555555">on3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="144" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g102" y="493"/><animate attributeName="display" from="inline" to="inline" begin="24126ms; anim_last.end+24126ms" dur="112ms"/></g><defs><g id="g103"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="color9">pyth</text><text x="152" textLength="8" class="background">o</text><text x="160" textLength="680" font-weight="bold" fill="#555555">n3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="152" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g103" y="493"/><animate attributeName="display" from="inline" to="inline" begin="24238ms; anim_last.end+24238ms" dur="103ms"/></g><defs><g id="g104"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="40" font-weight="bold" class="color9">pytho</text><text x="160" textLength="8" class="background">n</text><text x="168" textLength="672" font-weight="bold" fill="#555555">3 -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="160" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g104" y="493"/><animate attributeName="display" from="inline" to="inline" begin="24341ms; anim_last.end+24341ms" dur="136ms"/></g><defs><g id="g105"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="48" font-weight="bold" class="foreground">python</text><text x="168" textLength="8" class="background">3</text><text x="176" textLength="664" fill="#555555"> -m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="168" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g105" y="493"/><animate attributeName="display" from="inline" to="inline" begin="24477ms; anim_last.end+24477ms" dur="500ms"/></g><defs><g id="g106"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="background"> </text><text x="184" textLength="656" fill="#555555">-m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="176" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g106" y="493"/><animate attributeName="display" from="inline" to="inline" begin="24977ms; anim_last.end+24977ms" dur="103ms"/></g><defs><g id="g107"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="background">-</text><text x="192" textLength="648" fill="#555555">m scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="184" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g107" y="493"/><animate attributeName="display" from="inline" to="inline" begin="25080ms; anim_last.end+25080ms" dur="224ms"/></g><defs><g id="g108"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="color6">0</text><text x="192" textLength="8" class="background"> </text><text x="200" textLength="760" class="foreground">                                                                                               </text></g></defs><g display="none"><rect x="192" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g108" y="493"/><animate attributeName="display" from="inline" to="inline" begin="25304ms; anim_last.end+25304ms" dur="500ms"/></g><defs><g id="g109"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="background"> </text><text x="192" textLength="768" class="foreground">                                                                                                </text></g></defs><g display="none"><rect x="184" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g109" y="493"/><animate attributeName="display" from="inline" to="inline" begin="25804ms; anim_last.end+25804ms" dur="190ms"/></g><defs><g id="g110"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="8" class="color6">-</text><text x="192" textLength="8" class="background">m</text><text x="200" textLength="640" fill="#555555"> scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="192" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g110" y="493"/><animate attributeName="display" from="inline" to="inline" begin="25994ms; anim_last.end+25994ms" dur="500ms"/></g><defs><g id="g111"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="background"> </text><text x="208" textLength="632" fill="#555555">scapy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="200" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g111" y="493"/><animate attributeName="display" from="inline" to="inline" begin="26494ms; anim_last.end+26494ms" dur="104ms"/></g><defs><g id="g112"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="8" class="background">s</text><text x="216" textLength="624" fill="#555555">capy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="208" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g112" y="493"/><animate attributeName="display" from="inline" to="inline" begin="26598ms; anim_last.end+26598ms" dur="199ms"/></g><defs><g id="g113"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="8" text-decoration="underline" class="color6">s</text><text x="216" textLength="8" class="background">c</text><text x="224" textLength="616" fill="#555555">apy.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="216" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g113" y="493"/><animate attributeName="display" from="inline" to="inline" begin="26797ms; anim_last.end+26797ms" dur="143ms"/></g><defs><g id="g114"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="16" text-decoration="underline" class="color6">sc</text><text x="224" textLength="8" class="background">a</text><text x="232" textLength="608" fill="#555555">py.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="224" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g114" y="493"/><animate attributeName="display" from="inline" to="inline" begin="26940ms; anim_last.end+26940ms" dur="89ms"/></g><defs><g id="g115"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="24" class="color6">sca</text><text x="232" textLength="8" class="background">p</text><text x="240" textLength="600" fill="#555555">y.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="232" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g115" y="493"/><animate attributeName="display" from="inline" to="inline" begin="27029ms; anim_last.end+27029ms" dur="55ms"/></g><defs><g id="g116"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="32" class="color6">scap</text><text x="240" textLength="8" class="background">y</text><text x="248" textLength="592" fill="#555555">.tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="240" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g116" y="493"/><animate attributeName="display" from="inline" to="inline" begin="27084ms; anim_last.end+27084ms" dur="151ms"/></g><defs><g id="g117"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="40" class="color6">scapy</text><text x="248" textLength="8" class="background">.</text><text x="256" textLength="584" fill="#555555">tools.automotive.isotpscanner --channel vcan0 --start 700 --end 7ff -v -C</text><text x="840" textLength="120" class="foreground">               </text></g></defs><g display="none"><rect x="248" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g117" y="493"/><animate attributeName="display" from="inline" to="inline" begin="27235ms; anim_last.end+27235ms" dur="500ms"/></g><defs><g id="g118"><text x="0" textLength="80" class="foreground">import can</text></g></defs><defs><g id="g119"><text x="0" textLength="432" class="foreground">conf.contribs['CANSocket'] = {'use-python-can': False}</text></g></defs><defs><g id="g120"><text x="0" textLength="200" class="foreground">load_contrib('cansocket')</text></g></defs><defs><g id="g121"><text x="0" textLength="168" class="foreground">load_contrib('isotp')</text></g></defs><defs><g id="g122"><text x="0" textLength="576" class="foreground">ISOTPSocket("vcan0", sid=0x700, did=0x701, padding=False, basecls=ISOTP)</text></g></defs><defs><g id="g123"><text x="0" textLength="568" class="foreground">ISOTPSocket("vcan0", sid=0x709, did=0x707, padding=True, basecls=ISOTP)</text></g></defs><defs><g id="g124"><text x="0" textLength="576" class="foreground">ISOTPSocket("vcan0", sid=0x71c, did=0x788, padding=False, basecls=ISOTP)</text></g></defs><defs><g id="g125"><text x="0" textLength="568" class="foreground">ISOTPSocket("vcan0", sid=0x799, did=0x745, padding=True, basecls=ISOTP)</text></g></defs><defs><g id="g126"><text x="0" textLength="568" class="foreground">ISOTPSocket("vcan0", sid=0x7aa, did=0x703, padding=True, basecls=ISOTP)</text></g></defs><defs><g id="g127"><text x="0" textLength="576" class="foreground">ISOTPSocket("vcan0", sid=0x7cc, did=0x7bb, padding=False, basecls=ISOTP)</text></g></defs><g display="none"><use xlink:href="#g69" y="0"/><use xlink:href="#g96" y="34"/><use xlink:href="#g97" y="51"/><use xlink:href="#g99" y="68"/><use xlink:href="#g56" y="85"/><use xlink:href="#g57" y="102"/><use xlink:href="#g58" y="119"/><use xlink:href="#g59" y="136"/><use xlink:href="#g59" y="153"/><use xlink:href="#g60" y="170"/><use xlink:href="#g61" y="187"/><use xlink:href="#g62" y="204"/><use xlink:href="#g63" y="221"/><use xlink:href="#g64" y="238"/><use xlink:href="#g118" y="289"/><use xlink:href="#g119" y="306"/><use xlink:href="#g120" y="323"/><use xlink:href="#g121" y="340"/><use xlink:href="#g122" y="374"/><use xlink:href="#g123" y="391"/><use xlink:href="#g124" y="408"/><use xlink:href="#g125" y="425"/><use xlink:href="#g126" y="442"/><use xlink:href="#g127" y="459"/><animate attributeName="display" from="inline" to="inline" begin="22688ms; anim_last.end+22688ms" dur="5398ms"/></g><g display="none"><rect x="256" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g21" y="493"/><animate attributeName="display" from="inline" to="inline" begin="27735ms; anim_last.end+27735ms" dur="351ms"/></g><defs><g id="g128"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="56" font-weight="bold" class="foreground">python3</text><text x="176" textLength="8" class="foreground"> </text><text x="184" textLength="16" class="color6">-m</text><text x="200" textLength="8" class="foreground"> </text><text x="208" textLength="40" class="color6">scapy</text><text x="248" textLength="712" class="foreground">                                                                                         </text></g></defs><g display="none"><use xlink:href="#g96" y="17"/><use xlink:href="#g97" y="34"/><use xlink:href="#g99" y="51"/><use xlink:href="#g56" y="68"/><use xlink:href="#g57" y="85"/><use xlink:href="#g58" y="102"/><use xlink:href="#g59" y="119"/><use xlink:href="#g59" y="136"/><use xlink:href="#g60" y="153"/><use xlink:href="#g61" y="170"/><use xlink:href="#g62" y="187"/><use xlink:href="#g63" y="204"/><use xlink:href="#g64" y="221"/><use xlink:href="#g118" y="272"/><use xlink:href="#g119" y="289"/><use xlink:href="#g120" y="306"/><use xlink:href="#g121" y="323"/><use xlink:href="#g122" y="357"/><use xlink:href="#g123" y="374"/><use xlink:href="#g124" y="391"/><use xlink:href="#g125" y="408"/><use xlink:href="#g126" y="425"/><use xlink:href="#g127" y="442"/><use xlink:href="#g128" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="493"/><animate attributeName="display" from="inline" to="inline" begin="28086ms; anim_last.end+28086ms" dur="500ms"/></g><defs><g id="g129"><text x="0" textLength="304" font-weight="bold" class="color10">                                      </text></g></defs><defs><g id="g130"><text x="0" textLength="304" font-weight="bold" class="color10">                     aSPY//YASa       </text></g></defs><defs><g id="g131"><text x="0" textLength="304" font-weight="bold" class="color10">             apyyyyCY//////////YCa    </text><text x="304" textLength="32" font-weight="bold" class="color12">   |</text></g></defs><defs><g id="g132"><text x="0" textLength="304" font-weight="bold" class="color10">            sY//////YSpcs  scpCY//Pp  </text><text x="304" textLength="168" font-weight="bold" class="color12">   | Welcome to Scapy</text></g></defs><defs><g id="g133"><text x="0" textLength="304" font-weight="bold" class="color10"> ayp ayyyyyyySCP//Pp           syY//C </text><text x="304" textLength="296" font-weight="bold" class="color12">   | Version git-archive.dev304758016</text></g></defs><defs><g id="g134"><text x="0" textLength="304" font-weight="bold" class="color10"> AYAsAYYYYYYYY///Ps              cY//S</text><text x="304" textLength="32" font-weight="bold" class="color12">   |</text></g></defs><defs><g id="g135"><text x="0" textLength="304" font-weight="bold" class="color10">         pCCCCY//p          cSSps y//Y</text><text x="304" textLength="288" font-weight="bold" class="color12">   | https://github.com/secdev/scapy</text></g></defs><defs><g id="g136"><text x="0" textLength="304" font-weight="bold" class="color10">         SPPPP///a          pP///AC//Y</text><text x="304" textLength="32" font-weight="bold" class="color12">   |</text></g></defs><defs><g id="g137"><text x="0" textLength="304" font-weight="bold" class="color10">              A//A            cyP////C</text><text x="304" textLength="112" font-weight="bold" class="color12">   | Have fun!</text></g></defs><defs><g id="g138"><text x="0" textLength="304" font-weight="bold" class="color10">              p///Ac            sC///a</text><text x="304" textLength="32" font-weight="bold" class="color12">   |</text></g></defs><defs><g id="g139"><text x="0" textLength="304" font-weight="bold" class="color10">              P////YCpc           A//A</text><text x="304" textLength="288" font-weight="bold" class="color12">   | Wanna support scapy? Rate it on</text></g></defs><defs><g id="g140"><text x="0" textLength="304" font-weight="bold" class="color10">       scccccp///pSP///p          p//Y</text><text x="304" textLength="112" font-weight="bold" class="color12">   | sectools!</text></g></defs><defs><g id="g141"><text x="0" textLength="304" font-weight="bold" class="color10">      sY/////////y  caa           S//P</text><text x="304" textLength="288" font-weight="bold" class="color12">   | http://sectools.org/tool/scapy/</text></g></defs><defs><g id="g142"><text x="0" textLength="304" font-weight="bold" class="color10">       cayCyayP//Ya              pY/Ya</text><text x="304" textLength="288" font-weight="bold" class="color12">   |             -- Satoshi Nakamoto</text></g></defs><defs><g id="g143"><text x="0" textLength="304" font-weight="bold" class="color10">        sY/PsY////YCc          aC//Yp </text><text x="304" textLength="32" font-weight="bold" class="color12">   |</text></g></defs><defs><g id="g144"><text x="0" textLength="304" font-weight="bold" class="color10">         sc  sccaCY//PCypaapyCP//YSs  </text></g></defs><defs><g id="g145"><text x="0" textLength="304" font-weight="bold" class="color10">                  spCPY//////YPSps    </text></g></defs><defs><g id="g146"><text x="0" textLength="304" font-weight="bold" class="color10">                       ccaacs         </text></g></defs><defs><g id="g147"><text x="0" textLength="304" font-weight="bold" class="color10">                                      </text><text x="304" textLength="160" class="foreground"> using IPython 7.6.1</text></g></defs><defs><g id="g148"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="8" class="background"> </text><text x="40" textLength="920" class="foreground">                                                                                                                   </text></g></defs><g display="none"><use xlink:href="#g121" y="0"/><use xlink:href="#g122" y="34"/><use xlink:href="#g123" y="51"/><use xlink:href="#g124" y="68"/><use xlink:href="#g125" y="85"/><use xlink:href="#g126" y="102"/><use xlink:href="#g127" y="119"/><use xlink:href="#g128" y="153"/><use xlink:href="#g129" y="170"/><use xlink:href="#g130" y="187"/><use xlink:href="#g131" y="204"/><use xlink:href="#g132" y="221"/><use xlink:href="#g133" y="238"/><use xlink:href="#g134" y="255"/><use xlink:href="#g135" y="272"/><use xlink:href="#g136" y="289"/><use xlink:href="#g137" y="306"/><use xlink:href="#g138" y="323"/><use xlink:href="#g139" y="340"/><use xlink:href="#g140" y="357"/><use xlink:href="#g141" y="374"/><use xlink:href="#g142" y="391"/><use xlink:href="#g143" y="408"/><use xlink:href="#g144" y="425"/><use xlink:href="#g145" y="442"/><use xlink:href="#g146" y="459"/><use xlink:href="#g147" y="476"/><rect x="32" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="493"/><animate attributeName="display" from="inline" to="inline" begin="28586ms; anim_last.end+28586ms" dur="26ms"/></g><g display="none"><rect x="32" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="425"/><animate attributeName="display" from="inline" to="inline" begin="28612ms; anim_last.end+28612ms" dur="500ms"/></g><defs><g id="g149"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="8" class="foreground">c</text><text x="40" textLength="8" class="background"> </text><text x="48" textLength="912" class="foreground">                                                                                                                  </text></g></defs><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g149" y="425"/><animate attributeName="display" from="inline" to="inline" begin="29112ms; anim_last.end+29112ms" dur="12ms"/></g><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g149" y="425"/><animate attributeName="display" from="inline" to="inline" begin="29124ms; anim_last.end+29124ms" dur="407ms"/></g><defs><g id="g150"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="16" class="foreground">co</text><text x="48" textLength="8" class="background"> </text><text x="56" textLength="904" class="foreground">                                                                                                                 </text></g></defs><g display="none"><rect x="48" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g150" y="425"/><animate attributeName="display" from="inline" to="inline" begin="29531ms; anim_last.end+29531ms" dur="152ms"/></g><defs><g id="g151"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="24" class="foreground">con</text><text x="56" textLength="8" class="background"> </text><text x="64" textLength="896" class="foreground">                                                                                                                </text></g></defs><g display="none"><rect x="56" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g151" y="425"/><animate attributeName="display" from="inline" to="inline" begin="29683ms; anim_last.end+29683ms" dur="500ms"/></g><g display="none"><rect x="48" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g150" y="425"/><animate attributeName="display" from="inline" to="inline" begin="30183ms; anim_last.end+30183ms" dur="174ms"/></g><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g149" y="425"/><animate attributeName="display" from="inline" to="inline" begin="30357ms; anim_last.end+30357ms" dur="169ms"/></g><g display="none"><rect x="32" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="425"/><animate attributeName="display" from="inline" to="inline" begin="30526ms; anim_last.end+30526ms" dur="500ms"/></g><defs><g id="g152"><text x="0" textLength="960" class="foreground">                                                                                                                        </text></g></defs><g display="none"><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="28612ms; anim_last.end+28612ms" dur="2414ms"/></g><g display="none"><use xlink:href="#g124" y="0"/><use xlink:href="#g125" y="17"/><use xlink:href="#g126" y="34"/><use xlink:href="#g127" y="51"/><use xlink:href="#g128" y="85"/><use xlink:href="#g129" y="102"/><use xlink:href="#g130" y="119"/><use xlink:href="#g131" y="136"/><use xlink:href="#g132" y="153"/><use xlink:href="#g133" y="170"/><use xlink:href="#g134" y="187"/><use xlink:href="#g135" y="204"/><use xlink:href="#g136" y="221"/><use xlink:href="#g137" y="238"/><use xlink:href="#g138" y="255"/><use xlink:href="#g139" y="272"/><use xlink:href="#g140" y="289"/><use xlink:href="#g141" y="306"/><use xlink:href="#g142" y="323"/><use xlink:href="#g143" y="340"/><use xlink:href="#g144" y="357"/><use xlink:href="#g145" y="374"/><use xlink:href="#g146" y="391"/><use xlink:href="#g147" y="408"/><animate attributeName="display" from="inline" to="inline" begin="28612ms; anim_last.end+28612ms" dur="2914ms"/></g><defs><g id="g153"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="928" class="foreground">                                                                                                                    </text></g></defs><defs><g id="g154"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="8" class="background"> </text><text x="160" textLength="800" font-weight="bold" class="foreground">                                                                                                    </text></g></defs><g display="none"><use xlink:href="#g153" y="425"/><use xlink:href="#g152" y="476"/><rect x="152" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g154" y="493"/><animate attributeName="display" from="inline" to="inline" begin="31026ms; anim_last.end+31026ms" dur="500ms"/></g><defs><g id="g155"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="144" class="foreground">, basecls=ISOTP), </text></g></defs><defs><g id="g156"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="144" class="foreground">, basecls=ISOTP), </text></g></defs><defs><g id="g157"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="144" class="foreground">, basecls=ISOTP), </text></g></defs><defs><g id="g158"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="144" class="foreground">, basecls=ISOTP), </text></g></defs><defs><g id="g159"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="144" class="foreground">, basecls=ISOTP), </text></g></defs><defs><g id="g160"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="80" class="foreground">, basecls=</text><text x="568" textLength="8" class="background">I</text><text x="576" textLength="384" class="foreground">SOTP)]                                          </text></g></defs><defs><g id="g161"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="8" class="foreground">I</text><text x="160" textLength="8" class="background"> </text><text x="168" textLength="792" font-weight="bold" class="foreground">                                                                                                   </text></g></defs><g display="none"><use xlink:href="#g155" y="391"/><use xlink:href="#g156" y="408"/><use xlink:href="#g157" y="425"/><use xlink:href="#g158" y="442"/><use xlink:href="#g159" y="459"/><rect x="568" y="476" width="8" height="17" class="foreground"/><use xlink:href="#g160" y="476"/><rect x="160" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g161" y="493"/><animate attributeName="display" from="inline" to="inline" begin="31526ms; anim_last.end+31526ms" dur="256ms"/></g><defs><g id="g162"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="80" class="foreground">, basecls=</text><text x="568" textLength="16" class="background">IS</text><text x="584" textLength="376" class="foreground">OTP)]                                          </text></g></defs><defs><g id="g163"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="16" class="foreground">IS</text><text x="168" textLength="8" class="background"> </text><text x="176" textLength="784" font-weight="bold" class="foreground">                                                                                                  </text></g></defs><g display="none"><use xlink:href="#g155" y="391"/><use xlink:href="#g156" y="408"/><use xlink:href="#g157" y="425"/><use xlink:href="#g158" y="442"/><use xlink:href="#g159" y="459"/><rect x="568" y="476" width="16" height="17" class="foreground"/><use xlink:href="#g162" y="476"/><rect x="168" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g163" y="493"/><animate attributeName="display" from="inline" to="inline" begin="31782ms; anim_last.end+31782ms" dur="142ms"/></g><defs><g id="g164"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="80" class="foreground">, basecls=</text><text x="568" textLength="24" class="background">ISO</text><text x="592" textLength="368" class="foreground">TP)]                                          </text></g></defs><defs><g id="g165"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="24" class="foreground">ISO</text><text x="176" textLength="8" class="background"> </text><text x="184" textLength="776" font-weight="bold" class="foreground">                                                                                                 </text></g></defs><g display="none"><use xlink:href="#g155" y="391"/><use xlink:href="#g156" y="408"/><use xlink:href="#g157" y="425"/><use xlink:href="#g158" y="442"/><use xlink:href="#g159" y="459"/><rect x="568" y="476" width="24" height="17" class="foreground"/><use xlink:href="#g164" y="476"/><rect x="176" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g165" y="493"/><animate attributeName="display" from="inline" to="inline" begin="31924ms; anim_last.end+31924ms" dur="240ms"/></g><defs><g id="g166"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="80" class="foreground">, basecls=</text><text x="568" textLength="32" class="background">ISOT</text><text x="600" textLength="360" class="foreground">P)]                                          </text></g></defs><defs><g id="g167"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="32" class="foreground">ISOT</text><text x="184" textLength="8" class="background"> </text><text x="192" textLength="768" font-weight="bold" class="foreground">                                                                                                </text></g></defs><g display="none"><use xlink:href="#g155" y="391"/><use xlink:href="#g156" y="408"/><use xlink:href="#g157" y="425"/><use xlink:href="#g158" y="442"/><use xlink:href="#g159" y="459"/><rect x="568" y="476" width="32" height="17" class="foreground"/><use xlink:href="#g166" y="476"/><rect x="184" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g167" y="493"/><animate attributeName="display" from="inline" to="inline" begin="32164ms; anim_last.end+32164ms" dur="153ms"/></g><defs><g id="g168"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="48" font-weight="bold" fill="#008700">import</text><text x="80" textLength="8" class="foreground"> </text><text x="88" textLength="24" font-weight="bold" fill="#0087d7">can</text><text x="112" textLength="848" class="foreground">                                                                                                          </text></g></defs><defs><g id="g169"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="112" class="foreground">conf.contribs[</text><text x="152" textLength="88" fill="#af5f00">'CANSocket'</text><text x="240" textLength="40" class="foreground">] = {</text><text x="280" textLength="128" fill="#af5f00">'use-python-can'</text><text x="408" textLength="16" class="foreground">: </text><text x="424" textLength="40" font-weight="bold" fill="#008700">False</text><text x="464" textLength="16" class="foreground">} </text></g></defs><defs><g id="g170"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="104" class="foreground">load_contrib(</text><text x="144" textLength="88" fill="#af5f00">'cansocket'</text><text x="232" textLength="16" class="foreground">) </text></g></defs><defs><g id="g171"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="104" class="foreground">load_contrib(</text><text x="144" textLength="56" fill="#af5f00">'isotp'</text><text x="200" textLength="760" class="foreground">)                                                                                              </text></g></defs><defs><g id="g172"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="920" class="foreground">                                                                                                                   </text></g></defs><g display="none"><use xlink:href="#g168" y="306"/><use xlink:href="#g169" y="323"/><use xlink:href="#g170" y="340"/><use xlink:href="#g171" y="357"/><use xlink:href="#g172" y="374"/><animate attributeName="display" from="inline" to="inline" begin="31526ms; anim_last.end+31526ms" dur="1291ms"/></g><defs><g id="g173"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="80" class="foreground">, basecls=</text><text x="568" textLength="40" class="background">ISOTP</text><text x="608" textLength="352" class="foreground">)]                                          </text></g></defs><defs><g id="g174"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="40" class="foreground">ISOTP</text><text x="192" textLength="8" class="background"> </text><text x="200" textLength="760" font-weight="bold" class="foreground">                                                                                               </text></g></defs><g display="none"><use xlink:href="#g155" y="391"/><use xlink:href="#g156" y="408"/><use xlink:href="#g157" y="425"/><use xlink:href="#g158" y="442"/><use xlink:href="#g159" y="459"/><rect x="568" y="476" width="40" height="17" class="foreground"/><use xlink:href="#g173" y="476"/><rect x="192" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g174" y="493"/><animate attributeName="display" from="inline" to="inline" begin="32317ms; anim_last.end+32317ms" dur="500ms"/></g><defs><g id="g175"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="112" class="foreground">conf.contribs[</text><text x="144" textLength="8" fill="#af5f00">'</text><text x="152" textLength="48" class="background">ISOTP'</text><text x="200" textLength="40" class="foreground">] = {</text><text x="240" textLength="232" fill="#af5f00">'use-can-isotp-kernel-module'</text><text x="472" textLength="16" class="foreground">: </text><text x="488" textLength="32" font-weight="bold" fill="#008700">True</text><text x="520" textLength="440" class="foreground">}                                                      </text></g></defs><defs><g id="g176"><text x="0" textLength="152" font-weight="bold" class="foreground">I-search backward: </text><text x="152" textLength="48" class="foreground">ISOTP'</text><text x="200" textLength="8" class="background"> </text><text x="208" textLength="752" font-weight="bold" class="foreground">                                                                                              </text></g></defs><g display="none"><rect x="152" y="306" width="48" height="17" fill="#af5f00"/><use xlink:href="#g175" y="306"/><use xlink:href="#g152" y="476"/><rect x="200" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g176" y="493"/><animate attributeName="display" from="inline" to="inline" begin="32817ms; anim_last.end+32817ms" dur="500ms"/></g><defs><g id="g177"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="112" class="foreground">conf.contribs[</text><text x="144" textLength="8" fill="#af5f00">'</text><text x="152" textLength="8" class="background">I</text><text x="160" textLength="40" fill="#af5f00">SOTP'</text><text x="200" textLength="40" class="foreground">] = {</text><text x="240" textLength="232" fill="#af5f00">'use-can-isotp-kernel-module'</text><text x="472" textLength="16" class="foreground">: </text><text x="488" textLength="32" font-weight="bold" fill="#008700">True</text><text x="520" textLength="440" class="foreground">}                                                      </text></g></defs><g display="none"><rect x="152" y="306" width="8" height="17" class="foreground"/><use xlink:href="#g177" y="306"/><animate attributeName="display" from="inline" to="inline" begin="33317ms; anim_last.end+33317ms" dur="24ms"/></g><g display="none"><rect x="152" y="306" width="8" height="17" class="foreground"/><use xlink:href="#g177" y="306"/><animate attributeName="display" from="inline" to="inline" begin="33341ms; anim_last.end+33341ms" dur="390ms"/></g><g display="none"><use xlink:href="#g152" y="323"/><use xlink:href="#g152" y="340"/><use xlink:href="#g152" y="357"/><use xlink:href="#g152" y="374"/><use xlink:href="#g152" y="391"/><use xlink:href="#g152" y="408"/><use xlink:href="#g152" y="425"/><use xlink:href="#g152" y="442"/><use xlink:href="#g152" y="459"/><animate attributeName="display" from="inline" to="inline" begin="32817ms; anim_last.end+32817ms" dur="914ms"/></g><g display="none"><use xlink:href="#g152" y="476"/><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="33317ms; anim_last.end+33317ms" dur="414ms"/></g><g display="none"><use xlink:href="#g130" y="0"/><use xlink:href="#g131" y="17"/><use xlink:href="#g132" y="34"/><use xlink:href="#g133" y="51"/><use xlink:href="#g134" y="68"/><use xlink:href="#g135" y="85"/><use xlink:href="#g136" y="102"/><use xlink:href="#g137" y="119"/><use xlink:href="#g138" y="136"/><use xlink:href="#g139" y="153"/><use xlink:href="#g140" y="170"/><use xlink:href="#g141" y="187"/><use xlink:href="#g142" y="204"/><use xlink:href="#g143" y="221"/><use xlink:href="#g144" y="238"/><use xlink:href="#g145" y="255"/><use xlink:href="#g146" y="272"/><use xlink:href="#g147" y="289"/><animate attributeName="display" from="inline" to="inline" begin="31526ms; anim_last.end+31526ms" dur="2221ms"/></g><defs><g id="g178"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="112" class="foreground">conf.contribs[</text><text x="144" textLength="56" fill="#af5f00">'ISOTP'</text><text x="200" textLength="40" class="foreground">] = {</text><text x="240" textLength="232" fill="#af5f00">'use-can-isotp-kernel-module'</text><text x="472" textLength="16" class="foreground">: </text><text x="488" textLength="32" font-weight="bold" fill="#008700">True</text><text x="520" textLength="440" class="foreground">}                                                      </text></g></defs><g display="none"><use xlink:href="#g178" y="306"/><rect x="32" y="323" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="323"/><use xlink:href="#g152" y="340"/><use xlink:href="#g152" y="357"/><use xlink:href="#g152" y="374"/><use xlink:href="#g152" y="391"/><use xlink:href="#g152" y="408"/><use xlink:href="#g152" y="425"/><use xlink:href="#g152" y="442"/><use xlink:href="#g152" y="459"/><use xlink:href="#g152" y="476"/><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="33731ms; anim_last.end+33731ms" dur="16ms"/></g><g display="none"><rect x="32" y="255" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="255"/><use xlink:href="#g152" y="272"/><use xlink:href="#g152" y="289"/><use xlink:href="#g152" y="306"/><use xlink:href="#g152" y="323"/><use xlink:href="#g152" y="340"/><use xlink:href="#g152" y="357"/><use xlink:href="#g152" y="374"/><use xlink:href="#g152" y="391"/><use xlink:href="#g152" y="408"/><animate attributeName="display" from="inline" to="inline" begin="33747ms; anim_last.end+33747ms" dur="500ms"/></g><defs><g id="g179"><text x="0" textLength="16" font-weight="bold" class="color12">..</text><text x="16" textLength="944" class="foreground">                                                                                                                      </text></g></defs><g display="none"><use xlink:href="#g179" y="408"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="11ms"/></g><g display="none"><use xlink:href="#g152" y="425"/><animate attributeName="display" from="inline" to="inline" begin="33747ms; anim_last.end+33747ms" dur="511ms"/></g><defs><g id="g180"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><defs><g id="g181"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background"> </text></g></defs><g display="none"><use xlink:href="#g180" y="425"/><rect x="40" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g181" y="442"/><animate attributeName="display" from="inline" to="inline" begin="34258ms; anim_last.end+34258ms" dur="500ms"/></g><defs><g id="g182"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><use xlink:href="#g182" y="408"/><animate attributeName="display" from="inline" to="inline" begin="34258ms; anim_last.end+34258ms" dur="719ms"/></g><defs><g id="g183"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g183" y="425"/><animate attributeName="display" from="inline" to="inline" begin="34758ms; anim_last.end+34758ms" dur="219ms"/></g><defs><g id="g184"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><use xlink:href="#g184" y="391"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="907ms"/></g><defs><g id="g185"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><rect x="40" y="408" width="8" height="17" class="foreground"/><use xlink:href="#g185" y="408"/><animate attributeName="display" from="inline" to="inline" begin="34977ms; anim_last.end+34977ms" dur="177ms"/></g><defs><g id="g186"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><g display="none"><use xlink:href="#g186" y="374"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="1090ms"/></g><defs><g id="g187"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><rect x="40" y="391" width="8" height="17" class="foreground"/><use xlink:href="#g187" y="391"/><animate attributeName="display" from="inline" to="inline" begin="35154ms; anim_last.end+35154ms" dur="183ms"/></g><defs><g id="g188"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><use xlink:href="#g188" y="357"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="1281ms"/></g><defs><g id="g189"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><g display="none"><rect x="40" y="374" width="8" height="17" class="foreground"/><use xlink:href="#g189" y="374"/><animate attributeName="display" from="inline" to="inline" begin="35337ms; anim_last.end+35337ms" dur="191ms"/></g><defs><g id="g190"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x700</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x701</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><g display="none"><use xlink:href="#g190" y="340"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="1480ms"/></g><defs><g id="g191"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP)                                            </text></g></defs><g display="none"><rect x="40" y="357" width="8" height="17" class="foreground"/><use xlink:href="#g191" y="357"/><animate attributeName="display" from="inline" to="inline" begin="35528ms; anim_last.end+35528ms" dur="199ms"/></g><defs><g id="g192"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="background">I</text><text x="48" textLength="88" class="foreground">SOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x700</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x701</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)                                           </text></g></defs><g display="none"><rect x="40" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g192" y="340"/><animate attributeName="display" from="inline" to="inline" begin="35727ms; anim_last.end+35727ms" dur="500ms"/></g><defs><g id="g193"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="foreground">s</text><text x="48" textLength="8" class="background">I</text><text x="56" textLength="88" class="foreground">SOTPSocket(</text><text x="144" textLength="56" fill="#af5f00">"vcan0"</text><text x="200" textLength="48" class="foreground">, sid=</text><text x="248" textLength="40" fill="#008700">0x700</text><text x="288" textLength="48" class="foreground">, did=</text><text x="336" textLength="40" fill="#008700">0x701</text><text x="376" textLength="80" class="foreground">, padding=</text><text x="456" textLength="40" font-weight="bold" fill="#008700">False</text><text x="496" textLength="464" class="foreground">, basecls=ISOTP)                                          </text></g></defs><g display="none"><rect x="48" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g193" y="340"/><animate attributeName="display" from="inline" to="inline" begin="36227ms; anim_last.end+36227ms" dur="500ms"/></g><defs><g id="g194"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="16" class="foreground">so</text><text x="56" textLength="8" class="background">I</text><text x="64" textLength="88" class="foreground">SOTPSocket(</text><text x="152" textLength="56" fill="#af5f00">"vcan0"</text><text x="208" textLength="48" class="foreground">, sid=</text><text x="256" textLength="40" fill="#008700">0x700</text><text x="296" textLength="48" class="foreground">, did=</text><text x="344" textLength="40" fill="#008700">0x701</text><text x="384" textLength="80" class="foreground">, padding=</text><text x="464" textLength="40" font-weight="bold" fill="#008700">False</text><text x="504" textLength="456" class="foreground">, basecls=ISOTP)                                         </text></g></defs><g display="none"><rect x="56" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g194" y="340"/><animate attributeName="display" from="inline" to="inline" begin="36727ms; anim_last.end+36727ms" dur="243ms"/></g><defs><g id="g195"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="24" class="foreground">soc</text><text x="64" textLength="8" class="background">I</text><text x="72" textLength="88" class="foreground">SOTPSocket(</text><text x="160" textLength="56" fill="#af5f00">"vcan0"</text><text x="216" textLength="48" class="foreground">, sid=</text><text x="264" textLength="40" fill="#008700">0x700</text><text x="304" textLength="48" class="foreground">, did=</text><text x="352" textLength="40" fill="#008700">0x701</text><text x="392" textLength="80" class="foreground">, padding=</text><text x="472" textLength="40" font-weight="bold" fill="#008700">False</text><text x="512" textLength="448" class="foreground">, basecls=ISOTP)                                        </text></g></defs><g display="none"><rect x="64" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g195" y="340"/><animate attributeName="display" from="inline" to="inline" begin="36970ms; anim_last.end+36970ms" dur="13ms"/></g><g display="none"><rect x="64" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g195" y="340"/><animate attributeName="display" from="inline" to="inline" begin="36983ms; anim_last.end+36983ms" dur="378ms"/></g><defs><g id="g196"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="32" class="foreground">sock</text><text x="72" textLength="8" class="background">I</text><text x="80" textLength="88" class="foreground">SOTPSocket(</text><text x="168" textLength="56" fill="#af5f00">"vcan0"</text><text x="224" textLength="48" class="foreground">, sid=</text><text x="272" textLength="40" fill="#008700">0x700</text><text x="312" textLength="48" class="foreground">, did=</text><text x="360" textLength="40" fill="#008700">0x701</text><text x="400" textLength="80" class="foreground">, padding=</text><text x="480" textLength="40" font-weight="bold" fill="#008700">False</text><text x="520" textLength="440" class="foreground">, basecls=ISOTP)                                       </text></g></defs><g display="none"><rect x="72" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g196" y="340"/><animate attributeName="display" from="inline" to="inline" begin="37361ms; anim_last.end+37361ms" dur="13ms"/></g><g display="none"><rect x="72" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g196" y="340"/><animate attributeName="display" from="inline" to="inline" begin="37374ms; anim_last.end+37374ms" dur="385ms"/></g><defs><g id="g197"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="40" class="foreground">socks</text><text x="80" textLength="8" class="background">I</text><text x="88" textLength="88" class="foreground">SOTPSocket(</text><text x="176" textLength="56" fill="#af5f00">"vcan0"</text><text x="232" textLength="48" class="foreground">, sid=</text><text x="280" textLength="40" fill="#008700">0x700</text><text x="320" textLength="48" class="foreground">, did=</text><text x="368" textLength="40" fill="#008700">0x701</text><text x="408" textLength="80" class="foreground">, padding=</text><text x="488" textLength="40" font-weight="bold" fill="#008700">False</text><text x="528" textLength="432" class="foreground">, basecls=ISOTP)                                      </text></g></defs><g display="none"><rect x="80" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g197" y="340"/><animate attributeName="display" from="inline" to="inline" begin="37759ms; anim_last.end+37759ms" dur="13ms"/></g><g display="none"><rect x="80" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g197" y="340"/><animate attributeName="display" from="inline" to="inline" begin="37772ms; anim_last.end+37772ms" dur="313ms"/></g><defs><g id="g198"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="48" class="foreground">socks </text><text x="88" textLength="8" class="background">I</text><text x="96" textLength="88" class="foreground">SOTPSocket(</text><text x="184" textLength="56" fill="#af5f00">"vcan0"</text><text x="240" textLength="48" class="foreground">, sid=</text><text x="288" textLength="40" fill="#008700">0x700</text><text x="328" textLength="48" class="foreground">, did=</text><text x="376" textLength="40" fill="#008700">0x701</text><text x="416" textLength="80" class="foreground">, padding=</text><text x="496" textLength="40" font-weight="bold" fill="#008700">False</text><text x="536" textLength="424" class="foreground">, basecls=ISOTP)                                     </text></g></defs><g display="none"><rect x="88" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g198" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38085ms; anim_last.end+38085ms" dur="210ms"/></g><defs><g id="g199"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="56" class="foreground">socks =</text><text x="96" textLength="8" class="background">I</text><text x="104" textLength="88" class="foreground">SOTPSocket(</text><text x="192" textLength="56" fill="#af5f00">"vcan0"</text><text x="248" textLength="48" class="foreground">, sid=</text><text x="296" textLength="40" fill="#008700">0x700</text><text x="336" textLength="48" class="foreground">, did=</text><text x="384" textLength="40" fill="#008700">0x701</text><text x="424" textLength="80" class="foreground">, padding=</text><text x="504" textLength="40" font-weight="bold" fill="#008700">False</text><text x="544" textLength="416" class="foreground">, basecls=ISOTP)                                    </text></g></defs><g display="none"><rect x="96" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g199" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38295ms; anim_last.end+38295ms" dur="11ms"/></g><g display="none"><rect x="96" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g199" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38306ms; anim_last.end+38306ms" dur="45ms"/></g><defs><g id="g200"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="64" class="foreground">socks = </text><text x="104" textLength="8" class="background">I</text><text x="112" textLength="88" class="foreground">SOTPSocket(</text><text x="200" textLength="56" fill="#af5f00">"vcan0"</text><text x="256" textLength="48" class="foreground">, sid=</text><text x="304" textLength="40" fill="#008700">0x700</text><text x="344" textLength="48" class="foreground">, did=</text><text x="392" textLength="40" fill="#008700">0x701</text><text x="432" textLength="80" class="foreground">, padding=</text><text x="512" textLength="40" font-weight="bold" fill="#008700">False</text><text x="552" textLength="408" class="foreground">, basecls=ISOTP)                                   </text></g></defs><g display="none"><rect x="104" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g200" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38351ms; anim_last.end+38351ms" dur="10ms"/></g><g display="none"><rect x="104" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g200" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38361ms; anim_last.end+38361ms" dur="500ms"/></g><defs><g id="g201"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="72" class="foreground">socks = [</text><text x="112" textLength="8" class="background">I</text><text x="120" textLength="88" class="foreground">SOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="112" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g201" y="340"/><animate attributeName="display" from="inline" to="inline" begin="38861ms; anim_last.end+38861ms" dur="500ms"/></g><defs><g id="g202"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="80" class="foreground">socks = [I</text><text x="120" textLength="8" class="background">S</text><text x="128" textLength="80" class="foreground">OTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="120" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g202" y="340"/><animate attributeName="display" from="inline" to="inline" begin="39361ms; anim_last.end+39361ms" dur="500ms"/></g><defs><g id="g203"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">socks = [ISO</text><text x="136" textLength="8" class="background">T</text><text x="144" textLength="64" class="foreground">PSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="136" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g203" y="340"/><animate attributeName="display" from="inline" to="inline" begin="39861ms; anim_last.end+39861ms" dur="66ms"/></g><defs><g id="g204"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="104" class="foreground">socks = [ISOT</text><text x="144" textLength="8" class="background">P</text><text x="152" textLength="56" class="foreground">Socket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="144" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g204" y="340"/><animate attributeName="display" from="inline" to="inline" begin="39927ms; anim_last.end+39927ms" dur="45ms"/></g><defs><g id="g205"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="112" class="foreground">socks = [ISOTP</text><text x="152" textLength="8" class="background">S</text><text x="160" textLength="48" class="foreground">ocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="152" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g205" y="340"/><animate attributeName="display" from="inline" to="inline" begin="39972ms; anim_last.end+39972ms" dur="66ms"/></g><defs><g id="g206"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="120" class="foreground">socks = [ISOTPS</text><text x="160" textLength="8" class="background">o</text><text x="168" textLength="40" class="foreground">cket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="160" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g206" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40038ms; anim_last.end+40038ms" dur="48ms"/></g><defs><g id="g207"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="128" class="foreground">socks = [ISOTPSo</text><text x="168" textLength="8" class="background">c</text><text x="176" textLength="32" class="foreground">ket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="168" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g207" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40086ms; anim_last.end+40086ms" dur="49ms"/></g><defs><g id="g208"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="136" class="foreground">socks = [ISOTPSoc</text><text x="176" textLength="8" class="background">k</text><text x="184" textLength="24" class="foreground">et(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="176" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g208" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40135ms; anim_last.end+40135ms" dur="36ms"/></g><defs><g id="g209"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="144" class="foreground">socks = [ISOTPSock</text><text x="184" textLength="8" class="background">e</text><text x="192" textLength="16" class="foreground">t(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="184" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g209" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40171ms; anim_last.end+40171ms" dur="67ms"/></g><defs><g id="g210"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="152" class="foreground">socks = [ISOTPSocke</text><text x="192" textLength="8" class="background">t</text><text x="200" textLength="8" class="foreground">(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="192" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g210" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40238ms; anim_last.end+40238ms" dur="42ms"/></g><defs><g id="g211"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="160" class="foreground">socks = [ISOTPSocket</text><text x="200" textLength="8" class="background">(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="120" class="foreground">, basecls=ISOTP</text><text x="680" textLength="8" fill="#000000">)</text><text x="688" textLength="272" class="foreground">                                  </text></g></defs><g display="none"><rect x="200" y="340" width="8" height="17" class="foreground"/><rect x="680" y="340" width="8" height="17" fill="#afd7d7"/><use xlink:href="#g211" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40280ms; anim_last.end+40280ms" dur="51ms"/></g><defs><g id="g212"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="8" class="background">"</text><text x="216" textLength="48" fill="#af5f00">vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="208" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g212" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40331ms; anim_last.end+40331ms" dur="53ms"/></g><defs><g id="g213"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="8" fill="#af5f00">"</text><text x="216" textLength="8" class="background">v</text><text x="224" textLength="40" fill="#af5f00">can0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="216" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g213" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40384ms; anim_last.end+40384ms" dur="50ms"/></g><defs><g id="g214"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="16" fill="#af5f00">"v</text><text x="224" textLength="8" class="background">c</text><text x="232" textLength="32" fill="#af5f00">an0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="224" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g214" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40434ms; anim_last.end+40434ms" dur="48ms"/></g><defs><g id="g215"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="24" fill="#af5f00">"vc</text><text x="232" textLength="8" class="background">a</text><text x="240" textLength="24" fill="#af5f00">n0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="232" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g215" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40482ms; anim_last.end+40482ms" dur="38ms"/></g><defs><g id="g216"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="32" fill="#af5f00">"vca</text><text x="240" textLength="8" class="background">n</text><text x="248" textLength="16" fill="#af5f00">0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="240" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g216" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40520ms; anim_last.end+40520ms" dur="62ms"/></g><defs><g id="g217"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="40" fill="#af5f00">"vcan</text><text x="248" textLength="8" class="background">0</text><text x="256" textLength="8" fill="#af5f00">"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="248" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g217" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40582ms; anim_last.end+40582ms" dur="49ms"/></g><defs><g id="g218"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="48" fill="#af5f00">"vcan0</text><text x="256" textLength="8" class="background">"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="256" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g218" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40631ms; anim_last.end+40631ms" dur="153ms"/></g><defs><g id="g219"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="8" class="foreground">,</text><text x="272" textLength="8" class="background"> </text><text x="280" textLength="32" class="foreground">sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="272" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g219" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40784ms; anim_last.end+40784ms" dur="182ms"/></g><defs><g id="g220"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="40" class="foreground">, sid</text><text x="304" textLength="8" class="background">=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="304" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g220" y="340"/><animate attributeName="display" from="inline" to="inline" begin="40966ms; anim_last.end+40966ms" dur="158ms"/></g><defs><g id="g221"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="8" class="background">,</text><text x="360" textLength="40" class="foreground"> did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="352" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g221" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41124ms; anim_last.end+41124ms" dur="170ms"/></g><defs><g id="g222"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="40" class="foreground">, did</text><text x="392" textLength="8" class="background">=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="392" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g222" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41294ms; anim_last.end+41294ms" dur="158ms"/></g><defs><g id="g223"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="8" class="background">,</text><text x="448" textLength="72" class="foreground"> padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="440" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g223" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41452ms; anim_last.end+41452ms" dur="152ms"/></g><defs><g id="g224"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="72" class="foreground">, padding</text><text x="512" textLength="8" class="background">=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="512" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g224" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41604ms; anim_last.end+41604ms" dur="151ms"/></g><defs><g id="g225"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="8" class="background">,</text><text x="568" textLength="392" class="foreground"> basecls=ISOTP)                                  </text></g></defs><g display="none"><rect x="560" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g225" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41755ms; anim_last.end+41755ms" dur="152ms"/></g><defs><g id="g226"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="72" class="foreground">, basecls</text><text x="632" textLength="8" class="background">=</text><text x="640" textLength="320" class="foreground">ISOTP)                                  </text></g></defs><g display="none"><rect x="632" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g226" y="340"/><animate attributeName="display" from="inline" to="inline" begin="41907ms; anim_last.end+41907ms" dur="160ms"/></g><defs><g id="g227"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="160" class="foreground">socks = [ISOTPSocket</text><text x="200" textLength="8" fill="#000000">(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="120" class="foreground">, basecls=ISOTP</text><text x="680" textLength="8" class="background">)</text><text x="688" textLength="272" class="foreground">                                  </text></g></defs><g display="none"><rect x="200" y="340" width="8" height="17" fill="#afd7d7"/><rect x="680" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g227" y="340"/><animate attributeName="display" from="inline" to="inline" begin="42067ms; anim_last.end+42067ms" dur="500ms"/></g><defs><g id="g228"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="160" class="foreground">socks = [ISOTPSocket</text><text x="200" textLength="8" fill="#000000">(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="120" class="foreground">, basecls=ISOTP</text><text x="680" textLength="8" fill="#000000">)</text><text x="688" textLength="8" class="background"> </text><text x="696" textLength="264" class="foreground">                                 </text></g></defs><g display="none"><rect x="200" y="340" width="8" height="17" fill="#afd7d7"/><rect x="680" y="340" width="8" height="17" fill="#afd7d7"/><rect x="688" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g228" y="340"/><animate attributeName="display" from="inline" to="inline" begin="42567ms; anim_last.end+42567ms" dur="500ms"/></g><defs><g id="g229"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="696" textLength="8" class="background"> </text><text x="704" textLength="256" class="foreground">                                </text></g></defs><g display="none"><rect x="696" y="340" width="8" height="17" class="foreground"/><use xlink:href="#g229" y="340"/><animate attributeName="display" from="inline" to="inline" begin="43067ms; anim_last.end+43067ms" dur="500ms"/></g><g display="none"><use xlink:href="#g188" y="357"/><animate attributeName="display" from="inline" to="inline" begin="35727ms; anim_last.end+35727ms" dur="7840ms"/></g><defs><g id="g230"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="88" class="foreground">ISOTPSocket</text><text x="128" textLength="8" fill="#000000">(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="120" class="foreground">, basecls=ISOTP</text><text x="600" textLength="8" fill="#000000">)</text><text x="608" textLength="8" class="background"> </text><text x="616" textLength="344" class="foreground">                                           </text></g></defs><g display="none"><rect x="128" y="357" width="8" height="17" fill="#afd7d7"/><rect x="600" y="357" width="8" height="17" fill="#afd7d7"/><rect x="608" y="357" width="8" height="17" class="foreground"/><use xlink:href="#g230" y="357"/><animate attributeName="display" from="inline" to="inline" begin="43567ms; anim_last.end+43567ms" dur="500ms"/></g><defs><g id="g231"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="616" textLength="8" class="background"> </text><text x="624" textLength="336" class="foreground">                                          </text></g></defs><g display="none"><rect x="616" y="357" width="8" height="17" class="foreground"/><use xlink:href="#g231" y="357"/><animate attributeName="display" from="inline" to="inline" begin="44067ms; anim_last.end+44067ms" dur="363ms"/></g><g display="none"><use xlink:href="#g186" y="374"/><animate attributeName="display" from="inline" to="inline" begin="35528ms; anim_last.end+35528ms" dur="8902ms"/></g><defs><g id="g232"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="88" class="foreground">ISOTPSocket</text><text x="128" textLength="8" fill="#000000">(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="120" class="foreground">, basecls=ISOTP</text><text x="608" textLength="8" fill="#000000">)</text><text x="616" textLength="8" class="background"> </text><text x="624" textLength="336" class="foreground">                                          </text></g></defs><g display="none"><rect x="128" y="374" width="8" height="17" fill="#afd7d7"/><rect x="608" y="374" width="8" height="17" fill="#afd7d7"/><rect x="616" y="374" width="8" height="17" class="foreground"/><use xlink:href="#g232" y="374"/><animate attributeName="display" from="inline" to="inline" begin="44430ms; anim_last.end+44430ms" dur="500ms"/></g><defs><g id="g233"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="624" textLength="8" class="background"> </text><text x="632" textLength="328" class="foreground">                                         </text></g></defs><g display="none"><rect x="624" y="374" width="8" height="17" class="foreground"/><use xlink:href="#g233" y="374"/><animate attributeName="display" from="inline" to="inline" begin="44930ms; anim_last.end+44930ms" dur="13ms"/></g><g display="none"><rect x="624" y="374" width="8" height="17" class="foreground"/><use xlink:href="#g233" y="374"/><animate attributeName="display" from="inline" to="inline" begin="44943ms; anim_last.end+44943ms" dur="249ms"/></g><g display="none"><use xlink:href="#g184" y="391"/><animate attributeName="display" from="inline" to="inline" begin="35337ms; anim_last.end+35337ms" dur="9855ms"/></g><defs><g id="g234"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="88" class="foreground">ISOTPSocket</text><text x="128" textLength="8" fill="#000000">(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="120" class="foreground">, basecls=ISOTP</text><text x="600" textLength="8" fill="#000000">)</text><text x="608" textLength="8" class="background"> </text><text x="616" textLength="344" class="foreground">                                           </text></g></defs><g display="none"><rect x="128" y="391" width="8" height="17" fill="#afd7d7"/><rect x="600" y="391" width="8" height="17" fill="#afd7d7"/><rect x="608" y="391" width="8" height="17" class="foreground"/><use xlink:href="#g234" y="391"/><animate attributeName="display" from="inline" to="inline" begin="45192ms; anim_last.end+45192ms" dur="240ms"/></g><defs><g id="g235"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="616" textLength="8" class="background"> </text><text x="624" textLength="336" class="foreground">                                          </text></g></defs><g display="none"><rect x="616" y="391" width="8" height="17" class="foreground"/><use xlink:href="#g235" y="391"/><animate attributeName="display" from="inline" to="inline" begin="45432ms; anim_last.end+45432ms" dur="171ms"/></g><g display="none"><use xlink:href="#g182" y="408"/><animate attributeName="display" from="inline" to="inline" begin="35154ms; anim_last.end+35154ms" dur="10449ms"/></g><defs><g id="g236"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="88" class="foreground">ISOTPSocket</text><text x="128" textLength="8" fill="#000000">(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="120" class="foreground">, basecls=ISOTP</text><text x="600" textLength="8" fill="#000000">)</text><text x="608" textLength="8" class="background"> </text><text x="616" textLength="344" class="foreground">                                           </text></g></defs><g display="none"><rect x="128" y="408" width="8" height="17" fill="#afd7d7"/><rect x="600" y="408" width="8" height="17" fill="#afd7d7"/><rect x="608" y="408" width="8" height="17" class="foreground"/><use xlink:href="#g236" y="408"/><animate attributeName="display" from="inline" to="inline" begin="45603ms; anim_last.end+45603ms" dur="212ms"/></g><defs><g id="g237"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="616" textLength="8" class="background"> </text><text x="624" textLength="336" class="foreground">                                          </text></g></defs><g display="none"><rect x="616" y="408" width="8" height="17" class="foreground"/><use xlink:href="#g237" y="408"/><animate attributeName="display" from="inline" to="inline" begin="45815ms; anim_last.end+45815ms" dur="13ms"/></g><g display="none"><rect x="616" y="408" width="8" height="17" class="foreground"/><use xlink:href="#g237" y="408"/><animate attributeName="display" from="inline" to="inline" begin="45828ms; anim_last.end+45828ms" dur="326ms"/></g><g display="none"><use xlink:href="#g180" y="425"/><animate attributeName="display" from="inline" to="inline" begin="34977ms; anim_last.end+34977ms" dur="11177ms"/></g><defs><g id="g238"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="88" class="foreground">ISOTPSocket</text><text x="128" textLength="8" fill="#000000">(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="120" class="foreground">, basecls=ISOTP</text><text x="608" textLength="8" fill="#000000">)</text><text x="616" textLength="8" class="background"> </text><text x="624" textLength="336" class="foreground">                                          </text></g></defs><g display="none"><rect x="128" y="425" width="8" height="17" fill="#afd7d7"/><rect x="608" y="425" width="8" height="17" fill="#afd7d7"/><rect x="616" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g238" y="425"/><animate attributeName="display" from="inline" to="inline" begin="46154ms; anim_last.end+46154ms" dur="500ms"/></g><g display="none"><rect x="128" y="425" width="8" height="17" fill="#afd7d7"/><rect x="608" y="425" width="8" height="17" fill="#afd7d7"/><rect x="616" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g238" y="425"/><animate attributeName="display" from="inline" to="inline" begin="46654ms; anim_last.end+46654ms" dur="305ms"/></g><defs><g id="g239"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="136" class="foreground">, basecls=ISOTP),</text><text x="624" textLength="8" class="background"> </text><text x="632" textLength="328" class="foreground">                                         </text></g></defs><g display="none"><rect x="624" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g239" y="425"/><animate attributeName="display" from="inline" to="inline" begin="46959ms; anim_last.end+46959ms" dur="14ms"/></g><g display="none"><rect x="624" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g239" y="425"/><animate attributeName="display" from="inline" to="inline" begin="46973ms; anim_last.end+46973ms" dur="500ms"/></g><g display="none"><rect x="128" y="425" width="8" height="17" fill="#afd7d7"/><rect x="608" y="425" width="8" height="17" fill="#afd7d7"/><rect x="616" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g238" y="425"/><animate attributeName="display" from="inline" to="inline" begin="47473ms; anim_last.end+47473ms" dur="10ms"/></g><defs><g id="g240"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="168" class="foreground">socks = [ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP),                                 </text></g></defs><g display="none"><use xlink:href="#g240" y="340"/><animate attributeName="display" from="inline" to="inline" begin="43567ms; anim_last.end+43567ms" dur="4416ms"/></g><g display="none"><rect x="128" y="425" width="8" height="17" fill="#afd7d7"/><rect x="608" y="425" width="8" height="17" fill="#afd7d7"/><rect x="616" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g238" y="425"/><animate attributeName="display" from="inline" to="inline" begin="47483ms; anim_last.end+47483ms" dur="500ms"/></g><defs><g id="g241"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="64" class="foreground">socks = </text><text x="104" textLength="8" fill="#000000">[</text><text x="112" textLength="96" class="foreground">ISOTPSocket(</text><text x="208" textLength="56" fill="#af5f00">"vcan0"</text><text x="264" textLength="48" class="foreground">, sid=</text><text x="312" textLength="40" fill="#008700">0x700</text><text x="352" textLength="48" class="foreground">, did=</text><text x="400" textLength="40" fill="#008700">0x701</text><text x="440" textLength="80" class="foreground">, padding=</text><text x="520" textLength="40" font-weight="bold" fill="#008700">False</text><text x="560" textLength="400" class="foreground">, basecls=ISOTP),                                 </text></g></defs><defs><g id="g242"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="128" class="foreground">, basecls=ISOTP)</text><text x="616" textLength="8" fill="#000000">]</text><text x="624" textLength="8" class="background"> </text><text x="632" textLength="328" class="foreground">                                         </text></g></defs><g display="none"><rect x="104" y="340" width="8" height="17" fill="#afd7d7"/><use xlink:href="#g241" y="340"/><rect x="616" y="425" width="8" height="17" fill="#afd7d7"/><rect x="624" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g242" y="425"/><animate attributeName="display" from="inline" to="inline" begin="47983ms; anim_last.end+47983ms" dur="500ms"/></g><defs><g id="g243"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="8" class="foreground"> </text></g></defs><g display="none"><use xlink:href="#g243" y="442"/><animate attributeName="display" from="inline" to="inline" begin="34758ms; anim_last.end+34758ms" dur="13725ms"/></g><defs><g id="g244"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="112" class="foreground">conf.contribs[</text><text x="152" textLength="88" fill="#af5f00">'CANSocket'</text><text x="240" textLength="40" class="foreground">] = {</text><text x="280" textLength="128" fill="#af5f00">'use-python-can'</text><text x="408" textLength="16" class="foreground">: </text><text x="424" textLength="40" font-weight="bold" fill="#008700">False</text><text x="464" textLength="496" class="foreground">}                                                             </text></g></defs><defs><g id="g245"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="104" class="foreground">load_contrib(</text><text x="144" textLength="88" fill="#af5f00">'cansocket'</text><text x="232" textLength="728" class="foreground">)                                                                                          </text></g></defs><g display="none"><use xlink:href="#g168" y="255"/><use xlink:href="#g244" y="272"/><use xlink:href="#g245" y="289"/><use xlink:href="#g171" y="306"/><use xlink:href="#g172" y="323"/><animate attributeName="display" from="inline" to="inline" begin="34247ms; anim_last.end+34247ms" dur="14658ms"/></g><g display="none"><use xlink:href="#g240" y="340"/><animate attributeName="display" from="inline" to="inline" begin="48483ms; anim_last.end+48483ms" dur="422ms"/></g><defs><g id="g246"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x709</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x707</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP),                                           </text></g></defs><g display="none"><use xlink:href="#g246" y="357"/><animate attributeName="display" from="inline" to="inline" begin="44430ms; anim_last.end+44430ms" dur="4475ms"/></g><defs><g id="g247"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x71c</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x788</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP),                                          </text></g></defs><g display="none"><use xlink:href="#g247" y="374"/><animate attributeName="display" from="inline" to="inline" begin="45192ms; anim_last.end+45192ms" dur="3713ms"/></g><defs><g id="g248"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x799</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x745</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP),                                           </text></g></defs><g display="none"><use xlink:href="#g248" y="391"/><animate attributeName="display" from="inline" to="inline" begin="45603ms; anim_last.end+45603ms" dur="3302ms"/></g><defs><g id="g249"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7aa</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x703</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="32" font-weight="bold" fill="#008700">True</text><text x="480" textLength="480" class="foreground">, basecls=ISOTP),                                           </text></g></defs><g display="none"><use xlink:href="#g249" y="408"/><animate attributeName="display" from="inline" to="inline" begin="46154ms; anim_last.end+46154ms" dur="2751ms"/></g><defs><g id="g250"><text x="0" textLength="40" font-weight="bold" class="color12">...: </text><text x="40" textLength="96" class="foreground">ISOTPSocket(</text><text x="136" textLength="56" fill="#af5f00">"vcan0"</text><text x="192" textLength="48" class="foreground">, sid=</text><text x="240" textLength="40" fill="#008700">0x7cc</text><text x="280" textLength="48" class="foreground">, did=</text><text x="328" textLength="40" fill="#008700">0x7bb</text><text x="368" textLength="80" class="foreground">, padding=</text><text x="448" textLength="40" font-weight="bold" fill="#008700">False</text><text x="488" textLength="472" class="foreground">, basecls=ISOTP)]                                          </text></g></defs><g display="none"><use xlink:href="#g250" y="425"/><rect x="40" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g181" y="442"/><use xlink:href="#g243" y="459"/><animate attributeName="display" from="inline" to="inline" begin="48483ms; anim_last.end+48483ms" dur="422ms"/></g><g display="none"><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="33747ms; anim_last.end+33747ms" dur="15158ms"/></g><defs><g id="g251"><text x="0" textLength="8" class="background"> </text><text x="8" textLength="952" class="foreground">                                                                                                                       </text></g></defs><g display="none"><rect x="0" y="476" width="8" height="17" class="foreground"/><use xlink:href="#g251" y="476"/><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="48905ms; anim_last.end+48905ms" dur="158ms"/></g><g display="none"><use xlink:href="#g134" y="0"/><use xlink:href="#g135" y="17"/><use xlink:href="#g136" y="34"/><use xlink:href="#g137" y="51"/><use xlink:href="#g138" y="68"/><use xlink:href="#g139" y="85"/><use xlink:href="#g140" y="102"/><use xlink:href="#g141" y="119"/><use xlink:href="#g142" y="136"/><use xlink:href="#g143" y="153"/><use xlink:href="#g144" y="170"/><use xlink:href="#g145" y="187"/><use xlink:href="#g146" y="204"/><use xlink:href="#g147" y="221"/><use xlink:href="#g178" y="238"/><animate attributeName="display" from="inline" to="inline" begin="33747ms; anim_last.end+33747ms" dur="15329ms"/></g><g display="none"><use xlink:href="#g168" y="255"/><use xlink:href="#g244" y="272"/><use xlink:href="#g245" y="289"/><use xlink:href="#g171" y="306"/><use xlink:href="#g172" y="323"/><use xlink:href="#g240" y="340"/><use xlink:href="#g246" y="357"/><use xlink:href="#g247" y="374"/><use xlink:href="#g248" y="391"/><use xlink:href="#g249" y="408"/><use xlink:href="#g250" y="425"/><use xlink:href="#g243" y="442"/><use xlink:href="#g172" y="459"/><animate attributeName="display" from="inline" to="inline" begin="48905ms; anim_last.end+48905ms" dur="171ms"/></g><defs><g id="g252"><text x="0" textLength="960" class="foreground">INFO: Use native CANSocket. Specify 'conf.contribs['CANSocket'] = {'use-python-can': True}' to enable python-can.       </text></g></defs><g display="none"><use xlink:href="#g252" y="476"/><rect x="0" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g251" y="493"/><animate attributeName="display" from="inline" to="inline" begin="49063ms; anim_last.end+49063ms" dur="13ms"/></g><g display="none"><rect x="32" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="425"/><animate attributeName="display" from="inline" to="inline" begin="49076ms; anim_last.end+49076ms" dur="500ms"/></g><defs><g id="g253"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="8" class="foreground">s</text><text x="40" textLength="8" class="background"> </text><text x="48" textLength="912" class="foreground">                                                                                                                  </text></g></defs><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g253" y="425"/><animate attributeName="display" from="inline" to="inline" begin="49576ms; anim_last.end+49576ms" dur="13ms"/></g><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g253" y="425"/><animate attributeName="display" from="inline" to="inline" begin="49589ms; anim_last.end+49589ms" dur="369ms"/></g><defs><g id="g254"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="16" class="foreground">so</text><text x="48" textLength="8" class="background"> </text><text x="56" textLength="904" class="foreground">                                                                                                                 </text></g></defs><g display="none"><rect x="48" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g254" y="425"/><animate attributeName="display" from="inline" to="inline" begin="49958ms; anim_last.end+49958ms" dur="234ms"/></g><defs><g id="g255"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="24" class="foreground">soc</text><text x="56" textLength="8" class="background"> </text><text x="64" textLength="896" class="foreground">                                                                                                                </text></g></defs><g display="none"><rect x="56" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g255" y="425"/><animate attributeName="display" from="inline" to="inline" begin="50192ms; anim_last.end+50192ms" dur="79ms"/></g><defs><g id="g256"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="32" class="foreground">sock</text><text x="64" textLength="8" class="background"> </text><text x="72" textLength="888" class="foreground">                                                                                                               </text></g></defs><g display="none"><rect x="64" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g256" y="425"/><animate attributeName="display" from="inline" to="inline" begin="50271ms; anim_last.end+50271ms" dur="102ms"/></g><g display="none"><use xlink:href="#g138" y="0"/><use xlink:href="#g139" y="17"/><use xlink:href="#g140" y="34"/><use xlink:href="#g141" y="51"/><use xlink:href="#g142" y="68"/><use xlink:href="#g143" y="85"/><use xlink:href="#g144" y="102"/><use xlink:href="#g145" y="119"/><use xlink:href="#g146" y="136"/><use xlink:href="#g147" y="153"/><use xlink:href="#g178" y="170"/><use xlink:href="#g168" y="187"/><use xlink:href="#g244" y="204"/><use xlink:href="#g245" y="221"/><use xlink:href="#g171" y="238"/><use xlink:href="#g172" y="255"/><use xlink:href="#g240" y="272"/><use xlink:href="#g246" y="289"/><use xlink:href="#g247" y="306"/><use xlink:href="#g248" y="323"/><use xlink:href="#g249" y="340"/><use xlink:href="#g250" y="357"/><use xlink:href="#g243" y="374"/><use xlink:href="#g172" y="391"/><use xlink:href="#g252" y="408"/><animate attributeName="display" from="inline" to="inline" begin="49076ms; anim_last.end+49076ms" dur="1592ms"/></g><defs><g id="g257"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="40" class="foreground">socks</text><text x="72" textLength="8" class="background"> </text><text x="80" textLength="880" class="foreground">                                                                                                              </text></g></defs><g display="none"><rect x="72" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g257" y="425"/><animate attributeName="display" from="inline" to="inline" begin="50373ms; anim_last.end+50373ms" dur="295ms"/></g><g display="none"><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="49076ms; anim_last.end+49076ms" dur="1592ms"/></g><defs><g id="g258"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="928" class="foreground">socks                                                                                                               </text></g></defs><defs><g id="g259"><text x="0" textLength="960" class="foreground">[&lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91d3e18a50&gt;,          </text></g></defs><defs><g id="g260"><text x="0" textLength="880" class="foreground"> &lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91e65ad5d0&gt;,</text></g></defs><defs><g id="g261"><text x="0" textLength="880" class="foreground"> &lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91e65addd0&gt;,</text></g></defs><defs><g id="g262"><text x="0" textLength="960" class="foreground"> &lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91e65ad850&gt;,          </text></g></defs><defs><g id="g263"><text x="0" textLength="880" class="foreground"> &lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91e65bb590&gt;,</text></g></defs><defs><g id="g264"><text x="0" textLength="880" class="foreground"> &lt;&lt;ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket &gt; at 0x7f91e654b2d0&gt;]</text></g></defs><g display="none"><use xlink:href="#g141" y="0"/><use xlink:href="#g142" y="17"/><use xlink:href="#g143" y="34"/><use xlink:href="#g144" y="51"/><use xlink:href="#g145" y="68"/><use xlink:href="#g146" y="85"/><use xlink:href="#g147" y="102"/><use xlink:href="#g178" y="119"/><use xlink:href="#g168" y="136"/><use xlink:href="#g244" y="153"/><use xlink:href="#g245" y="170"/><use xlink:href="#g171" y="187"/><use xlink:href="#g172" y="204"/><use xlink:href="#g240" y="221"/><use xlink:href="#g246" y="238"/><use xlink:href="#g247" y="255"/><use xlink:href="#g248" y="272"/><use xlink:href="#g249" y="289"/><use xlink:href="#g250" y="306"/><use xlink:href="#g243" y="323"/><use xlink:href="#g172" y="340"/><use xlink:href="#g252" y="357"/><use xlink:href="#g258" y="374"/><use xlink:href="#g259" y="391"/><use xlink:href="#g260" y="408"/><use xlink:href="#g261" y="425"/><use xlink:href="#g262" y="442"/><use xlink:href="#g263" y="459"/><use xlink:href="#g264" y="476"/><rect x="32" y="493" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="493"/><animate attributeName="display" from="inline" to="inline" begin="50668ms; anim_last.end+50668ms" dur="14ms"/></g><g display="none"><rect x="32" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g148" y="425"/><animate attributeName="display" from="inline" to="inline" begin="50682ms; anim_last.end+50682ms" dur="500ms"/></g><defs><g id="g265"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="8" class="foreground">e</text><text x="40" textLength="8" class="background"> </text><text x="48" textLength="912" class="foreground">                                                                                                                  </text></g></defs><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g265" y="425"/><animate attributeName="display" from="inline" to="inline" begin="51182ms; anim_last.end+51182ms" dur="13ms"/></g><g display="none"><rect x="40" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g265" y="425"/><animate attributeName="display" from="inline" to="inline" begin="51195ms; anim_last.end+51195ms" dur="177ms"/></g><defs><g id="g266"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="16" class="foreground">ex</text><text x="48" textLength="8" class="background"> </text><text x="56" textLength="904" class="foreground">                                                                                                                 </text></g></defs><g display="none"><rect x="48" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g266" y="425"/><animate attributeName="display" from="inline" to="inline" begin="51372ms; anim_last.end+51372ms" dur="112ms"/></g><defs><g id="g267"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="24" class="foreground">exi</text><text x="56" textLength="8" class="background"> </text><text x="64" textLength="896" class="foreground">                                                                                                                </text></g></defs><g display="none"><rect x="56" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g267" y="425"/><animate attributeName="display" from="inline" to="inline" begin="51484ms; anim_last.end+51484ms" dur="104ms"/></g><defs><g id="g268"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="32" class="foreground">exit</text><text x="64" textLength="8" class="background"> </text><text x="72" textLength="888" class="foreground">                                                                                                               </text></g></defs><g display="none"><rect x="64" y="425" width="8" height="17" class="foreground"/><use xlink:href="#g268" y="425"/><animate attributeName="display" from="inline" to="inline" begin="51588ms; anim_last.end+51588ms" dur="500ms"/></g><g display="none"><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="50682ms; anim_last.end+50682ms" dur="1406ms"/></g><g display="none"><rect x="0" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g251" y="442"/><animate attributeName="display" from="inline" to="inline" begin="52088ms; anim_last.end+52088ms" dur="335ms"/></g><g display="none"><rect x="120" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g1" y="442"/><animate attributeName="display" from="inline" to="inline" begin="52423ms; anim_last.end+52423ms" dur="500ms"/></g><defs><g id="g269"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="8" font-weight="bold" class="color9">e</text><text x="128" textLength="8" class="background">c</text><text x="136" textLength="440" fill="#555555">ho "if you are lazy, get a copy and paste ready output"</text><text x="576" textLength="384" class="foreground">                                                </text></g></defs><g display="none"><rect x="128" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g269" y="442"/><animate attributeName="display" from="inline" to="inline" begin="52923ms; anim_last.end+52923ms" dur="224ms"/></g><defs><g id="g270"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="16" font-weight="bold" class="foreground">ex</text><text x="136" textLength="8" class="background">i</text><text x="144" textLength="8" fill="#555555">t</text><text x="152" textLength="808" class="foreground">                                                                                                     </text></g></defs><g display="none"><rect x="136" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g270" y="442"/><animate attributeName="display" from="inline" to="inline" begin="53147ms; anim_last.end+53147ms" dur="103ms"/></g><defs><g id="g271"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="24" font-weight="bold" class="color9">exi</text><text x="144" textLength="8" class="background">t</text><text x="152" textLength="808" class="foreground">                                                                                                     </text></g></defs><g display="none"><rect x="144" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g271" y="442"/><animate attributeName="display" from="inline" to="inline" begin="53250ms; anim_last.end+53250ms" dur="104ms"/></g><defs><g id="g272"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="foreground">exit</text><text x="152" textLength="8" class="background"> </text><text x="160" textLength="800" class="foreground">                                                                                                    </text></g></defs><g display="none"><rect x="152" y="442" width="8" height="17" class="foreground"/><use xlink:href="#g272" y="442"/><animate attributeName="display" from="inline" to="inline" begin="53354ms; anim_last.end+53354ms" dur="184ms"/></g><g display="none"><use xlink:href="#g145" y="0"/><use xlink:href="#g146" y="17"/><use xlink:href="#g147" y="34"/><use xlink:href="#g178" y="51"/><use xlink:href="#g168" y="68"/><use xlink:href="#g244" y="85"/><use xlink:href="#g245" y="102"/><use xlink:href="#g171" y="119"/><use xlink:href="#g172" y="136"/><use xlink:href="#g240" y="153"/><use xlink:href="#g246" y="170"/><use xlink:href="#g247" y="187"/><use xlink:href="#g248" y="204"/><use xlink:href="#g249" y="221"/><use xlink:href="#g250" y="238"/><use xlink:href="#g243" y="255"/><use xlink:href="#g172" y="272"/><use xlink:href="#g252" y="289"/><use xlink:href="#g258" y="306"/><use xlink:href="#g259" y="323"/><use xlink:href="#g260" y="340"/><use xlink:href="#g261" y="357"/><use xlink:href="#g262" y="374"/><use xlink:href="#g263" y="391"/><use xlink:href="#g264" y="408"/><animate attributeName="display" from="inline" to="inline" begin="50682ms; anim_last.end+50682ms" dur="3856ms"/></g><defs><g id="g273"><text x="0" textLength="32" font-weight="bold" class="color12">&gt;&gt;&gt; </text><text x="32" textLength="928" class="foreground">exit                                                                                                                </text></g></defs><g display="none"><use xlink:href="#g273" y="425"/><animate attributeName="display" from="inline" to="inline" begin="52088ms; anim_last.end+52088ms" dur="2450ms"/></g><defs><g id="g274"><text x="0" textLength="96" class="foreground">user@system </text><text x="96" textLength="8" class="color2">~</text><text x="104" textLength="16" class="foreground">&gt; </text><text x="120" textLength="32" font-weight="bold" class="foreground">exit</text><text x="152" textLength="808" class="foreground">                                                                                                     </text></g></defs><g display="none"><use xlink:href="#g274" y="442"/><rect x="0" y="459" width="8" height="17" class="foreground"/><use xlink:href="#g30" y="459"/><animate attributeName="display" from="inline" to="inline" begin="53538ms; anim_last.end+53538ms" dur="1000ms"/></g><g display="none"><use xlink:href="#g152" y="493"/><animate attributeName="display" from="inline" to="inline" begin="52088ms; anim_last.end+52088ms" dur="2450ms" id="anim_last"/></g></svg>
+</svg>

scapy-2.4.4.tar.gz/doc/scapy/graphics/pipetool_demo.svg Added

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+
+<svg width="114pt" height="188pt"
+ viewBox="0.00 0.00 114.00 188.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 184)">
+<title>pipe</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-184 110,-184 110,4 -4,4"/>
+
+<g id="node1" class="node">
+<title>2518161510704</title>
+<polygon fill="none" stroke="black" points="106,-108 0,-108 0,-72 106,-72 106,-108"/>
+<text text-anchor="middle" x="53" y="-86.3" font-family="Times New Roman,serif" font-size="14.00">TransformDrain</text>
+</g>
+
+<g id="node3" class="node">
+<title>2518161510896</title>
+<polygon fill="none" stroke="black" points="102,-36 4,-36 4,0 102,0 102,-36"/>
+<text text-anchor="middle" x="53" y="-14.3" font-family="Times New Roman,serif" font-size="14.00">WiresharkSink</text>
+</g>
+
+<g id="edge1" class="edge">
+<title>2518161510704&#45;&gt;2518161510896</title>
+<path fill="none" stroke="blue" d="M53,-71.7C53,-63.98 53,-54.71 53,-46.11"/>
+<polygon fill="blue" stroke="blue" points="53,-36.1 57.5,-46.1 53,-41.1 53,-46.1 53,-46.1 53,-46.1 53,-41.1 48.5,-46.1 53,-36.1 53,-36.1"/>
+</g>
+
+<g id="node2" class="node">
+<title>2518161510992</title>
+<polygon fill="none" stroke="black" points="94.5,-180 11.5,-180 11.5,-144 94.5,-144 94.5,-180"/>
+<text text-anchor="middle" x="53" y="-158.3" font-family="Times New Roman,serif" font-size="14.00">SniffSource</text>
+</g>
+
+<g id="edge2" class="edge">
+<title>2518161510992&#45;&gt;2518161510704</title>
+<path fill="none" stroke="blue" d="M53,-143.7C53,-135.98 53,-126.71 53,-118.11"/>
+<polygon fill="blue" stroke="blue" points="53,-108.1 57.5,-118.1 53,-113.1 53,-118.1 53,-118.1 53,-118.1 53,-113.1 48.5,-118.1 53,-108.1 53,-108.1"/>
+</g>
+</g>
+</svg>

scapy-2.4.3.tar.gz/doc/scapy/index.rst -> scapy-2.4.4.tar.gz/doc/scapy/index.rst Changed

scapy-2.4.3.tar.gz/doc/scapy/introduction.rst -> scapy-2.4.4.tar.gz/doc/scapy/introduction.rst Changed

@@ -6,27 +6,20 @@
 
 About Scapy
 ===========
+
 Scapy is a Python program that enables the user to send, sniff and dissect and forge network packets. This capability allows construction of tools that can probe, scan or attack networks.
 
-In other words, Scapy is a powerful interactive packet manipulation program. 
-It is able to forge or decode packets of a wide number of protocols,
-send them on the wire, capture them, match requests and replies, and 
-much more. Scapy can easily handle most classical tasks like scanning,
-tracerouting, probing, unit tests, attacks or network discovery. It can replace hping, arpspoof, arp-sk, arping, p0f and even some parts of Nmap, tcpdump, and tshark). 
+In other words, Scapy is a powerful interactive packet manipulation program. It is able to forge or decode packets of a wide number of protocols, send them on the wire, capture them, match requests and replies, and much more. Scapy can easily handle most classical tasks like scanning, tracerouting, probing, unit tests, attacks or network discovery. It can replace hping, arpspoof, arp-sk, arping, p0f and even some parts of Nmap, tcpdump, and tshark.
 
 .. image:: graphics/testing-taxonomy.*
    :scale: 50
-    
-Scapy also performs very well on a lot of other
-specific tasks that most other tools can't handle, like sending invalid frames,
-injecting your own 802.11 frames, combining techniques 
-(VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc. 
+
+Scapy also performs very well on a lot of other specific tasks that most other tools can't handle, like sending invalid frames, injecting your own 802.11 frames, combining techniques (VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc.
 
 The idea is simple. Scapy mainly does two things: sending packets and receiving answers. You define a set of packets, it sends them, receives answers, matches requests with answers and returns a list of packet couples (request, answer) and a list of unmatched packets. This has the big advantage over tools like Nmap or hping that an answer is not reduced to (open/closed/filtered), but is the whole packet.
 
 On top of this can be build more high level functions, for example, one that does traceroutes and give as a result only the start TTL of the request and the source IP of the answer. One that pings a whole network and gives the list of machines answering. One that does a portscan and returns a LaTeX report.
 
-
 What makes Scapy so special
 ===========================
 
@@ -45,46 +38,16 @@
 Fast packet design
 ------------------
 
-Other tools stick to the **program-that-you-run-from-a-shell** paradigm.
-The result is an awful syntax to describe a packet. For these tools, the 
-solution adopted uses a higher but less powerful description, in the form of 
-scenarios imagined by the tool's author. As an example, only the IP address must 
-be given to a port scanner to trigger the **port scanning** scenario. Even
-if the scenario is tweaked a bit, you still are stuck to a port scan.
-
-Scapy's paradigm is to propose a Domain Specific Language (DSL) that 
-enables a powerful and fast description of any kind of packet. Using the Python 
-syntax and a Python interpreter as the DSL syntax and interpreter has many 
-advantages: there is no need to write a separate interpreter, users don't need 
-to learn yet another language and they benefit from a complete, concise 
-and very powerful language.
-
-Scapy enables the user to describe a packet or set of packets as layers that are
-stacked one upon another. Fields of each layer have useful default values that 
-can be overloaded. Scapy does not oblige the user to use predetermined methods 
-or templates. This alleviates the requirement of writing a new tool each time a 
-different scenario is required. In C, it may take an average of 60 lines to 
-describe a packet. With Scapy, the packets to be sent may be described in only a
-single line with another line to print the result. 90\% of the network probing 
-tools can be rewritten in 2 lines of Scapy.
+Other tools stick to the **program-that-you-run-from-a-shell** paradigm. The result is an awful syntax to describe a packet. For these tools, the solution adopted uses a higher but less powerful description, in the form of scenarios imagined by the tool's author. As an example, only the IP address must be given to a port scanner to trigger the **port scanning** scenario. Even if the scenario is tweaked a bit, you still are stuck to a port scan.
+
+Scapy's paradigm is to propose a Domain Specific Language (DSL) that enables a powerful and fast description of any kind of packet. Using the Python syntax and a Python interpreter as the DSL syntax and interpreter has many advantages: there is no need to write a separate interpreter, users don't need to learn yet another language and they benefit from a complete, concise and very powerful language.
+
+Scapy enables the user to describe a packet or set of packets as layers that are stacked one upon another. Fields of each layer have useful default values that can be overloaded. Scapy does not oblige the user to use predetermined methods or templates. This alleviates the requirement of writing a new tool each time a different scenario is required. In C, it may take an average of 60 lines to describe a packet. With Scapy, the packets to be sent may be described in only a single line with another line to print the result. 90\% of the network probing tools can be rewritten in 2 lines of Scapy.
 
 Probe once, interpret many
 --------------------------
 
-Network discovery is blackbox testing. When probing a network, many stimuli are 
-sent while only a few of them are answered. If the right stimuli are 
-chosen, the desired information may be obtained by the responses or the lack of 
-responses. Unlike many tools, Scapy gives all the information, i.e. all the 
-stimuli sent and all the responses received. Examination of this data will give 
-the user the desired information. When the dataset is small, the user can just 
-dig for it. In other cases, the interpretation of the data will depend on the 
-point of view taken. Most tools choose the viewpoint and discard all the data 
-not related to that point of view. Because Scapy gives the complete raw data, 
-that data may be used many times allowing the viewpoint to evolve during 
-analysis. For example, a TCP port scan may be probed and the data visualized as 
-the result of the port scan. The data could then also be visualized with respect
-to the TTL of response packet. A new probe need not be initiated to adjust the 
-viewpoint of the data.
+Network discovery is blackbox testing. When probing a network, many stimuli are sent while only a few of them are answered. If the right stimuli are chosen, the desired information may be obtained by the responses or the lack of responses. Unlike many tools, Scapy gives all the information, i.e. all the stimuli sent and all the responses received. Examination of this data will give the user the desired information. When the dataset is small, the user can just dig for it. In other cases, the interpretation of the data will depend on the point of view taken. Most tools choose the viewpoint and discard all the data not related to that point of view. Because Scapy gives the complete raw data, that data may be used many times allowing the viewpoint to evolve during analysis. For example, a TCP port scan may be probed and the data visualized as the result of the port scan. The data could then also be visualized with respect to the TTL of response packet. A new probe need not be initiated to adjust the viewpoint of the data.
 
 .. image:: graphics/scapy-concept.*
    :scale: 80
@@ -92,25 +55,9 @@
 Scapy decodes, it does not interpret
 ------------------------------------
 
-A common problem with network probing tools is they try to interpret the answers
-received instead of only decoding and giving facts. Reporting something like 
-**Received a TCP Reset on port 80** is not subject to interpretation errors. 
-Reporting **Port 80 is closed** is an interpretation that may be right most 
-of the time but wrong in some specific contexts the tool's author did not 
-imagine. For instance, some scanners tend to report a filtered TCP port when 
-they receive an ICMP destination unreachable packet. This may be right, but in 
-some cases, it means the packet was not filtered by the firewall but rather there
-was no host to forward the packet to.
-
-Interpreting results can help users that don't know what a port scan is but 
-it can also make more harm than good, as it injects bias into the results. What 
-can tend to happen is that so that they can do the interpretation themselves, 
-knowledgeable users will try to reverse engineer the tool's interpretation to 
-derive the facts that triggered that interpretation. Unfortunately, much 
-information is lost in this operation.
-
-
+A common problem with network probing tools is they try to interpret the answers received instead of only decoding and giving facts. Reporting something like **Received a TCP Reset on port 80** is not subject to interpretation errors. Reporting **Port 80 is closed** is an interpretation that may be right most of the time but wrong in some specific contexts the tool's author did not imagine. For instance, some scanners tend to report a filtered TCP port when they receive an ICMP destination unreachable packet. This may be right, but in some cases, it means the packet was not filtered by the firewall but rather there was no host to forward the packet to.
 
+Interpreting results can help users that don't know what a port scan is but it can also make more harm than good, as it injects bias into the results. What can tend to happen is that so that they can do the interpretation themselves, knowledgeable users will try to reverse engineer the tool's interpretation to derive the facts that triggered that interpretation. Unfortunately, much information is lost in this operation.
 
 Quick demo
 ==========
@@ -118,7 +65,7 @@
 .. image:: graphics/animations/animation-scapy-demo.svg
    :align: center
 
-First, we play a bit and create four IP packets at once. Let's see how it works. We first instantiate the IP class. Then, we instantiate it again and we provide a destination that is worth four IP addresses (/30 gives the netmask). Using a Python idiom, we develop this implicit packet in a set of explicit packets. Then, we quit the interpreter. As we provided a session file, the variables we were working on are saved, then reloaded:: 
+First, we play a bit and create four IP packets at once. Let's see how it works. We first instantiate the IP class. Then, we instantiate it again and we provide a destination that is worth four IP addresses (/30 gives the netmask). Using a Python idiom, we develop this implicit packet in a set of explicit packets. Then, we quit the interpreter. As we provided a session file, the variables we were working on are saved, then reloaded::
 
     # ./run_scapy -s mysession
     New session [mysession]
@@ -130,12 +77,12 @@
     >>> ip
     <IP dst=<Net www.target.com/30> |>
     >>> [p for p in ip]
-    [<IP dst=207.171.175.28 |>, <IP dst=207.171.175.29 |>, 
+    [<IP dst=207.171.175.28 |>, <IP dst=207.171.175.29 |>,
      <IP dst=207.171.175.30 |>, <IP dst=207.171.175.31 |>]
     >>> ^D
-    
+
 ::
-    
+
     # ./run_scapy -s mysession
     Using session [mysession]
     Welcome to Scapy (2.4.0)
@@ -153,36 +100,33 @@
     '172.16.1.40'
     >>> a.ttl
     64
-    
-Let's say I want a broadcast MAC address, and IP payload to ketchup.com 
-and to mayo.com, TTL value from 1 to 9, and an UDP payload::
- 
+
+Let's say I want a broadcast MAC address, and IP payload to ketchup.com and to mayo.com, TTL value from 1 to 9, and an UDP payload::
+
     >>> Ether(dst="ff:ff:ff:ff:ff:ff")
-          /IP(dst=["ketchup.com","mayo.com"],ttl=(1,9)) 
-          /UDP() 
+          /IP(dst=["ketchup.com","mayo.com"],ttl=(1,9))
+          /UDP()
 
-We have 18 packets defined in 1 line (1 implicit packet) 
+We have 18 packets defined in 1 line (1 implicit packet)
 
 Sensible default values
 -----------------------
 
-Scapy tries to use sensible default values for all packet fields.
-If not overridden,
+Scapy tries to use sensible default values for all packet fields. If not overridden,
 
-* IP source is chosen according to destination and routing table 
-* Checksum is computed 
-* Source MAC is chosen according to the output interface 
-* Ethernet type and IP protocol are determined by the upper layer 
+* IP source is chosen according to destination and routing table
+* Checksum is computed
+* Source MAC is chosen according to the output interface
+* Ethernet type and IP protocol are determined by the upper layer
 
 .. image:: graphics/default-values-ip.png
    :scale: 60
 
-Other fields’ default values are chosen to be the most useful ones: 
-
-* TCP source port is 20, destination port is 80. 
-* UDP source and destination ports are 53. 
-* ICMP type is echo request. 
+Other fields’ default values are chosen to be the most useful ones:
 
+* TCP source port is 20, destination port is 80.
+* UDP source and destination ports are 53.
+* ICMP type is echo request.
 
 Learning Python
 ===============
@@ -190,5 +134,4 @@
 Scapy uses the Python interpreter as a command board. That means that you can directly use the Python language (assign variables, use loops, define functions, etc.)
 
 If you are new to Python and you really don't understand a word because of that, or if you want to learn this language, take an hour to read the very good `Python tutorial <http://docs.python.org/tutorial/>`_  by Guido Van Rossum. After that, you'll know Python :) (really!). For a more in-depth tutorial `Dive Into Python <http://getpython3.com/diveintopython3/index.html>`_ is a very good start too.
-

scapy-2.4.3.tar.gz/doc/scapy/layers/automotive.rst -> scapy-2.4.4.tar.gz/doc/scapy/layers/automotive.rst Changed

@@ -1,13 +1,16 @@
-*****************************************
-Automotive Penetration Testing with Scapy
-*****************************************
+**********
+Automotive
+**********
+
+Overview
+========
 
 .. note::
     All automotive related features work best on Linux systems. CANSockets and ISOTPSockets in Scapy are based on Linux kernel modules.
     The python-can project is used to support CAN and CANSockets on other systems, besides Linux.
     This guide explains the hardware setup on a BeagleBone Black. The BeagleBone Black was chosen because of its two CAN interfaces on the main processor.
     The presence of two CAN interfaces in one device gives the possibility of CAN MITM attacks and session hijacking.
-    The Cannelloni framework turns a BeagleBone Black into a CAN-to-UDP interface, which gives you the freedom to run Scapy
+    The Cannelloni framework turns a single board computer into a CAN-to-UDP interface, which gives you the freedom to run Scapy
     on a more powerful machine.
 
 Protocols
@@ -21,9 +24,9 @@
 +---------------------+----------------------+--------------------------------------------------------+
 | OSI Layer           | Protocol             | Scapy Implementations                                  |
 +=====================+======================+========================================================+
-| Application Layer   | UDS (ISO 14229)      | UDS, UDS_*                                             |
+| Application Layer   | UDS (ISO 14229)      | UDS, UDS_*, UDS_TesterPresentSender                    |
 |                     +----------------------+--------------------------------------------------------+
-|                     | GMLAN                | GMLAN, GMLAN_*                                         |
+|                     | GMLAN                | GMLAN, GMLAN_*, GMLAN_TesterPresentSender              |
 |                     +----------------------+--------------------------------------------------------+
 |                     | SOME/IP              | SOMEIP, SD                                             |
 |                     +----------------------+--------------------------------------------------------+
@@ -33,31 +36,36 @@
 |                     +----------------------+--------------------------------------------------------+
 |                     | CCP                  | CCP, DTO, CRO                                          |
 +---------------------+----------------------+--------------------------------------------------------+
-| Transportaion Layer | ISO-TP (ISO 15765-2) | ISOTPSocket, ISOTPNativeSocket, ISOTPSoftSocket        |
+| Transportation Layer| ISO-TP (ISO 15765-2) | ISOTPSocket, ISOTPNativeSocket, ISOTPSoftSocket        |
 |                     |                      |                                                        |
-|                     |                      | ISOTPSniffer, ISOTPMessageBuilder                      |
+|                     |                      | ISOTPSniffer, ISOTPMessageBuilder, ISOTPSession        |
 |                     |                      |                                                        |
-|                     |                      | ISOTPHeader, ISOTPHeaderEA,                            |
+|                     |                      | ISOTPHeader, ISOTPHeaderEA, ISOTPScan                  |
 |                     |                      |                                                        |
 |                     |                      | ISOTP, ISOTP_SF, ISOTP_FF, ISOTP_CF, ISOTP_FC          |
 +---------------------+----------------------+--------------------------------------------------------+
-| Data Link Layer     | CAN (ISO 11898)      | CAN, CANSocket, rdcandump                              |
+| Data Link Layer     | CAN (ISO 11898)      | CAN, CANSocket, rdcandump, CandumpReader               |
 +---------------------+----------------------+--------------------------------------------------------+
 
 
-Hands-On
-^^^^^^^^
+CAN Layer
+=========
+
+How-To
+--------
 
-Send a message over Linux SocketCAN::
+Send and receive a message over Linux SocketCAN::
 
    load_layer('can')
    load_contrib('cansocket')
-   socket = CANSocket(iface='can0')
+
+   socket = CANSocket(channel='can0')
    packet = CAN(identifier=0x123, data=b'01020304')
 
-   socket.sr1(packet, timeout=1)
+   socket.send(packet)
+   rx_packet = socket.recv()
 
-   srcan(packet, 'can0', timeout=1)
+   socket.sr1(packet, timeout=1)
 
 Send a message over a Vector CAN-Interface::
 
@@ -66,48 +74,45 @@
    conf.contribs['CANSocket'] = {'use-python-can' : True}
    load_contrib('cansocket')
    from can.interfaces.vector import VectorBus
-   socket = CANSocket(iface=VectorBus(0, bitrate=1000000))
+
+   socket = CANSocket(channel=VectorBus(0, bitrate=1000000))
    packet = CAN(identifier=0x123, data=b'01020304')
+
+   socket.send(packet)
+   rx_packet = socket.recv()
+
    socket.sr1(packet)
 
-   srcan(packet, VectorBus(0, bitrate=1000000))
 
-System compatibilities
-----------------------
 
-Dependent on your setup, different implementations have to be used.
+Tutorials
+---------
 
-+---------------------+----------------------+-------------------------------------+----------------------------------------------------------+
-| Python \ OS         | Linux with can_isotp | Linux wo can_isotp                  | Windows / OSX                                            |
-+=====================+======================+=====================================+==========================================================+
-| Python 3            | ISOTPNativeSocket    | ISOTPSoftSocket                     | ISOTPSoftSocket                                          |
-|                     +----------------------+-------------------------------------+                                                          |
-|                     | ``conf.contribs['CANSocket'] = {'use-python-can': False}`` | ``conf.contribs['CANSocket'] = {'use-python-can': True}``|
-+---------------------+------------------------------------------------------------+----------------------------------------------------------+
-| Python 2            | ISOTPSoftSocket                                            | ISOTPSoftSocket                                          |
-|                     |                                                            |                                                          |
-|                     | ``conf.contribs['CANSocket'] = {'use-python-can': True}``  | ``conf.contribs['CANSocket'] = {'use-python-can': True}``|
-+---------------------+------------------------------------------------------------+----------------------------------------------------------+
+Linux SocketCAN
+^^^^^^^^^^^^^^^
 
-The class ``ISOTPSocket`` can be set to a ``ISOTPNativeSocket`` or a ``ISOTPSoftSocket``.
-The decision is made dependent on the configuration ``conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': True}`` (to select ``ISOTPNativeSocket``) or
-``conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': False}`` (to select ``ISOTPSoftSocket``).
-This will allow you to write platform independent code. Apply this configuration before loading the ISOTP layer
-with ``load_contrib("isotp")``.
+This subsection summarizes some basics about Linux SocketCAN. An excellent overview
+from Oliver Hartkopp can be found here: https://wiki.automotivelinux.org/_media/agl-distro/agl2017-socketcan-print.pdf
 
-Another remark in respect to ISOTPSocket compatibility. Always use with for socket creation. Example::
+Virtual CAN Setup
+^^^^^^^^^^^^^^^^^
 
-    with ISOTPSocket("vcan0", did=0x241, sid=0x641) as sock:
-        sock.send(...)
+Linux SocketCAN supports virtual CAN interfaces. These interfaces are an easy way
+to do some first steps on a CAN-Bus without the requirement of special hardware.
+Besides that, virtual CAN interfaces are heavily used in Scapy unit test for automotive
+related contributions.
 
+Virtual CAN sockets require a special Linux kernel module. The following shell command loads the required module::
 
-CAN Layer
----------
+    sudo modprobe vcan
+
+In order to use a virtual CAN interface some additional commands for setup are required.
+This snippet chooses the name ``vcan0`` for the virtual CAN interface. Any name can be chosen here::
 
-Setup
-^^^^^
+    sudo ip link add name vcan0 type vcan
+    sudo ip link set dev vcan0 up
 
-These commands enable a virtual CAN interface on a Linux machine::
+The same commands can be executed from Scapy like this::
 
    from scapy.layers.can import *
    import os
@@ -115,39 +120,89 @@
    bashCommand = "/bin/bash -c 'sudo modprobe vcan; sudo ip link add name vcan0 type vcan; sudo ip link set dev vcan0 up'"
    os.system(bashCommand)
 
-If it's required, the CAN interface can be set into a ``listen-only`` or ``loopback`` mode with `ip link set` commands::
+If it's required, a CAN interface can be set into a ``listen-only`` or ``loopback`` mode with ``ip link set`` commands::
 
    ip link set vcan0 type can help  # shows additional information
 
 
-This example shows a basic functions of Linux can-utils. These utilities are handy for
-quick checks or logging.
+Linux can-utils
+^^^^^^^^^^^^^^^
+
+As part of Linux SocketCAN, some very useful commandline tools are provided from Oliver Hartkopp: https://github.com/linux-can/can-utils
+
+The following example shows basic functions of Linux can-utils. These utilities are very handy for
+quick checks, dumping, sending or logging of CAN messages from the command line.
 
 .. image:: ../graphics/animations/animation-cansend.svg
 
 CAN Frame
 ^^^^^^^^^
 
-Creating a standard CAN frame::
+Basic information about CAN can be found here: https://en.wikipedia.org/wiki/CAN_bus
+
+The following examples assume that CAN layer in your Scapy session is loaded. If it isn't,
+the CAN layer can be loaded with this command in your Scapy session::
 
-   frame = CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    >>> load_layer("can")
 
-Creating an extended CAN frame::
+Creation of a standard CAN frame::
+
+    >>> frame = CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+
+Creation of an extended CAN frame::
 
    frame = CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+   >>> frame.show()
+   ###[ CAN ]###
+     flags= extended
+     identifier= 0x10010000
+     length= 8
+     reserved= 0
+     data= '\x01\x02\x03\x04\x05\x06\x07\x08'
+
 
 .. image:: ../graphics/animations/animation-scapy-canframe.svg
 
-Writing and reading to pcap files::
+CAN Frame in- and export
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+CAN Frames can be written to and read from ``pcap`` files::
 
    x = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
    wrpcap('/tmp/scapyPcapTest.pcap', x, append=False)
    y = rdpcap('/tmp/scapyPcapTest.pcap', 1)
 
 .. image:: ../graphics/animations/animation-scapy-rdpcap.svg
+
+Additionally CAN Frames can be imported from ``candump`` output and log files.
+The ``CandumpReader`` class can be used in the same way as a ``socket`` object.
+This allows you to use ``sniff`` and other functions from Scapy::
+
+    with CandumpReader("candump.log") as sock:
+        can_msgs = sniff(count=50, opened_socket=sock)
+
 .. image:: ../graphics/animations/animation-scapy-rdcandump.svg
 
-CANSocket native
+Scapy CANSocket
+^^^^^^^^^^^^^^^
+
+In Scapy, two kind of CANSockets are implemented. One implementation is called **Native CANSocket**,
+the other implementation is called **Python-can CANSocket**.
+
+Since Python 3 supports ``PF_CAN`` sockets, **Native CANSockets** can be used on a
+Linux based system with Python 3 or higher. These sockets have a performance advantage
+because ``select`` is callable on them. This has a big effect in MITM scenarios.
+
+For compatibility reasons, **Python-can CANSockets** were added to Scapy.
+On Windows or OSX and on all systems without Python 3, CAN buses can be accessed
+through ``python-can``. ``python-can`` needs to be installed on the system: https://github.com/hardbyte/python-can/
+**Python-can CANSockets** are a wrapper of python-can interface objects for Scapy.
+Both CANSockets provide the same API which makes them exchangeable under most conditions.
+Nevertheless some unique behaviours of each CANSocket type has to be respected.
+Some CAN-interfaces, like Vector hardware is only supported on Windows.
+These interfaces can be used through **Python-can CANSockets**.
+
+Native CANSocket
 ^^^^^^^^^^^^^^^^
 
 Creating a simple native CANSocket::
@@ -193,35 +248,27 @@
 
 python-can is required to use various CAN-interfaces on Windows, OSX or Linux.
 The python-can library is used through a CANSocket object. To create a python-can
-CANSocket object, a python-can ``Bus`` object has to be used as interface.
-The ``timeout`` parameter can be used to increase the receive performance of a
-python-can CANSocket object. ``recv`` inside a python-can CANSocket object is
-implemented through busy wait, since there is no ``select`` functionality on
-Windows or on some proprietary CAN interfaces (like Vector interfaces). A small
-``timeout`` might be required, if a ``sniff`` or ``bridge_and_sniff`` on multiple
-interfaces is performed.
+CANSocket object, all parameters of a python-can ``interface.Bus`` object has to 
+be used for the initialization of the CANSocket.
 
 Ways of creating a python-can CANSocket::
 
    conf.contribs['CANSocket'] = {'use-python-can': True}
    load_contrib('cansocket')
-   import can
 
 Creating a simple python-can CANSocket::
 
-   socket = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
+   socket = CANSocket(bustype='socketcan', channel='vcan0', bitrate=250000)
 
 Creating a python-can CANSocket with multiple filters::
 
-   socket = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000,
+   socket = CANSocket(bustype='socketcan', channel='vcan0', bitrate=250000,
                    can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff},
                                {'can_id': 0x400, 'can_mask': 0x7ff},
                                {'can_id': 0x600, 'can_mask': 0x7ff},
-                               {'can_id': 0x7ff, 'can_mask': 0x7ff}]))
+                               {'can_id': 0x7ff, 'can_mask': 0x7ff}])
 
-.. image:: ../graphics/animations/animation-scapy-python-can-cansocket.svg
-
-For further details on python-can check: https://python-can.readthedocs.io/en/2.2.0/
+For further details on python-can check: https://python-can.readthedocs.io/
 
 CANSocket MITM attack with bridge and sniff
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -292,7 +339,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In order to support the DBC file format, ``SignalFields`` and the ``SignalPacket``
-class were added to Scapy. ``SignalFields`` should only be used inside a ``SignalPacket``.
+classes were added to Scapy. ``SignalFields`` should only be used inside a ``SignalPacket``.
 Multiplexer fields (MUX) can be created through ``ConditionalFields``. The following
 example demonstrates the usage::
 
@@ -314,9 +361,9 @@
      SG_ floatSignal2 : 32|32@1- (1,0) [0|0] ""  CCL_TEST
      SG_ floatSignal1 : 7|32@0- (1,0) [0|0] ""  CCL_TEST
 
-Scapy implementation of this DBC descriptions::
+Scapy implementation of this DBC description::
 
-   class muxTestFrame(SignalPacket):
+    class muxTestFrame(SignalPacket):
         fields_desc = [
             LEUnsignedSignalField("myMuxer", default=0, start=53, size=3),
             ConditionalField(LESignedSignalField("muxSig4", default=0, start=25, size=7), lambda p: p.myMuxer == 0),
@@ -330,17 +377,31 @@
             LESignedSignalField("muxSig9", default=0, start=41, size=7, scaling=100, offset=-5, unit="V"),
         ]
 
-   class testFrameFloat(SignalPacket):
+    class testFrameFloat(SignalPacket):
         fields_desc = [
             LEFloatSignalField("floatSignal2", default=0, start=32),
             BEFloatSignalField("floatSignal1", default=0, start=7)
         ]
 
+    bind_layers(SignalHeader, muxTestFrame, identifier=0x123)
+    bind_layers(SignalHeader, testFrameFloat, identifier=0x321)
+
+    dbc_sock = CANSocket("can0", basecls=SignalHeader)
 
+    pkt = SignalHeader()/testFrameFloat(floatSignal2=3.4)
+
+    dbc_sock.send(pkt)
+
+This example uses the class ``SignalHeader`` as header. The payload is specified by individual ``SignalPackets``.
+``bind_layers`` combines the header with the payload dependent on the CAN identifier.
+If you want to directly receive ``SignalPackets`` from your ``CANSocket``, provide the parameter ``basecls`` to
+the ``init`` function of your ``CANSocket``.
+
+Canmatrix supports the creation of Scapy files from DBC or AUTOSAR XML files https://github.com/ebroecker/canmatrix
 
 
 CAN Calibration Protocol (CCP)
-------------------------------
+==============================
 
 CCP is derived from CAN. The CAN-header is part of a CCP frame. CCP has two types
 of message objects. One is called Command Receive Object (CRO), the other is called
@@ -387,10 +448,40 @@
 command of our CRO object.
 
 ISOTP
------
+=====
+
+System compatibilities
+----------------------
+
+Dependent on your setup, different implementations have to be used.
+
++---------------------+----------------------+-------------------------------------+----------------------------------------------------------+
+| Python \ OS         | Linux with can_isotp | Linux wo can_isotp                  | Windows / OSX                                            |
++=====================+======================+=====================================+==========================================================+
+| Python 3            | ISOTPNativeSocket    | ISOTPSoftSocket                     | ISOTPSoftSocket                                          |
+|                     +----------------------+-------------------------------------+                                                          |
+|                     | ``conf.contribs['CANSocket'] = {'use-python-can': False}`` | ``conf.contribs['CANSocket'] = {'use-python-can': True}``|
++---------------------+------------------------------------------------------------+----------------------------------------------------------+
+| Python 2            | ISOTPSoftSocket                                                                                                       |
+|                     |                                                                                                                       |
+|                     | ``conf.contribs['CANSocket'] = {'use-python-can': True}``                                                             |
++---------------------+------------------------------------------------------------+----------------------------------------------------------+
+
+The class ``ISOTPSocket`` can be set to a ``ISOTPNativeSocket`` or a ``ISOTPSoftSocket``.
+The decision is made dependent on the configuration ``conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': True}`` (to select ``ISOTPNativeSocket``) or
+``conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': False}`` (to select ``ISOTPSoftSocket``).
+This will allow you to write platform independent code. Apply this configuration before loading the ISOTP layer
+with ``load_contrib("isotp")``.
+
+Another remark in respect to ISOTPSocket compatibility. Always use with for socket creation. Example::
+
+    with ISOTPSocket("vcan0", did=0x241, sid=0x641) as sock:
+        sock.send(...)
+
+
 
 ISOTP message
-^^^^^^^^^^^^^
+-------------
 
 Creating an ISOTP message::
 
@@ -421,7 +512,7 @@
    packets = isoTpSocket.sniff(timeout=0.5)
 
 ISOTP MITM attack with bridge and sniff
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+---------------------------------------
 
 Set up two vcans on Linux terminal::
 
@@ -431,11 +522,9 @@
    sudo ip link set dev vcan0 up
    sudo ip link set dev vcan1 up
 
-Set up ISOTP::
+Set up ISOTP:
 
-.. note::
-
-    First make sure you build an iso-tp kernel module.
+First make sure you installed an iso-tp kernel module.
 
 When the vcan core module is loaded with "sudo modprobe vcan" the iso-tp module can be loaded to the kernel.
 
@@ -498,7 +587,7 @@
 An ISOTPSocket will not respect ``src, dst, exdst, exsrc`` of an ISOTP message object.
 
 ISOTP Sockets
--------------
+=============
 
 Scapy provides two kinds of ISOTP Sockets. One implementation, the ISOTPNativeSocket
 is using the Linux kernel module from Hartkopp. The other implementation, the ISOTPSoftSocket
@@ -506,7 +595,7 @@
 Windows, and OSX.
 
 ISOTPNativeSocket
-^^^^^^^^^^^^^^^^^
+-----------------
 
 **Requires:**
 
@@ -514,7 +603,7 @@
 * Linux
 * Hartkopp's Linux kernel module: ``https://github.com/hartkopp/can-isotp.git``
 
-During pentests, the ISOTPNativeSockets do have a better performance and
+During pentests, the ISOTPNativeSockets has a better performance and
 reliability, usually. If you are working on Linux, consider this implementation::
 
    conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': True}
@@ -525,7 +614,7 @@
 like ``sniff, sr, sr1, bridge_and_sniff`` work out of the box.
 
 ISOTPSoftSocket
-^^^^^^^^^^^^^^^
+---------------
 
 ISOTPSoftSockets can use any CANSocket. This gives the flexibility to use all
 python-can interfaces. Additionally, these sockets work on Python2 and Python3.
@@ -551,8 +640,78 @@
 Pythons ``with`` statement.
 
 
+ISOTPScan and ISOTPScanner
+--------------------------
+
+ISOTPScan is a utility function to find ISOTP-Endpoints on a CAN-Bus.
+ISOTPScanner is a commandline-utility for the identical function.
+
+.. image:: ../graphics/animations/animation-scapy-isotpscan.svg
+
+Commandline usage example::
+
+    python -m scapy.tools.automotive.isotpscanner -h
+    usage:	isotpscanner [-i interface] [-c channel] [-b bitrate]
+                    [-n NOISE_LISTEN_TIME] [-t SNIFF_TIME] [-x|--extended]
+                    [-C|--piso] [-v|--verbose] [-h|--help] [-s start] [-e end]
+
+        Scan for open ISOTP-Sockets.
+
+        required arguments:
+        -c, --channel         python-can channel or Linux SocketCAN interface name
+        -s, --start           Start scan at this identifier (hex)
+        -e, --end             End scan at this identifier (hex)
+
+        additional required arguments for WINDOWS or Python 2:
+        -i, --interface       python-can interface for the scan.
+                              Depends on used interpreter and system,
+                              see examples below. Any python-can interface can
+                              be provided. Please see:
+                              https://python-can.readthedocs.io for
+                              further interface examples.
+        -b, --bitrate         python-can bitrate.
+
+        optional arguments:
+        -h, --help            show this help message and exit
+        -n NOISE_LISTEN_TIME, --noise_listen_time NOISE_LISTEN_TIME
+                              Seconds listening for noise before scan.
+        -t SNIFF_TIME, --sniff_time SNIFF_TIME
+                              Duration in milliseconds a sniff is waiting for a
+                              flow-control response.
+        -x, --extended        Scan with ISOTP extended addressing.
+        -C, --piso            Print 'Copy&Paste'-ready ISOTPSockets.
+        -v, --verbose         Display information during scan.
+
+        Example of use:
+
+        Python2 or Windows:
+        python2 -m scapy.tools.automotive.isotpscanner --interface=pcan --channel=PCAN_USBBUS1 --bitrate=250000 --start 0 --end 100
+        python2 -m scapy.tools.automotive.isotpscanner --interface vector --channel 0 --bitrate 250000 --start 0 --end 100
+        python2 -m scapy.tools.automotive.isotpscanner --interface socketcan --channel=can0 --bitrate=250000 --start 0 --end 100
+
+        Python3 on Linux:
+        python3 -m scapy.tools.automotive.isotpscanner --channel can0 --start 0 --end 100
+
+
+Interactive shell usage example::
+
+    >>> conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': True}
+    >>> conf.contribs['CANSocket'] = {'use-python-can': False}
+    >>> load_contrib('cansocket')
+    >>> load_contrib('isotp')
+    >>> socks = ISOTPScan(CANSocket("vcan0"), range(0x700, 0x7ff), can_interface="vcan0")
+    >>> socks
+    [<<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98e27c8210>,
+     <<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98f9079cd0>,
+     <<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98f90cd490>,
+     <<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98f912ec50>,
+     <<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98f912e950>,
+     <<ISOTPNativeSocket: read/write packets at a given CAN interface using CAN_ISOTP socket > at 0x7f98f906c0d0>]
+
+
+
 UDS
----
+===
 
 The main usage of UDS is flashing and diagnostic of an ECU. UDS is an
 application layer protocol and can be used as a DoIP or ENET payload or a UDS packet
@@ -570,9 +729,9 @@
 
 
 Customization of UDS_RDBI, UDS_WDBI
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------------------
 
-In real-world use-cases, the UDS layer is heavily customized. OEMs define there own substructure of packets.
+In real-world use-cases, the UDS layer is heavily customized. OEMs define their own substructure of packets.
 Especially the packets ReadDataByIdentifier or WriteDataByIdentifier have a very OEM or even ECU specific
 substructure. Therefore a ``StrField`` ``dataRecord`` is not added to the ``field_desc``.
 The intended usage is to create ECU or OEM specific description files, which extend the general UDS layer of
@@ -634,7 +793,7 @@
 .. image:: ../graphics/animations/animation-scapy-uds3.svg
 
 GMLAN
------
+=====
 GMLAN is very similar to UDS. It's GMs application layer protocol for
 flashing, calibration and diagnostic of their cars.
 Use the argument ``basecls=GMLAN`` on the ``init`` function of an ISOTPSocket.
@@ -644,11 +803,97 @@
 .. image:: ../graphics/animations/animation-scapy-gmlan.svg
 
 
+ECU Utility examples
+====================
+
+The ECU utility can be used to analyze the internal states of an ECU under investigation.
+This utility depends heavily on the support of the used protocol. ``UDS`` is supported.
+
+Log all commands applied to an ECU
+----------------------------------
+
+This example shows the logging mechanism of an ECU object. The log of an ECU is a dictionary of applied UDS commands. The key for this dictionary is the UDS service name. The value consists of a list of tuples, containing a timestamp and a log value
+
+Usage example::
+
+    ecu = ECU(verbose=False, store_supported_responses=False)
+    ecu.update(PacketList(msgs))
+    print(ecu.log)
+    timestamp, value = ecu.log["DiagnosticSessionControl"][0]
+
+
+
+Trace all commands applied to an ECU
+------------------------------------
+
+This example shows the trace mechanism of an ECU object. Traces of the current state of the ECU object and the received message are printed on stdout. Some messages, depending on the protocol, will change the internal state of the ECU.
+
+Usage example::
+
+    ecu = ECU(verbose=True, logging=False, store_supported_responses=False)
+    ecu.update(PacketList(msgs))
+    print(ecu.current_session)
+
+
+
+Generate supported responses of an ECU
+--------------------------------------
+
+This example shows a mechanism to clone a real world ECU by analyzing a list of Packets.
+
+Usage example::
+
+    ecu = ECU(verbose=False, logging=False, store_supported_responses=True)
+    ecu.update(PacketList(msgs))
+    supported_responses = ecu.supported_responses
+    unanswered_packets = ecu.unanswered_packets
+    print(supported_responses)
+    print(unanswered_packets)
+
+
+
+Analyze multiple UDS messages
+-----------------------------
+
+This example shows how to load ``UDS`` messages from a ``.pcap`` file containing ``CAN`` messages. A ``PcapReader`` object is used as socket and an ``ISOTPSession`` parses ``CAN`` frames to ``ISOTP`` frames which are then casted to ``UDS`` objects through the ``basecls`` parameter
+
+Usage example::
+
+    with PcapReader("test/contrib/automotive/ecu_trace.pcap") as sock:
+        udsmsgs = sniff(session=ISOTPSession, session_kwargs={"use_ext_addr":False, "basecls":UDS}, count=50, opened_socket=sock)
+
+
+    ecu = ECU()
+    ecu.update(udsmsgs)
+    print(ecu.log)
+    print(ecu.supported_responses)
+    assert len(ecu.log["TransferData"]) == 2
+
+
+
+Analyze on the fly with ECUSession
+----------------------------------
+
+This example shows the usage of an ECUSession in sniff. An ISOTPSocket or any socket like object which returns entire messages of the right protocol can be used. An ``ECUSession`` is used as supersession in an ``ISOTPSession``. To obtain the ``ECU`` object from an ``ECUSession``, the ``ECUSession`` has to be created outside of sniff.
+
+Usage example::
+
+    session = ECUSession()
+
+    with PcapReader("test/contrib/automotive/ecu_trace.pcap") as sock:
+        udsmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "use_ext_addr":False, "basecls":UDS}, count=50, opened_socket=sock)
+
+    ecu = session.ecu
+    print(ecu.log)
+    print(ecu.supported_responses)
+
+
+
 SOME/IP and SOME/IP SD messages
--------------------------------
+===============================
 
 Creating a SOME/IP message
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+--------------------------
 
 This example shows a SOME/IP message which requests a service 0x1234 with the method 0x421. Different types of SOME/IP messages follow the same procedure and their specifications can be seen here ``http://www.some-ip.com/papers/cache/AUTOSAR_TR_SomeIpExample_4.2.1.pdf``.
 
@@ -672,8 +917,8 @@
    sip.proto_ver = 1
    sip.msg_type = "REQUEST"
    sip.retcode = "E_OK"
-   sip.msg_id.srv_id = 0x1234
-   sip.msg_id.method_id = 0x421
+   sip.srv_id = 0x1234
+   sip.method_id = 0x421
 
 Add the payload::
 
@@ -686,13 +931,13 @@
 
 
 Creating a SOME/IP SD message
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------------
 
 In this example a SOME/IP SD offer service message is shown with an IPv4 endpoint. Different entries and options basically follow the same procedure as shown here and can be seen at ``https://www.autosar.org/fileadmin/user_upload/standards/classic/4-3/AUTOSAR_SWS_ServiceDiscovery.pdf``.
 
 Load the contribution::
 
-   load_contrib("automotive.someip_sd")
+   load_contrib("automotive.someip")
 
 Create UDP package::
 
@@ -730,22 +975,20 @@
    sd = SD()
    sd.set_entryArray(ea)
    sd.set_optionArray(oa)
-   spsd = sd.get_someip(True)
-
-The get_someip method stacks the SOMEIP/SD message on top of a SOME/IP message, which has the desired SOME/IP values prefilled for the SOME/IP SD package transmission.
 
 Stack it and send it::
 
-   p = i/u/spsd
+   p = i/u/sd
    send(p)
 
 
-
+OBD
+===
 
 OBD message
--------------
+-----------
 
-OBD is implemented on top of ISOTP. Use an ISOTPSocket for the communication with a ECU. 
+OBD is implemented on top of ISOTP. Use an ISOTPSocket for the communication with an ECU. 
 You should set the parameters ``basecls=OBD`` and ``padding=True`` in your ISOTPSocket init call.
 
 OBD is split into different service groups. Here are some example requests:
@@ -788,9 +1031,9 @@
 Service 03, 07 and 0A support Diagnostic Trouble codes (dtc).
 Service 04 doesn't require a payload.
 Service 05 is not implemented on OBD over CAN.
-Service 06 support Monitoring Identifiers (mid).
-Service 08 support Test Identifiers (tid).
-Service 09 support Information Identifiers (iid).
+Service 06 supports Monitoring Identifiers (mid).
+Service 08 supports Test Identifiers (tid).
+Service 09 supports Information Identifiers (iid).
 
 Examples:
 ^^^^^^^^^
@@ -819,13 +1062,13 @@
 
 
 Test-Setup Tutorials
---------------------
+====================
 
 Hardware Setup
-^^^^^^^^^^^^^^
+--------------
 
 Beagle Bone Black Operating System Setup
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. | **Download an Image**
    | The latest Debian Linux image can be found at the website
@@ -883,7 +1126,7 @@
 
 
 Dual-CAN Setup
-~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^
 
 #. | **Device tree setup**
    | You'll need to follow this section only if you want to use two CAN
@@ -1050,7 +1293,7 @@
 
 
 ISO-TP Kernel Module Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---------------------------------
 
 A Linux ISO-TP kernel module can be downloaded from this website:
 ``https://github.com/hartkopp/can-isotp.git``. The file
@@ -1060,7 +1303,7 @@
 to load this module automatically at system boot of the BBB.
 
 CAN-Interface Setup
-~~~~~~~~~~~~~~~~~~~
+-------------------
 
 As the final step to prepare the BBB's CAN interfaces for usage, these
 interfaces have to be set up through some terminal commands. The bitrate
@@ -1072,7 +1315,7 @@
     ip link set can1 up type can bitrate 500000
 
 Raspberry Pi SOME/IP setup
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------
 
 To build a small test environment in which you can send SOME/IP messages to and from server instances or disguise yourself as a server, one Raspberry Pi, your laptop and the vsomeip library are sufficient.
 
@@ -1105,10 +1348,10 @@
 
 
 Software Setup
-^^^^^^^^^^^^^^
+--------------
 
 Cannelloni Framework Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The Cannelloni framework is a small application written in C++ to
 transfer CAN data over UDP. In this way, a researcher can map the CAN

scapy-2.4.3.tar.gz/doc/scapy/layers/bluetooth.rst -> scapy-2.4.4.tar.gz/doc/scapy/layers/bluetooth.rst Changed

scapy-2.4.3.tar.gz/doc/scapy/layers/http.rst -> scapy-2.4.4.tar.gz/doc/scapy/layers/http.rst Changed

scapy-2.4.4.tar.gz/doc/scapy/layers/netflow.rst Added

@@ -0,0 +1,99 @@
+Netflow
+=======
+
+Netflow packets mainly comes in 3 versions::
+
+- ``Netflow V5``
+- ``Netflow V7``
+- ``Netflow V9 / V10 (IPfix)``
+
+While the two first versions are pretty straightforward, building or dissecting Netflow v9/v10 isn't easy.
+
+Netflow V1
+----------
+
+.. code::
+
+    netflow = NetflowHeader()/NetflowHeaderV1()/NetflowRecordV1()
+    pkt = Ether()/IP()/UDP()/netflow
+
+Netflow V5
+----------
+
+.. code::
+
+    netflow = NetflowHeader()/NetflowHeaderV5(count=1)/NetflowRecordV5(dst="192.168.0.1")
+    pkt = Ether()/IP()/UDP()/netflow
+
+NetflowV9 / IPfix
+-----------------
+
+Netflow v9 and IPfix use a template based system. This means that records that are sent over the wire require a "Template" to be sent previously in a Flowset packet.
+
+This template is required to understand thr format of the record, therefore needs to be provided when building or dissecting those.
+
+Fortunately, Scapy knows how to detect the templates and will provide dissecting methods that take care of that.
+
+.. note::
+
+    The following examples apply to Netflow V9. When using IPfix, use the exact same format but replace the class names with their V10 counterpart (if they exist ! Scapy shares some classes between the two). Have a look at :mod:`~scapy.layers.netflow`
+
+- **Build**
+
+.. code::
+
+    header = Ether()/IP()/UDP()
+    netflow_header = NetflowHeader()/NetflowHeaderV9()
+
+    # Let's first build the template. Those need an ID > 255
+    flowset = NetflowFlowsetV9(
+        templates=[NetflowTemplateV9(
+            template_fields=[
+                NetflowTemplateFieldV9(fieldType=1, fieldLength=1),  # IN_BYTES
+                NetflowTemplateFieldV9(fieldType=2, fieldLength=4),  # IN_PKTS
+                NetflowTemplateFieldV9(fieldType=4),  # PROTOCOL
+                NetflowTemplateFieldV9(fieldType=8),  # IPV4_SRC_ADDR
+                NetflowTemplateFieldV9(fieldType=12),  # IPV4_DST_ADDR
+            ],
+            templateID=256,
+            fieldCount=5)
+        ],
+        flowSetID=0
+    )
+    # Let's generate the record class. This will be a Packet class
+    # In case you provided several templates in ghe flowset, you will need
+    # to pass the template ID as second parameter
+    recordClass = GetNetflowRecordV9(flowset)
+    # Now lets build the data records
+    dataFS = NetflowDataflowsetV9(
+        templateID=256,
+        records=[ # Some random data.
+            recordClass(
+                IN_BYTES=b"\x12",
+                IN_PKTS=b"\0\0\0\0",
+                PROTOCOL=6,
+                IPV4_SRC_ADDR="192.168.0.10",
+                IPV4_DST_ADDR="192.168.0.11"
+            ),
+            recordClass(
+                IN_BYTES=b"\x0c",
+                IN_PKTS=b"\1\1\1\1",
+                PROTOCOL=3,
+                IPV4_SRC_ADDR="172.0.0.10",
+                IPV4_DST_ADDR="172.0.0.11"
+            )
+        ],
+    )
+    pkt = header / netflow_header / flowset / dataFS
+
+- **Dissection**
+
+Scapy provides two methods to parse NetflowV9/IPFix:
+
+- :class:`~scapy.layers.netflow.NetflowSession`: to use with ``sniff(session=NetflowV9Session, [...])``
+- :func:`~scapy.layers.netflow.netflowv9_defragment`: to use on a packet or list of packets.
+
+With the previous example::
+
+    pkt = Ether(raw(pkt))  # will loose the defragmentation
+    pkt = netflowv9_defragment(pkt)[0]

scapy-2.4.4.tar.gz/doc/scapy/routing.rst Added

@@ -0,0 +1,93 @@
+*************
+Scapy routing
+*************
+
+Scapy needs to know many things related to the network configuration of your machine, to be able to route packets properly. For instance, the interface list, the IPv4 and IPv6 routes...
+
+This means that Scapy has implemented bindings to get this information. Those bindings are OS specific. This will show you how to use it for a different usage.
+
+.. note::
+    Scapy will have OS-specific functions underlying some high level functions. This page ONLY presents the cross platform ones
+
+
+List interfaces
+---------------
+
+Use ``get_if_list()`` to get the interface list
+
+.. code-block:: pycon
+
+    >>> get_if_list()
+    ['lo', 'eth0']
+
+IPv4 routes
+-----------
+
+.. note::
+    If you want to change or edit the routes, have a look at `the "Routing" section in Usage <usage.html#routing>`_
+
+The routes are stores in :py:attr:`conf.route <scapy.route.Route>`. You can use it to display the routes, or get specific routing
+
+.. code-block:: pycon
+
+    >>> conf.route
+
+    Network          Netmask          Gateway   Iface  Output IP  Metric
+    0.0.0.0          0.0.0.0          10.0.0.1  eth0   10.0.0.5   100
+    10.0.0.0         255.255.255.0    0.0.0.0   eth0   10.0.0.5   0
+    127.0.0.0        255.0.0.0        0.0.0.0   lo     127.0.0.1  1
+    168.63.129.16    255.255.255.255  10.0.0.1  eth0   10.0.0.5   100
+    169.254.169.254  255.255.255.255  10.0.0.1  eth0   10.0.0.5   100
+
+Get the route for a specific IP:  :py:func:`conf.route.route() <scapy.route.Route.route>` will return ``(interface, outgoing_ip, gateway)``
+
+.. code-block:: pycon
+
+    >>> conf.route.route("127.0.0.1")
+    ('lo', '127.0.0.1', '0.0.0.0')
+
+IPv6 routes
+-----------
+
+Same than IPv4 but with :py:attr:`conf.route6 <scapy.route6.Route6>`
+
+Get router IP address
+---------------------
+
+.. code-block:: pycon
+
+    >>> gw = conf.route.route("0.0.0.0")[2]
+    >>> gw
+    '10.0.0.1'
+
+Get local IP / IP of an interface
+---------------------------------
+
+Use ``conf.iface``
+
+.. code-block:: pycon
+
+    >>> ip = get_if_addr(conf.iface)  # default interface
+    >>> ip = get_if_addr("eth0")
+    >>> ip
+    '10.0.0.5'
+
+Get local MAC / MAC of an interface
+-----------------------------------
+
+.. code-block:: pycon
+
+    >>> mac = get_if_hwaddr(conf.iface)  # default interface
+    >>> mac = get_if_hwaddr("eth0")
+    >>> mac
+    '54:3f:19:c9:38:6d'
+
+Get MAC by IP
+-------------
+
+.. code-block:: pycon
+
+    >>> mac = getmacbyip("10.0.0.1")
+    >>> mac
+    'f3:ae:5e:76:31:9b'
+

scapy-2.4.4.tar.gz/doc/scapy/sphinx_apidoc_postprocess.py Added

@@ -0,0 +1,55 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Gabriel Potter <gabriel@potter.fr>
+# This program is published under a GPLv2 license
+
+"""
+Scapy's post process of sphinx-api command
+"""
+
+import glob
+import os
+import sys
+
+files = list(glob.iglob('./api/*.rst'))
+parents = set(
+    "%s.rst" % x for x in (
+        f.rsplit('.', 1)[0] for f in (
+            f[:-4] for f in files
+        )
+    ) if x
+)
+
+for f in files:
+    # Post process each file
+    _e = False
+    with open(f) as fd:
+        content = fd.readlines()
+    if f in parents:
+        # Process "parent files", i.e. with subfiles
+        # Remove sub categories (better indexation)
+        for name in ["Subpackages", "Submodules"]:
+            try:
+                sub = content.index(name+"\n")
+            except ValueError:
+                continue
+            del content[sub:sub+3]
+            _e = True
+        # Custom
+        if f.endswith("scapy.rst"):
+            content[0] = "Scapy API reference\n"
+            content[1] = "=" * (len(content[0]) - 1) + "\n"
+            for i, line in enumerate(content):
+                if "toctree" in line:
+                    content[i] = line + "   :titlesonly:\n"
+            _e = True
+    # File / module file
+    for name in ["package", "module"]:
+        if name in content[0]:
+            content[0] = content[0].replace(" " + name, "")
+            content[1] = "=" * (len(content[0]) - 1) + "\n"
+            _e = True
+    if _e:
+        print("Post-processed '%s'" % f)
+        with open(f, "w") as fd:
+            fd.writelines(content)

scapy-2.4.3.tar.gz/doc/scapy/troubleshooting.rst -> scapy-2.4.4.tar.gz/doc/scapy/troubleshooting.rst Changed

@@ -10,12 +10,14 @@
 
 The use monitor mode varies greatly depending on the platform.
 
-- **Windows or *BSD or ``conf.use_pcap = True``**
+- **Windows or *BSD or conf.use_pcap = True**
   ``libpcap`` must be called differently by Scapy in order for it to create the sockets in monitor mode. You will need to pass the ``monitor=True`` to any calls that open a socket (``send``, ``sniff``...) or to a Scapy socket that you create yourself (``conf.L2Socket``...)
 - **Native Linux (with pcap disabled):**
   You should set the interface in monitor mode on your own. Scapy provides utilitary functions: ``set_iface_monitor`` and ``get_iface_mode`` (linux only), that may be used (they do system calls to ``iwconfig`` and will restart the adapter).
 
-Note that many adapters do not support monitor mode, especially on Windows, or may incorrectly report the headers. See `the Wireshark doc about this <https://wiki.wireshark.org/CaptureSetup/WLAN>`_
+**If you are using Npcap:** please note that Npcap ``npcap-0.9983`` broke the 802.11 util back in 2019. It has yet to be fixed (as of Npcap 0.9994) so in the meantime, use `npcap-0.9982.exe <https://nmap.org/npcap/dist/npcap-0.9982.exe>`_
+
+.. note:: many adapters do not support monitor mode, especially on Windows, or may incorrectly report the headers. See `the Wireshark doc about this <https://wiki.wireshark.org/CaptureSetup/WLAN>`_
 
 We make our best to make this work, if your adapter works with Wireshark for instance, but not with Scapy, feel free to report an issue.

scapy-2.4.3.tar.gz/doc/scapy/usage.rst -> scapy-2.4.4.tar.gz/doc/scapy/usage.rst Changed

@@ -48,7 +48,7 @@
 Interactive tutorial
 ====================
 
-This section will show you several of Scapy's features.
+This section will show you several of Scapy's features with Python 2.
 Just open a Scapy session as shown above and try the examples yourself.
 
 
@@ -97,7 +97,7 @@
 .. image:: graphics/fieldsmanagement.png
    :scale: 90
 
-Each packet can be build or dissected (note: in Python ``_`` (underscore) is the latest result)::
+Each packet can be built or dissected (note: in Python ``_`` (underscore) is the latest result)::
 
     >>> raw(IP())
     'E\x00\x00\x14\x00\x01\x00\x00@\x00|\xe7\x7f\x00\x00\x01\x7f\x00\x00\x01'
@@ -277,7 +277,7 @@
 .. index::
    single: sr()
 
-Now, let's try to do some fun things. The sr() function is for sending packets and receiving answers. The function returns a couple of packet and answers, and the unanswered packets. The function sr1() is a variant that only returns one packet that answered the packet (or the packet set) sent. The packets must be layer 3 packets (IP, ARP, etc.). The function srp() do the same for layer 2 packets (Ethernet, 802.3, etc.). If there is, no response a None value will be assigned instead when the timeout is reached.
+Now, let's try to do some fun things. The sr() function is for sending packets and receiving answers. The function returns a couple of packet and answers, and the unanswered packets. The function sr1() is a variant that only returns one packet that answered the packet (or the packet set) sent. The packets must be layer 3 packets (IP, ARP, etc.). The function srp() do the same for layer 2 packets (Ethernet, 802.3, etc.). If there is no response, a None value will be assigned instead when the timeout is reached.
 
 ::
 
@@ -346,7 +346,7 @@
     IP / TCP 192.168.8.14:20 > 192.168.8.1:22 S ==> Ether / IP / TCP 192.168.8.1:22 > 192.168.8.14:20 RA / Padding
     IP / TCP 192.168.8.14:20 > 192.168.8.1:23 S ==> Ether / IP / TCP 192.168.8.1:23 > 192.168.8.14:20 RA / Padding
     
-If there is a limited rate of answers, you can specify a time interval to wait between two packets with the inter parameter. If some packets are lost or if specifying an interval is not enough, you can resend all the unanswered packets, either by calling the function again, directly with the unanswered list, or by specifying a retry parameter. If retry is 3, Scapy will try to resend unanswered packets 3 times. If retry is -3, Scapy will resend unanswered packets until no more answer is given for the same set of unanswered packets 3 times in a row. The timeout parameter specify the time to wait after the last packet has been sent::
+If there is a limited rate of answers, you can specify a time interval (in seconds) to wait between two packets with the inter parameter. If some packets are lost or if specifying an interval is not enough, you can resend all the unanswered packets, either by calling the function again, directly with the unanswered list, or by specifying a retry parameter. If retry is 3, Scapy will try to resend unanswered packets 3 times. If retry is -3, Scapy will resend unanswered packets until no more answer is given for the same set of unanswered packets 3 times in a row. The timeout parameter specify the time to wait after the last packet has been sent::
 
     >>> sr(IP(dst="172.20.29.5/30")/TCP(dport=[21,22,23]),inter=0.5,retry=-2,timeout=1)
     Begin emission:
@@ -403,7 +403,7 @@
 
 The above will display stimulus/response pairs for answered probes. We can display only the information we are interested in by using a simple loop:
 
-    >>> ans.summary( lambda(s,r): r.sprintf("%TCP.sport% \t %TCP.flags%") )
+    >>> ans.summary( lambda s,r: r.sprintf("%TCP.sport% \t %TCP.flags%") )
     440      RA
     441      RA
     442      RA
@@ -417,7 +417,7 @@
     **.*.*..*..................
     Received 362 packets, got 8 answers, remaining 1 packets
     >>> ans.make_table(
-    ...    lambda(s,r): (s.dst, s.dport,
+    ...    lambda s,r: (s.dst, s.dport,
     ...    r.sprintf("{TCP:%TCP.flags%}{ICMP:%IP.src% - %ICMP.type%}")))
         66.35.250.150                192.168.1.1 216.109.112.135 
     22  66.35.250.150 - dest-unreach RA          -               
@@ -428,17 +428,17 @@
 
 For larger scans, we could be interested in displaying only certain responses. The example below will only display packets with the “SA” flag set::
 
-    >>> ans.nsummary(lfilter = lambda (s,r): r.sprintf("%TCP.flags%") == "SA")
+    >>> ans.nsummary(lfilter = lambda s,r: r.sprintf("%TCP.flags%") == "SA")
     0003 IP / TCP 192.168.1.100:ftp_data > 192.168.1.1:https S ======> IP / TCP 192.168.1.1:https > 192.168.1.100:ftp_data SA
 
 In case we want to do some expert analysis of responses, we can use the following command to indicate which ports are open::
 
-    >>> ans.summary(lfilter = lambda (s,r): r.sprintf("%TCP.flags%") == "SA",prn=lambda(s,r):r.sprintf("%TCP.sport% is open"))
+    >>> ans.summary(lfilter = lambda s,r: r.sprintf("%TCP.flags%") == "SA",prn=lambda s,r: r.sprintf("%TCP.sport% is open"))
     https is open
 
 Again, for larger scans we can build a table of open ports::
 
-    >>> ans.filter(lambda (s,r):TCP in r and r[TCP].flags&2).make_table(lambda (s,r): 
+    >>> ans.filter(lambda s,r: TCP in r and r[TCP].flags&2).make_table(lambda s,r:
     ...             (s.dst, s.dport, "X"))
         66.35.250.150 192.168.1.1 216.109.112.135 
     80  X             -           X               
@@ -707,6 +707,9 @@
 .. note::
    Asynchronous sniffing is only available since **Scapy 2.4.3**
 
+.. warning::
+   Asynchronous sniffing does not necessarily improves performance (it's rather the opposite). If you want to sniff on multiple interfaces / socket, remember you can pass them all to a single `sniff()` call
+
 It is possible to sniff asynchronously. This allows to stop the sniffer programmatically, rather than with ctrl^C.
 It provides ``start()``, ``stop()`` and ``join()`` utils.
 
@@ -755,9 +758,12 @@
 Scapy includes some basic Sessions, but it is possible to implement your own.
 Available by default:
 
-- ``IPSession`` -> *defragment IP packets* on-the-flow, to make a stream usable by ``prn``.
-- ``TCPSession`` -> *defragment certain TCP protocols**. Only **HTTP 1.0** currently uses this functionality.
-- ``NetflowSession`` -> *resolve Netflow V9 packets* from their NetflowFlowset information objects
+- :py:class:`~scapy.sessions.IPSession` -> *defragment IP packets* on-the-flow, to make a stream usable by ``prn``.
+- :py:class:`~scapy.sessions.TCPSession` -> *defragment certain TCP protocols*. Currently supports:
+   - HTTP 1.0
+   - TLS
+- :py:class:`~scapy.sessions.TLSSession` -> *matches TLS sessions* on the flow.
+- :py:class:`~scapy.sessions.NetflowSession` -> *resolve Netflow V9 packets* from their NetflowFlowset information objects
 
 Those sessions can be used using the ``session=`` parameter of ``sniff()``. Examples::
 
@@ -767,7 +773,34 @@
 
 .. note::
    To implement your own Session class, in order to support another flow-based protocol, start by copying a sample from `scapy/sessions.py <https://github.com/secdev/scapy/blob/master/scapy/sessions.py>`_
-   Your custom ``Session`` class only needs to extend the ``DefaultSession`` class, and implement a ``on_packet_received`` function, such as in the example.
+   Your custom ``Session`` class only needs to extend the :py:class:`~scapy.sessions.DefaultSession` class, and implement a ``on_packet_received`` function, such as in the example.
+
+.. note:: Would you need it, you can use: ``class TLS_over_TCP(TLSSession, TCPSession): pass`` to sniff TLS packets that are defragmented.
+
+How to use TCPSession to defragment TCP packets
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The layer on which the decompression is applied must be immediately following the TCP layer. You need to implement a class function called ``tcp_reassemble`` that accepts the binary data and a metada dictionary as argument and returns, when full, a packet. Let's study the (pseudo) example of TLS:
+
+.. code::
+
+    class TLS(Packet):
+        [...]
+
+        @classmethod
+        def tcp_reassemble(cls, data, metadata):
+            length = struct.unpack("!H", data[3:5])[0] + 5
+            if len(data) == length:
+                return TLS(data)
+
+
+In this example, we first get the total length of the TLS payload announced by the TLS header, and we compare it to the length of the data. When the data reaches this length, the packet is complete and can be returned. When implementing ``tcp_reassemble``, it's usually a matter of detecting when a packet isn't missing anything else.
+
+The ``data`` argument is bytes and the ``metadata`` argument is a dictionary which keys are as follow:
+
+- ``metadata["pay_class"]``: the TCP payload class (here TLS)
+- ``metadata.get("tcp_psh", False)``: will be present if the PUSH flag is set
+- ``metadata.get("tcp_end", False)``: will be present if the END or RESET flag is set
 
 Filters
 -------
@@ -976,7 +1009,7 @@
 
     >>> ans, unans = sr(IP(dst="www.test.fr/30", ttl=(1,6))/TCP())
     Received 49 packets, got 24 answers, remaining 0 packets
-    >>> ans.make_table( lambda (s,r): (s.dst, s.ttl, r.src) )
+    >>> ans.make_table( lambda s,r: (s.dst, s.ttl, r.src) )
       216.15.189.192  216.15.189.193  216.15.189.194  216.15.189.195  
     1 192.168.8.1     192.168.8.1     192.168.8.1     192.168.8.1     
     2 81.57.239.254   81.57.239.254   81.57.239.254   81.57.239.254   
@@ -991,7 +1024,7 @@
 
     >>> ans, unans = sr(IP(dst="172.20.80.192/28")/TCP(dport=[20,21,22,25,53,80]))
     Received 142 packets, got 25 answers, remaining 71 packets
-    >>> ans.make_table(lambda (s,r): (s.dst, s.dport, r.sprintf("%IP.id%")))
+    >>> ans.make_table(lambda s,r: (s.dst, s.dport, r.sprintf("%IP.id%")))
        172.20.80.196 172.20.80.197 172.20.80.198 172.20.80.200 172.20.80.201 
     20 0             4203          7021          -             11562             
     21 0             4204          7022          -             11563             
@@ -1250,7 +1283,7 @@
 
 Answers can be reviewed with the following command::
 
-    >>> ans.summary(lambda (s,r): r.sprintf("%Ether.src% %ARP.psrc%") )
+    >>> ans.summary(lambda s,r: r.sprintf("%Ether.src% %ARP.psrc%") )
 
 Scapy also includes a built-in arping() function which performs similar to the above two commands:
 
@@ -1266,7 +1299,7 @@
 
 Information on live hosts can be collected with the following request::
 
-    >>> ans.summary(lambda (s,r): r.sprintf("%IP.src% is alive") )
+    >>> ans.summary(lambda s,r: r.sprintf("%IP.src% is alive") )
 
 
 TCP Ping
@@ -1278,7 +1311,7 @@
 
 Any response to our probes will indicate a live host. We can collect results with the following command::
 
-    >>> ans.summary( lambda(s,r) : r.sprintf("%IP.src% is alive") )
+    >>> ans.summary( lambda s,r : r.sprintf("%IP.src% is alive") )
 
 
 UDP Ping
@@ -1288,9 +1321,9 @@
 
     >>> ans, unans = sr( IP(dst="192.168.*.1-10")/UDP(dport=0) )
 
-Once again, results can be collected with this command:
+Once again, results can be collected with this command::
 
-    >>> ans.summary( lambda(s,r) : r.sprintf("%IP.src% is alive") )
+    >>> ans.summary( lambda s,r : r.sprintf("%IP.src% is alive") )
 
 
 DNS Requests
@@ -1373,7 +1406,7 @@
 
 ::
 
-    >>> res.nsummary( lfilter=lambda (s,r): (r.haslayer(TCP) and (r.getlayer(TCP).flags & 2)) )
+    >>> res.nsummary( lfilter=lambda s,r: (r.haslayer(TCP) and (r.getlayer(TCP).flags & 2)) )
     
     
 IKE Scanning
@@ -1389,7 +1422,7 @@
 
 Visualizing the results in a list::
 
-    >>> res.nsummary(prn=lambda (s,r): r.src, lfilter=lambda (s,r): r.haslayer(ISAKMP) ) 
+    >>> res.nsummary(prn=lambda s,r: r.src, lfilter=lambda s,r: r.haslayer(ISAKMP) ) 
     
   
 
@@ -1405,7 +1438,7 @@
 
 Results would be::
 
-    >>> ans.summary( lambda(s,r) : r.sprintf("%IP.src%\t{ICMP:%ICMP.type%}\t{TCP:%TCP.flags%}"))
+    >>> ans.summary( lambda s,r: r.sprintf("%IP.src%\t{ICMP:%ICMP.type%}\t{TCP:%TCP.flags%}"))
     192.168.1.1     time-exceeded
     68.86.90.162    time-exceeded
     4.79.43.134     time-exceeded
@@ -1427,7 +1460,7 @@
 
 We can visualize the results as a list of routers::
 
-    >>> res.make_table(lambda (s,r): (s.dst, s.ttl, r.src)) 
+    >>> res.make_table(lambda s,r: (s.dst, s.ttl, r.src))
 
 
 DNS traceroute
@@ -1486,9 +1519,10 @@
 
 The following command will display information similar to most wireless sniffers::
 
->>> sniff(iface="ath0", monitor=True, prn=lambda x:x.sprintf("{Dot11Beacon:%Dot11.addr3%\t%Dot11Beacon.info%\t%PrismHeader.channel%\t%Dot11Beacon.cap%}"))
+>>> sniff(iface="ath0", prn=lambda x:x.sprintf("{Dot11Beacon:%Dot11.addr3%\t%Dot11Beacon.info%\t%PrismHeader.channel%\t%Dot11Beacon.cap%}"))
 
-Note the `monitor=True` argument, which only work from scapy>2.4.0 (2.4.0dev+), that is cross-platform. It will in work in most cases (Windows, OSX), but might require you to manually toggle monitor mode.
+.. note::
+    On Windows and OSX, you will need to also use `monitor=True`, which only works on scapy>2.4.0 (2.4.0dev+). This might require you to manually toggle monitor mode.
 
 The above command will produce output similar to the one below::
 
@@ -1548,9 +1582,9 @@
     >>> ans.summary()
     Ether / IP / UDP 0.0.0.0:bootpc > 255.255.255.255:bootps / BOOTP / DHCP ==> Ether / IP / UDP 192.168.1.1:bootps > 255.255.255.255:bootpc / BOOTP / DHCP
     Ether / IP / UDP 0.0.0.0:bootpc > 255.255.255.255:bootps / BOOTP / DHCP ==> Ether / IP / UDP 192.168.1.11:bootps > 255.255.255.255:bootpc / BOOTP / DHCP
-    }}}
-    We are only interested in the MAC and IP addresses of the replies: 
-    {{{
+
+We are only interested in the MAC and IP addresses of the replies: 
+
     >>> for p in ans: print p[1][Ether].src, p[1][IP].src
     ...
     00:de:ad:be:ef:00 192.168.1.1
@@ -1686,6 +1720,34 @@
 __ https://www.wireshark.org
 __ https://wiki.wireshark.org/ProtocolReference
 
+Performance of Scapy
+--------------------
+
+Problem
+^^^^^^^
+
+Scapy dissects slowly and/or misses packets under heavy loads.
+
+.. note::
+
+    Please bare in mind that Scapy is not designed to be blazing fast, but rather easily hackable & extensible. The packet model makes it VERY easy to create new layers, compared to pretty much all other alternatives, but comes with a performance cost. Of course, we still do our best to make Scapy as fast as possible, but it's not the absolute main goal.
+
+Solution
+^^^^^^^^
+
+There are quite a few ways of speeding up scapy's dissection. You can use all of them
+
+- **Using a BPF filter**: The OS is faster than Scapy. If you make the OS filter the packets instead of Scapy, it will only handle a fraction of the load. Use the ``filter=`` argument of the :py:func:`~scapy.sendrecv.sniff` function.
+- **By disabling layers you don't use**: If you are not using some layers, why dissect them? You can let Scapy know which layers to dissect and all the others will simply be parsed as ``Raw``. This comes with a great performance boost but requires you to know what you're doing.
+
+.. code:: python
+
+    # Enable filtering: only Ether, IP and ICMP will be dissected
+    conf.layers.filter([Ether, IP, ICMP])
+    # Disable filtering: restore everything to normal
+    conf.layers.unfilter()
+
+
 OS Fingerprinting
 -----------------

scapy-2.4.3.tar.gz/doc/vagrant_ci/Vagrantfile -> scapy-2.4.4.tar.gz/doc/vagrant_ci/Vagrantfile Changed

scapy-2.4.3.tar.gz/doc/vagrant_ci/provision_freebsd.sh -> scapy-2.4.4.tar.gz/doc/vagrant_ci/provision_freebsd.sh Changed

scapy-2.4.3.tar.gz/doc/vagrant_ci/provision_netbsd.sh -> scapy-2.4.4.tar.gz/doc/vagrant_ci/provision_netbsd.sh Changed

scapy-2.4.3.tar.gz/doc/vagrant_ci/provision_openbsd.sh -> scapy-2.4.4.tar.gz/doc/vagrant_ci/provision_openbsd.sh Changed

scapy-2.4.3.tar.gz/run_scapy -> scapy-2.4.4.tar.gz/run_scapy Changed

scapy-2.4.3.tar.gz/run_scapy.bat -> scapy-2.4.4.tar.gz/run_scapy.bat Changed

scapy-2.4.3.tar.gz/scapy/__init__.py -> scapy-2.4.4.tar.gz/scapy/__init__.py Changed

@@ -7,18 +7,21 @@
 Scapy: create, send, sniff, dissect and manipulate network packets.
 
 Usable either from an interactive console or as a Python library.
-http://www.secdev.org/projects/scapy
+https://scapy.net
 """
 
 import os
 import re
 import subprocess
 
+from scapy.compat import AnyStr
+
 
 _SCAPY_PKG_DIR = os.path.dirname(__file__)
 
 
 def _version_from_git_describe():
+    # type: () -> AnyStr
     """
     Read the version from ``git describe``. It returns the latest tag with an
     optional suffix if the current directory is not exactly on the tag.
@@ -38,30 +41,46 @@
 
         >>> _version_from_git_describe()
         '2.3.2.dev346'
+
+    :raises CalledProcessError: if git is unavailable
+    :return: Scapy's latest tag
     """
     if not os.path.isdir(os.path.join(os.path.dirname(_SCAPY_PKG_DIR), '.git')):  # noqa: E501
         raise ValueError('not in scapy git repo')
 
-    process = subprocess.Popen(['git', 'describe', '--always'],
-                               cwd=_SCAPY_PKG_DIR,
-                               stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-    out, err = process.communicate()
-
-    if process.returncode == 0:
-        tag = out.decode().strip()
-        match = re.match('^v?(.+?)-(\\d+)-g[a-f0-9]+$', tag)
-        if match:
-            # remove the 'v' prefix and add a '.devN' suffix
-            return '%s.dev%s' % (match.group(1), match.group(2))
+    def _git(cmd):
+        process = subprocess.Popen(
+            cmd.split(),
+            cwd=_SCAPY_PKG_DIR,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        out, err = process.communicate()
+        if process.returncode == 0:
+            return out.decode().strip()
         else:
-            # just remove the 'v' prefix
-            return re.sub('^v', '', tag)
+            raise subprocess.CalledProcessError(process.returncode, err)
+
+    tag = _git("git describe --always")
+    if not tag.startswith("v"):
+        # Upstream was not fetched
+        commit = _git("git rev-list --tags --max-count=1")
+        tag = _git("git describe --tags --always --long %s" % commit)
+    match = re.match('^v?(.+?)-(\\d+)-g[a-f0-9]+$', tag)
+    if match:
+        # remove the 'v' prefix and add a '.devN' suffix
+        return '%s.dev%s' % (match.group(1), match.group(2))
     else:
-        raise subprocess.CalledProcessError(process.returncode, err)
+        # just remove the 'v' prefix
+        return re.sub('^v', '', tag)
 
 
 def _version():
+    # type: () -> str
+    """Returns the Scapy version from multiple methods
+
+    :return: the Scapy version
+    """
     version_file = os.path.join(_SCAPY_PKG_DIR, 'VERSION')
     try:
         tag = _version_from_git_describe()
@@ -79,7 +98,7 @@
         except Exception:
             # Rely on git archive "export-subst" git attribute.
             # See 'man gitattributes' for more details.
-            git_archive_id = '3047580162  (tag: v2.4.3)'
+            git_archive_id = '95ba5b8504  (tag: v2.4.4)'
             sha1 = git_archive_id.strip().split()[0]
             match = re.search('tag:(\\S+)', git_archive_id)
             if match:
@@ -91,7 +110,9 @@
 
 
 VERSION = __version__ = _version()
-VERSION_MAIN = re.search(r"[0-9.]+", VERSION).group()
+
+_tmp = re.search(r"[0-9.]+", VERSION)
+VERSION_MAIN = _tmp.group() if _tmp is not None else VERSION
 
 if __name__ == "__main__":
     from scapy.main import interact

scapy-2.4.3.tar.gz/scapy/all.py -> scapy-2.4.4.tar.gz/scapy/all.py Changed

scapy-2.4.3.tar.gz/scapy/ansmachine.py -> scapy-2.4.4.tar.gz/scapy/ansmachine.py Changed

scapy-2.4.3.tar.gz/scapy/arch/__init__.py -> scapy-2.4.4.tar.gz/scapy/arch/__init__.py Changed

@@ -10,7 +10,6 @@
 from __future__ import absolute_import
 import socket
 
-import scapy.consts
 from scapy.consts import LINUX, SOLARIS, WINDOWS, BSD
 from scapy.error import Scapy_Exception
 from scapy.config import conf, _set_conf_sockets
@@ -24,7 +23,7 @@
 
 
 if not WINDOWS:
-    if not conf.use_pcap and not conf.use_dnet:
+    if not conf.use_pcap:
         from scapy.arch.bpf.core import get_if_raw_addr
 
 
@@ -57,7 +56,7 @@
 elif BSD:
     from scapy.arch.unix import read_routes, read_routes6, in6_getifaddr  # noqa: F401, E501
     from scapy.arch.bpf.core import *  # noqa F403
-    if not (conf.use_pcap or conf.use_dnet):
+    if not conf.use_pcap:
         # Native
         from scapy.arch.bpf.supersocket import * # noqa F403
         conf.use_bpf = True
@@ -68,7 +67,7 @@
     from scapy.arch.windows.native import *  # noqa F403
 
 if conf.iface is None:
-    conf.iface = scapy.consts.LOOPBACK_INTERFACE
+    conf.iface = conf.loopback_name
 
 _set_conf_sockets()  # Apply config

scapy-2.4.3.tar.gz/scapy/arch/bpf/__init__.py -> scapy-2.4.4.tar.gz/scapy/arch/bpf/__init__.py Changed

scapy-2.4.3.tar.gz/scapy/arch/bpf/consts.py -> scapy-2.4.4.tar.gz/scapy/arch/bpf/consts.py Changed

scapy-2.4.3.tar.gz/scapy/arch/bpf/core.py -> scapy-2.4.4.tar.gz/scapy/arch/bpf/core.py Changed

@@ -20,7 +20,6 @@
 from scapy.arch.common import get_if, compile_filter
 from scapy.compat import plain_str
 from scapy.config import conf
-from scapy.consts import LOOPBACK_NAME
 from scapy.data import ARPHDR_LOOPBACK, ARPHDR_ETHER
 from scapy.error import Scapy_Exception, warning
 from scapy.modules.six.moves import range
@@ -71,7 +70,7 @@
     NULL_MAC_ADDRESS = b'\x00' * 6
 
     # Handle the loopback interface separately
-    if ifname == LOOPBACK_NAME:
+    if ifname == conf.loopback_name:
         return (ARPHDR_LOOPBACK, NULL_MAC_ADDRESS)
 
     # Get ifconfig output
@@ -164,7 +163,7 @@
     for ifname in get_if_list():
 
         # Unlike pcap_findalldevs(), we do not care of loopback interfaces.
-        if ifname == LOOPBACK_NAME:
+        if ifname == conf.loopback_name:
             continue
 
         # Get interface flags
@@ -208,5 +207,5 @@
     ifaces = get_working_ifaces()
     if not ifaces:
         # A better interface will be selected later using the routing table
-        return LOOPBACK_NAME
+        return conf.loopback_name
     return ifaces[0]

scapy-2.4.3.tar.gz/scapy/arch/bpf/supersocket.py -> scapy-2.4.4.tar.gz/scapy/arch/bpf/supersocket.py Changed

@@ -4,9 +4,11 @@
 Scapy *BSD native support - BPF sockets
 """
 
+from ctypes import c_long, sizeof
 import errno
 import fcntl
 import os
+import platform
 from select import select
 import struct
 import time
@@ -23,7 +25,10 @@
 from scapy.compat import raw
 
 
-if FREEBSD or NETBSD:
+if FREEBSD:
+    # On 32bit architectures long might be 32bit.
+    BPF_ALIGNMENT = sizeof(c_long)
+elif NETBSD:
     BPF_ALIGNMENT = 8  # sizeof(long)
 else:
     BPF_ALIGNMENT = 4  # sizeof(int32_t)
@@ -109,7 +114,10 @@
                 else:
                     filter = "not (%s)" % conf.except_filter
             if filter is not None:
-                attach_filter(self.ins, filter, self.iface)
+                try:
+                    attach_filter(self.ins, filter, self.iface)
+                except ImportError as ex:
+                    warning("Cannot set filter: %s" % ex)
 
         # Set the guessed packet class
         self.guessed_cls = self.guess_cls()
@@ -260,8 +268,21 @@
             return
 
         # Extract useful information from the BPF header
-        if FREEBSD or NETBSD:
-            # struct bpf_xhdr or struct bpf_hdr32
+        if FREEBSD:
+            # Unless we set BIOCSTSTAMP to something different than
+            # BPF_T_MICROTIME, we will get bpf_hdr on FreeBSD, which means
+            # that we'll get a struct timeval, which is time_t, suseconds_t.
+            # On i386 time_t is 32bit so the bh_tstamp will only be 8 bytes.
+            # We really want to set BIOCSTSTAMP to BPF_T_NANOTIME and be
+            # done with this and it always be 16?
+            if platform.machine() == "i386":
+                # struct bpf_hdr
+                bh_tstamp_offset = 8
+            else:
+                # struct bpf_hdr (64bit time_t) or struct bpf_xhdr
+                bh_tstamp_offset = 16
+        elif NETBSD:
+            # struct bpf_hdr or struct bpf_hdr32
             bh_tstamp_offset = 16
         else:
             # struct bpf_hdr
@@ -336,7 +357,9 @@
         """Receive on layer 3"""
         r = SuperSocket.recv(self, x)
         if r:
+            r.payload.time = r.time
             return r.payload
+        return r
 
     def send(self, pkt):
         """Send a packet"""

scapy-2.4.3.tar.gz/scapy/arch/common.py -> scapy-2.4.4.tar.gz/scapy/arch/common.py Changed

@@ -8,47 +8,18 @@
 """
 
 import ctypes
-import os
 import socket
 import struct
-import subprocess
+import sys
 import time
-from ctypes import POINTER, Structure
-from ctypes import c_uint, c_uint32, c_ushort, c_ubyte
 from scapy.consts import WINDOWS
 from scapy.config import conf
-from scapy.data import MTU
+from scapy.data import MTU, ARPHRD_TO_DLT
 from scapy.error import Scapy_Exception
-from scapy.consts import OPENBSD
-import scapy.modules.six as six
 
 if not WINDOWS:
     from fcntl import ioctl
 
-# BOOT
-
-
-def _check_tcpdump():
-    """
-    Return True if the tcpdump command can be started
-    """
-    with open(os.devnull, 'wb') as devnull:
-        try:
-            proc = subprocess.Popen([conf.prog.tcpdump, "--version"],
-                                    stdout=devnull, stderr=subprocess.STDOUT)
-        except OSError:
-            return False
-
-    if OPENBSD:
-        # 'tcpdump --version' returns 1 on OpenBSD 6.4
-        return proc.wait() == 1
-    else:
-        return proc.wait() == 0
-
-
-# This won't be used on Windows
-TCPDUMP = WINDOWS or _check_tcpdump()
-
 # UTILS
 
 
@@ -56,9 +27,10 @@
     """Ease SIOCGIF* ioctl calls"""
 
     sck = socket.socket()
-    ifreq = ioctl(sck, cmd, struct.pack("16s16x", iff.encode("utf8")))
-    sck.close()
-    return ifreq
+    try:
+        return ioctl(sck, cmd, struct.pack("16s16x", iff.encode("utf8")))
+    finally:
+        sck.close()
 
 
 def get_if_raw_hwaddr(iff):
@@ -93,94 +65,74 @@
 # BPF HANDLERS
 
 
-class bpf_insn(Structure):
-    """"The BPF instruction data structure"""
-    _fields_ = [("code", c_ushort),
-                ("jt", c_ubyte),
-                ("jf", c_ubyte),
-                ("k", c_uint32)]
-
-
-class bpf_program(Structure):
-    """"Structure for BIOCSETF"""
-    _fields_ = [("bf_len", c_uint),
-                ("bf_insns", POINTER(bpf_insn))]
-
-
-def _legacy_bpf_pointer(tcpdump_lines):
-    """Get old-format BPF Pointer. Deprecated"""
-    X86_64 = os.uname()[4] in ['x86_64', 'aarch64']
-    size = int(tcpdump_lines[0])
-    bpf = b""
-    for l in tcpdump_lines[1:]:
-        if six.PY2:
-            int_type = long  # noqa: F821
-        else:
-            int_type = int
-        bpf += struct.pack("HBBI", *map(int_type, l.split()))
-
-    # Thanks to http://www.netprojects.de/scapy-with-pypy-solved/ for the pypy trick  # noqa: E501
-    if conf.use_pypy:
-        str_buffer = ctypes.create_string_buffer(bpf)
-        return struct.pack('HL', size, ctypes.addressof(str_buffer))
-    else:
-        # XXX. Argl! We need to give the kernel a pointer on the BPF,
-        # Python object header seems to be 20 bytes. 36 bytes for x86 64bits arch.  # noqa: E501
-        if X86_64:
-            return struct.pack("HL", size, id(bpf) + 36)
-        else:
-            return struct.pack("HI", size, id(bpf) + 20)
-
-
-def get_bpf_pointer(tcpdump_lines):
-    """Create a BPF Pointer for TCPDump filter"""
-    if conf.use_pypy:
-        return _legacy_bpf_pointer(tcpdump_lines)
-
-    # Allocate BPF instructions
-    size = int(tcpdump_lines[0])
-    bpf_insn_a = bpf_insn * size
-    bip = bpf_insn_a()
-
-    # Fill the BPF instruction structures with the byte code
-    tcpdump_lines = tcpdump_lines[1:]
-    i = 0
-    for line in tcpdump_lines:
-        values = [int(v) for v in line.split()]
-        bip[i].code = c_ushort(values[0])
-        bip[i].jt = c_ubyte(values[1])
-        bip[i].jf = c_ubyte(values[2])
-        bip[i].k = c_uint(values[3])
-        i += 1
-
-    # Create the BPF program
-    return bpf_program(size, bip)
-
-
-def compile_filter(bpf_filter, iface=None):
-    """Asks Tcpdump to parse the filter, then build the matching
-    BPF bytecode using get_bpf_pointer.
+def compile_filter(filter_exp, iface=None, linktype=None,
+                   promisc=False):
+    """Asks libpcap to parse the filter, then build the matching
+    BPF bytecode.
+
+    :param iface: if provided, use the interface to compile
+    :param linktype: if provided, use the linktype to compile
     """
-    if not TCPDUMP:
-        raise Scapy_Exception("tcpdump is not available. Cannot use filter !")
     try:
-        process = subprocess.Popen([
-            conf.prog.tcpdump,
-            "-p",
-            "-i", (conf.iface if iface is None else iface),
-            "-ddd",
-            "-s", str(MTU),
-            bpf_filter],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
+        from scapy.libs.winpcapy import (
+            PCAP_ERRBUF_SIZE,
+            pcap_open_live,
+            pcap_compile,
+            pcap_compile_nopcap,
+            pcap_close
+        )
+        from scapy.libs.structures import bpf_program
+    except OSError:
+        raise ImportError(
+            "libpcap is not available. Cannot compile filter !"
+        )
+    from ctypes import create_string_buffer
+    bpf = bpf_program()
+    bpf_filter = create_string_buffer(filter_exp.encode("utf8"))
+    if not linktype:
+        # Try to guess linktype to avoid root
+        if not iface:
+            if not conf.iface:
+                raise Scapy_Exception(
+                    "Please provide an interface or linktype!"
+                )
+            if WINDOWS:
+                iface = conf.iface.pcap_name
+            else:
+                iface = conf.iface
+        # Try to guess linktype to avoid requiring root
+        try:
+            arphd = get_if_raw_hwaddr(iface)[0]
+            linktype = ARPHRD_TO_DLT.get(arphd)
+        except Exception:
+            # Failed to use linktype: use the interface
+            pass
+    if linktype is not None:
+        ret = pcap_compile_nopcap(
+            MTU, linktype, ctypes.byref(bpf), bpf_filter, 0, -1
+        )
+    elif iface:
+        err = create_string_buffer(PCAP_ERRBUF_SIZE)
+        iface = create_string_buffer(iface.encode("utf8"))
+        pcap = pcap_open_live(
+            iface, MTU, promisc, 0, err
         )
-    except OSError as ex:
-        raise Scapy_Exception("Failed to attach filter: %s" % ex)
-    lines, err = process.communicate()
-    ret = process.returncode
-    if ret:
+        error = bytes(bytearray(err)).strip(b"\x00")
+        if error:
+            raise OSError(error)
+        ret = pcap_compile(
+            pcap, ctypes.byref(bpf), bpf_filter, 0, -1
+        )
+        pcap_close(pcap)
+    if ret == -1:
         raise Scapy_Exception(
-            "Failed to attach filter: tcpdump returned: %s" % err
+            "Failed to compile filter expression %s (%s)" % (filter_exp, ret)
+        )
+    if conf.use_pypy and sys.pypy_version_info <= (7, 3, 0):
+        # PyPy < 7.3.0 has a broken behavior
+        # https://bitbucket.org/pypy/pypy/issues/3114
+        return struct.pack(
+            'HL',
+            bpf.bf_len, ctypes.addressof(bpf.bf_insns.contents)
         )
-    lines = lines.strip().split(b"\n")
-    return get_bpf_pointer(lines)
+    return bpf

scapy-2.4.3.tar.gz/scapy/arch/linux.py -> scapy-2.4.4.tar.gz/scapy/arch/linux.py Changed

@@ -11,27 +11,26 @@
 
 
 import array
-import ctypes
 from fcntl import ioctl
 import os
 from select import select
 import socket
 import struct
 import time
-import re
 
 import subprocess
 
 from scapy.compat import raw, plain_str
-from scapy.consts import LOOPBACK_NAME, LINUX
+from scapy.consts import LINUX
 import scapy.utils
 import scapy.utils6
 from scapy.packet import Packet, Padding
 from scapy.config import conf
-from scapy.data import MTU, ETH_P_ALL
+from scapy.data import MTU, ETH_P_ALL, SOL_PACKET, SO_ATTACH_FILTER, \
+    SO_TIMESTAMPNS
 from scapy.supersocket import SuperSocket
 from scapy.error import warning, Scapy_Exception, \
-    ScapyInvalidPlatformException
+    ScapyInvalidPlatformException, log_runtime
 from scapy.arch.common import get_if, compile_filter
 import scapy.modules.six as six
 from scapy.modules.six.moves import range
@@ -72,11 +71,6 @@
 PACKET_MR_PROMISC = 1
 PACKET_MR_ALLMULTI = 2
 
-# From bits/socket.h
-SOL_PACKET = 263
-# From asm/socket.h
-SO_ATTACH_FILTER = 26
-
 # From net/route.h
 RTF_UP = 0x0001  # Route usable
 RTF_REJECT = 0x0200
@@ -94,25 +88,9 @@
 PACKET_FASTROUTE = 6  # Fastrouted frame
 # Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space
 
-# Used to get VLAN data
-ETH_P_8021Q = 0x8100
-TP_STATUS_VLAN_VALID = 1 << 4
-
-
-class tpacket_auxdata(ctypes.Structure):
-    _fields_ = [
-        ("tp_status", ctypes.c_uint),
-        ("tp_len", ctypes.c_uint),
-        ("tp_snaplen", ctypes.c_uint),
-        ("tp_mac", ctypes.c_ushort),
-        ("tp_net", ctypes.c_ushort),
-        ("tp_vlan_tci", ctypes.c_ushort),
-        ("tp_padding", ctypes.c_ushort),
-    ]
-
-
 # Utils
 
+
 def get_if_raw_addr(iff):
     try:
         return get_if(iff, SIOCGIFADDR)[20:24]
@@ -124,7 +102,10 @@
     try:
         f = open("/proc/net/dev", "rb")
     except IOError:
-        f.close()
+        try:
+            f.close()
+        except Exception:
+            pass
         warning("Can't open /proc/net/dev !")
         return []
     lst = []
@@ -142,21 +123,22 @@
     Return the name of the first network interfcace that is up.
     """
     for i in get_if_list():
-        if i == LOOPBACK_NAME:
+        if i == conf.loopback_name:
             continue
         ifflags = struct.unpack("16xH14x", get_if(i, SIOCGIFFLAGS))[0]
         if ifflags & IFF_UP:
             return i
-    return LOOPBACK_NAME
+    return conf.loopback_name
 
 
 def attach_filter(sock, bpf_filter, iface):
-    # XXX We generate the filter on the interface conf.iface
-    # because tcpdump open the "any" interface and ppp interfaces
-    # in cooked mode. As we use them in raw mode, the filter will not
-    # work... one solution could be to use "any" interface and translate
-    # the filter from cooked mode to raw mode
-    # mode
+    """
+    Compile bpf filter and attach it to a socket
+
+    :param sock: the python socket
+    :param bpf_filter: the bpf string filter to compile
+    :param iface: the interface used to compile
+    """
     bp = compile_filter(bpf_filter, iface)
     sock.setsockopt(socket.SOL_SOCKET, SO_ATTACH_FILTER, bp)
 
@@ -230,21 +212,21 @@
     routes = []
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
-        ifreq = ioctl(s, SIOCGIFADDR, struct.pack("16s16x", scapy.consts.LOOPBACK_NAME.encode("utf8")))  # noqa: E501
+        ifreq = ioctl(s, SIOCGIFADDR, struct.pack("16s16x", conf.loopback_name.encode("utf8")))  # noqa: E501
         addrfamily = struct.unpack("h", ifreq[16:18])[0]
         if addrfamily == socket.AF_INET:
-            ifreq2 = ioctl(s, SIOCGIFNETMASK, struct.pack("16s16x", scapy.consts.LOOPBACK_NAME.encode("utf8")))  # noqa: E501
+            ifreq2 = ioctl(s, SIOCGIFNETMASK, struct.pack("16s16x", conf.loopback_name.encode("utf8")))  # noqa: E501
             msk = socket.ntohl(struct.unpack("I", ifreq2[20:24])[0])
             dst = socket.ntohl(struct.unpack("I", ifreq[20:24])[0]) & msk
             ifaddr = scapy.utils.inet_ntoa(ifreq[20:24])
-            routes.append((dst, msk, "0.0.0.0", scapy.consts.LOOPBACK_NAME, ifaddr, 1))  # noqa: E501
+            routes.append((dst, msk, "0.0.0.0", conf.loopback_name, ifaddr, 1))  # noqa: E501
         else:
-            warning("Interface %s: unknown address family (%i)" % (scapy.consts.LOOPBACK_NAME, addrfamily))  # noqa: E501
+            warning("Interface %s: unknown address family (%i)" % (conf.loopback_name, addrfamily))  # noqa: E501
     except IOError as err:
         if err.errno == 99:
-            warning("Interface %s: no address assigned" % scapy.consts.LOOPBACK_NAME)  # noqa: E501
+            warning("Interface %s: no address assigned" % conf.loopback_name)  # noqa: E501
         else:
-            warning("Interface %s: failed to get address config (%s)" % (scapy.consts.LOOPBACK_NAME, str(err)))  # noqa: E501
+            warning("Interface %s: failed to get address config (%s)" % (conf.loopback_name, str(err)))  # noqa: E501
 
     for line in f.readlines()[1:]:
         line = plain_str(line)
@@ -345,7 +327,7 @@
 
     lifaddr = in6_getifaddr()
     for line in f.readlines():
-        d, dp, s, sp, nh, metric, rc, us, fl, dev = line.split()
+        d, dp, _, _, nh, metric, rc, us, fl, dev = line.split()
         metric = int(metric, 16)
         fl = int(fl, 16)
         dev = plain_str(dev)
@@ -357,12 +339,10 @@
 
         d = proc2r(d)
         dp = int(dp, 16)
-        s = proc2r(s)
-        sp = int(sp, 16)
         nh = proc2r(nh)
 
         cset = []  # candidate set (possible source addresses)
-        if dev == LOOPBACK_NAME:
+        if dev == conf.loopback_name:
             if d == '::':
                 continue
             cset = ['::1']
@@ -403,54 +383,6 @@
             break
 
 
-def get_iface_mode(iface):
-    """Return the interface mode.
-    params:
-     - iface: the iwconfig interface
-    """
-    p = subprocess.Popen(["iwconfig", iface], stdout=subprocess.PIPE,
-                         stderr=subprocess.STDOUT)
-    output, err = p.communicate()
-    match = re.search(br"mode:([a-zA-Z]*)", output.lower())
-    if match:
-        return plain_str(match.group(1))
-    return "unknown"
-
-
-def set_iface_monitor(iface, monitor):
-    """Sets the monitor mode (or remove it) from an interface.
-    params:
-     - iface: the iwconfig interface
-     - monitor: True if the interface should be set in monitor mode,
-                False if it should be in managed mode
-    """
-    mode = get_iface_mode(iface)
-    if mode == "unknown":
-        warning("Could not parse iwconfig !")
-    current_monitor = mode == "monitor"
-    if monitor == current_monitor:
-        # Already correct
-        return True
-    s_mode = "monitor" if monitor else "managed"
-
-    def _check_call(commands):
-        p = subprocess.Popen(commands,
-                             stderr=subprocess.PIPE,
-                             stdout=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if p.returncode != 0:
-            warning("%s failed !" % " ".join(commands))
-            return False
-        return True
-    if not _check_call(["ifconfig", iface, "down"]):
-        return False
-    if not _check_call(["iwconfig", iface, "mode", s_mode]):
-        return False
-    if not _check_call(["ifconfig", iface, "up"]):
-        return False
-    return True
-
-
 class L2Socket(SuperSocket):
     desc = "read/write packets at layer 2 using Linux PF_PACKET sockets"
 
@@ -460,9 +392,8 @@
         self.type = type
         self.promisc = conf.sniff_promisc if promisc is None else promisc
         if monitor is not None:
-            warning(
-                "The monitor argument is ineffective on native linux sockets."
-                " Use set_iface_monitor instead."
+            log_runtime.info(
+                "The 'monitor' argument has no effect on native linux sockets."
             )
         self.ins = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, socket.htons(type))  # noqa: E501
         if not nofilter:
@@ -472,7 +403,10 @@
                 else:
                     filter = "not (%s)" % conf.except_filter
             if filter is not None:
-                attach_filter(self.ins, filter, iface)
+                try:
+                    attach_filter(self.ins, filter, iface)
+                except ImportError as ex:
+                    warning("Cannot set filter: %s" % ex)
         if self.promisc:
             set_promisc(self.ins, self.iface)
         self.ins.bind((self.iface, type))
@@ -484,7 +418,19 @@
         )
         if not six.PY2:
             # Receive Auxiliary Data (VLAN tags)
-            self.ins.setsockopt(SOL_PACKET, PACKET_AUXDATA, 1)
+            try:
+                self.ins.setsockopt(SOL_PACKET, PACKET_AUXDATA, 1)
+                self.ins.setsockopt(
+                    socket.SOL_SOCKET,
+                    SO_TIMESTAMPNS,
+                    1
+                )
+                self.auxdata_available = True
+            except OSError:
+                # Note: Auxiliary Data is only supported since
+                #       Linux 2.6.21
+                msg = "Your Linux Kernel does not support Auxiliary Data!"
+                log_runtime.info(msg)
         if isinstance(self, L2ListenSocket):
             self.outs = None
         else:
@@ -512,46 +458,17 @@
         try:
             if self.promisc and self.ins:
                 set_promisc(self.ins, self.iface, 0)
-        except AttributeError:
+        except (AttributeError, OSError):
             pass
         SuperSocket.close(self)
 
-    if six.PY2:
-        def _recv_raw(self, sock, x):
-            """Internal function to receive a Packet"""
-            pkt, sa_ll = sock.recvfrom(x)
-            return pkt, sa_ll
-    else:
-        def _recv_raw(self, sock, x):
-            """Internal function to receive a Packet,
-            and process ancillary data.
-            """
-            flags_len = socket.CMSG_LEN(4096)
-            pkt, ancdata, flags, sa_ll = sock.recvmsg(x, flags_len)
-            if not pkt:
-                return pkt, sa_ll
-            for cmsg_lvl, cmsg_type, cmsg_data in ancdata:
-                # Check available ancillary data
-                if (cmsg_lvl == SOL_PACKET and cmsg_type == PACKET_AUXDATA):
-                    # Parse AUXDATA
-                    auxdata = tpacket_auxdata.from_buffer_copy(cmsg_data)
-                    if auxdata.tp_vlan_tci != 0 or \
-                            auxdata.tp_status & TP_STATUS_VLAN_VALID:
-                        # Insert VLAN tag
-                        tag = struct.pack(
-                            "!HH",
-                            ETH_P_8021Q,
-                            auxdata.tp_vlan_tci
-                        )
-                        pkt = pkt[:12] + tag + pkt[12:]
-            return pkt, sa_ll
-
     def recv_raw(self, x=MTU):
         """Receives a packet, then returns a tuple containing (cls, pkt_data, time)"""  # noqa: E501
-        pkt, sa_ll = self._recv_raw(self.ins, x)
+        pkt, sa_ll, ts = self._recv_raw(self.ins, x)
         if self.outs and sa_ll[2] == socket.PACKET_OUTGOING:
             return None, None, None
-        ts = get_last_packet_timestamp(self.ins)
+        if ts is None:
+            ts = get_last_packet_timestamp(self.ins)
         return self.LL, pkt, ts
 
     def send(self, x):
@@ -580,7 +497,8 @@
     def recv(self, x=MTU):
         pkt = SuperSocket.recv(self, x)
         if pkt and self.lvl == 2:
-            pkt = pkt.payload
+            pkt.payload.time = pkt.time
+            return pkt.payload
         return pkt
 
     def send(self, x):
@@ -591,11 +509,17 @@
         self.outs.bind(sdto)
         sn = self.outs.getsockname()
         ll = lambda x: x
-        if type(x) in conf.l3types:
-            sdto = (iff, conf.l3types[type(x)])
+        type_x = type(x)
+        if type_x in conf.l3types:
+            sdto = (iff, conf.l3types[type_x])
         if sn[3] in conf.l2types:
             ll = lambda x: conf.l2types[sn[3]]() / x
+        if self.lvl == 3 and type_x != self.LL:
+            warning("Incompatible L3 types detected using %s instead of %s !",
+                    type_x, self.LL)
+            self.LL = type_x
         sx = raw(ll(x))
+        x.sent_time = time.time()
         try:
             self.outs.sendto(sx, sdto)
         except socket.error as msg:
@@ -606,7 +530,6 @@
                     self.outs.sendto(raw(ll(p)), sdto)
             else:
                 raise
-        x.sent_time = time.time()
 
 
 class VEthPair(object):

scapy-2.4.3.tar.gz/scapy/arch/pcapdnet.py -> scapy-2.4.4.tar.gz/scapy/arch/pcapdnet.py Changed

@@ -4,7 +4,7 @@
 # This program is published under a GPLv2 license
 
 """
-Packet sending and receiving with libdnet and libpcap/WinPcap.
+Packet sending and receiving libpcap/WinPcap.
 """
 
 import os
@@ -15,12 +15,11 @@
 
 from scapy.automaton import SelectableObject
 from scapy.arch.common import _select_nonblock
-from scapy.compat import raw, plain_str, chb
+from scapy.compat import raw, plain_str
 from scapy.config import conf
 from scapy.consts import WINDOWS
-from scapy.data import MTU, ETH_P_ALL, ARPHDR_ETHER, ARPHDR_LOOPBACK
+from scapy.data import MTU, ETH_P_ALL
 from scapy.pton_ntop import inet_ntop
-from scapy.utils import mac2str
 from scapy.supersocket import SuperSocket
 from scapy.error import Scapy_Exception, log_loading, warning
 import scapy.consts
@@ -42,28 +41,29 @@
 
     def __init__(self):
         SelectableObject.__init__(self)
+        self.cls = None
 
     def check_recv(self):
         return True
 
     def recv_raw(self, x=MTU):
         """Receives a packet, then returns a tuple containing (cls, pkt_data, time)"""  # noqa: E501
-        ll = self.ins.datalink()
-        if ll in conf.l2types:
-            cls = conf.l2types[ll]
-        else:
-            cls = conf.default_l2
-            warning("Unable to guess datalink type (interface=%s linktype=%i). Using %s",  # noqa: E501
-                    self.iface, ll, cls.name)
-
-        pkt = None
-        while pkt is None:
-            pkt = self.ins.next()
-            if pkt is not None:
-                ts, pkt = pkt
-            if pkt is None:
-                return None, None, None
-        return cls, pkt, ts
+        if self.cls is None:
+            ll = self.ins.datalink()
+            if ll in conf.l2types:
+                self.cls = conf.l2types[ll]
+            else:
+                self.cls = conf.default_l2
+                warning(
+                    "Unable to guess datalink type "
+                    "(interface=%s linktype=%i). Using %s",
+                    self.iface, ll, self.cls.name
+                )
+
+        ts, pkt = self.ins.next()
+        if pkt is None:
+            return None, None, None
+        return self.cls, pkt, ts
 
     def nonblock_recv(self):
         """Receives and dissect a packet in non-blocking mode.
@@ -86,28 +86,29 @@
     if WINDOWS:
         # Windows specific
         NPCAP_PATH = os.environ["WINDIR"] + "\\System32\\Npcap"
-        from scapy.modules.winpcapy import pcap_setmintocopy
+        from scapy.libs.winpcapy import pcap_setmintocopy
     else:
-        from scapy.modules.winpcapy import pcap_get_selectable_fd
+        from scapy.libs.winpcapy import pcap_get_selectable_fd
     from ctypes import POINTER, byref, create_string_buffer, c_ubyte, cast
 
     # Part of the Winpcapy integration was inspired by phaethon/scapy
     # but he destroyed the commit history, so there is no link to that
     try:
-        from scapy.modules.winpcapy import PCAP_ERRBUF_SIZE, pcap_if_t, \
+        from scapy.libs.winpcapy import PCAP_ERRBUF_SIZE, pcap_if_t, \
             sockaddr_in, sockaddr_in6, pcap_findalldevs, pcap_freealldevs, \
             pcap_lib_version, pcap_close, \
             pcap_open_live, pcap_pkthdr, \
             pcap_next_ex, pcap_datalink, \
             pcap_compile, pcap_setfilter, pcap_setnonblock, pcap_sendpacket, \
-            bpf_program as winpcapy_bpf_program
+            bpf_program
 
         def load_winpcapy():
-            """This functions calls Winpcap/Npcap pcap_findalldevs function,
-            and extracts and parse all the data scapy will need to use it:
-             - the Interface List
-            This data is stored in their respective conf.cache_* subfields:
-                conf.cache_iflist
+            """This functions calls libpcap ``pcap_findalldevs`` function,
+            and extracts and parse all the data scapy will need
+            to build the Interface List.
+
+            The date will be stored in ``conf.cache_iflist``, or accessible
+            with ``get_if_list()``
             """
             err = create_string_buffer(PCAP_ERRBUF_SIZE)
             devs = POINTER(pcap_if_t)()
@@ -176,7 +177,7 @@
                             "Please use Npcap instead")
             elif b"npcap" in version.lower():
                 conf.use_npcap = True
-                LOOPBACK_NAME = scapy.consts.LOOPBACK_NAME = "Npcap Loopback Adapter"  # noqa: E501
+                conf.loopback_name = conf.loopback_name = "Npcap Loopback Adapter"  # noqa: E501
 
 if conf.use_pcap:
     def get_if_list():
@@ -185,17 +186,18 @@
             load_winpcapy()
         return list(conf.cache_iflist)
 
-    class _PcapWrapper_winpcap:  # noqa: F811
-        """Wrapper for the WinPcap calls"""
+    class _PcapWrapper_libpcap:  # noqa: F811
+        """Wrapper for the libpcap calls"""
 
         def __init__(self, device, snaplen, promisc, to_ms, monitor=None):
             self.errbuf = create_string_buffer(PCAP_ERRBUF_SIZE)
             self.iface = create_string_buffer(device.encode("utf8"))
+            self.dtl = None
             if monitor:
                 if WINDOWS and not conf.use_npcap:
                     raise OSError("On Windows, this feature requires NPcap !")
                 # Npcap-only functions
-                from scapy.modules.winpcapy import pcap_create, \
+                from scapy.libs.winpcapy import pcap_create, \
                     pcap_set_snaplen, pcap_set_promisc, \
                     pcap_set_timeout, pcap_set_rfmon, pcap_activate
                 self.pcap = pcap_create(self.iface, self.errbuf)
@@ -210,6 +212,9 @@
                 self.pcap = pcap_open_live(self.iface,
                                            snaplen, promisc, to_ms,
                                            self.errbuf)
+                error = bytes(bytearray(self.errbuf)).strip(b"\x00")
+                if error:
+                    raise OSError(error)
 
             if WINDOWS:
                 # Winpcap/Npcap exclusive: make every packet to be instantly
@@ -218,24 +223,35 @@
 
             self.header = POINTER(pcap_pkthdr)()
             self.pkt_data = POINTER(c_ubyte)()
-            self.bpf_program = winpcapy_bpf_program()
+            self.bpf_program = bpf_program()
 
         def next(self):
-            c = pcap_next_ex(self.pcap, byref(self.header), byref(self.pkt_data))  # noqa: E501
+            """
+            Returns the next packet as the tuple
+            (timestamp, raw_packet)
+            """
+            c = pcap_next_ex(
+                self.pcap,
+                byref(self.header),
+                byref(self.pkt_data)
+            )
             if not c > 0:
-                return
-            ts = self.header.contents.ts.tv_sec + float(self.header.contents.ts.tv_usec) / 1000000  # noqa: E501
-            pkt = b"".join(chb(i) for i in self.pkt_data[:self.header.contents.len])  # noqa: E501
+                return None, None
+            ts = self.header.contents.ts.tv_sec + float(self.header.contents.ts.tv_usec) / 1e6  # noqa: E501
+            pkt = bytes(bytearray(self.pkt_data[:self.header.contents.len]))
             return ts, pkt
         __next__ = next
 
         def datalink(self):
-            return pcap_datalink(self.pcap)
+            """Wrapper around pcap_datalink"""
+            if self.dtl is None:
+                self.dtl = pcap_datalink(self.pcap)
+            return self.dtl
 
         def fileno(self):
             if WINDOWS:
                 log_loading.error("Cannot get selectable PCAP fd on Windows")
-                return 0
+                return -1
             else:
                 # This does not exist under Windows
                 return pcap_get_selectable_fd(self.pcap)
@@ -259,7 +275,7 @@
 
         def close(self):
             pcap_close(self.pcap)
-    open_pcap = lambda *args, **kargs: _PcapWrapper_winpcap(*args, **kargs)
+    open_pcap = _PcapWrapper_libpcap
 
     # pcap sockets
 
@@ -341,9 +357,11 @@
 
         def send(self, x):
             sx = raw(x)
-            if hasattr(x, "sent_time"):
+            try:
                 x.sent_time = time.time()
-            return self.outs.send(sx)
+            except AttributeError:
+                pass
+            self.outs.send(sx)
 
     class L3pcapSocket(L2pcapSocket):
         desc = "read/write packets at layer 3 using only libpcap"
@@ -351,7 +369,9 @@
         def recv(self, x=MTU):
             r = L2pcapSocket.recv(self, x)
             if r:
+                r.payload.time = r.time
                 return r.payload
+            return r
 
         def send(self, x):
             # Makes send detects when it should add Loopback(), Dot11... instead of Ether()  # noqa: E501
@@ -362,98 +382,13 @@
                 cls = conf.default_l2
                 warning("Unable to guess datalink type (interface=%s linktype=%i). Using %s", self.iface, ll, cls.name)  # noqa: E501
             sx = raw(cls() / x)
-            if hasattr(x, "sent_time"):
+            try:
                 x.sent_time = time.time()
-            return self.ins.send(sx)
+            except AttributeError:
+                pass
+            self.outs.send(sx)
 else:
     # No libpcap installed
     get_if_list = lambda: []
     if WINDOWS:
         NPCAP_PATH = ""
-
-##########
-#  DNET  #
-##########
-
-# DEPRECATED
-
-if conf.use_dnet:
-    warning("dnet usage with scapy is deprecated, and will be removed in a future version.")  # noqa: E501
-    try:
-        try:
-            # First try to import dnet
-            import dnet
-        except ImportError:
-            # Then, try to import dumbnet as dnet
-            import dumbnet as dnet
-    except ImportError as e:
-        if conf.interactive:
-            log_loading.error("Unable to import dnet module: %s", e)
-            conf.use_dnet = False
-
-            def get_if_raw_hwaddr(iff):
-                "dummy"
-                return (0, b"\0\0\0\0\0\0")
-
-            def get_if_raw_addr(iff):  # noqa: F811
-                "dummy"
-                return b"\0\0\0\0"
-
-            def get_if_list():
-                "dummy"
-                return {}
-        else:
-            raise
-    else:
-        def get_if_raw_hwaddr(iff):
-            """Return a tuple containing the link type and the raw hardware
-               address corresponding to the interface 'iff'"""
-
-            if iff == scapy.arch.LOOPBACK_NAME:
-                return (ARPHDR_LOOPBACK, b'\x00' * 6)
-
-            # Retrieve interface information
-            try:
-                tmp_intf = dnet.intf().get(iff)
-                link_addr = tmp_intf["link_addr"]
-            except Exception:
-                raise Scapy_Exception("Error in attempting to get hw address"
-                                      " for interface [%s]" % iff)
-
-            if hasattr(link_addr, "type"):
-                # Legacy dnet module
-                return link_addr.type, link_addr.data
-
-            else:
-                # dumbnet module
-                mac = mac2str(str(link_addr))
-
-                # Adjust the link type
-                if tmp_intf["type"] == 6:  # INTF_TYPE_ETH from dnet
-                    return (ARPHDR_ETHER, mac)
-
-                return (tmp_intf["type"], mac)
-
-        def get_if_raw_addr(ifname):  # noqa: F811
-            i = dnet.intf()
-            try:
-                return i.get(ifname)["addr"].data
-            except (OSError, KeyError):
-                warning("No MAC address found on %s !" % ifname)
-                return b"\0\0\0\0"
-
-        def get_if_list():
-            """Returns all dnet names"""
-            return [i.get("name", None) for i in dnet.intf()]
-
-        def get_working_if():
-            """Returns the first interface than can be used with dnet"""
-
-            if_iter = iter(dnet.intf())
-
-            try:
-                intf = next(if_iter)
-            except (StopIteration, RuntimeError):
-                return scapy.consts.LOOPBACK_NAME
-
-            return intf.get("name", scapy.consts.LOOPBACK_NAME)

scapy-2.4.3.tar.gz/scapy/arch/solaris.py -> scapy-2.4.4.tar.gz/scapy/arch/solaris.py Changed

scapy-2.4.3.tar.gz/scapy/arch/unix.py -> scapy-2.4.4.tar.gz/scapy/arch/unix.py Changed

@@ -14,7 +14,7 @@
 import scapy.utils
 from scapy.arch import get_if_addr
 from scapy.config import conf
-from scapy.consts import FREEBSD, NETBSD, OPENBSD, SOLARIS, LOOPBACK_NAME
+from scapy.consts import FREEBSD, NETBSD, OPENBSD, SOLARIS
 from scapy.error import warning, log_interactive
 from scapy.pton_ntop import inet_pton
 from scapy.utils6 import in6_getscope, construct_source_candidate_set
@@ -49,7 +49,7 @@
     if SOLARIS:
         f = os.popen("netstat -rvn -f inet")
     elif FREEBSD:
-        f = os.popen("netstat -rnW")  # -W to handle long interface names
+        f = os.popen("netstat -rnW -f inet")  # -W to show long interface names
     else:
         f = os.popen("netstat -rn -f inet")
     ok = 0
@@ -71,7 +71,7 @@
                 mtu_present = "mtu" in line
                 prio_present = "prio" in line
                 refs_present = "ref" in line  # There is no s on Solaris
-                use_present = "use" in line
+                use_present = "use" in line or "nhop" in line
             continue
         if not line:
             break
@@ -212,9 +212,9 @@
 
         # Get the list of network interfaces
         splitted_line = []
-        for l in f:
-            if "flags" in l:
-                iface = l.split()[0].rstrip(':')
+        for line in f:
+            if "flags" in line:
+                iface = line.split()[0].rstrip(':')
                 splitted_line.append(iface)
 
     else:  # FreeBSD, NetBSD or Darwin
@@ -339,7 +339,7 @@
             # Note: multicast routing is handled in Route6.route()
             continue
 
-        if LOOPBACK_NAME in dev:
+        if conf.loopback_name in dev:
             # Handle ::1 separately
             cset = ["::1"]
             next_hop = "::"

scapy-2.4.3.tar.gz/scapy/arch/windows/__init__.py -> scapy-2.4.4.tar.gz/scapy/arch/windows/__init__.py Changed

@@ -11,13 +11,12 @@
 from __future__ import absolute_import
 from __future__ import print_function
 import os
+import platform as platform_lib
 import socket
 import subprocess as sp
 from glob import glob
 import struct
 
-import scapy
-import scapy.consts
 from scapy.arch.windows.structures import _windows_title, \
     GetAdaptersAddresses, GetIpForwardTable, GetIpForwardTable2, \
     get_service_status
@@ -34,12 +33,24 @@
 from scapy.supersocket import SuperSocket
 
 conf.use_pcap = True
-conf.use_dnet = False
 
 # These import must appear after setting conf.use_* variables
 from scapy.arch import pcapdnet  # noqa: E402
 from scapy.arch.pcapdnet import NPCAP_PATH, get_if_list  # noqa: E402
 
+# Detection happens after pcapdnet import (NPcap detection)
+NPCAP_LOOPBACK_NAME = r"\Device\NPF_Loopback"
+if conf.use_npcap:
+    conf.loopback_name = NPCAP_LOOPBACK_NAME
+else:
+    try:
+        if float(platform_lib.release()) >= 8.1:
+            conf.loopback_name = "Microsoft KM-TEST Loopback Adapter"
+        else:
+            conf.loopback_name = "Microsoft Loopback Adapter"
+    except ValueError:
+        conf.loopback_name = "Microsoft Loopback Adapter"
+
 # hot-patching socket for missing variables on Windows
 if not hasattr(socket, 'IPPROTO_IPIP'):
     socket.IPPROTO_IPIP = 4
@@ -306,6 +317,7 @@
     def __init__(self, data=None):
         self.name = None
         self.ip = None
+        self.ip6 = None
         self.mac = None
         self.pcap_name = None
         self.description = None
@@ -325,6 +337,7 @@
         """
         self.data = data
         self.name = data['name']
+        self.pcap_name = data['pcap_name']
         self.description = data['description']
         self.win_index = data['win_index']
         self.guid = data['guid']
@@ -332,51 +345,42 @@
         self.ipv4_metric = data['ipv4_metric']
         self.ipv6_metric = data['ipv6_metric']
         self.ips = data['ips']
-        if 'invalid' in data:
-            self.invalid = data['invalid']
-        # Other attributes are optional
-        self._update_pcapdata()
+        self.flags = data['flags']
+        self.invalid = data['invalid']
 
         try:
             # Npcap loopback interface
-            if conf.use_npcap:
-                pcap_name_loopback = _get_npcap_config("LoopbackAdapter")
-                if pcap_name_loopback:  # May not be defined
-                    guid = _pcapname_to_guid(pcap_name_loopback)
-                    if self.guid == guid:
-                        # https://nmap.org/npcap/guide/npcap-devguide.html
-                        self.mac = "00:00:00:00:00:00"
-                        self.ip = "127.0.0.1"
-                        return
+            if conf.use_npcap and self.pcap_name == NPCAP_LOOPBACK_NAME:
+                # https://nmap.org/npcap/guide/npcap-devguide.html
+                self.mac = "00:00:00:00:00:00"
+                self.ip = "127.0.0.1"
+                self.ip6 = "::1"
+                return
         except KeyError:
             pass
 
-        try:
-            self.ip = next(x for x in self.ips if ":" not in x)
-        except StopIteration:
-            pass
+        # Chose main IPv4
+        if self.ips:
+            try:
+                self.ip = next(x for x in self.ips if ":" not in x)
+            except StopIteration:
+                pass
+            try:
+                self.ip6 = next(x for x in self.ips if ":" in x)
+            except StopIteration:
+                pass
+            if not self.ip and not self.ip6:
+                self.invalid = True
 
-        try:
-            # Windows native loopback interface
-            if not self.ip and self.name == scapy.consts.LOOPBACK_NAME:
-                self.ip = "127.0.0.1"
-        except (KeyError, AttributeError, NameError) as e:
-            print(e)
+    def __hash__(self):
+        return hash(self.guid)
 
-    def _update_pcapdata(self):
-        # https://github.com/nmap/nmap/issues/1422
-        # Lookup for the Winpcap/Npcap pcap_name according to the GUID
-        if self.is_invalid():
-            return
-        for pcap_name, if_data in six.iteritems(conf.cache_iflist):
-            _, ips, flags = if_data
-            if pcap_name.endswith(self.guid):
-                self.pcap_name = pcap_name
-                self.flags = flags
-                self.ips.extend(x for x in ips if x not in self.ips)
-                return
-        # No matching pcap_name found: won't be able to sniff on it
-        self.invalid = True
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.name == other or self.pcap_name == other
+        if isinstance(other, NetworkInterface):
+            return self.data == other.data
+        return object.__eq__(self, other)
 
     def is_invalid(self):
         return self.invalid
@@ -385,8 +389,6 @@
         if not conf.use_npcap:
             raise OSError("This operation requires Npcap.")
         if self.raw80211 is None:
-            # The Dot11Adapters is not officially supported anymore.
-            # we just try/except, and check that it exists globally
             val = _get_npcap_config("Dot11Support")
             self.raw80211 = bool(int(val)) if val else False
         if not self.raw80211:
@@ -400,7 +402,7 @@
         _windows_title()  # Reset title of the window
         if code != 0:
             raise OSError(res.decode("utf8", errors="ignore"))
-        return (code == 0)
+        return True
 
     def _npcap_get(self, key):
         res, code = _exec_cmd(" ".join([_WlanHelper, self.guid[1:-1], key]))
@@ -620,9 +622,6 @@
                         return True
                     elif _confir in ["no", "n"]:
                         return False
-                return False
-        _error_msg = ("No match between your pcap and windows "
-                      "network interfaces found. ")
         if _detect:
             # No action needed
             return
@@ -635,8 +634,7 @@
                 if succeed:
                     log_loading.info("Pcap service started !")
                     return
-            _error_msg = "Could not start the pcap service ! "
-        warning(_error_msg +
+        warning("Could not start the pcap service ! "
                 "You probably won't be able to send packets. "
                 "Deactivating unneeded interfaces and restarting "
                 "Scapy might help. Check your winpcap/npcap installation "
@@ -647,45 +645,45 @@
             # Try a restart
             NetworkInterfaceDict._pcap_check()
 
+        windows_interfaces = dict()
         for i in get_windows_if_list():
-            try:
-                interface = NetworkInterface(i)
-                self.data[interface.guid] = interface
-            except KeyError:
-                pass
-
-        # Remove invalid loopback interfaces (not usable)
-        for key, iface in self.data.copy().items():
-            if iface.ip == "127.0.0.1" and iface.is_invalid():
-                del self.data[key]
+            # Detect Loopback interface
+            if "Loopback" in i['name']:
+                i['name'] = conf.loopback_name
+            if i['guid']:
+                if conf.use_npcap and i['name'] == conf.loopback_name:
+                    i['guid'] = NPCAP_LOOPBACK_NAME
+                windows_interfaces[i['guid']] = i
 
-        # Replace LOOPBACK_INTERFACE
-        try:
-            scapy.consts.LOOPBACK_INTERFACE = self.dev_from_name(
-                scapy.consts.LOOPBACK_NAME,
-            )
-        except ValueError:
-            pass
-        # Support non-windows cards (e.g. Napatech)
         index = 0
         for pcap_name, if_data in six.iteritems(conf.cache_iflist):
-            name, _, _ = if_data
+            name, ips, flags = if_data
             guid = _pcapname_to_guid(pcap_name)
-            if guid not in self.data:
+            data = windows_interfaces.get(guid, None)
+            if data:
+                # Exists in Windows registry
+                data['pcap_name'] = pcap_name
+                data['ips'].extend(ips)
+                data['flags'] = flags
+                data['invalid'] = False
+            else:
+                # Only in [Wi]npcap
                 index -= 1
-                dummy_data = {
+                data = {
                     'name': name,
-                    'description': "[Unknown] %s" % name,
+                    'pcap_name': pcap_name,
+                    'description': name,
                     'win_index': index,
                     'guid': guid,
                     'invalid': False,
-                    'mac': 'ff:ff:ff:ff:ff:ff',
+                    'mac': '00:00:00:00:00:00',
                     'ipv4_metric': 0,
                     'ipv6_metric': 0,
-                    'ips': []
+                    'ips': ips,
+                    'flags': flags
                 }
-                # No KeyError will happen here, as we get it from cache
-                self.data[guid] = NetworkInterface(dummy_data)
+            # No KeyError will happen here, as we get it from cache
+            self.data[guid] = NetworkInterface(data)
 
     def dev_from_name(self, name):
         """Return the first pcap device name for a given Windows
@@ -713,9 +711,7 @@
                         if iface.win_index == if_index)
         except (StopIteration, RuntimeError):
             if str(if_index) == "1":
-                # Test if the loopback interface is set up
-                if isinstance(scapy.consts.LOOPBACK_INTERFACE, NetworkInterface):  # noqa: E501
-                    return scapy.consts.LOOPBACK_INTERFACE
+                return IFACES.dev_from_pcapname(conf.loopback_name)
             raise ValueError("Unknown network interface index %r" % if_index)
 
     def reload(self):
@@ -744,9 +740,13 @@
                 str(dev.description)
             )
             index = str(dev.win_index)
-            res.append((index, description, str(dev.ip), mac))
+            res.append((index, description, str(dev.ip), str(dev.ip6), mac))
 
-        res = pretty_list(res, [("INDEX", "IFACE", "IP", "MAC")], sortBy=2)
+        res = pretty_list(
+            res,
+            [("INDEX", "IFACE", "IPv4", "IPv6", "MAC")],
+            sortBy=2
+        )
         if print_result:
             print(res)
         else:
@@ -800,7 +800,7 @@
         if not isinstance(iface, NetworkInterface) and \
            iface_pcap_name is not None:
             iface = IFACES.dev_from_name(iface)
-        if iface.is_invalid():
+        if iface is None or iface.is_invalid():
             raise Scapy_Exception(
                 "Interface is invalid (no pcap match found) !"
             )
@@ -838,7 +838,7 @@
         # Build route
         try:
             iface = dev_from_index(ifIndex)
-            if iface.ip == "0.0.0.0":
+            if not iface.ip or iface.ip == "0.0.0.0":
                 continue
         except ValueError:
             continue
@@ -857,31 +857,28 @@
     sock_addr_name = 'Ipv6' if ipv6 else 'Ipv4'
     sin_addr_name = 'sin6_addr' if ipv6 else 'sin_addr'
     metric_name = 'ipv6_metric' if ipv6 else 'ipv4_metric'
-    ip_len = 16 if ipv6 else 4
     if ipv6:
         lifaddr = in6_getifaddr()
     routes = []
 
-    def _extract_ip_netmask(obj):
+    def _extract_ip(obj):
         ip = obj[sock_addr_name][sin_addr_name]
         ip = bytes(bytearray(ip['byte']))
-        # Extract netmask
-        netmask = (ip_len - (len(ip) - len(ip.rstrip(b"\x00")))) * 8
         # Build IP
         ip = inet_ntop(af, ip)
-        return ip, netmask
+        return ip
 
     for route in GetIpForwardTable2(af):
         # Extract data
         ifIndex = route['InterfaceIndex']
-        _dest = route['DestinationPrefix']
-        dest, netmask = _extract_ip_netmask(_dest['Prefix'])
-        nexthop, _ = _extract_ip_netmask(route['NextHop'])
+        dest = _extract_ip(route['DestinationPrefix']['Prefix'])
+        netmask = route['DestinationPrefix']['PrefixLength']
+        nexthop = _extract_ip(route['NextHop'])
         metric = route['Metric']
         # Build route
         try:
             iface = dev_from_index(ifIndex)
-            if iface.ip == "0.0.0.0":
+            if not iface.ip or iface.ip == "0.0.0.0":
                 continue
         except ValueError:
             continue
@@ -903,7 +900,7 @@
         if WINDOWS_XP:
             routes = _read_routes_c_v1()
         else:
-            routes = _read_routes_c(False)
+            routes = _read_routes_c(ipv6=False)
     except Exception as e:
         warning("Error building scapy IPv4 routing table : %s", e)
     else:
@@ -929,14 +926,14 @@
             scope = in6_getscope(ip)
             ifaddrs.append((ip, scope, iface))
     # Appends Npcap loopback if available
-    if conf.use_npcap and scapy.consts.LOOPBACK_INTERFACE:
-        ifaddrs.append(("::1", 0, scapy.consts.LOOPBACK_INTERFACE))
+    if conf.use_npcap and conf.loopback_name:
+        ifaddrs.append(("::1", 0, conf.loopback_name))
     return ifaddrs
 
 
 def _append_route6(routes, dpref, dp, nh, iface, lifaddr, metric):
     cset = []  # candidate set (possible source addresses)
-    if iface.name == scapy.consts.LOOPBACK_NAME:
+    if iface.name == conf.loopback_name:
         if dpref == '::':
             return
         cset = ['::1']
@@ -968,8 +965,8 @@
         iface = min(conf.route.routes, key=lambda x: x[1])[3]
     except ValueError:
         # no route
-        iface = scapy.consts.LOOPBACK_INTERFACE
-    if iface.is_invalid():
+        iface = conf.loopback_name
+    if isinstance(iface, NetworkInterface) and iface.is_invalid():
         # Backup mode: try them all
         for iface in six.itervalues(IFACES):
             if not iface.is_invalid():
@@ -979,14 +976,14 @@
 
 
 def _get_valid_guid():
-    if scapy.consts.LOOPBACK_INTERFACE:
-        return scapy.consts.LOOPBACK_INTERFACE.guid
+    if conf.loopback_name:
+        return conf.loopback_name.guid
     else:
         return next((i.guid for i in six.itervalues(IFACES)
                      if not i.is_invalid()), None)
 
 
-def route_add_loopback(routes=None, ipv6=False, iflist=None):
+def _route_add_loopback(routes=None, ipv6=False, iflist=None):
     """Add a route to 127.0.0.1 and ::1 to simplify unit tests on Windows"""
     if not WINDOWS:
         warning("Not available")
@@ -1000,7 +997,8 @@
         if not conf.route.routes:
             return
     data = {
-        'name': scapy.consts.LOOPBACK_NAME,
+        'name': conf.loopback_name,
+        'pcap_name': "\\Device\\NPF_{0XX00000-X000-0X0X-X00X-00XXXX000XXX}",
         'description': "Loopback",
         'win_index': -1,
         'guid': "{0XX00000-X000-0X0X-X00X-00XXXX000XXX}",
@@ -1008,34 +1006,28 @@
         'mac': '00:00:00:00:00:00',
         'ipv4_metric': 0,
         'ipv6_metric': 0,
-        'ips': ["127.0.0.1", "::"]
+        'ips': ["127.0.0.1", "::"],
+        'flags': 0
     }
-    adapter = NetworkInterface()
-    adapter.pcap_name = "\\Device\\NPF_{0XX00000-X000-0X0X-X00X-00XXXX000XXX}"
-    adapter.update(data)
-    adapter.invalid = False
-    adapter.ip = "127.0.0.1"
+    adapter = NetworkInterface(data)
     if iflist:
         iflist.append(adapter.pcap_name)
         return
-    # Remove all LOOPBACK_NAME routes
+    # Remove all conf.loopback_name routes
     for route in list(conf.route.routes):
         iface = route[3]
-        if iface.name == scapy.consts.LOOPBACK_NAME:
+        if iface.pcap_name == conf.loopback_name:
             conf.route.routes.remove(route)
-    # Remove LOOPBACK_NAME interface
+    # Remove conf.loopback_name interface
     for devname, iface in list(IFACES.items()):
-        if iface.name == scapy.consts.LOOPBACK_NAME:
+        if iface.pcap_name == conf.loopback_name:
             IFACES.pop(devname)
     # Inject interface
     IFACES["{0XX00000-X000-0X0X-X00X-00XXXX000XXX}"] = adapter
-    scapy.consts.LOOPBACK_INTERFACE = adapter
+    conf.loopback_name = adapter.pcap_name
     if isinstance(conf.iface, NetworkInterface):
-        if conf.iface.name == scapy.consts.LOOPBACK_NAME:
+        if conf.iface.pcap_name == conf.loopback_name:
             conf.iface = adapter
-    if isinstance(conf.iface6, NetworkInterface):
-        if conf.iface6.name == scapy.consts.LOOPBACK_NAME:
-            conf.iface6 = adapter
     conf.netcache.arp_cache["127.0.0.1"] = "ff:ff:ff:ff:ff:ff"
     conf.netcache.in6_neighbor["::1"] = "ff:ff:ff:ff:ff:ff"
     # Build the packed network addresses

scapy-2.4.3.tar.gz/scapy/arch/windows/native.py -> scapy-2.4.4.tar.gz/scapy/arch/windows/native.py Changed

scapy-2.4.3.tar.gz/scapy/as_resolvers.py -> scapy-2.4.4.tar.gz/scapy/as_resolvers.py Changed

scapy-2.4.3.tar.gz/scapy/asn1/__init__.py -> scapy-2.4.4.tar.gz/scapy/asn1/__init__.py Changed

scapy-2.4.3.tar.gz/scapy/asn1/asn1.py -> scapy-2.4.4.tar.gz/scapy/asn1/asn1.py Changed

@@ -335,9 +335,9 @@
             else:
                 warning("Invalid val: should be bytes")
                 val = "<invalid val_readable>"
-            super(ASN1_Object, self).__setattr__("val", val)
-            super(ASN1_Object, self).__setattr__(name, value)
-            super(ASN1_Object, self).__setattr__("unused_bits", 0)
+            object.__setattr__(self, "val", val)
+            object.__setattr__(self, name, value)
+            object.__setattr__(self, "unused_bits", 0)
         elif name == "val":
             value = plain_str(value)
             if isinstance(value, str):
@@ -356,14 +356,14 @@
                 warning("Invalid val: should be str")
                 val_readable = b"<invalid val>"
                 unused_bits = 0
-            super(ASN1_Object, self).__setattr__("val_readable", val_readable)
-            super(ASN1_Object, self).__setattr__(name, value)
-            super(ASN1_Object, self).__setattr__("unused_bits", unused_bits)
+            object.__setattr__(self, "val_readable", val_readable)
+            object.__setattr__(self, name, value)
+            object.__setattr__(self, "unused_bits", unused_bits)
         elif name == "unused_bits":
             warning("Invalid operation: unused_bits rewriting "
                     "is not supported.")
         else:
-            super(ASN1_Object, self).__setattr__(name, value)
+            object.__setattr__(self, name, value)
 
     def __repr__(self):
         s = self.val_readable
@@ -396,7 +396,8 @@
     tag = ASN1_Class_UNIVERSAL.OID
 
     def __init__(self, val):
-        val = conf.mib._oid(plain_str(val))
+        val = plain_str(val)
+        val = conf.mib._oid(val)
         ASN1_Object.__init__(self, val)
         self.oidname = conf.mib._oidname(val)

scapy-2.4.3.tar.gz/scapy/asn1/mib.py -> scapy-2.4.4.tar.gz/scapy/asn1/mib.py Changed

@@ -29,10 +29,6 @@
 
 
 class MIBDict(DADict):
-    def fixname(self, val):
-        # We overwrite DADict fixname method as we want to keep - in names
-        return val
-
     def _findroot(self, x):
         """Internal MIBDict function used to find a partial OID"""
         if x.startswith("."):
@@ -88,12 +84,21 @@
         do_graph(s, **kargs)
 
 
-def _mib_register(ident, value, the_mib, unresolved):
-    """Internal function used to register an OID and its name in a MIBDict"""
-    if ident in the_mib or ident in unresolved:
-        return ident in the_mib
+def _mib_register(ident, value, the_mib, unresolved, alias):
+    """
+    Internal function used to register an OID and its name in a MIBDict
+    """
+    if ident in the_mib:
+        # We have already resolved this one. Store the alias
+        alias[".".join(value)] = ident
+        return True
+    if ident in unresolved:
+        # We know we can't resolve this one
+        return False
     resval = []
     not_resolved = 0
+    # Resolve the OID
+    # (e.g. 2.basicConstraints.3 -> 2.2.5.29.19.3)
     for v in value:
         if _mib_re_integer.match(v):
             resval.append(v)
@@ -110,15 +115,20 @@
             else:
                 resval.append(v)
     if not_resolved:
+        # Unresolved
         unresolved[ident] = resval
         return False
     else:
+        # Fully resolved
         the_mib[ident] = resval
         keys = list(unresolved)
         i = 0
+        # Go through the unresolved to update the ones that
+        # depended on the one we just did
         while i < len(keys):
             k = keys[i]
-            if _mib_register(k, unresolved[k], the_mib, {}):
+            if _mib_register(k, unresolved[k], the_mib, {}, alias):
+                # Now resolved: we can remove it from unresolved
                 del(unresolved[k])
                 del(keys[i])
                 i = 0
@@ -129,19 +139,26 @@
 
 
 def load_mib(filenames):
-    """Load the conf.mib dict from a list of filenames"""
+    """
+    Load the conf.mib dict from a list of filenames
+    """
     the_mib = {'iso': ['1']}
     unresolved = {}
+    alias = {}
+    # Export the current MIB to a working dictionary
     for k in six.iterkeys(conf.mib):
-        _mib_register(conf.mib[k], k.split("."), the_mib, unresolved)
+        _mib_register(conf.mib[k], k.split("."), the_mib, unresolved, alias)
 
+    # Read the files
     if isinstance(filenames, (str, bytes)):
         filenames = [filenames]
     for fnames in filenames:
         for fname in glob(fnames):
-            f = open(fname)
-            text = f.read()
-            cleantext = " ".join(_mib_re_strings.split(" ".join(_mib_re_comments.split(text))))  # noqa: E501
+            with open(fname) as f:
+                text = f.read()
+            cleantext = " ".join(
+                _mib_re_strings.split(" ".join(_mib_re_comments.split(text)))
+            )
             for m in _mib_re_oiddecl.finditer(cleantext):
                 gr = m.groups()
                 ident, oid = gr[0], gr[-1]
@@ -151,13 +168,19 @@
                     m = _mib_re_both.match(elt)
                     if m:
                         oid[i] = m.groups()[1]
-                _mib_register(ident, oid, the_mib, unresolved)
+                _mib_register(ident, oid, the_mib, unresolved, alias)
 
+    # Create the new MIB
     newmib = MIBDict(_name="MIB")
+    # Add resolved values
     for oid, key in six.iteritems(the_mib):
         newmib[".".join(key)] = oid
+    # Add unresolved values
     for oid, key in six.iteritems(unresolved):
         newmib[".".join(key)] = oid
+    # Add aliases
+    for key, oid in six.iteritems(alias):
+        newmib[key] = oid
 
     conf.mib = newmib
 
@@ -519,7 +542,7 @@
 #       policies       #
 
 certPolicy_oids = {
-    "anyPolicy": "2.5.29.32.0"
+    "2.5.29.32.0": "anyPolicy"
 }
 
 # from Chromium source code (ev_root_ca_metadata.cc)

scapy-2.4.3.tar.gz/scapy/asn1fields.py -> scapy-2.4.4.tar.gz/scapy/asn1fields.py Changed

scapy-2.4.3.tar.gz/scapy/automaton.py -> scapy-2.4.4.tar.gz/scapy/automaton.py Changed

@@ -20,18 +20,13 @@
 import threading
 from scapy.config import conf
 from scapy.utils import do_graph
-from scapy.error import log_interactive, warning
+from scapy.error import log_runtime, warning
 from scapy.plist import PacketList
 from scapy.data import MTU
 from scapy.supersocket import SuperSocket
 from scapy.consts import WINDOWS
 import scapy.modules.six as six
 
-if WINDOWS:
-    from scapy.error import Scapy_Exception
-    recv_error = Scapy_Exception
-else:
-    recv_error = ()
 
 """ In Windows, select.select is not available for custom objects. Here's the implementation of scapy to re-create this functionality  # noqa: E501
 # Passive way: using no-ressources locks
@@ -191,19 +186,17 @@
 def select_objects(inputs, remain):
     """
     Select SelectableObject objects. Same than:
-        select.select([inputs], [], [], remain)
+    ``select.select([inputs], [], [], remain)``
     But also works on Windows, only on SelectableObject.
 
-    inputs: objects to process
-    remain: timeout. If 0, return [].
+    :param inputs: objects to process
+    :param remain: timeout. If 0, return [].
     """
     handler = SelectableSelector(inputs, remain)
     return handler.process()
 
 
 class ObjectPipe(SelectableObject):
-    read_allowed_exceptions = ()
-
     def __init__(self):
         self.closed = False
         self.rd, self.wr = os.pipe()
@@ -224,6 +217,9 @@
     def write(self, obj):
         self.send(obj)
 
+    def flush(self):
+        pass
+
     def recv(self, n=0):
         if self.closed:
             if self.check_recv():
@@ -242,6 +238,9 @@
             os.close(self.wr)
             self.queue.clear()
 
+    def __del__(self):
+        self.close()
+
     @staticmethod
     def select(sockets, remain=conf.recv_poll_rate):
         # Only handle ObjectPipes
@@ -426,6 +425,7 @@
         # Register recv hook
         self.spb.register_hook(self.call_release)
         kargs["external_fd"] = {ioevent: (self.spa, self.spb)}
+        kargs["is_atmt_socket"] = True
         self.atmt = automaton(*args, **kargs)
         self.atmt.runbg()
 
@@ -447,7 +447,11 @@
         return r
 
     def close(self):
-        pass
+        if not self.closed:
+            self.atmt.stop()
+            self.spa.close()
+            self.spb.close()
+            self.closed = True
 
     @staticmethod
     def select(sockets, remain=conf.recv_poll_rate):
@@ -694,7 +698,7 @@
     # Services
     def debug(self, lvl, msg):
         if self.debug_level >= lvl:
-            log_interactive.debug(msg)
+            log_runtime.debug(msg)
 
     def send(self, pkt):
         if self.state.state in self.interception_points:
@@ -725,6 +729,7 @@
         external_fd = kargs.pop("external_fd", {})
         self.send_sock_class = kargs.pop("ll", conf.L3socket)
         self.recv_sock_class = kargs.pop("recvsock", conf.L2listen)
+        self.is_atmt_socket = kargs.pop("is_atmt_socket", False)
         self.started = threading.Lock()
         self.threadid = None
         self.breakpointed = None
@@ -920,18 +925,14 @@
                         if fd == self.cmdin:
                             yield self.CommandMessage("Received command message")  # noqa: E501
                         elif fd == self.listen_sock:
-                            try:
-                                pkt = self.listen_sock.recv(MTU)
-                            except recv_error:
-                                pass
-                            else:
-                                if pkt is not None:
-                                    if self.master_filter(pkt):
-                                        self.debug(3, "RECVD: %s" % pkt.summary())  # noqa: E501
-                                        for rcvcond in self.recv_conditions[self.state.state]:  # noqa: E501
-                                            self._run_condition(rcvcond, pkt, *state_output)  # noqa: E501
-                                    else:
-                                        self.debug(4, "FILTR: %s" % pkt.summary())  # noqa: E501
+                            pkt = self.listen_sock.recv(MTU)
+                            if pkt is not None:
+                                if self.master_filter(pkt):
+                                    self.debug(3, "RECVD: %s" % pkt.summary())  # noqa: E501
+                                    for rcvcond in self.recv_conditions[self.state.state]:  # noqa: E501
+                                        self._run_condition(rcvcond, pkt, *state_output)  # noqa: E501
+                                else:
+                                    self.debug(4, "FILTR: %s" % pkt.summary())  # noqa: E501
                         else:
                             self.debug(3, "IOEVENT on %s" % fd.ioname)
                             for ioevt in self.ioevents[self.state.state]:

scapy-2.4.3.tar.gz/scapy/autorun.py -> scapy-2.4.4.tar.gz/scapy/autorun.py Changed

@@ -104,11 +104,9 @@
     """Create an interactive session and execute the
     commands passed as "cmds" and return all output
 
-    params:
-      - cmds: a list of commands to run
-    returns: (output, returned)
-
-    The output contains both sys.stdout and sys.stderr logs"""
+    :param cmds: a list of commands to run
+    :returns: (output, returned) contains both sys.stdout and sys.stderr logs
+    """
     sstdout, sstderr = sys.stdout, sys.stderr
     sw = StringWriter()
     try:
@@ -123,6 +121,27 @@
     return sw.s, res
 
 
+def autorun_get_interactive_live_session(cmds, **kargs):
+    """Create an interactive session and execute the
+    commands passed as "cmds" and return all output
+
+    :param cmds: a list of commands to run
+    :returns: (output, returned) contains both sys.stdout and sys.stderr logs
+    """
+    sstdout, sstderr = sys.stdout, sys.stderr
+    sw = StringWriter(debug=sstdout)
+    try:
+        try:
+            sys.stdout = sys.stderr = sw
+            res = autorun_commands(cmds, **kargs)
+        except StopAutorun as e:
+            e.code_run = sw.s
+            raise
+    finally:
+        sys.stdout, sys.stderr = sstdout, sstderr
+    return sw.s, res
+
+
 def autorun_get_text_interactive_session(cmds, **kargs):
     ct = conf.color_theme
     try:
@@ -133,6 +152,16 @@
     return s, res
 
 
+def autorun_get_live_interactive_session(cmds, **kargs):
+    ct = conf.color_theme
+    try:
+        conf.color_theme = DefaultTheme()
+        s, res = autorun_get_interactive_live_session(cmds, **kargs)
+    finally:
+        conf.color_theme = ct
+    return s, res
+
+
 def autorun_get_ansi_interactive_session(cmds, **kargs):
     ct = conf.color_theme
     try:

scapy-2.4.3.tar.gz/scapy/base_classes.py -> scapy-2.4.4.tar.gz/scapy/base_classes.py Changed

@@ -127,12 +127,20 @@
         return "Net(%r)" % self.repr
 
     def __eq__(self, other):
+        if not other:
+            return False
         if hasattr(other, "parsed"):
             p2 = other.parsed
         else:
             p2, nm2 = self._parse_net(other)
         return self.parsed == p2
 
+    def __ne__(self, other):
+        # Python 2.7 compat
+        return not self == other
+
+    __hash__ = None
+
     def __contains__(self, other):
         if hasattr(other, "parsed"):
             p2 = other.parsed
@@ -266,29 +274,6 @@
         return newcls
 
 
-class NewDefaultValues(Packet_metaclass):
-    """NewDefaultValues is deprecated (not needed anymore)
-
-    remove this:
-        __metaclass__ = NewDefaultValues
-    and it should still work.
-    """
-    def __new__(cls, name, bases, dct):
-        from scapy.error import log_loading
-        import traceback
-        try:
-            for tb in traceback.extract_stack() + [("??", -1, None, "")]:
-                f, l, _, line = tb
-                if line.startswith("class"):
-                    break
-        except Exception:
-            f, l = "??", -1  # noqa: E741
-            raise
-        log_loading.warning("Deprecated (no more needed) use of NewDefaultValues  (%s l. %i).", f, l)  # noqa: E501
-
-        return super(NewDefaultValues, cls).__new__(cls, name, bases, dct)
-
-
 class BasePacket(Gen):
     __slots__ = []
 
@@ -320,7 +305,7 @@
             if WINDOWS and conf.prog.psreader is None:
                 os.startfile(fname)
             else:
-                with ContextManagerSubprocess("psdump()", conf.prog.psreader):
+                with ContextManagerSubprocess(conf.prog.psreader):
                     subprocess.Popen([conf.prog.psreader, fname])
         else:
             canvas.writeEPSfile(filename)
@@ -344,8 +329,7 @@
             if WINDOWS and conf.prog.pdfreader is None:
                 os.startfile(fname)
             else:
-                with ContextManagerSubprocess("pdfdump()",
-                                              conf.prog.pdfreader):
+                with ContextManagerSubprocess(conf.prog.pdfreader):
                     subprocess.Popen([conf.prog.pdfreader, fname])
         else:
             canvas.writePDFfile(filename)
@@ -369,8 +353,7 @@
             if WINDOWS and conf.prog.svgreader is None:
                 os.startfile(fname)
             else:
-                with ContextManagerSubprocess("svgdump()",
-                                              conf.prog.svgreader):
+                with ContextManagerSubprocess(conf.prog.svgreader):
                     subprocess.Popen([conf.prog.svgreader, fname])
         else:
             canvas.writeSVGfile(filename)

scapy-2.4.3.tar.gz/scapy/compat.py -> scapy-2.4.4.tar.gz/scapy/compat.py Changed

@@ -13,6 +13,7 @@
 import binascii
 import gzip
 import struct
+import sys
 
 import scapy.modules.six as six
 
@@ -59,11 +60,19 @@
             return x.encode()
         return bytes(x)
 
-    def plain_str(x):
-        """Convert basic byte objects to str"""
-        if isinstance(x, bytes):
-            return x.decode(errors="ignore")
-        return str(x)
+    if sys.version_info[0:2] <= (3, 4):
+        def plain_str(x):
+            """Convert basic byte objects to str"""
+            if isinstance(x, bytes):
+                return x.decode(errors="ignore")
+            return str(x)
+    else:
+        # Python 3.5+
+        def plain_str(x):
+            """Convert basic byte objects to str"""
+            if isinstance(x, bytes):
+                return x.decode(errors="backslashreplace")
+            return str(x)
 
     def chb(x):
         """Same than chr() but encode as bytes."""
@@ -117,3 +126,33 @@
 else:
     gzip_decompress = gzip.decompress
     gzip_compress = gzip.compress
+
+# Typing compatibility
+
+try:
+    # Only required if using mypy-lang for static typing
+    from typing import Optional, List, Union, Callable, Any, AnyStr, Tuple, \
+        Sized, Dict, Pattern, cast
+except ImportError:
+    # Let's make some fake ones.
+
+    def cast(_type, obj):
+        return obj
+
+    class _FakeType(object):
+        # make the objects subscriptable indefinetly
+        def __getitem__(self, item):
+            return _FakeType()
+
+    Optional = _FakeType()
+    Union = _FakeType()
+    Callable = _FakeType()
+    List = _FakeType()
+    Dict = _FakeType()
+    Any = _FakeType()
+    AnyStr = _FakeType()
+    Tuple = _FakeType()
+    Pattern = _FakeType()
+
+    class Sized(object):
+        pass

scapy-2.4.3.tar.gz/scapy/config.py -> scapy-2.4.4.tar.gz/scapy/config.py Changed

@@ -15,6 +15,7 @@
 import time
 import socket
 import sys
+import atexit
 
 from scapy import VERSION, base_classes
 from scapy.consts import DARWIN, WINDOWS, LINUX, BSD, SOLARIS
@@ -190,9 +191,12 @@
     def __init__(self):
         list.__init__(self)
         self.ldict = {}
+        self.filtered = False
+        self._backup_dict = {}
 
     def __repr__(self):
-        return "\n".join("%-20s: %s" % (l.__name__, l.name) for l in self)
+        return "\n".join("%-20s: %s" % (layer.__name__, layer.name)
+                         for layer in self)
 
     def register(self, layer):
         self.append(layer)
@@ -209,13 +213,36 @@
             result.append((lay, doc.strip().split("\n")[0] if doc else lay))
         return result
 
+    def filter(self, items):
+        """Disable dissection of unused layers to speed up dissection"""
+        if self.filtered:
+            raise ValueError("Already filtered. Please disable it first")
+        for lay in six.itervalues(self.ldict):
+            for cls in lay:
+                if cls not in self._backup_dict:
+                    self._backup_dict[cls] = cls.payload_guess[:]
+                    cls.payload_guess = [
+                        y for y in cls.payload_guess if y[1] in items
+                    ]
+        self.filtered = True
+
+    def unfilter(self):
+        """Re-enable dissection for all layers"""
+        if not self.filtered:
+            raise ValueError("Not filtered. Please filter first")
+        for lay in six.itervalues(self.ldict):
+            for cls in lay:
+                cls.payload_guess = self._backup_dict[cls]
+        self._backup_dict.clear()
+        self.filtered = False
+
 
 class CommandsList(list):
     def __repr__(self):
         s = []
-        for l in sorted(self, key=lambda x: x.__name__):
-            doc = l.__doc__.split("\n")[0] if l.__doc__ else "--"
-            s.append("%-20s: %s" % (l.__name__, doc))
+        for li in sorted(self, key=lambda x: x.__name__):
+            doc = li.__doc__.split("\n")[0] if li.__doc__ else "--"
+            s.append("%-20s: %s" % (li.__name__, doc))
         return "\n".join(s)
 
     def register(self, cmd):
@@ -377,31 +404,24 @@
 
 def isCryptographyValid():
     """
-    Check if the cryptography library is present, and if it is recent enough
-    for most usages in scapy (v1.7 or later).
+    Check if the cryptography module >= 2.0.0 is present. This is the minimum
+    version for most usages in Scapy.
     """
     try:
         import cryptography
     except ImportError:
         return False
-    return _version_checker(cryptography, (1, 7))
-
-
-def isCryptographyRecent():
-    """
-    Check if the cryptography library is recent (2.0 and later)
-    """
-    try:
-        import cryptography
-    except ImportError:
-        return False
-    return _version_checker(cryptography, (2, 0))
+    return _version_checker(cryptography, (2, 0, 0))
 
 
 def isCryptographyAdvanced():
     """
-    Check if the cryptography library is present, and if it supports X25519,
-    ChaCha20Poly1305 and such (v2.0 or later).
+    Check if the cryptography module is present, and if it supports X25519,
+    ChaCha20Poly1305 and such.
+
+    Notes:
+    - cryptography >= 2.0 is required
+    - OpenSSL >= 1.1.0 is required
     """
     try:
         from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey  # noqa: E501
@@ -447,7 +467,7 @@
             "Scapy only supports libpcap on Solaris !"
         )
     # we are already in an Interceptor hook, use Interceptor.set_from_hook
-    if conf.use_pcap or conf.use_dnet:
+    if conf.use_pcap:
         try:
             from scapy.arch.pcapdnet import L2pcapListenSocket, L2pcapSocket, \
                 L3pcapSocket
@@ -459,8 +479,9 @@
             conf.L3socket6 = functools.partial(L3pcapSocket, filter="ip6")
             conf.L2socket = L2pcapSocket
             conf.L2listen = L2pcapListenSocket
-            # Update globals
-            _load("scapy.arch.pcapdnet")
+            if conf.interactive:
+                # Update globals
+                _load("scapy.arch.pcapdnet")
             return
     if conf.use_bpf:
         from scapy.arch.bpf.supersocket import L2bpfListenSocket, \
@@ -469,8 +490,9 @@
         conf.L3socket6 = functools.partial(L3bpfSocket, filter="ip6")
         conf.L2socket = L2bpfSocket
         conf.L2listen = L2bpfListenSocket
-        # Update globals
-        _load("scapy.arch.bpf")
+        if conf.interactive:
+            # Update globals
+            _load("scapy.arch.bpf")
         return
     if LINUX:
         from scapy.arch.linux import L3PacketSocket, L2Socket, L2ListenSocket
@@ -478,8 +500,9 @@
         conf.L3socket6 = functools.partial(L3PacketSocket, filter="ip6")
         conf.L2socket = L2Socket
         conf.L2listen = L2ListenSocket
-        # Update globals
-        _load("scapy.arch.linux")
+        if conf.interactive:
+            # Update globals
+            _load("scapy.arch.linux")
         return
     if WINDOWS:
         from scapy.arch.windows import _NotAvailableSocket
@@ -523,58 +546,46 @@
 
 
 class Conf(ConfClass):
-    """This object contains the configuration of Scapy.
-session  : filename where the session will be saved
-interactive_shell : can be "ipython", "python" or "auto". Default: Auto
-stealth  : if 1, prevents any unwanted packet to go out (ARP, DNS, ...)
-checkIPID: if 0, doesn't check that IPID matches between IP sent and ICMP IP citation received  # noqa: E501
-           if 1, checks that they either are equal or byte swapped equals (bug in some IP stacks)  # noqa: E501
-           if 2, strictly checks that they are equals
-checkIPsrc: if 1, checks IP src in IP and ICMP IP citation match (bug in some NAT stacks)  # noqa: E501
-checkIPinIP: if True, checks that IP-in-IP layers match. If False, do not
-             check IP layers that encapsulates another IP layer
-check_TCPerror_seqack: if 1, also check that TCP seq and ack match the ones in ICMP citation  # noqa: E501
-iff      : selects the default output interface for srp() and sendp(). default:"eth0")  # noqa: E501
-verb     : level of verbosity, from 0 (almost mute) to 3 (verbose)
-promisc  : default mode for listening socket (to get answers if you spoof on a lan)  # noqa: E501
-sniff_promisc : default mode for sniff()
-filter   : bpf filter added to every sniffing socket to exclude traffic from analysis  # noqa: E501
-histfile : history file
-padding  : includes padding in disassembled packets
-except_filter : BPF filter for packets to ignore
-debug_match : when 1, store received packet that are not matched into debug.recv  # noqa: E501
-route    : holds the Scapy routing table and provides methods to manipulate it
-warning_threshold : how much time between warnings from the same place
-ASN1_default_codec: Codec used by default for ASN1 objects
-mib      : holds MIB direct access dictionary
-resolve  : holds list of fields for which resolution should be done
-noenum   : holds list of enum fields for which conversion to string should NOT be done  # noqa: E501
-AS_resolver: choose the AS resolver class to use
-extensions_paths: path or list of paths where extensions are to be looked for
-contribs : a dict which can be used by contrib layers to store local configuration  # noqa: E501
-debug_tls:When 1, print some TLS session secrets when they are computed.
-recv_poll_rate: how often to check for new packets. Defaults to 0.05s.
-"""
+    """
+    This object contains the configuration of Scapy.
+    """
     version = ReadOnlyAttribute("version", VERSION)
-    session = ""
+    session = ""  #: filename where the session will be saved
     interactive = False
+    #: can be "ipython", "python" or "auto". Default: Auto
     interactive_shell = ""
+    #: if 1, prevents any unwanted packet to go out (ARP, DNS, ...)
     stealth = "not implemented"
+    #: selects the default output interface for srp() and sendp().
     iface = None
-    iface6 = None
     layers = LayersList()
     commands = CommandsList()
+    ASN1_default_codec = None  #: Codec used by default for ASN1 objects
+    AS_resolver = None  #: choose the AS resolver class to use
     dot15d4_protocol = None  # Used in dot15d4.py
     logLevel = Interceptor("logLevel", log_scapy.level, _loglevel_changer)
+    #: if 0, doesn't check that IPID matches between IP sent and
+    #: ICMP IP citation received
+    #: if 1, checks that they either are equal or byte swapped
+    #: equals (bug in some IP stacks)
+    #: if 2, strictly checks that they are equals
     checkIPID = False
+    #: if 1, checks IP src in IP and ICMP IP citation match
+    #: (bug in some NAT stacks)
     checkIPsrc = True
     checkIPaddr = True
+    #: if True, checks that IP-in-IP layers match. If False, do
+    #: not check IP layers that encapsulates another IP layer
     checkIPinIP = True
+    #: if 1, also check that TCP seq and ack match the
+    #: ones in ICMP citation
     check_TCPerror_seqack = False
-    verb = 2
+    verb = 2  #: level of verbosity, from 0 (almost mute) to 3 (verbose)
     prompt = Interceptor("prompt", ">>> ", _prompt_changer)
+    #: default mode for listening socket (to get answers if you
+    #: spoof on a lan)
     promisc = True
-    sniff_promisc = 1
+    sniff_promisc = 1  #: default mode for sniff()
     raw_layer = None
     raw_summary = False
     default_l2 = None
@@ -587,37 +598,57 @@
     BTsocket = None
     USBsocket = None
     min_pkt_size = 60
+    mib = None  #: holds MIB direct access dictionary
     bufsize = 2**16
+    #: history file
     histfile = os.getenv('SCAPY_HISTFILE',
                          os.path.join(os.path.expanduser("~"),
                                       ".scapy_history"))
+    #: includes padding in disassembled packets
     padding = 1
+    #: BPF filter for packets to ignore
     except_filter = ""
+    #: bpf filter added to every sniffing socket to exclude traffic
+    #: from analysis
+    filter = ""
+    #: when 1, store received packet that are not matched into `debug.recv`
     debug_match = False
+    #: When 1, print some TLS session secrets when they are computed.
     debug_tls = False
     wepkey = ""
     cache_iflist = {}
+    #: holds the Scapy IPv4 routing table and provides methods to
+    #: manipulate it
     route = None  # Filed by route.py
+    #: holds the Scapy IPv6 routing table and provides methods to
+    #: manipulate it
     route6 = None  # Filed by route6.py
     auto_fragment = True
+    #: raise exception when a packet dissector raises an exception
     debug_dissector = False
     color_theme = Interceptor("color_theme", NoTheme(), _prompt_changer)
+    #: how much time between warnings from the same place
     warning_threshold = 5
     prog = ProgPath()
+    #: holds list of fields for which resolution should be done
     resolve = Resolve()
+    #: holds list of enum fields for which conversion to string
+    #: should NOT be done
     noenum = Resolve()
     emph = Emphasize()
+    #: read only attribute to show if PyPy is in use
     use_pypy = ReadOnlyAttribute("use_pypy", isPyPy())
+    #: use libpcap integration or not. Changing this value will update
+    #: the conf.L[2/3] sockets
     use_pcap = Interceptor(
         "use_pcap",
         os.getenv("SCAPY_USE_PCAPDNET", "").lower().startswith("y"),
         _socket_changer
     )
-    # XXX use_dnet is deprecated
-    use_dnet = os.getenv("SCAPY_USE_PCAPDNET", "").lower().startswith("y")
     use_bpf = Interceptor("use_bpf", False, _socket_changer)
     use_npcap = False
     ipv6_enabled = socket.has_ipv6
+    #: path or list of paths where extensions are to be looked for
     extensions_paths = "."
     stats_classic_protocols = []
     stats_dot11_protocols = []
@@ -630,15 +661,22 @@
                    'inet6', 'ipsec', 'ir', 'isakmp', 'l2', 'l2tp',
                    'llmnr', 'lltd', 'mgcp', 'mobileip', 'netbios',
                    'netflow', 'ntp', 'ppi', 'ppp', 'pptp', 'radius', 'rip',
-                   'rtp', 'sctp', 'sixlowpan', 'skinny', 'smb', 'snmp',
+                   'rtp', 'sctp', 'sixlowpan', 'skinny', 'smb', 'smb2', 'snmp',
                    'tftp', 'vrrp', 'vxlan', 'x509', 'zigbee']
+    #: a dict which can be used by contrib layers to store local
+    #: configuration
     contribs = dict()
     crypto_valid = isCryptographyValid()
-    crypto_valid_recent = isCryptographyRecent()
-    crypto_valid_advanced = crypto_valid_recent and isCryptographyAdvanced()
+    crypto_valid_advanced = isCryptographyAdvanced()
     fancy_prompt = True
     auto_crop_tables = True
+    #: how often to check for new packets.
+    #: Defaults to 0.05s.
     recv_poll_rate = 0.05
+    #: When True, raise exception if no dst MAC found otherwise broadcast.
+    #: Default is False.
+    raise_no_dst_mac = False
+    loopback_name = "lo" if LINUX else "lo0"
 
     def __getattr__(self, attr):
         # Those are loaded on runtime to avoid import loops
@@ -657,7 +695,10 @@
         if attr == "services_tcp":
             from scapy.data import TCP_SERVICES
             return TCP_SERVICES
-        return object.__getattr__(self, attr)
+        if attr == "iface6":
+            warning("conf.iface6 is deprecated in favor of conf.iface")
+            attr = "iface"
+        return object.__getattribute__(self, attr)
 
 
 if not Conf.ipv6_enabled:
@@ -680,3 +721,16 @@
                               "Please install python-cryptography v1.7 or later.")  # noqa: E501
         return func(*args, **kwargs)
     return func_in
+
+
+def scapy_delete_temp_files():
+    # type: () -> None
+    for f in conf.temp_files:
+        try:
+            os.unlink(f)
+        except Exception:
+            pass
+    del conf.temp_files[:]
+
+
+atexit.register(scapy_delete_temp_files)

scapy-2.4.3.tar.gz/scapy/consts.py -> scapy-2.4.4.tar.gz/scapy/consts.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/aoe.py -> scapy-2.4.4.tar.gz/scapy/contrib/aoe.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/automotive/bmw/definitions.py Added

@@ -0,0 +1,5314 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = BMW specific definitions for UDS
+# scapy.contrib.status = loads
+
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import ByteField, ShortField, ByteEnumField, X3BytesField, \
+    StrField, StrFixedLenField, LEIntField, LEThreeBytesField, PacketListField
+from scapy.contrib.automotive.uds import UDS, UDS_RDBI, UDS_DSC, UDS_IOCBI, \
+    UDS_RC, UDS_RD, UDS_RSDBI, UDS_RDBIPR
+
+
+BMW_specific_enum = {
+    0: "requestIdentifiedBCDDTCAndStatus",
+    1: "requestSupportedBCDDTCAndStatus",
+    2: "requestIdentified2ByteHexDTCAndStatus",
+    3: "requestSupported2ByteHexDTCAndStatus",
+    128: "ECUIdentificationDataTable",
+    129: "ECUIdentificationScalingTable",
+    134: "BMW_currentUIFdataTable",
+    135: "BMW_physicalECUhardwareNumber",
+    136: "BMW_changeIndex",
+    137: "BMW_systemSupplierECUserialNumber",
+    138: "BMW_systemSupplierSpecific",
+    139: "BMW_systemSupplierSpecific",
+    140: "BMW_systemSupplierSpecific",
+    141: "BMW_systemSupplierSpecific",
+    142: "BMW_systemSupplierSpecific",
+    143: "BMW_systemSupplierSpecific",
+    144: "VIN - Vehicle Identification Number",
+    145: "vehicleManufacturerECUHardwareNumber",
+    146: "systemSupplierECUHardwareNumber",
+    147: "systemSupplierECUHardwareVersionNumber",
+    148: "systemSupplierECUSoftwareNumber",
+    149: "systemSupplierECUSoftwareVersionNumber",
+    150: "exhaustRegulationOrTypeApprovalNumber",
+    151: "systemNameOrEngineType",
+    152: "repairShopCodeOrTesterSerialNumber",
+    153: "programmingDate",
+    154: "BMW_vehicleManufacturerECUhardwareVersionNumber",
+    155: "BMW_vehicleManufacturerCodingIndex",
+    156: "BMW_vehicleManufacturerDiagnosticIndex",
+    157: "BMW_dateOfECUmanufacturing",
+    158: "BMW_systemSupplierIndex",
+    159: "BMW_vehicleManufECUsoftwareLayerVersionNumbers",
+    241: "BMW / OBD tester address",
+    245: "OBD via function bus",
+    250: "MOST tester address"}
+
+BMW_memoryTypeIdentifiers = {
+    0: "BMW_linearAddressRange",
+    1: "BMW_ROM_EPROM_internal",
+    2: "BMW_ROM_EPROM_external",
+    3: "BMW_NVRAM_characteristicZones_DTCmemory",
+    4: "BMW_RAM_internal_shortMOV",
+    5: "BMW_RAM_external_xDataMOV",
+    6: "BMW_flashEPROM_internal",
+    7: "BMW_UIFmemory",
+    8: "BMW_vehicleOrderDataMemory_onlyToBeUsedByDS2_ECUs",
+    9: "BMW_flashEPROM_external",
+    11: "BMW_RAM_internal_longMOVatRegister"}
+
+
+class IOCBLI_REQ(Packet):
+    name = 'InputOutputControlByLocalIdentifier_Request'
+    fields_desc = [
+        ByteField('inputOutputLocalIdentifier', 1),
+        ByteEnumField('inputOutputControlParameter', 0,
+                      {0: "returnControlToECU",
+                       1: "reportCurrentState",
+                       2: "reportIOConditions",
+                       3: "reportIOScaling",
+                       4: "resetToDefault",
+                       5: "freezeCurrentState",
+                       6: "executeControlOption",
+                       7: "shortTermAdjustment",
+                       8: "longTerAdjustment",
+                       9: "reportIOCalibrationParameters"})]
+
+
+bind_layers(UDS, IOCBLI_REQ, service=0x30)
+UDS.services[0x30] = 'InputOutputControlByLocalIdentifier'
+
+
+class RDTCBS_REQ(Packet):
+    name = 'ReadDTCByStatus_Request'
+    fields_desc = [
+        ByteEnumField('statusOfDTC', 0, BMW_specific_enum),
+        ShortField('groupOfDTC', 0)]
+
+
+bind_layers(UDS, RDTCBS_REQ, service=0x18)
+UDS.services[0x18] = 'ReadDTCByStatus'
+
+
+class RSODTC_REQ(Packet):
+    name = 'ReadStatusOfDTC_Request'
+    fields_desc = [
+        ShortField('groupOfDTC', 0)]
+
+
+bind_layers(UDS, RSODTC_REQ, service=0x17)
+UDS.services[0x17] = 'ReadStatusOfDTC'
+
+
+class REI_IDENT_REQ(Packet):
+    name = 'Read ECU Identification_Request'
+    fields_desc = [
+        ByteEnumField('identificationDataTable', 0, BMW_specific_enum)]
+
+
+bind_layers(UDS, REI_IDENT_REQ, service=0x1a)
+UDS.services[0x1a] = 'ReadECUIdentification'
+
+
+class SPRBLI_REQ(Packet):
+    name = 'StopRoutineByLocalIdentifier_Request'
+    fields_desc = [
+        ByteEnumField('localIdentifier', 0,
+                      {1: "codingChecksum",
+                       2: "clearMemory",
+                       3: "clearHistoryMemory",
+                       4: "selfTest",
+                       5: "powerDown",
+                       6: "clearDTCshadowMemory",
+                       7: "requestForAuthentication",
+                       8: "releaseAuthentication",
+                       9: "checkSignature",
+                       10: "checkProgrammingStatus",
+                       11: "executeDiagnosticService",
+                       12: "controlEnergySavingMode",
+                       13: "resetSystemFaultMessage",
+                       14: "timeControlledPowerdown",
+                       15: "disableCommunicationOverGateway",
+                       31: "SweepingTechnologies"}),
+        StrField('routineExitOption', b"")]
+
+
+bind_layers(UDS, SPRBLI_REQ, service=0x32)
+UDS.services[0x32] = 'StopRoutineByLocalIdentifier'
+
+
+class ENMT_REQ(Packet):
+    name = 'EnableNormalMessageTransmission_Request'
+    fields_desc = [
+        ByteEnumField('responseRequired', 0, {1: "yes", 2: "no"})]
+
+
+bind_layers(UDS, ENMT_REQ, service=0x29)
+UDS.services[0x29] = 'EnableNormalMessageTransmission'
+
+
+class WDBLI_REQ(Packet):
+    name = 'WriteDataByLocalIdentifier_Request'
+    fields_desc = [
+        ByteEnumField('recordLocalIdentifier', 0, {144: "shortVIN"}),
+        StrField('recordValue', b"")]
+
+
+bind_layers(UDS, WDBLI_REQ, service=0x3b)
+UDS.services[0x3b] = 'WriteDataByLocalIdentifier'
+
+
+class RDS2TCM_REQ(Packet):
+    name = 'ReadDS2TroubleCodeMemory_Request'
+    fields_desc = [
+        ByteField('DS2faultNumber', 0)]
+
+
+bind_layers(UDS, RDS2TCM_REQ, service=0xa0)
+UDS.services[0xa0] = 'ReadDS2TroubleCodeMemory'
+
+
+class RDBLI_REQ(Packet):
+    name = 'ReadDataByLocalIdentifier_Request'
+    fields_desc = [
+        ByteField('recordLocalIdentifier', 0)]
+
+
+bind_layers(UDS, RDBLI_REQ, service=0x21)
+UDS.services[0x21] = 'ReadDataByLocalIdentifier'
+
+
+class RRRBA_REQ(Packet):
+    name = 'RequestRoutineResultsByAddress_Request'
+    fields_desc = [
+        X3BytesField('routineAddress', 0),
+        ByteEnumField('memoryTypeIdentifier', 0, BMW_memoryTypeIdentifiers)]
+
+
+bind_layers(UDS, RRRBA_REQ, service=0x3a)
+UDS.services[0x3a] = 'RequestRoutineResultsByAddress'
+
+
+class RRRBLI_REQ(Packet):
+    name = 'RequestRoutineResultsByLocalIdentifier_Request'
+    fields_desc = [
+        ByteField('routineLocalID', 0)]
+
+
+bind_layers(UDS, RRRBLI_REQ, service=0x33)
+UDS.services[0x33] = 'RequestRoutineResultsByLocalIdentifier'
+
+
+class SPRBA_REQ(Packet):
+    name = 'StopRoutineByAddress_Request'
+    fields_desc = [
+        X3BytesField('routineAddress', 0),
+        ByteEnumField('memoryTypeIdentifier', 0, BMW_memoryTypeIdentifiers),
+        StrField('routineExitOption', 0)]
+
+
+bind_layers(UDS, SPRBA_REQ, service=0x39)
+UDS.services[0x39] = 'StopRoutineByAddress'
+
+
+class STRBA_REQ(Packet):
+    name = 'StartRoutineByAddress_Request'
+    fields_desc = [
+        X3BytesField('routineAddress', 0),
+        ByteEnumField('memoryTypeIdentifier', 0, BMW_memoryTypeIdentifiers),
+        StrField('routineEntryOption', 0)]
+
+
+bind_layers(UDS, STRBA_REQ, service=0x38)
+UDS.services[0x38] = 'StartRoutineByAddress'
+
+
+class UDS2S_REQ(Packet):
+    name = 'UnpackDS2Service_Request'
+    fields_desc = [
+        ByteField('DS2ECUAddress', 0),
+        ByteField('DS2requestLength', 0),
+        ByteField('DS2ControlByte', 0),
+        StrField('DS2requestParameters', 0)]
+
+
+bind_layers(UDS, UDS2S_REQ, service=0xa5)
+UDS.services[0xa5] = 'UnpackDS2Service'
+
+
+class SVK_DateField(LEThreeBytesField):
+    def i2repr(self, pkt, x):
+        x = self.addfield(pkt, b"", x)
+        return "%02X.%02X.20%02X" % (x[0], x[1], x[2])
+
+
+class SVK_Entry(Packet):
+    fields_desc = [
+        ByteEnumField("processClass", 0, {1: "HWEL", 2: "HWAP", 4: "GWTB",
+                                          5: "CAFD", 6: "BTLD", 7: "FLSL",
+                                          8: "SWFL"}),
+        StrFixedLenField("svk_id", b"", length=4),
+        ByteField("mainVersion", 0),
+        ByteField("subVersion", 0),
+        ByteField("patchVersion", 0)]
+
+    def extract_padding(self, p):
+        return b"", p
+
+
+class SVK(Packet):
+    prog_status_enum = {
+        1: "signature check and programming-dependencies check passed",
+        2: "software entry invalid or programming-dependencies check failed",
+        3: "software entry incompatible to hardware entry",
+        4: "software entry incompatible with other software entry"}
+
+    fields_desc = [
+        ByteEnumField("prog_status1", 0, prog_status_enum),
+        ByteEnumField("prog_status2", 0, prog_status_enum),
+        ShortField("entries_count", 0),
+        SVK_DateField("prog_date", b'\x00\x00\x00'),
+        ByteField("pad1", 0),
+        LEIntField("prog_milage", 0),
+        StrFixedLenField("pad2", 0, length=5),
+        PacketListField("entries", [], cls=SVK_Entry,
+                        count_from=lambda x: x.entries_count)]
+
+
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf101)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf102)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf103)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf104)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf105)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf106)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf107)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf108)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf109)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10a)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10b)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10c)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10d)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10e)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf10f)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf110)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf111)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf112)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf113)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf114)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf115)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf116)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf117)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf118)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf119)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11a)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11b)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11c)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11d)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11e)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf11f)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf120)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf121)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf122)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf123)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf124)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf125)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf126)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf127)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf128)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf129)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12a)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12b)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12c)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12d)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12e)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf12f)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf130)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf131)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf132)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf133)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf134)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf135)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf136)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf137)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf138)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf139)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13a)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13b)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13c)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13d)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13e)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13f)
+bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf140)
+
+
+UDS_RDBI.dataIdentifiers[0x0014] = "RDBCI_IS_LESEN_DETAIL_REQ"
+UDS_RDBI.dataIdentifiers[0x0015] = "RDBCI_HS_LESEN_DETAIL_REQ"
+UDS_RDBI.dataIdentifiers[0x0e80] = "AirbagLock"
+UDS_RDBI.dataIdentifiers[0x1000] = "testStamp"
+UDS_RDBI.dataIdentifiers[0x1001] = "CBSdata"
+UDS_RDBI.dataIdentifiers[0x1002] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1003] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1004] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1005] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1006] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1007] = "smallUserInformationField"
+UDS_RDBI.dataIdentifiers[0x1008] = "smallUserInformationFieldBMWfast"
+UDS_RDBI.dataIdentifiers[0x1009] = "vehicleProductionDate"
+UDS_RDBI.dataIdentifiers[0x100a] = "energySavingState"       # or EnergyMode
+UDS_RDBI.dataIdentifiers[0x100b] = "Istep"       # or I-Stufe
+UDS_RDBI.dataIdentifiers[0x100d] = "gatewayTableVersionNumber"
+UDS_RDBI.dataIdentifiers[0x100e] = "ExtendedMode"
+UDS_RDBI.dataIdentifiers[0x1010] = "fullVehicleIdentificationNumber"
+UDS_RDBI.dataIdentifiers[0x1011] = "vehicleType"
+UDS_RDBI.dataIdentifiers[0x1012] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1013] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1014] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1015] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1016] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1017] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1018] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1019] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101a] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101b] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101c] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101d] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101e] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x101f] = "chipCardData_1012_101F"
+UDS_RDBI.dataIdentifiers[0x1600] = "IdentifyNumberofSubbusMembers"
+UDS_RDBI.dataIdentifiers[0x1601] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1602] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1603] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1604] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1605] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1606] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1607] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1608] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1609] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x160f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1610] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1611] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1612] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1613] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1614] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1615] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1616] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1617] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1618] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1619] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x161f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1620] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1621] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1622] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1623] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1624] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1625] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1626] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1627] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1628] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1629] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x162f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1630] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1631] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1632] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1633] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1634] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1635] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1636] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1637] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1638] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1639] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x163f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1640] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1641] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1642] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1643] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1644] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1645] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1646] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1647] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1648] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1649] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x164f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1650] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1651] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1652] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1653] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1654] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1655] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1656] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1657] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1658] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1659] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x165f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1660] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1661] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1662] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1663] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1664] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1665] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1666] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1667] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1668] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1669] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x166f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1670] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1671] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1672] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1673] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1674] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1675] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1676] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1677] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1678] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1679] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x167f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1680] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1681] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1682] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1683] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1684] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1685] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1686] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1687] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1688] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1689] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x168f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1690] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1691] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1692] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1693] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1694] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1695] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1696] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1697] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1698] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x1699] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169a] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169b] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169c] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169d] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169e] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x169f] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16a9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16aa] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ab] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ac] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ad] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ae] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16af] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16b9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ba] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16bb] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16bc] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16bd] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16be] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16bf] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16c9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ca] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16cb] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16cc] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16cd] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ce] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16cf] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16d9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16da] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16db] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16dc] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16dd] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16de] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16df] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16e9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ea] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16eb] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ec] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ed] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ee] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ef] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f0] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f1] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f2] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f3] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f4] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f5] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f6] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f7] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f8] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16f9] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16fa] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16fb] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16fc] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16fd] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16fe] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x16ff] = "SubbusMemberSerialNumber"
+UDS_RDBI.dataIdentifiers[0x171f] = "Certificate"
+UDS_RDBI.dataIdentifiers[0x172a] = "IPIdent"
+UDS_RDBI.dataIdentifiers[0x1734] = "IndividualDataIDTable"
+UDS_RDBI.dataIdentifiers[0x1735] = "StatusLifeCycle"
+UDS_RDBI.dataIdentifiers[0x2000] = "dtcShadowMemory"
+UDS_RDBI.dataIdentifiers[0x2001] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2002] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2003] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2004] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2005] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2006] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2007] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2008] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2009] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x200f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2010] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2011] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2012] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2013] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2014] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2015] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2016] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2017] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2018] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2019] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x201f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2020] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2021] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2022] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2023] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2024] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2025] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2026] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2027] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2028] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2029] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x202f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2030] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2031] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2032] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2033] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2034] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2035] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2036] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2037] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2038] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2039] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x203f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2040] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2041] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2042] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2043] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2044] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2045] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2046] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2047] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2048] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2049] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x204f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2050] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2051] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2052] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2053] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2054] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2055] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2056] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2057] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2058] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2059] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x205f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2060] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2061] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2062] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2063] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2064] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2065] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2066] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2067] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2068] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2069] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x206f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2070] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2071] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2072] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2073] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2074] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2075] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2076] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2077] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2078] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2079] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x207f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2080] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2081] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2082] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2083] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2084] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2085] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2086] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2087] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2088] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2089] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x208f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2090] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2091] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2092] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2093] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2094] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2095] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2096] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2097] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2098] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2099] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209a] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209b] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209c] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209d] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209e] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x209f] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20a9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20aa] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ab] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ac] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ad] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ae] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20af] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20b9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ba] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20bb] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20bc] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20bd] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20be] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20bf] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20c9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ca] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20cb] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20cc] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20cd] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ce] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20cf] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20d9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20da] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20db] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20dc] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20dd] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20de] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20df] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20e9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ea] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20eb] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ec] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ed] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ee] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ef] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f0] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f1] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f2] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f3] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f4] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f5] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f6] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f7] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f8] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20f9] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20fa] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20fb] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20fc] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20fd] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20fe] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x20ff] = "dtcShadowMemoryEntry"
+UDS_RDBI.dataIdentifiers[0x2100] = "dtcHistoryMemory"
+UDS_RDBI.dataIdentifiers[0x2101] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2102] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2103] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2104] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2105] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2106] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2107] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2108] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2109] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x210f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2110] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2111] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2112] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2113] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2114] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2115] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2116] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2117] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2118] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2119] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x211f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2120] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2121] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2122] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2123] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2124] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2125] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2126] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2127] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2128] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2129] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x212f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2130] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2131] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2132] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2133] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2134] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2135] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2136] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2137] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2138] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2139] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x213f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2140] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2141] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2142] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2143] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2144] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2145] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2146] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2147] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2148] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2149] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x214f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2150] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2151] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2152] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2153] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2154] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2155] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2156] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2157] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2158] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2159] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x215f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2160] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2161] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2162] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2163] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2164] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2165] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2166] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2167] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2168] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2169] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x216f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2170] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2171] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2172] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2173] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2174] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2175] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2176] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2177] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2178] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2179] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x217f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2180] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2181] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2182] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2183] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2184] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2185] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2186] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2187] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2188] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2189] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x218f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2190] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2191] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2192] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2193] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2194] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2195] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2196] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2197] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2198] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2199] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219a] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219b] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219c] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219d] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219e] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x219f] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21a9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21aa] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ab] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ac] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ad] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ae] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21af] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21b9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ba] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21bb] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21bc] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21bd] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21be] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21bf] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21c9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ca] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21cb] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21cc] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21cd] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ce] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21cf] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21d9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21da] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21db] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21dc] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21dd] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21de] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21df] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21e9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ea] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21eb] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ec] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ed] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ee] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ef] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f0] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f1] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f2] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f3] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f4] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f5] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f6] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f7] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f8] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21f9] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21fa] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21fb] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21fc] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21fd] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21fe] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x21ff] = "dtcHistoryMemoryEntry 2101-21FF"
+UDS_RDBI.dataIdentifiers[0x2200] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2201] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2202] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2203] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2204] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2205] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2206] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2207] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2208] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2209] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x220f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2210] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2211] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2212] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2213] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2214] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2215] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2216] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2217] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2218] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2219] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x221f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2220] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2221] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2222] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2223] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2224] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2225] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2226] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2227] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2228] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2229] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x222f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2230] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2231] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2232] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2233] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2234] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2235] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2236] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2237] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2238] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2239] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x223f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2240] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2241] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2242] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2243] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2244] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2245] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2246] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2247] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2248] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2249] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x224f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2250] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2251] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2252] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2253] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2254] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2255] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2256] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2257] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2258] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2259] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x225f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2260] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2261] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2262] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2263] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2264] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2265] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2266] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2267] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2268] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2269] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x226f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2270] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2271] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2272] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2273] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2274] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2275] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2276] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2277] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2278] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2279] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x227f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2280] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2281] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2282] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2283] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2284] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2285] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2286] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2287] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2288] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2289] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x228f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2290] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2291] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2292] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2293] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2294] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2295] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2296] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2297] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2298] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2299] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229a] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229b] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229c] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229d] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229e] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x229f] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22a9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22aa] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ab] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ac] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ad] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ae] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22af] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22b9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ba] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22bb] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22bc] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22bd] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22be] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22bf] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22c9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ca] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22cb] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22cc] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22cd] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ce] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22cf] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22d9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22da] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22db] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22dc] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22dd] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22de] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22df] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22e9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ea] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22eb] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ec] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ed] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ee] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ef] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f0] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f1] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f2] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f3] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f4] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f5] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f6] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f7] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f8] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22f9] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22fa] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22fb] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22fc] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22fd] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22fe] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x22ff] = "afterSalesServiceData_2200_22FF"
+UDS_RDBI.dataIdentifiers[0x2300] = "operatingData"       # or RDBCI_BETRIEBSDATEN_LESEN_REQ  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2301] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2302] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2303] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2304] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2305] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2306] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2307] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2308] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2309] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x230f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2310] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2311] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2312] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2313] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2314] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2315] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2316] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2317] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2318] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2319] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x231f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2320] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2321] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2322] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2323] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2324] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2325] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2326] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2327] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2328] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2329] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x232f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2330] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2331] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2332] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2333] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2334] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2335] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2336] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2337] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2338] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2339] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x233f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2340] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2341] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2342] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2343] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2344] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2345] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2346] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2347] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2348] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2349] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x234f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2350] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2351] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2352] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2353] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2354] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2355] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2356] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2357] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2358] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2359] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x235f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2360] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2361] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2362] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2363] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2364] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2365] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2366] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2367] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2368] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2369] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x236f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2370] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2371] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2372] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2373] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2374] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2375] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2376] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2377] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2378] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2379] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x237f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2380] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2381] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2382] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2383] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2384] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2385] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2386] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2387] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2388] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2389] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x238f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2390] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2391] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2392] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2393] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2394] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2395] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2396] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2397] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2398] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2399] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239a] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239b] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239c] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239d] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239e] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x239f] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23a9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23aa] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ab] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ac] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ad] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ae] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23af] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23b9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ba] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23bb] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23bc] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23bd] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23be] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23bf] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23c9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ca] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23cb] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23cc] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23cd] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ce] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23cf] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23d9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23da] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23db] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23dc] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23dd] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23de] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23df] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23e9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ea] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23eb] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ec] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ed] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ee] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ef] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f0] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f1] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f2] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f3] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f4] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f5] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f6] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f7] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f8] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23f9] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23fa] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23fb] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23fc] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23fd] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23fe] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x23ff] = "additionalOperatingData 2301-23FF"
+UDS_RDBI.dataIdentifiers[0x2400] = "personalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2401] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2402] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2403] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2404] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2405] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2406] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2407] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2408] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2409] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240a] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240b] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240c] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240d] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240e] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x240f] = "additionalpersonalizationDataDriver0"
+UDS_RDBI.dataIdentifiers[0x2410] = "personalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2411] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2412] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2413] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2414] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2415] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2416] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2417] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2418] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2419] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241a] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241b] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241c] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241d] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241e] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x241f] = "additionalPersonalizationDataDriver1"
+UDS_RDBI.dataIdentifiers[0x2420] = "personalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2421] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2422] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2423] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2424] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2425] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2426] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2427] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2428] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2429] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242a] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242b] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242c] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242d] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242e] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x242f] = "additionalpersonalizationDataDriver2"
+UDS_RDBI.dataIdentifiers[0x2430] = "personalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2431] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2432] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2433] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2434] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2435] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2436] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2437] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2438] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2439] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243a] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243b] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243c] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243d] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243e] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x243f] = "additionalPersonalizationDataDriver3"
+UDS_RDBI.dataIdentifiers[0x2500] = "programmReferenzBackup/vehicleManufacturerECUHW_NrBackup"  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2501] = "eraseTime, signatureTime, resetTime, authentificationTime"       # or memorySegmentationTable  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2502] = "hardwareReferenz"       # or programmingCounter  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2503] = "programmingCounter-MaxValue"       # or programmReferenz  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2504] = "flashTimingParameter"       # or datenReferenz  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2505] = "maximumBlocklength"
+UDS_RDBI.dataIdentifiers[0x2506] = "ReadMemoryAddress"       # or maximaleBlockLaenge  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2507] = "EcuSupportsDeleteSwe"
+UDS_RDBI.dataIdentifiers[0x2508] = "GWRoutingStatus"
+UDS_RDBI.dataIdentifiers[0x2509] = "RoutingTable"
+UDS_RDBI.dataIdentifiers[0x2541] = "STATUS_CALCVN"
+UDS_RDBI.dataIdentifiers[0x3000] = "RDBI_CD_REQ"       # or WDBI_CD_REQ
+UDS_RDBI.dataIdentifiers[0x300a] = "Codier-VIN"
+UDS_RDBI.dataIdentifiers[0x37fe] = "Codierpruefstempel"
+UDS_RDBI.dataIdentifiers[0x3f00] = "SVT-Ist"
+UDS_RDBI.dataIdentifiers[0x3f01] = "SVT-Soll"
+UDS_RDBI.dataIdentifiers[0x3f02] = "SGListeSecurity"
+UDS_RDBI.dataIdentifiers[0x3f03] = "SG-Liste SWT"
+UDS_RDBI.dataIdentifiers[0x3f04] = "Zeitstempel"
+UDS_RDBI.dataIdentifiers[0x3f05] = "Liste aller Seriennummern"
+UDS_RDBI.dataIdentifiers[0x3f06] = "FA"
+UDS_RDBI.dataIdentifiers[0x3f07] = "SGListeKomplett"
+UDS_RDBI.dataIdentifiers[0x3f08] = "SGListeAktivesMelden"
+UDS_RDBI.dataIdentifiers[0x3f09] = "FP"
+UDS_RDBI.dataIdentifiers[0x3f0a] = "SGListeDifferentiellProg"
+UDS_RDBI.dataIdentifiers[0x3f0b] = "SGListeNGSC"
+UDS_RDBI.dataIdentifiers[0x3f0c] = "SGListeCodierrelevantesSG"
+UDS_RDBI.dataIdentifiers[0x3f0d] = "SGListeFlashfaehigesSG"
+UDS_RDBI.dataIdentifiers[0x3f0e] = "SGListeK_CAN"
+UDS_RDBI.dataIdentifiers[0x3f0f] = "SGListeBody_CAN"
+UDS_RDBI.dataIdentifiers[0x3f10] = "SGListeI_CAN"
+UDS_RDBI.dataIdentifiers[0x3f11] = "SGListeMOST"
+UDS_RDBI.dataIdentifiers[0x3f12] = "SGListeFA_CAN"
+UDS_RDBI.dataIdentifiers[0x3f13] = "SGListeFlexRay"
+UDS_RDBI.dataIdentifiers[0x3f14] = "SGListeA_CAN"
+UDS_RDBI.dataIdentifiers[0x3f15] = "SGListeISO14229"
+UDS_RDBI.dataIdentifiers[0x3f16] = "SGListeS_CAN"
+UDS_RDBI.dataIdentifiers[0x3f17] = "SGListeEthernet"
+UDS_RDBI.dataIdentifiers[0x3f18] = "SGListeD_CAN"
+UDS_RDBI.dataIdentifiers[0x3f19] = "Identifikation VCM"
+UDS_RDBI.dataIdentifiers[0x3f1a] = "SVT-Version"
+UDS_RDBI.dataIdentifiers[0x3f1b] = "vehicleOrder_3F00_3FFE"
+UDS_RDBI.dataIdentifiers[0x3f1c] = "FA_Teil1"
+UDS_RDBI.dataIdentifiers[0x3f1d] = "FA_Teil2"
+UDS_RDBI.dataIdentifiers[0x3fff] = "changeIndexOfCodingData"
+UDS_RDBI.dataIdentifiers[0x403c] = "STATUS_CALCVN_EA"
+UDS_RDBI.dataIdentifiers[0x4080] = "AirbagLock_NEU"
+UDS_RDBI.dataIdentifiers[0x4ab4] = "Betriebsstundenzaehler"
+UDS_RDBI.dataIdentifiers[0x5fc2] = "WDBI_DME_ABGLEICH_PROG_REQ"
+UDS_RDBI.dataIdentifiers[0xd114] = "Gesamtweg-Streckenzähler Offset"
+UDS_RDBI.dataIdentifiers[0xd387] = "STATUS_DIEBSTAHLSCHUTZ"
+UDS_RDBI.dataIdentifiers[0xdb9c] = "InitStatusEngineAngle"
+UDS_RDBI.dataIdentifiers[0xf000] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf001] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf002] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf003] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf004] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf005] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf006] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf007] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf008] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf009] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00a] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00b] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00c] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00d] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00e] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf00f] = "networkConfigurationDataForTractorTrailerApplication"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf010] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf011] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf012] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf013] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf014] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf015] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf016] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf017] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf018] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf019] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf01f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf020] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf021] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf022] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf023] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf024] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf025] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf026] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf027] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf028] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf029] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf02f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf030] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf031] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf032] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf033] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf034] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf035] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf036] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf037] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf038] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf039] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf03f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf040] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf041] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf042] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf043] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf044] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf045] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf046] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf047] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf048] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf049] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf04f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf050] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf051] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf052] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf053] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf054] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf055] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf056] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf057] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf058] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf059] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf05f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf060] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf061] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf062] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf063] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf064] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf065] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf066] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf067] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf068] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf069] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf06f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf070] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf071] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf072] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf073] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf074] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf075] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf076] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf077] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf078] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf079] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf07f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf080] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf081] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf082] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf083] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf084] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf085] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf086] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf087] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf088] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf089] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf08f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf090] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf091] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf092] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf093] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf094] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf095] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf096] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf097] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf098] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf099] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09a] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09b] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09c] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09d] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09e] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf09f] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0a9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0aa] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ab] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ac] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ad] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ae] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0af] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0b9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ba] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0bb] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0bc] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0bd] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0be] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0bf] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0c9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ca] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0cb] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0cc] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0cd] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ce] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0cf] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0d9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0da] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0db] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0dc] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0dd] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0de] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0df] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0e9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ea] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0eb] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ec] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ed] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ee] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ef] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f0] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f1] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f2] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f3] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f4] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f5] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f6] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f7] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f8] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0f9] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0fa] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0fb] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0fc] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0fd] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0fe] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf0ff] = "networkConfigurationData"
+UDS_RDBI.dataIdentifiers[0xf100] = "activeSessionState"
+UDS_RDBI.dataIdentifiers[0xf101] = "SVK_Aktuell"
+UDS_RDBI.dataIdentifiers[0xf102] = "SVK_SystemSupplier"
+UDS_RDBI.dataIdentifiers[0xf103] = "SVK_Werk"
+UDS_RDBI.dataIdentifiers[0xf104] = "SVK_Backup_01"
+UDS_RDBI.dataIdentifiers[0xf105] = "SVK_Backup_02"
+UDS_RDBI.dataIdentifiers[0xf106] = "SVK_Backup_03"
+UDS_RDBI.dataIdentifiers[0xf107] = "SVK_Backup_04"
+UDS_RDBI.dataIdentifiers[0xf108] = "SVK_Backup_05"
+UDS_RDBI.dataIdentifiers[0xf109] = "SVK_Backup_06"
+UDS_RDBI.dataIdentifiers[0xf10a] = "SVK_Backup_07"
+UDS_RDBI.dataIdentifiers[0xf10b] = "SVK_Backup_08"
+UDS_RDBI.dataIdentifiers[0xf10c] = "SVK_Backup_09"
+UDS_RDBI.dataIdentifiers[0xf10d] = "SVK_Backup_10"
+UDS_RDBI.dataIdentifiers[0xf10e] = "SVK_Backup_11"
+UDS_RDBI.dataIdentifiers[0xf10f] = "SVK_Backup_12"
+UDS_RDBI.dataIdentifiers[0xf110] = "SVK_Backup_13"
+UDS_RDBI.dataIdentifiers[0xf111] = "SVK_Backup_14"
+UDS_RDBI.dataIdentifiers[0xf112] = "SVK_Backup_15"
+UDS_RDBI.dataIdentifiers[0xf113] = "SVK_Backup_16"
+UDS_RDBI.dataIdentifiers[0xf114] = "SVK_Backup_17"
+UDS_RDBI.dataIdentifiers[0xf115] = "SVK_Backup_18"
+UDS_RDBI.dataIdentifiers[0xf116] = "SVK_Backup_19"
+UDS_RDBI.dataIdentifiers[0xf117] = "SVK_Backup_20"
+UDS_RDBI.dataIdentifiers[0xf118] = "SVK_Backup_21"
+UDS_RDBI.dataIdentifiers[0xf119] = "SVK_Backup_22"
+UDS_RDBI.dataIdentifiers[0xf11a] = "SVK_Backup_23"
+UDS_RDBI.dataIdentifiers[0xf11b] = "SVK_Backup_24"
+UDS_RDBI.dataIdentifiers[0xf11c] = "SVK_Backup_25"
+UDS_RDBI.dataIdentifiers[0xf11d] = "SVK_Backup_26"
+UDS_RDBI.dataIdentifiers[0xf11e] = "SVK_Backup_27"
+UDS_RDBI.dataIdentifiers[0xf11f] = "SVK_Backup_28"
+UDS_RDBI.dataIdentifiers[0xf120] = "SVK_Backup_29"
+UDS_RDBI.dataIdentifiers[0xf121] = "SVK_Backup_30"
+UDS_RDBI.dataIdentifiers[0xf122] = "SVK_Backup_31"
+UDS_RDBI.dataIdentifiers[0xf123] = "SVK_Backup_32"
+UDS_RDBI.dataIdentifiers[0xf124] = "SVK_Backup_33"
+UDS_RDBI.dataIdentifiers[0xf125] = "SVK_Backup_34"
+UDS_RDBI.dataIdentifiers[0xf126] = "SVK_Backup_35"
+UDS_RDBI.dataIdentifiers[0xf127] = "SVK_Backup_36"
+UDS_RDBI.dataIdentifiers[0xf128] = "SVK_Backup_37"
+UDS_RDBI.dataIdentifiers[0xf129] = "SVK_Backup_38"
+UDS_RDBI.dataIdentifiers[0xf12a] = "SVK_Backup_39"
+UDS_RDBI.dataIdentifiers[0xf12b] = "SVK_Backup_40"
+UDS_RDBI.dataIdentifiers[0xf12c] = "SVK_Backup_41"
+UDS_RDBI.dataIdentifiers[0xf12d] = "SVK_Backup_42"
+UDS_RDBI.dataIdentifiers[0xf12e] = "SVK_Backup_43"
+UDS_RDBI.dataIdentifiers[0xf12f] = "SVK_Backup_44"
+UDS_RDBI.dataIdentifiers[0xf130] = "SVK_Backup_45"
+UDS_RDBI.dataIdentifiers[0xf131] = "SVK_Backup_46"
+UDS_RDBI.dataIdentifiers[0xf132] = "SVK_Backup_47"
+UDS_RDBI.dataIdentifiers[0xf133] = "SVK_Backup_48"
+UDS_RDBI.dataIdentifiers[0xf134] = "SVK_Backup_49"
+UDS_RDBI.dataIdentifiers[0xf135] = "SVK_Backup_50"
+UDS_RDBI.dataIdentifiers[0xf136] = "SVK_Backup_51"
+UDS_RDBI.dataIdentifiers[0xf137] = "SVK_Backup_52"
+UDS_RDBI.dataIdentifiers[0xf138] = "SVK_Backup_53"
+UDS_RDBI.dataIdentifiers[0xf139] = "SVK_Backup_54"
+UDS_RDBI.dataIdentifiers[0xf13a] = "SVK_Backup_55"
+UDS_RDBI.dataIdentifiers[0xf13b] = "SVK_Backup_56"
+UDS_RDBI.dataIdentifiers[0xf13c] = "SVK_Backup_57"
+UDS_RDBI.dataIdentifiers[0xf13d] = "SVK_Backup_58"
+UDS_RDBI.dataIdentifiers[0xf13e] = "SVK_Backup_59"
+UDS_RDBI.dataIdentifiers[0xf13f] = "SVK_Backup_60"
+UDS_RDBI.dataIdentifiers[0xf140] = "SVK_Backup_61"
+UDS_RDBI.dataIdentifiers[0xf150] = "SGBDIndex"
+UDS_RDBI.dataIdentifiers[0xf15a] = "fingerprint"
+UDS_RDBI.dataIdentifiers[0xf180] = "bootSoftwareIdentification"
+UDS_RDBI.dataIdentifiers[0xf181] = "applicationSoftwareIdentification"
+UDS_RDBI.dataIdentifiers[0xf182] = "applicationDataIdentification"
+UDS_RDBI.dataIdentifiers[0xf183] = "bootSoftwareFingerprint"
+UDS_RDBI.dataIdentifiers[0xf184] = "applicationSoftwareFingerprint"
+UDS_RDBI.dataIdentifiers[0xf185] = "applicationDataFingerprint"
+UDS_RDBI.dataIdentifiers[0xf186] = "activeDiagnosticSession"
+UDS_RDBI.dataIdentifiers[0xf187] = "vehicleManufacturerSparePartNumber"
+UDS_RDBI.dataIdentifiers[0xf188] = "vehicleManufacturerECUSoftwareNumber"
+UDS_RDBI.dataIdentifiers[0xf189] = "vehicleManufacturerECUSoftwareVersionNumber"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf18a] = "systemSupplierIdentifier"
+UDS_RDBI.dataIdentifiers[0xf18b] = "ECUManufacturingDate"
+UDS_RDBI.dataIdentifiers[0xf18c] = "ECUSerialNumber"
+UDS_RDBI.dataIdentifiers[0xf18d] = "supportedFunctionalUnits"
+UDS_RDBI.dataIdentifiers[0xf190] = "VIN"
+UDS_RDBI.dataIdentifiers[0xf191] = "vehicleManufacturerECUHardwareNumber"
+UDS_RDBI.dataIdentifiers[0xf192] = "systemSupplierECUHardwareNumber"
+UDS_RDBI.dataIdentifiers[0xf193] = "systemSupplierECUHardwareVersionNumber"
+UDS_RDBI.dataIdentifiers[0xf194] = "systemSupplierECUSoftwareNumber"
+UDS_RDBI.dataIdentifiers[0xf195] = "systemSupplierECUSoftwareVersionNumber"
+UDS_RDBI.dataIdentifiers[0xf196] = "exhaustRegulationOrTypeApprovalNumber"
+UDS_RDBI.dataIdentifiers[0xf197] = "systemNameOrEngineType"
+UDS_RDBI.dataIdentifiers[0xf198] = "repairShopCodeOrTesterSerialNumber"
+UDS_RDBI.dataIdentifiers[0xf199] = "programmingDate"
+UDS_RDBI.dataIdentifiers[0xf19a] = "calibrationRepairShopCodeOrCalibrationEquipmentSerialNumber"  # noqa E501
+UDS_RDBI.dataIdentifiers[0xf19b] = "calibrationDate"
+UDS_RDBI.dataIdentifiers[0xf19c] = "calibrationEquipmentSoftwareNumber"
+UDS_RDBI.dataIdentifiers[0xf19d] = "ECUInstallationDate"
+UDS_RDBI.dataIdentifiers[0xf19e] = "ODXFileIdentifier"
+UDS_RDBI.dataIdentifiers[0xf19f] = "entityIdentifier"
+UDS_RDBI.dataIdentifiers[0xf200] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf201] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf202] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf203] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf204] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf205] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf206] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf207] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf208] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf209] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf20f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf210] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf211] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf212] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf213] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf214] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf215] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf216] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf217] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf218] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf219] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf21f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf220] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf221] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf222] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf223] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf224] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf225] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf226] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf227] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf228] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf229] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf22f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf230] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf231] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf232] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf233] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf234] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf235] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf236] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf237] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf238] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf239] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf23f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf240] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf241] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf242] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf243] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf244] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf245] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf246] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf247] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf248] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf249] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf24f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf250] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf251] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf252] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf253] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf254] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf255] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf256] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf257] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf258] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf259] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf25f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf260] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf261] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf262] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf263] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf264] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf265] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf266] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf267] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf268] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf269] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf26f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf270] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf271] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf272] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf273] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf274] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf275] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf276] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf277] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf278] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf279] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf27f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf280] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf281] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf282] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf283] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf284] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf285] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf286] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf287] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf288] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf289] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf28f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf290] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf291] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf292] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf293] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf294] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf295] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf296] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf297] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf298] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf299] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29a] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29b] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29c] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29d] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29e] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf29f] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2a9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2aa] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ab] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ac] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ad] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ae] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2af] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2b9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ba] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2bb] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2bc] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2bd] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2be] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2bf] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2c9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ca] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2cb] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2cc] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2cd] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ce] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2cf] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2d9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2da] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2db] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2dc] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2dd] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2de] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2df] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2e9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ea] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2eb] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ec] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ed] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ee] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ef] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f0] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f1] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f2] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f3] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f4] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f5] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f6] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f7] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f8] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2f9] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2fa] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2fb] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2fc] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2fd] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2fe] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf2ff] = "periodicDataIdentifier_F200_F2FF"
+UDS_RDBI.dataIdentifiers[0xf300] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf301] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf302] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf303] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf304] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf305] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf306] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf307] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf308] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf309] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf30f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf310] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf311] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf312] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf313] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf314] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf315] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf316] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf317] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf318] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf319] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf31f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf320] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf321] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf322] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf323] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf324] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf325] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf326] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf327] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf328] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf329] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf32f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf330] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf331] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf332] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf333] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf334] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf335] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf336] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf337] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf338] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf339] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf33f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf340] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf341] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf342] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf343] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf344] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf345] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf346] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf347] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf348] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf349] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf34f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf350] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf351] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf352] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf353] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf354] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf355] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf356] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf357] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf358] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf359] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf35f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf360] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf361] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf362] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf363] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf364] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf365] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf366] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf367] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf368] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf369] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf36f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf370] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf371] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf372] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf373] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf374] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf375] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf376] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf377] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf378] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf379] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf37f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf380] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf381] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf382] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf383] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf384] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf385] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf386] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf387] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf388] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf389] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf38f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf390] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf391] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf392] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf393] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf394] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf395] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf396] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf397] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf398] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf399] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39a] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39b] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39c] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39d] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39e] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf39f] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3a9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3aa] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ab] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ac] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ad] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ae] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3af] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3b9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ba] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3bb] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3bc] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3bd] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3be] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3bf] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3c9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ca] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3cb] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3cc] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3cd] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ce] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3cf] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3d9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3da] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3db] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3dc] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3dd] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3de] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3df] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3e9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ea] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3eb] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ec] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ed] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ee] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ef] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f0] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f1] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f2] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f3] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f4] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f5] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f6] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f7] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f8] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3f9] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3fa] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3fb] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3fc] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3fd] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3fe] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf3ff] = "dynamicallyDefinedDataIdentifier_F300_F3FF"
+UDS_RDBI.dataIdentifiers[0xf400] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf401] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf402] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf403] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf404] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf405] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf406] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf407] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf408] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf409] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf40f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf410] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf411] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf412] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf413] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf414] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf415] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf416] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf417] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf418] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf419] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf41f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf420] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf421] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf422] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf423] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf424] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf425] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf426] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf427] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf428] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf429] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf42f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf430] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf431] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf432] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf433] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf434] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf435] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf436] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf437] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf438] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf439] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf43f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf440] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf441] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf442] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf443] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf444] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf445] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf446] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf447] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf448] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf449] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf44f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf450] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf451] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf452] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf453] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf454] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf455] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf456] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf457] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf458] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf459] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf45f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf460] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf461] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf462] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf463] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf464] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf465] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf466] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf467] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf468] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf469] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf46f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf470] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf471] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf472] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf473] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf474] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf475] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf476] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf477] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf478] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf479] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf47f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf480] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf481] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf482] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf483] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf484] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf485] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf486] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf487] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf488] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf489] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf48f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf490] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf491] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf492] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf493] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf494] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf495] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf496] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf497] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf498] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf499] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49a] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49b] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49c] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49d] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49e] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf49f] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4a9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4aa] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ab] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ac] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ad] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ae] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4af] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4b9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ba] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4bb] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4bc] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4bd] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4be] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4bf] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4c9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ca] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4cb] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4cc] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4cd] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ce] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4cf] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4d9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4da] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4db] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4dc] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4dd] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4de] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4df] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4e9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ea] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4eb] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ec] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ed] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ee] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ef] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f0] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f1] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f2] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f3] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f4] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f5] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f6] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f7] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f8] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4f9] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4fa] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4fb] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4fc] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4fd] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4fe] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf4ff] = "OBDPids_F400 - F4FF"
+UDS_RDBI.dataIdentifiers[0xf500] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf501] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf502] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf503] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf504] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf505] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf506] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf507] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf508] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf509] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf50f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf510] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf511] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf512] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf513] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf514] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf515] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf516] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf517] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf518] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf519] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf51f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf520] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf521] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf522] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf523] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf524] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf525] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf526] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf527] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf528] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf529] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf52f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf530] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf531] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf532] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf533] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf534] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf535] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf536] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf537] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf538] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf539] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf53f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf540] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf541] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf542] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf543] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf544] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf545] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf546] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf547] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf548] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf549] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf54f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf550] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf551] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf552] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf553] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf554] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf555] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf556] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf557] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf558] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf559] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf55f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf560] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf561] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf562] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf563] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf564] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf565] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf566] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf567] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf568] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf569] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf56f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf570] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf571] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf572] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf573] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf574] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf575] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf576] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf577] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf578] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf579] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf57f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf580] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf581] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf582] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf583] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf584] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf585] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf586] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf587] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf588] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf589] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf58f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf590] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf591] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf592] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf593] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf594] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf595] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf596] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf597] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf598] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf599] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59a] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59b] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59c] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59d] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59e] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf59f] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5a9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5aa] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ab] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ac] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ad] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ae] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5af] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5b9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ba] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5bb] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5bc] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5bd] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5be] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5bf] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5c9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ca] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5cb] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5cc] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5cd] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ce] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5cf] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5d9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5da] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5db] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5dc] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5dd] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5de] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5df] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5e9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ea] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5eb] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ec] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ed] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ee] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ef] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f0] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f1] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f2] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f3] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f4] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f5] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f6] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f7] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f8] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5f9] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5fa] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5fb] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5fc] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5fd] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5fe] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf5ff] = "OBDPids_F500 - F5FF"
+UDS_RDBI.dataIdentifiers[0xf600] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf601] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf602] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf603] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf604] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf605] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf606] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf607] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf608] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf609] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf60f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf610] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf611] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf612] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf613] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf614] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf615] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf616] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf617] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf618] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf619] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf61f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf620] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf621] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf622] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf623] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf624] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf625] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf626] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf627] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf628] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf629] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf62f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf630] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf631] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf632] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf633] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf634] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf635] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf636] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf637] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf638] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf639] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf63f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf640] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf641] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf642] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf643] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf644] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf645] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf646] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf647] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf648] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf649] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf64f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf650] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf651] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf652] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf653] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf654] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf655] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf656] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf657] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf658] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf659] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf65f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf660] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf661] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf662] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf663] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf664] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf665] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf666] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf667] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf668] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf669] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf66f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf670] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf671] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf672] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf673] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf674] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf675] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf676] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf677] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf678] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf679] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf67f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf680] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf681] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf682] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf683] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf684] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf685] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf686] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf687] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf688] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf689] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf68f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf690] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf691] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf692] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf693] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf694] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf695] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf696] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf697] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf698] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf699] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69a] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69b] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69c] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69d] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69e] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf69f] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6a9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6aa] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ab] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ac] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ad] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ae] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6af] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6b9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ba] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6bb] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6bc] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6bd] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6be] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6bf] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6c9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ca] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6cb] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6cc] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6cd] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ce] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6cf] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6d9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6da] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6db] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6dc] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6dd] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6de] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6df] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6e9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ea] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6eb] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ec] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ed] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ee] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ef] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f0] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f1] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f2] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f3] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f4] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f5] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f6] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f7] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f8] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6f9] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6fa] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6fb] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6fc] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6fd] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6fe] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf6ff] = "OBDMonitorIds_F600 - F6FF"
+UDS_RDBI.dataIdentifiers[0xf700] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf701] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf702] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf703] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf704] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf705] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf706] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf707] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf708] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf709] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf70f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf710] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf711] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf712] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf713] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf714] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf715] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf716] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf717] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf718] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf719] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf71f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf720] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf721] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf722] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf723] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf724] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf725] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf726] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf727] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf728] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf729] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf72f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf730] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf731] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf732] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf733] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf734] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf735] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf736] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf737] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf738] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf739] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf73f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf740] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf741] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf742] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf743] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf744] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf745] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf746] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf747] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf748] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf749] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf74f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf750] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf751] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf752] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf753] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf754] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf755] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf756] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf757] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf758] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf759] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf75f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf760] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf761] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf762] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf763] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf764] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf765] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf766] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf767] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf768] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf769] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf76f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf770] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf771] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf772] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf773] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf774] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf775] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf776] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf777] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf778] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf779] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf77f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf780] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf781] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf782] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf783] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf784] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf785] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf786] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf787] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf788] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf789] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf78f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf790] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf791] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf792] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf793] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf794] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf795] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf796] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf797] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf798] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf799] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79a] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79b] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79c] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79d] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79e] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf79f] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7a9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7aa] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ab] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ac] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ad] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ae] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7af] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7b9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ba] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7bb] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7bc] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7bd] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7be] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7bf] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7c9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ca] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7cb] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7cc] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7cd] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ce] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7cf] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7d9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7da] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7db] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7dc] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7dd] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7de] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7df] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7e9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ea] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7eb] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ec] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ed] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ee] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ef] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f0] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f1] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f2] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f3] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f4] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f5] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f6] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f7] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f8] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7f9] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7fa] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7fb] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7fc] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7fd] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7fe] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf7ff] = "OBDMonitorIds_F700 - F7FF"
+UDS_RDBI.dataIdentifiers[0xf800] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf801] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf802] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf803] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf804] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf805] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf806] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf807] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf808] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf809] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf80f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf810] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf811] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf812] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf813] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf814] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf815] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf816] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf817] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf818] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf819] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf81f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf820] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf821] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf822] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf823] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf824] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf825] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf826] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf827] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf828] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf829] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf82f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf830] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf831] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf832] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf833] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf834] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf835] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf836] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf837] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf838] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf839] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf83f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf840] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf841] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf842] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf843] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf844] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf845] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf846] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf847] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf848] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf849] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf84f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf850] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf851] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf852] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf853] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf854] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf855] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf856] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf857] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf858] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf859] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf85f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf860] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf861] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf862] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf863] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf864] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf865] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf866] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf867] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf868] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf869] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf86f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf870] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf871] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf872] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf873] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf874] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf875] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf876] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf877] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf878] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf879] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf87f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf880] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf881] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf882] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf883] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf884] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf885] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf886] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf887] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf888] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf889] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf88f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf890] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf891] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf892] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf893] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf894] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf895] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf896] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf897] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf898] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf899] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89a] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89b] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89c] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89d] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89e] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf89f] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8a9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8aa] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ab] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ac] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ad] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ae] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8af] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8b9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ba] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8bb] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8bc] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8bd] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8be] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8bf] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8c9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ca] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8cb] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8cc] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8cd] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ce] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8cf] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8d9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8da] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8db] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8dc] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8dd] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8de] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8df] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8e9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ea] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8eb] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ec] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ed] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ee] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ef] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f0] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f1] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f2] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f3] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f4] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f5] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f6] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f7] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f8] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8f9] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8fa] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8fb] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8fc] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8fd] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8fe] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf8ff] = "OBDInfoTypes_F800_F8FF"
+UDS_RDBI.dataIdentifiers[0xf900] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf901] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf902] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf903] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf904] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf905] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf906] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf907] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf908] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf909] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf90f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf910] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf911] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf912] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf913] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf914] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf915] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf916] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf917] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf918] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf919] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf91f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf920] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf921] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf922] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf923] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf924] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf925] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf926] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf927] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf928] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf929] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf92f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf930] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf931] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf932] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf933] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf934] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf935] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf936] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf937] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf938] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf939] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf93f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf940] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf941] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf942] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf943] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf944] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf945] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf946] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf947] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf948] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf949] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf94f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf950] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf951] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf952] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf953] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf954] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf955] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf956] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf957] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf958] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf959] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf95f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf960] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf961] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf962] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf963] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf964] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf965] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf966] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf967] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf968] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf969] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf96f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf970] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf971] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf972] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf973] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf974] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf975] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf976] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf977] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf978] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf979] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf97f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf980] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf981] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf982] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf983] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf984] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf985] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf986] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf987] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf988] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf989] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf98f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf990] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf991] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf992] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf993] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf994] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf995] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf996] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf997] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf998] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf999] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99a] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99b] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99c] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99d] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99e] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf99f] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9a9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9aa] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ab] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ac] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ad] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ae] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9af] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9b9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ba] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9bb] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9bc] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9bd] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9be] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9bf] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9c9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ca] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9cb] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9cc] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9cd] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ce] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9cf] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9d9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9da] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9db] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9dc] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9dd] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9de] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9df] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9e9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ea] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9eb] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ec] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ed] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ee] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ef] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f0] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f1] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f2] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f3] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f4] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f5] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f6] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f7] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f8] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9f9] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9fa] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9fb] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9fc] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9fd] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9fe] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xf9ff] = "tachographPIds_F900_F9FF"
+UDS_RDBI.dataIdentifiers[0xfa00] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa01] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa02] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa03] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa04] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa05] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa06] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa07] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa08] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa09] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa0f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa10] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa11] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa12] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa13] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa14] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa15] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa16] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa17] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa18] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa19] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa1f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa20] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa21] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa22] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa23] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa24] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa25] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa26] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa27] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa28] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa29] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa2f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa30] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa31] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa32] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa33] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa34] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa35] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa36] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa37] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa38] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa39] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa3f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa40] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa41] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa42] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa43] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa44] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa45] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa46] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa47] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa48] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa49] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa4f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa50] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa51] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa52] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa53] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa54] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa55] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa56] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa57] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa58] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa59] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa5f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa60] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa61] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa62] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa63] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa64] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa65] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa66] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa67] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa68] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa69] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa6f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa70] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa71] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa72] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa73] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa74] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa75] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa76] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa77] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa78] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa79] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa7f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa80] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa81] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa82] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa83] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa84] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa85] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa86] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa87] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa88] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa89] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa8f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa90] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa91] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa92] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa93] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa94] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa95] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa96] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa97] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa98] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa99] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9a] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9b] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9c] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9d] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9e] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfa9f] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaa9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaaa] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaab] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaac] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaad] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaae] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaaf] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfab9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaba] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfabb] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfabc] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfabd] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfabe] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfabf] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfac9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaca] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfacb] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfacc] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfacd] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xface] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfacf] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfad9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfada] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfadb] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfadc] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfadd] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfade] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfadf] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfae9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaea] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaeb] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaec] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaed] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaee] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaef] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf0] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf1] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf2] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf3] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf4] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf5] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf6] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf7] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf8] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaf9] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfafa] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfafb] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfafc] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfafd] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfafe] = "safetySystemPIds_FA00_FAFF"
+UDS_RDBI.dataIdentifiers[0xfaff] = "safetySystemPIds_FA00_FAFF"
+
+UDS_DSC.diagnosticSessionTypes[0x81] = "defaultMode-StandardDiagnosticMode-OBDIIMode"  # noqa E501
+UDS_DSC.diagnosticSessionTypes[0x82] = "periodicTransmissions"
+UDS_DSC.diagnosticSessionTypes[0x83] = "BMW_NOTtoBeImplemented_endOfLineVehicleManufacturerMode"  # noqa E501
+UDS_DSC.diagnosticSessionTypes[0x84] = "endOfLineSystemSupplierMode"
+UDS_DSC.diagnosticSessionTypes[0x85] = "ECUProgrammingMode"
+UDS_DSC.diagnosticSessionTypes[0x86] = "ECUDevelopmentMode"
+UDS_DSC.diagnosticSessionTypes[0x87] = "ECUAdjustmentMode"
+UDS_DSC.diagnosticSessionTypes[0x88] = "ECUVariantCodingMode"
+UDS_DSC.diagnosticSessionTypes[0x89] = "BMW_ECUsafetyMode"
+
+UDS_IOCBI.dataIdentifiers = UDS_RDBI.dataIdentifiers
+
+UDS_RC.routineControlIdentifiers[0x0000] = "BMW_linearAddressRange"
+UDS_RC.routineControlIdentifiers[0x0001] = "BMW_ROM_EPROM_internal"
+UDS_RC.routineControlIdentifiers[0x0002] = "BMW_ROM_EPROM_external"
+UDS_RC.routineControlIdentifiers[0x0003] = "BMW_NVRAM_characteristicZones_DTCmemory"  # noqa E501
+UDS_RC.routineControlIdentifiers[0x0004] = "BMW_RAM_internal_shortMOV"
+UDS_RC.routineControlIdentifiers[0x0005] = "BMW_RAM_external_xDataMOV"
+UDS_RC.routineControlIdentifiers[0x0006] = "BMW_flashEPROM_internal"
+UDS_RC.routineControlIdentifiers[0x0007] = "BMW_UIFmemory"
+UDS_RC.routineControlIdentifiers[0x0008] = "BMW_vehicleOrderDataMemory"
+UDS_RC.routineControlIdentifiers[0x0009] = "BMW_flashEPROM_external"
+UDS_RC.routineControlIdentifiers[0x000b] = "BMW_RAM_internal_longMOVatRegister"
+UDS_RC.routineControlIdentifiers[0x0100] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0101] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0102] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0103] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0104] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0105] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0106] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0107] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0108] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0109] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x010f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0110] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0111] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0112] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0113] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0114] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0115] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0116] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0117] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0118] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0119] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x011f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0120] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0121] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0122] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0123] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0124] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0125] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0126] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0127] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0128] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0129] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x012f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0130] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0131] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0132] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0133] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0134] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0135] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0136] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0137] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0138] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0139] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x013f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0140] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0141] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0142] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0143] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0144] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0145] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0146] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0147] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0148] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0149] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x014f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0150] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0151] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0152] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0153] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0154] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0155] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0156] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0157] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0158] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0159] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x015f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0160] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0161] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0162] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0163] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0164] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0165] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0166] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0167] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0168] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0169] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x016f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0170] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0171] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0172] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0173] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0174] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0175] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0176] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0177] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0178] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0179] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x017f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0180] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0181] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0182] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0183] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0184] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0185] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0186] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0187] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0188] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0189] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x018f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0190] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0191] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0192] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0193] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0194] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0195] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0196] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0197] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0198] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0199] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019a] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019b] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019c] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019d] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019e] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x019f] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01a9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01aa] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ab] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ac] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ad] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ae] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01af] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01b9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ba] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01bb] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01bc] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01bd] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01be] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01bf] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01c9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ca] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01cb] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01cc] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01cd] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ce] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01cf] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01d9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01da] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01db] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01dc] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01dd] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01de] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01df] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01e9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ea] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01eb] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ec] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ed] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ee] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ef] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f0] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f1] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f2] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f3] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f4] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f5] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f6] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f7] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f8] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01f9] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01fa] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01fb] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01fc] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01fd] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01fe] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x01ff] = "tachographTestIds_0100_01FF"
+UDS_RC.routineControlIdentifiers[0x0200] = "VCM_SVT"
+UDS_RC.routineControlIdentifiers[0x0202] = "checkMemory"
+UDS_RC.routineControlIdentifiers[0x0203] = "checkProgrammingPreCondition"
+UDS_RC.routineControlIdentifiers[0x0204] = "readSWEProgrammingStatus"
+UDS_RC.routineControlIdentifiers[0x0205] = "readSWEDevelopmentInfo"
+UDS_RC.routineControlIdentifiers[0x0206] = "checkProgrammingPower"
+UDS_RC.routineControlIdentifiers[0x0207] = "VCM_Generiere_SVT"
+UDS_RC.routineControlIdentifiers[0x020b] = "Steuergerätetausch"
+UDS_RC.routineControlIdentifiers[0x020c] = "KeyExchange"
+UDS_RC.routineControlIdentifiers[0x020d] = "FingerprintExchange"
+UDS_RC.routineControlIdentifiers[0x020e] = "InternalAuthentication"
+UDS_RC.routineControlIdentifiers[0x020f] = "CyclicSignatureCheck"
+UDS_RC.routineControlIdentifiers[0x0210] = "TeleServiceLogin"
+UDS_RC.routineControlIdentifiers[0x0211] = "ExternalAuthentication"
+UDS_RC.routineControlIdentifiers[0x0212] = "StoreTransportKeyList"
+UDS_RC.routineControlIdentifiers[0x0213] = "InitSignalKeyDeployment"
+UDS_RC.routineControlIdentifiers[0x0214] = "N10GetState"
+UDS_RC.routineControlIdentifiers[0x0215] = "GetParameterN11"
+UDS_RC.routineControlIdentifiers[0x0220] = "RequestDeleteSwPackage"
+UDS_RC.routineControlIdentifiers[0x0230] = "ResetState"
+UDS_RC.routineControlIdentifiers[0x0231] = "GetState"
+UDS_RC.routineControlIdentifiers[0x0232] = "ResetStateFsCSM"
+UDS_RC.routineControlIdentifiers[0x0233] = "GetParameterN11"
+UDS_RC.routineControlIdentifiers[0x0234] = "ExternerInit"
+UDS_RC.routineControlIdentifiers[0x02a5] = "RequestListEntry"
+UDS_RC.routineControlIdentifiers[0x0f01] = "codingChecksum"
+UDS_RC.routineControlIdentifiers[0x0f02] = "clearMemory"
+UDS_RC.routineControlIdentifiers[0x0f04] = "selfTest"
+UDS_RC.routineControlIdentifiers[0x0f05] = "powerDown"
+UDS_RC.routineControlIdentifiers[0x0f06] = "clearDTCSecondaryMemory"
+UDS_RC.routineControlIdentifiers[0x0f07] = "requestForAuthentication"
+UDS_RC.routineControlIdentifiers[0x0f08] = "releaseAuthentication"
+UDS_RC.routineControlIdentifiers[0x0f09] = "checkSignature"
+UDS_RC.routineControlIdentifiers[0x0f0a] = "checkProgrammingStatus"
+UDS_RC.routineControlIdentifiers[0x0f0b] = "ExecuteDiagnosticService"
+UDS_RC.routineControlIdentifiers[0x0f0c] = "SetEnergyMode"       # or controlEnergySavingMode  # noqa E501
+UDS_RC.routineControlIdentifiers[0x0f0d] = "resetSystemFaultMessage"
+UDS_RC.routineControlIdentifiers[0x0f0e] = "timeControlledPowerDown"
+UDS_RC.routineControlIdentifiers[0x0f0f] = "disableCommunicationOverGateway"
+UDS_RC.routineControlIdentifiers[0x0f1f] = "SwtRoutine"
+UDS_RC.routineControlIdentifiers[0x1002] = "Individualdatenrettung"
+UDS_RC.routineControlIdentifiers[0x1003] = "SetExtendedMode"
+UDS_RC.routineControlIdentifiers[0x1007] = "MasterVIN"
+UDS_RC.routineControlIdentifiers[0x100d] = "ActivateCodingMode"
+UDS_RC.routineControlIdentifiers[0x100e] = "ActivateProgrammingMode"
+UDS_RC.routineControlIdentifiers[0x100f] = "ActivateApplicationMode"
+UDS_RC.routineControlIdentifiers[0x1010] = "SetDefaultBus"
+UDS_RC.routineControlIdentifiers[0x1011] = "GetActualConfig"
+UDS_RC.routineControlIdentifiers[0x1013] = "RequestListEntryGWTB"
+UDS_RC.routineControlIdentifiers[0x1021] = "requestPreferredProtcol"
+UDS_RC.routineControlIdentifiers[0x1022] = "checkConnection"
+UDS_RC.routineControlIdentifiers[0x1024] = "ResetActivationlineLogical"
+UDS_RC.routineControlIdentifiers[0x1042] = "EthernetARLTable"
+UDS_RC.routineControlIdentifiers[0x1045] = "EthernetIPConfiguration"
+UDS_RC.routineControlIdentifiers[0x104e] = "EthernetARLTableExtended"
+UDS_RC.routineControlIdentifiers[0x4001] = "SetGWRouting"
+UDS_RC.routineControlIdentifiers[0x4002] = "HDDDownload"
+UDS_RC.routineControlIdentifiers[0x4007] = "updateMode"
+UDS_RC.routineControlIdentifiers[0x4008] = "httpUpdate"
+UDS_RC.routineControlIdentifiers[0x7000] = "ProcessingApplicationData"
+UDS_RC.routineControlIdentifiers[0xa07c] = "RequestDeactivateHddSafeMode"
+UDS_RC.routineControlIdentifiers[0xa0b2] = "RequestSteuernApixReinitMode"
+UDS_RC.routineControlIdentifiers[0xab8f] = "setEngineAngle"
+UDS_RC.routineControlIdentifiers[0xe000] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe001] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe002] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe003] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe004] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe005] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe006] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe007] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe008] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe009] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe00f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe010] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe011] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe012] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe013] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe014] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe015] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe016] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe017] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe018] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe019] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe01f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe020] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe021] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe022] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe023] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe024] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe025] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe026] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe027] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe028] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe029] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe02f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe030] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe031] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe032] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe033] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe034] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe035] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe036] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe037] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe038] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe039] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe03f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe040] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe041] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe042] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe043] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe044] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe045] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe046] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe047] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe048] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe049] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe04f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe050] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe051] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe052] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe053] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe054] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe055] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe056] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe057] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe058] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe059] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe05f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe060] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe061] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe062] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe063] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe064] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe065] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe066] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe067] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe068] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe069] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe06f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe070] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe071] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe072] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe073] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe074] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe075] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe076] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe077] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe078] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe079] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe07f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe080] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe081] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe082] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe083] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe084] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe085] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe086] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe087] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe088] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe089] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe08f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe090] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe091] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe092] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe093] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe094] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe095] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe096] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe097] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe098] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe099] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe09f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0a9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0aa] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ab] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ac] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ad] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ae] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0af] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0b9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ba] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0bb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0bc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0bd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0be] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0bf] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0c9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ca] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0cb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0cc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0cd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ce] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0cf] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0d9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0da] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0db] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0dc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0dd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0de] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0df] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0e9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ea] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0eb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ec] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ed] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ee] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ef] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0f9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0fa] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0fb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0fc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0fd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0fe] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe0ff] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe100] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe101] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe102] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe103] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe104] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe105] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe106] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe107] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe108] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe109] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe10f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe110] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe111] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe112] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe113] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe114] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe115] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe116] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe117] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe118] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe119] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe11f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe120] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe121] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe122] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe123] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe124] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe125] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe126] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe127] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe128] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe129] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe12f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe130] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe131] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe132] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe133] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe134] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe135] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe136] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe137] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe138] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe139] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe13f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe140] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe141] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe142] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe143] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe144] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe145] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe146] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe147] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe148] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe149] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe14f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe150] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe151] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe152] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe153] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe154] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe155] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe156] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe157] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe158] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe159] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe15f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe160] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe161] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe162] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe163] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe164] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe165] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe166] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe167] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe168] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe169] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe16f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe170] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe171] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe172] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe173] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe174] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe175] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe176] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe177] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe178] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe179] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe17f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe180] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe181] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe182] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe183] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe184] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe185] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe186] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe187] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe188] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe189] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe18f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe190] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe191] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe192] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe193] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe194] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe195] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe196] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe197] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe198] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe199] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19a] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19b] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19c] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19d] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19e] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe19f] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1a9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1aa] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ab] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ac] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ad] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ae] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1af] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1b9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ba] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1bb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1bc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1bd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1be] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1bf] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1c9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ca] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1cb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1cc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1cd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ce] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1cf] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1d9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1da] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1db] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1dc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1dd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1de] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1df] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1e9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ea] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1eb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ec] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ed] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ee] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ef] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f0] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f1] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f2] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f3] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f4] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f5] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f6] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f7] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f8] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1f9] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1fa] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1fb] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1fc] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1fd] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1fe] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xe1ff] = "OBDTestIDs"
+UDS_RC.routineControlIdentifiers[0xf013] = "DeactivateSegeln"
+UDS_RC.routineControlIdentifiers[0xf043] = "RequestDeactivateMontagemodus"
+UDS_RC.routineControlIdentifiers[0xf760] = "ResetActivationline"
+UDS_RC.routineControlIdentifiers[0xff00] = "eraseMemory"
+UDS_RC.routineControlIdentifiers[0xff01] = "checkProgrammingDependencies"
+
+UDS_RD.dataFormatIdentifiers[0x0001] = "BMW_ROM_EPROM_internal"
+UDS_RD.dataFormatIdentifiers[0x0002] = "BMW_ROM_EPROM_external"
+UDS_RD.dataFormatIdentifiers[0x0003] = "BMW_NVRAM_characteristicZones_DTCmemory"  # noqa E501
+UDS_RD.dataFormatIdentifiers[0x0004] = "BMW_RAM_internal_shortMOV"
+UDS_RD.dataFormatIdentifiers[0x0005] = "BMW_RAM_external_xDataMOV"
+UDS_RD.dataFormatIdentifiers[0x0006] = "BMW_flashEPROM_internal"
+UDS_RD.dataFormatIdentifiers[0x0007] = "BMW_UIFmemory"
+UDS_RD.dataFormatIdentifiers[0x0008] = "BMW_vehicleOrderDataMemory_onlyToBeUsedByDS2_ECUs"  # noqa E501
+UDS_RD.dataFormatIdentifiers[0x0009] = "BMW_flashEPROM_external"
+UDS_RD.dataFormatIdentifiers[0x000b] = "BMW_RAM_internal_longMOVatRegister"
+UDS_RD.dataFormatIdentifiers[0x0010] = "NRV and noEncryptingMethod"
+
+UDS_RSDBI.dataIdentifiers = UDS_RDBI.dataIdentifiers

scapy-2.4.3.tar.gz/scapy/contrib/automotive/bmw/enet.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/bmw/enet.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Nils Weiss <nils@we155.de>
@@ -15,6 +13,9 @@
 from scapy.layers.inet import TCP
 from scapy.supersocket import StreamSocket
 from scapy.contrib.automotive.uds import UDS
+from scapy.contrib.isotp import ISOTP
+from scapy.error import Scapy_Exception
+from scapy.data import MTU
 
 
 """
@@ -67,6 +68,28 @@
 
 class ENETSocket(StreamSocket):
     def __init__(self, ip='127.0.0.1', port=6801):
+        self.ip = ip
+        self.port = port
         s = socket.socket()
-        s.connect((ip, port))
+        s.connect((self.ip, self.port))
         StreamSocket.__init__(self, s, ENET)
+
+
+class ISOTP_ENETSocket(ENETSocket):
+    def __init__(self, src, dst, ip='127.0.0.1', port=6801, basecls=ISOTP):
+        super(ISOTP_ENETSocket, self).__init__(ip, port)
+        self.src = src
+        self.dst = dst
+        self.basecls = ENET
+        self.outputcls = basecls
+
+    def send(self, x):
+        if not isinstance(x, ISOTP):
+            raise Scapy_Exception("Please provide a packet class based on "
+                                  "ISOTP")
+        super(ISOTP_ENETSocket, self).send(
+            ENET(src=self.src, dst=self.dst) / x)
+
+    def recv(self, x=MTU):
+        pkt = super(ISOTP_ENETSocket, self).recv(x)
+        return self.outputcls(bytes(pkt[1]))

scapy-2.4.3.tar.gz/scapy/contrib/automotive/ccp.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/ccp.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/automotive/ecu.py Added

@@ -0,0 +1,413 @@
+#! /usr/bin/env python
+
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Helper class for tracking ECU states (ECU)
+# scapy.contrib.status = loads
+
+import time
+import random
+
+from collections import defaultdict
+
+from scapy.packet import Raw, Packet
+from scapy.plist import PacketList
+from scapy.error import Scapy_Exception
+from scapy.sessions import DefaultSession
+from scapy.ansmachine import AnsweringMachine
+from scapy.config import conf
+
+__all__ = ["ECU_State", "ECU", "ECUResponse", "ECUSession", "ECU_am"]
+
+
+class ECU_State(object):
+    def __init__(self, session=1, tester_present=False, security_level=0,
+                 communication_control=0, **kwargs):
+        self.session = session
+        self.security_level = security_level
+        self.communication_control = communication_control
+        self._tp = tester_present
+        self.misc = kwargs
+
+    def reset(self):
+        self.session = 1
+        self.security_level = 0
+        self.communication_control = 0
+        self._tp = False
+        self.misc = dict()
+
+    @property
+    def tp(self):
+        return self._tp or self.session > 1
+
+    def __eq__(self, other):
+        return other.session == self.session and other.tp == self.tp and \
+            other.misc == self.misc and \
+            self.security_level == other.security_level
+
+    def __ne__(self, other):
+        return not other == self
+
+    def __lt__(self, other):
+        if self.session == other.session:
+            return len(self.misc) < len(other.misc)
+        return self.session < other.session
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __repr__(self):
+        tps = "_TP" if self.tp else ""
+        sl = "_SL%d" % self.security_level if self.security_level else ""
+        ks = "_" + "_".join(self.misc.keys()) if len(self.misc) else ""
+        return "%d%s%s%s" % (self.session, tps, sl, ks)
+
+
+class ECU(object):
+    """A ECU object can be used to
+            - track the states of an ECU.
+            - to log all modification to an ECU
+            - to extract supported responses of a real ECU
+
+           Usage:
+           >>> print("This ecu logs, tracks and creates supported responses")
+           >>> my_virtual_ecu = ECU()
+           >>> my_virtual_ecu.update(PacketList([...]))
+           >>> my_virtual_ecu.supported_responses
+           >>> print("Another ecu just tracks")
+           >>> my_tracking_ecu = ECU(logging=False, store_supported_responses=False)  # noqa: E501
+           >>> my_tracking_ecu.update(PacketList([...]))
+           >>> print("Another ecu just logs all modifications to it")
+           >>> my_logging_ecu = ECU(verbose=False, store_supported_responses=False)  # noqa: E501
+           >>> my_logging_ecu.update(PacketList([...]))
+           >>> my_logging_ecu.log
+           >>> print("Another ecu just creates supported responses")
+           >>> my_response_ecu = ECU(verbose=False, logging=False)
+           >>> my_response_ecu.update(PacketList([...]))
+           >>> my_response_ecu.supported_responses
+       """
+    def __init__(self, init_session=None, init_security_level=None,
+                 init_communication_control=None, logging=True, verbose=True,
+                 store_supported_responses=True):
+        """
+        Initialize an ECU object
+
+        :param init_session: An initial session
+        :param init_security_level: An initial security level
+        :param init_communication_control: An initial communication control
+                                           setting
+        :param logging: Turn logging on or off. Default is on.
+        :param verbose: Turn tracking on or off. Default is on.
+        :param store_supported_responses: Turn creation of supported responses
+                                          on or off. Default is on.
+        """
+        self.state = ECU_State(
+            session=init_session or 1, security_level=init_security_level or 0,
+            communication_control=init_communication_control or 0)
+        self.verbose = verbose
+        self.logging = logging
+        self.store_supported_responses = store_supported_responses
+        self.log = defaultdict(list)
+        self._supported_responses = list()
+        self._unanswered_packets = PacketList()
+
+    @property
+    def current_session(self):
+        return self.state.session
+
+    @current_session.setter
+    def current_session(self, ses):
+        self.state.session = ses
+
+    @property
+    def current_security_level(self):
+        return self.state.security_level
+
+    @current_security_level.setter
+    def current_security_level(self, sec):
+        self.state.security_level = sec
+
+    @property
+    def communication_control(self):
+        return self.state.communication_control
+
+    @communication_control.setter
+    def communication_control(self, cc):
+        self.state.communication_control = cc
+
+    def reset(self):
+        self.state.reset()
+
+    def update(self, p):
+        if isinstance(p, PacketList):
+            for pkt in p:
+                self._update(pkt)
+        elif not isinstance(p, Packet):
+            raise Scapy_Exception("Provide a Packet object for an update")
+        else:
+            self._update(p)
+
+    def _update(self, pkt):
+        if self.verbose:
+            print(repr(self), repr(pkt))
+        if self.store_supported_responses:
+            self._update_supported_responses(pkt)
+        if self.logging:
+            self._update_log(pkt)
+        self._update_internal_state(pkt)
+
+    def _update_log(self, pkt):
+        for layer in pkt.layers():
+            if hasattr(layer, "get_log"):
+                log_key, log_value = layer.get_log(pkt)
+                self.log[log_key].append((pkt.time, log_value))
+
+    def _update_internal_state(self, pkt):
+        for layer in pkt.layers():
+            if hasattr(layer, "modifies_ecu_state"):
+                layer.modifies_ecu_state(pkt, self)
+
+    def _update_supported_responses(self, pkt):
+        self._unanswered_packets += PacketList([pkt])
+        answered, unanswered = self._unanswered_packets.sr()
+        for _, resp in answered:
+            ecu_resp = ECUResponse(session=self.current_session,
+                                   security_level=self.current_security_level,
+                                   responses=resp)
+
+            if ecu_resp not in self._supported_responses:
+                if self.verbose:
+                    print("[+] ", repr(ecu_resp))
+                self._supported_responses.append(ecu_resp)
+            else:
+                if self.verbose:
+                    print("[-] ", repr(ecu_resp))
+        self._unanswered_packets = unanswered
+
+    @property
+    def supported_responses(self):
+        # This sorts responses in the following order:
+        # 1. Positive responses first
+        # 2. Lower ServiceID first
+        # 3. Longer (more specific) responses first
+        self._supported_responses.sort(
+            key=lambda x: (x.responses[0].service == 0x7f,
+                           x.responses[0].service,
+                           0xffffffff - len(x.responses[0])))
+        return self._supported_responses
+
+    @property
+    def unanswered_packets(self):
+        return self._unanswered_packets
+
+    def __repr__(self):
+        return "ses: %03d  sec: %03d  cc: %d" % (self.current_session,
+                                                 self.current_security_level,
+                                                 self.communication_control)
+
+
+class ECUSession(DefaultSession):
+    """Tracks modification to an ECU 'on-the-flow'.
+
+    Usage:
+    >>> sniff(session=ECUSession)
+    """
+
+    def __init__(self, *args, **kwargs):
+        DefaultSession.__init__(self, *args, **kwargs)
+        self.ecu = ECU(init_session=kwargs.pop("init_session", None),
+                       init_security_level=kwargs.pop("init_security_level", None),  # noqa: E501
+                       init_communication_control=kwargs.pop("init_communication_control", None),  # noqa: E501
+                       logging=kwargs.pop("logging", True),
+                       verbose=kwargs.pop("verbose", True),
+                       store_supported_responses=kwargs.pop("store_supported_responses", True))  # noqa: E501
+
+    def on_packet_received(self, pkt):
+        if not pkt:
+            return
+        if isinstance(pkt, list):
+            for p in pkt:
+                ECUSession.on_packet_received(self, p)
+            return
+        self.ecu.update(pkt)
+        DefaultSession.on_packet_received(self, pkt)
+
+
+class ECUResponse:
+    """Encapsulates a response and the according ECU state.
+    A list of this objects can be used to configure a ECU Answering Machine.
+    This is useful, if you want to clone the behaviour of a real ECU on a bus.
+
+        Usage:
+        >>> print("Generates a ECUResponse which answers on UDS()/UDS_RDBI(identifiers=[2]) if ECU is in session 2 and has security_level 2")  # noqa: E501
+        >>> ECUResponse(session=2,                     security_level=2,                responses=UDS()/UDS_RDBIPR(dataIdentifier=2)/Raw(b"deadbeef1"))  # noqa: E501
+        >>> print("Further examples")
+        >>> ECUResponse(session=range(3,5),            security_level=[3,4],            responses=UDS()/UDS_RDBIPR(dataIdentifier=3)/Raw(b"deadbeef2"))  # noqa: E501
+        >>> ECUResponse(session=[5,6,7],               security_level=range(5,7),       responses=UDS()/UDS_RDBIPR(dataIdentifier=5)/Raw(b"deadbeef3"))  # noqa: E501
+        >>> ECUResponse(session=lambda x: 8 < x <= 10, security_level=lambda x: x > 10, responses=UDS()/UDS_RDBIPR(dataIdentifier=9)/Raw(b"deadbeef4"))  # noqa: E501
+    """
+    def __init__(self, session=1, security_level=0,
+                 responses=Raw(b"\x7f\x10"),
+                 answers=None):
+        """
+        Initialize an ECUResponse capsule
+
+        :param session: Defines the session in which this response is valid.
+                        A integer, a callable or any iterable object can be
+                        provided.
+        :param security_level: Defines the security_level in which this
+                               response is valid. A integer, a callable or any
+                               iterable object can be provided.
+        :param responses: A Packet or a list of Packet objects. By default the
+                          last packet is asked if it answers a incoming packet.
+                          This allows to send for example
+                          `requestCorrectlyReceived-ResponsePending` packets.
+        :param answers: Optional argument to provide a custom answer here:
+                        `lambda resp, req: return resp.answers(req)`
+                        This allows the modification of a response depending
+                        on a request. Custom SecurityAccess mechanisms can
+                        be implemented in this way or generic NegativeResponse
+                        messages which answers to everything can be realized
+                        in this way.
+        """
+        self.__session = session \
+            if hasattr(session, "__iter__") or callable(session) else [session]
+        self.__security_level = security_level \
+            if hasattr(security_level, "__iter__") or callable(security_level)\
+            else [security_level]
+        if isinstance(responses, PacketList):
+            self.responses = responses
+        elif isinstance(responses, Packet):
+            self.responses = PacketList([responses])
+        elif hasattr(responses, "__iter__"):
+            self.responses = PacketList(responses)
+        else:
+            self.responses = PacketList([responses])
+
+        self.__custom_answers = answers
+
+    def in_correct_session(self, current_session):
+        if callable(self.__session):
+            return self.__session(current_session)
+        else:
+            return current_session in self.__session
+
+    def has_security_access(self, current_security_level):
+        if callable(self.__security_level):
+            return self.__security_level(current_security_level)
+        else:
+            return current_security_level in self.__security_level
+
+    def answers(self, other):
+        if self.__custom_answers is not None:
+            return self.__custom_answers(self.responses[-1], other)
+        else:
+            return self.responses[-1].answers(other)
+
+    def __repr__(self):
+        return "session=%s, security_level=%s, responses=%s" % \
+               (self.__session, self.__security_level,
+                [resp.summary() for resp in self.responses])
+
+    def __eq__(self, other):
+        return \
+            self.__class__ == other.__class__ and \
+            self.__session == other.__session and \
+            self.__security_level == other.__security_level and \
+            len(self.responses) == len(other.responses) and \
+            all(bytes(x) == bytes(y) for x, y in zip(self.responses,
+                                                     other.responses))
+
+    def __ne__(self, other):
+        # Python 2.7 compat
+        return not self == other
+
+    __hash__ = None
+
+
+conf.contribs['ECU_am'] = {'send_delay': 0}
+
+
+class ECU_am(AnsweringMachine):
+    """AnsweringMachine which emulates the basic behaviour of a real world ECU.
+    Provide a list of ``ECUResponse`` objects to configure the behaviour of this
+    AnsweringMachine.
+
+        :param supported_responses: List of ``ECUResponse`` objects to define
+                                    the behaviour. The default response is
+                                    ``generalReject``.
+        :param main_socket: Defines the object of the socket to send
+                            and receive packets.
+        :param broadcast_socket: Defines the object of the broadcast socket.
+                                 Listen-only, responds with the main_socket.
+                                 `None` to disable broadcast capabilities.
+        :param basecls: Provide a basecls of the used protocol
+
+           Usage:
+           >>> resp = ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))  # noqa: E501
+           >>> sock = ISOTPSocket(can_iface, sid=0x700, did=0x600, basecls=UDS)  # noqa: E501
+           >>> answering_machine = ECU_am(supported_responses=[resp], main_socket=sock, basecls=UDS)  # noqa: E501
+           >>> sim = threading.Thread(target=answering_machine, kwargs={'count': 4, 'timeout':5})  # noqa: E501
+           >>> sim.start()
+       """
+    function_name = "ECU_am"
+    sniff_options_list = ["store", "opened_socket", "count", "filter", "prn", "stop_filter", "timeout"]  # noqa: E501
+
+    def parse_options(self, supported_responses=None,
+                      main_socket=None, broadcast_socket=None, basecls=Raw,
+                      timeout=None):
+        self.main_socket = main_socket
+        self.sockets = [self.main_socket]
+
+        if broadcast_socket is not None:
+            self.sockets.append(broadcast_socket)
+
+        self.ecu_state = ECU(logging=False, verbose=False,
+                             store_supported_responses=False)
+        self.basecls = basecls
+        self.supported_responses = supported_responses
+
+        self.sniff_options["timeout"] = timeout
+        self.sniff_options["opened_socket"] = self.sockets
+
+    def is_request(self, req):
+        return req.__class__ == self.basecls
+
+    def print_reply(self, req, reply):
+        print("%s ==> %s" % (req.summary(), [res.summary() for res in reply]))
+
+    def make_reply(self, req):
+        if self.supported_responses is not None:
+            for resp in self.supported_responses:
+                if not isinstance(resp, ECUResponse):
+                    raise Scapy_Exception("Unsupported type for response. "
+                                          "Please use `ECUResponse` objects. ")
+
+                if not resp.in_correct_session(self.ecu_state.current_session):
+                    continue
+
+                if not resp.has_security_access(
+                        self.ecu_state.current_security_level):
+                    continue
+
+                if not resp.answers(req):
+                    continue
+
+                for r in resp.responses:
+                    for layer in r.layers():
+                        if hasattr(layer, "modifies_ecu_state"):
+                            layer.modifies_ecu_state(r, self.ecu_state)
+
+                return resp.responses
+
+        return PacketList([self.basecls(b"\x7f" + bytes(req)[0:1] + b"\x10")])
+
+    def send_reply(self, reply):
+        for p in reply:
+            time.sleep(conf.contribs['ECU_am']['send_delay'])
+            if len(reply) > 1:
+                time.sleep(random.uniform(0.01, 0.5))
+            self.main_socket.send(p)

scapy-2.4.4.tar.gz/scapy/contrib/automotive/enumerator.py Added

@@ -0,0 +1,392 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Enumerator and Automotive Scanner Baseclasses
+# scapy.contrib.status = loads
+
+from collections import defaultdict, namedtuple
+
+from scapy.error import Scapy_Exception, log_interactive, warning
+from scapy.utils import make_lined_table, SingleConversationSocket
+from scapy.modules import six
+from scapy.contrib.automotive.ecu import ECU_State
+
+
+class Graph:
+    def __init__(self):
+        """
+        self.edges is a dict of all possible next nodes
+        e.g. {'X': ['A', 'B', 'C', 'E'], ...}
+        self.weights has all the weights between two nodes,
+        with the two nodes as a tuple as the key
+        e.g. {('X', 'A'): 7, ('X', 'B'): 2, ...}
+        """
+        self.edges = defaultdict(list)
+        self.weights = {}
+
+    def add_edge(self, from_node, to_node, weight=1):
+        # Note: assumes edges are bi-directional
+        self.edges[from_node].append(to_node)
+        self.edges[to_node].append(from_node)
+        self.weights[(from_node, to_node)] = weight
+        self.weights[(to_node, from_node)] = weight
+
+    @property
+    def nodes(self):
+        return self.edges.keys()
+
+    @staticmethod
+    def dijsktra(graph, initial, end):
+        # shortest paths is a dict of nodes
+        # whose value is a tuple of (previous node, weight)
+        shortest_paths = {initial: (None, 0)}
+        current_node = initial
+        visited = set()
+
+        while current_node != end:
+            visited.add(current_node)
+            destinations = graph.edges[current_node]
+            weight_to_current_node = shortest_paths[current_node][1]
+
+            for next_node in destinations:
+                weight = \
+                    graph.weights[(current_node, next_node)] + \
+                    weight_to_current_node
+                if next_node not in shortest_paths:
+                    shortest_paths[next_node] = (current_node, weight)
+                else:
+                    current_shortest_weight = shortest_paths[next_node][1]
+                    if current_shortest_weight > weight:
+                        shortest_paths[next_node] = (current_node, weight)
+
+            next_destinations = {node: shortest_paths[node] for node in
+                                 shortest_paths if node not in visited}
+            if not next_destinations:
+                return None
+            # next node is the destination with the lowest weight
+            current_node = min(next_destinations,
+                               key=lambda k: next_destinations[k][1])
+
+        # Work back through destinations in shortest path
+        path = []
+        while current_node is not None:
+            path.append(current_node)
+            next_node = shortest_paths[current_node][0]
+            current_node = next_node
+        # Reverse path
+        path.reverse()
+        return path
+
+
+class Enumerator(object):
+    """ Base class for Enumerators
+
+    Args:
+        sock: socket where enumeration takes place
+    """
+    description = "About my results"
+    negative_response_blacklist = []
+    ScanResult = namedtuple("ScanResult", "state req resp")
+
+    def __init__(self, sock):
+        self.sock = sock
+        self.results = list()
+        self.stats = {"answered": 0, "unanswered": 0, "answertime_max": 0,
+                      "answertime_min": 0, "answertime_avg": 0,
+                      "negative_resps": 0}
+        self.state_completed = defaultdict(bool)
+        self.retry_pkt = None
+        self.request_iterators = dict()
+
+    @property
+    def completed(self):
+        return all([self.state_completed[s] for s in self.scanned_states])
+
+    def pre_scan(self, global_configuration):
+        pass
+
+    def scan(self, state, requests, timeout=1, **kwargs):
+
+        if state not in self.request_iterators:
+            self.request_iterators[state] = iter(requests)
+
+        if self.retry_pkt:
+            it = [self.retry_pkt]
+        else:
+            it = self.request_iterators[state]
+
+        log_interactive.debug("Using iterator %s in state %s" % (it, state))
+
+        for req in it:
+            try:
+                res = self.sock.sr1(req, timeout=timeout, verbose=False)
+            except ValueError as e:
+                warning("Exception in scan %s" % e)
+                break
+
+            self.results.append(Enumerator.ScanResult(state, req, res))
+            if self.evaluate_response(res, **kwargs):
+                return
+
+        self.update_stats()
+        self.state_completed[state] = True
+
+    def post_scan(self, global_configuration):
+        pass
+
+    def evaluate_response(self, response, **kwargs):
+        return self is None  # always return False by default
+
+    def dump(self, completed_only=True):
+        if completed_only:
+            selected_states = [k for k, v in self.state_completed.items() if v]
+        else:
+            selected_states = self.state_completed.keys()
+
+        data = [{"state": str(s),
+                 "protocol": str(req.__class__.__name__),
+                 "req_time": req.sent_time,
+                 "req_data": str(req),
+                 "resp_time": resp.time if resp is not None else None,
+                 "resp_data": str(resp) if resp is not None else None,
+                 "isotp_params": {
+                     "resp_src": resp.src, "resp_dst": resp.dst,
+                     "resp_exsrc": resp.exsrc, "resp_exdst": resp.exdst}
+                 if resp is not None else None}
+                for s, req, resp in self.results if s in selected_states]
+
+        return {"format_version": 0.1,
+                "name": str(self.__class__.__name__),
+                "states_completed": [(str(k), v) for k, v in
+                                     self.state_completed.items()],
+                "data": data}
+
+    def remove_completed_states(self):
+        selected_states = [k for k, v in self.state_completed.items() if not v]
+        uncompleted_results = [r for r in self.results if
+                               r.state in selected_states]
+        self.results = uncompleted_results
+
+    def update_stats(self):
+        answered = self.filtered_results
+        unanswered = [r for r in self.results if r.resp is None]
+        answertimes = [x.resp.time - x.req.sent_time for x in answered if
+                       x.resp.time is not None and x.req.sent_time is not None]
+        nrs = [r.resp for r in self.filtered_results if r.resp.service == 0x7f]
+        try:
+            self.stats["answered"] = len(answered)
+            self.stats["unanswered"] = len(unanswered)
+            self.stats["negative_resps"] = len(nrs)
+            self.stats["answertime_max"] = max(answertimes)
+            self.stats["answertime_min"] = min(answertimes)
+            self.stats["answertime_avg"] = sum(answertimes) / len(answertimes)
+        except (ValueError, ZeroDivisionError):
+            for k, v in self.stats.items():
+                if v is None:
+                    self.stats[k] = 0
+
+    @property
+    def filtered_results(self):
+        return [r for r in self.results if r.resp is not None]
+
+    @property
+    def scanned_states(self):
+        return set([s for s, _, _, in self.results])
+
+    def show_negative_response_details(self, dump=False):
+        raise NotImplementedError("This needs a protocol specific "
+                                  "implementation")
+
+    def show(self, dump=False, filtered=True, verbose=False):
+        s = "\n\n" + "=" * (len(self.description) + 10) + "\n"
+        s += " " * 5 + self.description + "\n"
+        s += "-" * (len(self.description) + 10) + "\n"
+
+        s += "%d requests were sent, %d answered, %d unanswered" % \
+             (len(self.results), self.stats["answered"],
+              self.stats["unanswered"]) + "\n"
+
+        s += "Times between request and response:\tMIN: %f\tMAX: %f\tAVG: %f" \
+             % (self.stats["answertime_min"], self.stats["answertime_max"],
+                self.stats["answertime_avg"]) + "\n"
+
+        s += "%d negative responses were received" % \
+             self.stats["negative_resps"] + "\n"
+
+        if not dump:
+            print(s)
+            s = ""
+        else:
+            s += "\n"
+
+        s += self.show_negative_response_details(dump) or "" + "\n"
+
+        if len(self.negative_response_blacklist):
+            s += "The following negative response codes are blacklisted: "
+            s += "%s" % self.negative_response_blacklist + "\n"
+
+        if not dump:
+            print(s)
+        else:
+            s += "\n"
+
+        data = self.results if not filtered else self.filtered_results
+        if len(data):
+            s += make_lined_table(data, self.get_table_entry, dump=dump) or ""
+        else:
+            s += "=== No data to display ===\n"
+        if verbose:
+            completed = [(x, self.state_completed[x])
+                         for x in self.scanned_states]
+            s += make_lined_table(completed,
+                                  lambda tup: ("Scan state completed", tup[0],
+                                               tup[1]),
+                                  dump=dump) or ""
+
+        return s if dump else None
+
+    @staticmethod
+    def get_table_entry(tup):
+        raise NotImplementedError()
+
+    @staticmethod
+    def get_label(response,
+                  positive_case="PR: PositiveResponse",
+                  negative_case="NR: NegativeResponse"):
+        if response is None:
+            label = "Timeout"
+        elif response.service == 0x7f:
+            # FIXME: service is a protocol specific field
+            label = negative_case
+        else:
+            if isinstance(positive_case, six.string_types):
+                label = positive_case
+            elif callable(positive_case):
+                label = positive_case()
+            else:
+                raise Scapy_Exception("Unsupported Type for positive_case. "
+                                      "Provide a string or a function.")
+        return label
+
+
+class Scanner(object):
+    default_enumerator_clss = []
+
+    def __init__(self, socket, reset_handler=None, enumerators=None, **kwargs):
+        # The TesterPresentSender can interfere with a enumerator, since a
+        # target may only allow one request at a time.
+        # The SingleConversationSocket prevents interleaving requests.
+        if not isinstance(socket, SingleConversationSocket):
+            self.socket = SingleConversationSocket(socket)
+        else:
+            self.socket = socket
+        self.tps = None  # TesterPresentSender
+        self.target_state = ECU_State()
+        self.reset_handler = reset_handler
+        self.verbose = kwargs.get("verbose", False)
+        if enumerators:
+            # enumerators can be a mix of classes or instances
+            self.enumerators = [e(self.socket) for e in enumerators if not isinstance(e, Enumerator)] + [e for e in enumerators if isinstance(e, Enumerator)]  # noqa: E501
+        else:
+            self.enumerators = [e(self.socket) for e in self.default_enumerator_clss]  # noqa: E501
+        self.enumerator_classes = [e.__class__ for e in self.enumerators]
+        self.state_graph = Graph()
+        self.state_graph.add_edge(ECU_State(), ECU_State())
+        self.configuration = \
+            {"dynamic_timeout": kwargs.pop("dynamic_timeout", False),
+             "enumerator_classes": self.enumerator_classes,
+             "verbose": self.verbose,
+             "state_graph": self.state_graph,
+             "delay_state_change": kwargs.pop("delay_state_change", 0.5)}
+
+        for e in self.enumerators:
+            self.configuration[e.__class__] = kwargs.pop(
+                e.__class__.__name__ + "_kwargs", dict())
+
+        for conf_key in self.enumerators:
+            conf_val = self.configuration[conf_key.__class__]
+            for kwargs_key, kwargs_val in kwargs.items():
+                if kwargs_key not in conf_val.keys():
+                    conf_val[kwargs_key] = kwargs_val
+            self.configuration[conf_key.__class__] = conf_val
+
+        log_interactive.debug("The following configuration was created")
+        log_interactive.debug(self.configuration)
+
+    def dump(self, completed_only=True):
+        return {"format_version": 0.1,
+                "enumerators": [e.dump(completed_only)
+                                for e in self.enumerators],
+                "state_graph": [str(p) for p in self.get_state_paths()],
+                "dynamic_timeout": self.configuration["dynamic_timeout"],
+                "verbose": self.configuration["verbose"],
+                "delay_state_change": self.configuration["delay_state_change"]}
+
+    def get_state_paths(self):
+        paths = [Graph.dijsktra(self.state_graph, ECU_State(), s)
+                 for s in self.state_graph.nodes if s != ECU_State()]
+        return sorted([p for p in paths if p is not None] + [[ECU_State()]],
+                      key=lambda x: x[-1])
+
+    def reset_target(self):
+        log_interactive.info("[i] Target reset")
+        self.reset_tps()
+        if self.reset_handler:
+            try:
+                self.reset_handler(self)
+            except TypeError:
+                self.reset_handler()
+
+        self.target_state = ECU_State()
+
+    def execute_enumerator(self, enumerator):
+        enumerator_kwargs = self.configuration[enumerator.__class__]
+        enumerator.pre_scan(self.configuration)
+        enumerator.scan(state=self.target_state, **enumerator_kwargs)
+        enumerator.post_scan(self.configuration)
+
+    def reset_tps(self):
+        if self.tps:
+            self.tps.stop()
+            self.tps = None
+
+    def scan(self):
+        scan_complete = False
+        while not scan_complete:
+            scan_complete = True
+            log_interactive.info("[i] Scan paths %s" % self.get_state_paths())
+            for p in self.get_state_paths():
+                log_interactive.info("[i] Scan path %s" % p)
+                final_state = p[-1]
+                for e in self.enumerators:
+                    if e.state_completed[final_state]:
+                        log_interactive.debug("[+] State %s for %s completed" %
+                                              (repr(final_state), e))
+                        continue
+                    if not self.enter_state_path(p):
+                        log_interactive.error("[-] Error entering path %s" % p)
+                        continue
+                    log_interactive.info("[i] EXECUTE SCAN %s for path %s" %
+                                         (e.__class__.__name__, p))
+                    self.execute_enumerator(e)
+                    scan_complete = False
+        self.reset_target()
+
+    def enter_state_path(self, path):
+        if path[0] != ECU_State():
+            raise Scapy_Exception(
+                "Initial state of path not equal reset state of the target")
+
+        self.reset_target()
+        if len(path) == 1:
+            return True
+
+        for s in path[1:]:
+            if not self.enter_state(s):
+                return False
+        return True
+
+    def enter_state(self, state):
+        raise NotImplementedError

scapy-2.4.3.tar.gz/scapy/contrib/automotive/gm/gmlan.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/gm/gmlan.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Nils Weiss <nils@we155.de>
@@ -14,28 +12,39 @@
     ConditionalField, XByteField, StrField, XShortEnumField, XShortField, \
     X3BytesField, XIntField, ShortField, PacketField, PacketListField, \
     FieldListField
-from scapy.packet import Packet, bind_layers
+from scapy.packet import Packet, bind_layers, NoPayload
 from scapy.config import conf
-from scapy.error import warning
-from scapy.utils import PeriodicSenderThread
+from scapy.error import warning, log_loading
+from scapy.contrib.isotp import ISOTP
 
 
 """
 GMLAN
 """
 
-conf.contribs['GMLAN'] = {'GMLAN_ECU_AddressingScheme': None}
+try:
+    if conf.contribs['GMLAN']['treat-response-pending-as-answer']:
+        pass
+except KeyError:
+    log_loading.info("Specify \"conf.contribs['GMLAN'] = "
+                     "{'treat-response-pending-as-answer': True}\" to treat "
+                     "a negative response 'RequestCorrectlyReceived-"
+                     "ResponsePending' as answer of a request. \n"
+                     "The default value is False.")
+    conf.contribs['GMLAN'] = {'treat-response-pending-as-answer': False}
+
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = None
 
 
-class GMLAN(Packet):
+class GMLAN(ISOTP):
     @staticmethod
     def determine_len(x):
         if conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] is None:
-            warning("Define conf.GMLAN_ECU_AddressingScheme! "
+            warning("Define conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme']! "  # noqa: E501
                     "Assign either 2,3 or 4")
         if conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] \
                 not in [2, 3, 4]:
-            warning("Define conf.GMLAN_ECU_AddressingScheme! "
+            warning("Define conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme']! "  # noqa: E501
                     "Assign either 2,3 or 4")
         return conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] == x
 
@@ -87,18 +96,36 @@
     ]
 
     def answers(self, other):
-        """DEV: true if self is an answer from other"""
-        if other.__class__ == self.__class__:
-            return (other.service + 0x40) == self.service or \
-                   (self.service == 0x7f and
-                    (self.requestServiceId == other.service))
-        return 0
+        if other.__class__ != self.__class__:
+            return False
+        if self.service == 0x7f:
+            return self.payload.answers(other)
+        if self.service == (other.service + 0x40):
+            if isinstance(self.payload, NoPayload) or \
+                    isinstance(other.payload, NoPayload):
+                return True
+            else:
+                return self.payload.answers(other.payload)
+        return False
 
     def hashret(self):
         if self.service == 0x7f:
             return struct.pack('B', self.requestServiceId)
         return struct.pack('B', self.service & ~0x40)
 
+    @staticmethod
+    def modifies_ecu_state(pkt, ecu):
+        if pkt.service == 0x50:
+            ecu.current_session = 3
+        elif pkt.service == 0x60:
+            ecu.current_session = 1
+            ecu.communication_control = 0
+            ecu.current_security_level = 0
+        elif pkt.service == 0x68:
+            ecu.communication_control = 1
+        elif pkt.service == 0xe5:
+            ecu.current_session = 2
+
 
 # ########################IDO###################################
 class GMLAN_IDO(Packet):
@@ -111,6 +138,11 @@
         ByteEnumField('subfunction', 0, subfunctions)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_IDO.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_IDO, service=0x10)
 
@@ -140,6 +172,11 @@
                          lambda pkt: pkt.subfunction == 0x02)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RFRD.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_RFRD, service=0x12)
 
@@ -150,6 +187,15 @@
         ByteEnumField('subfunction', 0, GMLAN_RFRD.subfunctions)
     ]
 
+    def answers(self, other):
+        return other.__class__ == GMLAN_RFRD and \
+            other.subfunction == self.subfunction
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RFRDPR.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_RFRDPR, service=0x52)
 
@@ -272,6 +318,11 @@
         XByteEnumField('dataIdentifier', 0, dataIdentifiers)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RDBI.dataIdentifier%")
+
 
 bind_layers(GMLAN, GMLAN_RDBI, service=0x1A)
 
@@ -282,6 +333,16 @@
         XByteEnumField('dataIdentifier', 0, GMLAN_RDBI.dataIdentifiers),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_RDBIPR.dataIdentifier%"),
+             bytes(pkt[1].payload))
+
+    def answers(self, other):
+        return other.__class__ == GMLAN_RDBI and \
+            other.dataIdentifier == self.dataIdentifier
+
 
 bind_layers(GMLAN, GMLAN_RDBIPR, service=0x5A)
 
@@ -300,6 +361,11 @@
                                        dataIdentifiers))
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RDBPI.identifiers%")
+
 
 bind_layers(GMLAN, GMLAN_RDBPI, service=0x22)
 
@@ -310,6 +376,15 @@
         XShortEnumField('parameterIdentifier', 0, GMLAN_RDBPI.dataIdentifiers),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RDBPIPR.parameterIdentifier%")
+
+    def answers(self, other):
+        return other.__class__ == GMLAN_RDBPI and \
+            self.parameterIdentifier in other.identifiers
+
 
 bind_layers(GMLAN, GMLAN_RDBPIPR, service=0x62)
 
@@ -332,6 +407,11 @@
                          lambda pkt: pkt.subfunction > 0x0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RDBPKTI.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_RDBPKTI, service=0xAA)
 
@@ -349,6 +429,11 @@
         XShortField('memorySize', 0),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RMBA.memoryAddress%")
+
 
 bind_layers(GMLAN, GMLAN_RMBA, service=0x23)
 
@@ -365,6 +450,15 @@
         StrField('dataRecord', None, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == GMLAN_RMBA and \
+            other.memoryAddress == self.memoryAddress
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_RMBAPR.memoryAddress%"), pkt.dataRecord)
+
 
 bind_layers(GMLAN, GMLAN_RMBAPR, service=0x63)
 
@@ -393,6 +487,15 @@
                          lambda pkt: pkt.subfunction % 2 == 0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        if pkt.subfunction % 2 == 1:
+            return pkt.sprintf("%GMLAN.service%"), \
+                (pkt.subfunction, None)
+        else:
+            return pkt.sprintf("%GMLAN.service%"), \
+                (pkt.subfunction, pkt.securityKey)
+
 
 bind_layers(GMLAN, GMLAN_SA, service=0x27)
 
@@ -405,6 +508,24 @@
                          lambda pkt: pkt.subfunction % 2 == 1),
     ]
 
+    def answers(self, other):
+        return other.__class__ == GMLAN_SA \
+            and other.subfunction == self.subfunction
+
+    @staticmethod
+    def get_log(pkt):
+        if pkt.subfunction % 2 == 0:
+            return pkt.sprintf("%GMLAN.service%"), \
+                (pkt.subfunction, None)
+        else:
+            return pkt.sprintf("%GMLAN.service%"), \
+                (pkt.subfunction, pkt.securitySeed)
+
+    @staticmethod
+    def modifies_ecu_state(pkt, ecu):
+        if pkt.subfunction % 2 == 0:
+            ecu.current_security_level = pkt.subfunction
+
 
 bind_layers(GMLAN, GMLAN_SAPR, service=0x67)
 
@@ -417,6 +538,11 @@
         StrField('PIDData', b'\x00\x00')
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_DDM.DPIDIdentifier%"), pkt.PIDData)
+
 
 bind_layers(GMLAN, GMLAN_DDM, service=0x2C)
 
@@ -427,6 +553,15 @@
         XByteField('DPIDIdentifier', 0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_DDMPR.DPIDIdentifier%")
+
+    def answers(self, other):
+        return other.__class__ == GMLAN_DDM \
+            and other.DPIDIdentifier == self.DPIDIdentifier
+
 
 bind_layers(GMLAN, GMLAN_DDMPR, service=0x6C)
 
@@ -445,6 +580,11 @@
         XByteField('memorySize', 0),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.parameterIdentifier, pkt.memoryAddress, pkt.memorySize)
+
 
 bind_layers(GMLAN, GMLAN_DPBA, service=0x2D)
 
@@ -455,6 +595,14 @@
         XShortField('parameterIdentifier', 0),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), pkt.parameterIdentifier
+
+    def answers(self, other):
+        return other.__class__ == GMLAN_DPBA \
+            and other.parameterIdentifier == self.parameterIdentifier
+
 
 bind_layers(GMLAN, GMLAN_DPBA, service=0x6D)
 
@@ -472,6 +620,11 @@
                          lambda pkt: GMLAN.determine_len(4)),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.dataFormatIdentifier, pkt.memorySize)
+
 
 bind_layers(GMLAN, GMLAN_RD, service=0x34)
 
@@ -494,6 +647,12 @@
         StrField("dataRecord", None)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_TD.subfunction%"), pkt.startingAddress,
+             pkt.dataRecord)
+
 
 bind_layers(GMLAN, GMLAN_TD, service=0x36)
 
@@ -506,6 +665,11 @@
         StrField("dataRecord", b'\x00')
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_WDBI.dataIdentifier%"), pkt.dataRecord)
+
 
 bind_layers(GMLAN, GMLAN_WDBI, service=0x3B)
 
@@ -516,6 +680,15 @@
         XByteEnumField('dataIdentifier', 0, GMLAN_RDBI.dataIdentifiers)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_WDBIPR.dataIdentifier%")
+
+    def answers(self, other):
+        return other.__class__ == GMLAN_WDBI \
+            and other.dataIdentifier == self.dataIdentifier
+
 
 bind_layers(GMLAN, GMLAN_WDBIPR, service=0x7B)
 
@@ -539,6 +712,11 @@
         ByteEnumField('programmedState', 0, programmedStates),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RPSPR.programmedState%")
+
 
 bind_layers(GMLAN, GMLAN_RPSPR, service=0xE2)
 
@@ -555,6 +733,11 @@
         ByteEnumField('subfunction', 0, subfunctions),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_PM.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_PM, service=0xA5)
 
@@ -571,6 +754,11 @@
         ByteEnumField('subfunction', 0, subfunctions)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            pkt.sprintf("%GMLAN_RDI.subfunction%")
+
 
 bind_layers(GMLAN, GMLAN_RDI, service=0xA9)
 
@@ -633,22 +821,16 @@
         ShortField('deviceControlLimitExceeded', 0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%GMLAN.service%"), \
+            (pkt.sprintf("%GMLAN_NR.requestServiceId%"),
+             pkt.sprintf("%GMLAN_NR.returnCode%"))
 
-bind_layers(GMLAN, GMLAN_NR, service=0x7f)
-
-
-# ##################################################################
-# ######################## UTILS ###################################
-# ##################################################################
-
+    def answers(self, other):
+        return self.requestServiceId == other.service and \
+            (self.returnCode != 0x78 or
+             conf.contribs['GMLAN']['treat-response-pending-as-answer'])
 
-class GMLAN_TesterPresentSender(PeriodicSenderThread):
-    def __init__(self, sock, pkt=GMLAN(service="TesterPresent"), interval=2):
-        """ Thread to send TesterPresent messages packets periodically
 
-        Args:
-            sock: socket where packet is sent periodically
-            pkt: packet to send
-            interval: interval between two packets
-        """
-        PeriodicSenderThread.__init__(self, sock, pkt, interval)
+bind_layers(GMLAN, GMLAN_NR, service=0x7f)

scapy-2.4.4.tar.gz/scapy/contrib/automotive/gm/gmlanutils.py Added

@@ -0,0 +1,339 @@
+#! /usr/bin/env python
+
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Markus Schroetter <project.m.schroetter@gmail.com>
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = GMLAN Utilities
+# scapy.contrib.status = loads
+
+import time
+from scapy.contrib.automotive.gm.gmlan import GMLAN, GMLAN_SA, GMLAN_RD, \
+    GMLAN_TD, GMLAN_PM, GMLAN_RMBA
+from scapy.config import conf
+from scapy.contrib.isotp import ISOTPSocket
+from scapy.error import warning, log_loading
+from scapy.utils import PeriodicSenderThread
+
+
+__all__ = ["GMLAN_TesterPresentSender", "GMLAN_InitDiagnostics",
+           "GMLAN_GetSecurityAccess", "GMLAN_RequestDownload",
+           "GMLAN_TransferData", "GMLAN_TransferPayload",
+           "GMLAN_ReadMemoryByAddress", "GMLAN_BroadcastSocket"]
+
+log_loading.info("\"conf.contribs['GMLAN']"
+                 "['treat-response-pending-as-answer']\" set to True). This "
+                 "is required by the GMLAN-Utils module to operate "
+                 "correctly.")
+try:
+    conf.contribs['GMLAN']['treat-response-pending-as-answer'] = False
+except KeyError:
+    conf.contribs['GMLAN'] = {'treat-response-pending-as-answer': False}
+
+
+class GMLAN_TesterPresentSender(PeriodicSenderThread):
+    def __init__(self, sock, pkt=GMLAN(service="TesterPresent"), interval=2):
+        """ Thread to send TesterPresent messages packets periodically
+
+        Args:
+            sock: socket where packet is sent periodically
+            pkt: packet to send
+            interval: interval between two packets
+        """
+        PeriodicSenderThread.__init__(self, sock, pkt, interval)
+
+
+def _check_response(resp, verbose):
+    if resp is None:
+        if verbose:
+            print("Timeout.")
+        return False
+    if verbose:
+        resp.show()
+    return resp.sprintf("%GMLAN.service%") != "NegativeResponse"
+
+
+def _send_and_check_response(sock, req, timeout, verbose):
+    if verbose:
+        print("Sending %s" % repr(req))
+    resp = sock.sr1(req, timeout=timeout, verbose=0)
+    return _check_response(resp, verbose)
+
+
+def GMLAN_InitDiagnostics(sock, broadcastsocket=None, timeout=None,
+                          verbose=None, retry=0):
+    """Send messages to put an ECU into an diagnostic/programming state.
+
+    Args:
+        sock:       socket to send the message on.
+        broadcast:  socket for broadcasting. If provided some message will be
+                    sent as broadcast. Recommended when used on a network with
+                    several ECUs.
+        timeout:    timeout for sending, receiving or sniffing packages.
+        verbose:    set verbosity level
+        retry:      number of retries in case of failure.
+
+    Returns true on success.
+    """
+    if verbose is None:
+        verbose = conf.verb
+    retry = abs(retry)
+
+    while retry >= 0:
+        retry -= 1
+
+        # DisableNormalCommunication
+        p = GMLAN(service="DisableNormalCommunication")
+        if broadcastsocket is None:
+            if not _send_and_check_response(sock, p, timeout, verbose):
+                continue
+        else:
+            if verbose:
+                print("Sending %s as broadcast" % repr(p))
+            broadcastsocket.send(p)
+        time.sleep(0.05)
+
+        # ReportProgrammedState
+        p = GMLAN(service="ReportProgrammingState")
+        if not _send_and_check_response(sock, p, timeout, verbose):
+            continue
+        # ProgrammingMode requestProgramming
+        p = GMLAN() / GMLAN_PM(subfunction="requestProgrammingMode")
+        if not _send_and_check_response(sock, p, timeout, verbose):
+            continue
+        time.sleep(0.05)
+
+        # InitiateProgramming enableProgramming
+        # No response expected
+        p = GMLAN() / GMLAN_PM(subfunction="enableProgrammingMode")
+        if verbose:
+            print("Sending %s" % repr(p))
+        sock.send(p)
+        time.sleep(0.05)
+        return True
+    return False
+
+
+def GMLAN_GetSecurityAccess(sock, keyFunction, level=1, timeout=None,
+                            verbose=None, retry=0):
+    """Authenticate on ECU. Implements Seey-Key procedure.
+
+    Args:
+        sock:        socket to send the message on.
+        keyFunction: function implementing the key algorithm.
+        level:       level of access
+        timeout:     timeout for sending, receiving or sniffing packages.
+        verbose:     set verbosity level
+        retry:       number of retries in case of failure.
+
+    Returns true on success.
+    """
+    if verbose is None:
+        verbose = conf.verb
+    retry = abs(retry)
+
+    if level % 2 == 0:
+        warning("Parameter Error: Level must be an odd number.")
+        return False
+
+    while retry >= 0:
+        retry -= 1
+
+        request = GMLAN() / GMLAN_SA(subfunction=level)
+        if verbose:
+            print("Requesting seed..")
+        resp = sock.sr1(request, timeout=timeout, verbose=0)
+        if not _check_response(resp, verbose):
+            if verbose:
+                print("Negative Response.")
+            continue
+
+        seed = resp.securitySeed
+        if seed == 0:
+            if verbose:
+                print("ECU security already unlocked. (seed is 0x0000)")
+            return True
+
+        keypkt = GMLAN() / GMLAN_SA(subfunction=level + 1,
+                                    securityKey=keyFunction(seed))
+        if verbose:
+            print("Responding with key..")
+        resp = sock.sr1(keypkt, timeout=timeout, verbose=0)
+        if resp is None:
+            if verbose:
+                print("Timeout.")
+            continue
+        if verbose:
+            resp.show()
+        if resp.sprintf("%GMLAN.service%") == "SecurityAccessPositiveResponse":   # noqa: E501
+            if verbose:
+                print("SecurityAccess granted.")
+            return True
+        # Invalid Key
+        elif resp.sprintf("%GMLAN.service%") == "NegativeResponse" and \
+                resp.sprintf("%GMLAN.returnCode%") == "InvalidKey":
+            if verbose:
+                print("Key invalid")
+            continue
+
+    return False
+
+
+def GMLAN_RequestDownload(sock, length, timeout=None, verbose=None, retry=0):
+    """Send RequestDownload message.
+
+    Usually used before calling TransferData.
+
+    Args:
+        sock:       socket to send the message on.
+        length:     value for the message's parameter 'unCompressedMemorySize'.
+        timeout:    timeout for sending, receiving or sniffing packages.
+        verbose:    set verbosity level.
+        retry:      number of retries in case of failure.
+
+    Returns true on success.
+    """
+    if verbose is None:
+        verbose = conf.verb
+    retry = abs(retry)
+
+    while retry >= 0:
+        # RequestDownload
+        pkt = GMLAN() / GMLAN_RD(memorySize=length)
+        resp = sock.sr1(pkt, timeout=timeout, verbose=0)
+        if _check_response(resp, verbose):
+            return True
+        retry -= 1
+        if retry >= 0 and verbose:
+            print("Retrying..")
+    return False
+
+
+def GMLAN_TransferData(sock, addr, payload, maxmsglen=None, timeout=None,
+                       verbose=None, retry=0):
+    """Send TransferData message.
+
+    Usually used after calling RequestDownload.
+
+    Args:
+        sock:       socket to send the message on.
+        addr:       destination memory address on the ECU.
+        payload:    data to be sent.
+        maxmsglen:  maximum length of a single iso-tp message. (default:
+                    maximum length)
+        timeout:    timeout for sending, receiving or sniffing packages.
+        verbose:    set verbosity level.
+        retry:      number of retries in case of failure.
+
+    Returns true on success.
+    """
+    if verbose is None:
+        verbose = conf.verb
+    retry = abs(retry)
+    startretry = retry
+
+    scheme = conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme']
+    if addr < 0 or addr >= 2**(8 * scheme):
+        warning("Error: Invalid address " + hex(addr) + " for scheme " +
+                str(scheme))
+        return False
+
+    # max size of dataRecord according to gmlan protocol
+    if maxmsglen is None or maxmsglen <= 0 or maxmsglen > (4093 - scheme):
+        maxmsglen = (4093 - scheme)
+
+    for i in range(0, len(payload), maxmsglen):
+        retry = startretry
+        while True:
+            if len(payload[i:]) > maxmsglen:
+                transdata = payload[i:i + maxmsglen]
+            else:
+                transdata = payload[i:]
+            pkt = GMLAN() / GMLAN_TD(startingAddress=addr + i,
+                                     dataRecord=transdata)
+            resp = sock.sr1(pkt, timeout=timeout, verbose=0)
+            if _check_response(resp, verbose):
+                break
+            retry -= 1
+            if retry >= 0:
+                if verbose:
+                    print("Retrying..")
+            else:
+                return False
+
+    return True
+
+
+def GMLAN_TransferPayload(sock, addr, payload, maxmsglen=None, timeout=None,
+                          verbose=None, retry=0):
+    """Send data by using GMLAN services.
+
+    Args:
+        sock:       socket to send the data on.
+        addr:       destination memory address on the ECU.
+        payload:    data to be sent.
+        maxmsglen:  maximum length of a single iso-tp message. (default:
+                    maximum length)
+        timeout:    timeout for sending, receiving or sniffing packages.
+        verbose:    set verbosity level.
+        retry:      number of retries in case of failure.
+
+    Returns true on success.
+    """
+    if not GMLAN_RequestDownload(sock, len(payload), timeout=timeout,
+                                 verbose=verbose, retry=retry):
+        return False
+    if not GMLAN_TransferData(sock, addr, payload, maxmsglen=maxmsglen,
+                              timeout=timeout, verbose=verbose, retry=retry):
+        return False
+    return True
+
+
+def GMLAN_ReadMemoryByAddress(sock, addr, length, timeout=None,
+                              verbose=None, retry=0):
+    """Read data from ECU memory.
+
+    Args:
+        sock:       socket to send the data on.
+        addr:       source memory address on the ECU.
+        length:     bytes to read
+        timeout:    timeout for sending, receiving or sniffing packages.
+        verbose:    set verbosity level.
+        retry:      number of retries in case of failure.
+
+    Returns the bytes read.
+    """
+    if verbose is None:
+        verbose = conf.verb
+    retry = abs(retry)
+
+    scheme = conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme']
+    if addr < 0 or addr >= 2**(8 * scheme):
+        warning("Error: Invalid address " + hex(addr) + " for scheme " +
+                str(scheme))
+        return None
+
+    # max size of dataRecord according to gmlan protocol
+    if length <= 0 or length > (4094 - scheme):
+        warning("Error: Invalid length " + hex(length) + " for scheme " +
+                str(scheme) + ". Choose between 0x1 and " + hex(4094 - scheme))
+        return None
+
+    while retry >= 0:
+        # RequestDownload
+        pkt = GMLAN() / GMLAN_RMBA(memoryAddress=addr, memorySize=length)
+        resp = sock.sr1(pkt, timeout=timeout, verbose=0)
+        if _check_response(resp, verbose):
+            return resp.dataRecord
+        retry -= 1
+        if retry >= 0 and verbose:
+            print("Retrying..")
+    return None
+
+
+def GMLAN_BroadcastSocket(interface):
+    """Returns a GMLAN broadcast socket using interface."""
+    return ISOTPSocket(interface, sid=0x101, did=0x0, basecls=GMLAN,
+                       extended_addr=0xfe)

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/iid/iids.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/iid/iids.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/mid/mids.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/mid/mids.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/obd.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/obd.py Changed

@@ -1,5 +1,3 @@
-# flake8: noqa: F405
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Andreas Korb <andreas.d.korb@gmail.com>
@@ -16,11 +14,25 @@
 from scapy.contrib.automotive.obd.pid.pids import *
 from scapy.contrib.automotive.obd.tid.tids import *
 from scapy.contrib.automotive.obd.services import *
-from scapy.packet import Packet, bind_layers
+from scapy.packet import bind_layers, NoPayload
+from scapy.error import log_loading
+from scapy.config import conf
 from scapy.fields import XByteEnumField
+from scapy.contrib.isotp import ISOTP
+
+try:
+    if conf.contribs['OBD']['treat-response-pending-as-answer']:
+        pass
+except KeyError:
+    log_loading.info("Specify \"conf.contribs['OBD'] = "
+                     "{'treat-response-pending-as-answer': True}\" to treat "
+                     "a negative response 'requestCorrectlyReceived-"
+                     "ResponsePending' as answer of a request. \n"
+                     "The default value is False.")
+    conf.contribs['OBD'] = {'treat-response-pending-as-answer': False}
 
 
-class OBD(Packet):
+class OBD(ISOTP):
     services = {
         0x01: 'CurrentPowertrainDiagnosticDataRequest',
         0x02: 'PowertrainFreezeFrameDataRequest',
@@ -56,11 +68,16 @@
         return struct.pack('B', self.service & ~0x40)
 
     def answers(self, other):
-        """DEV: true if self is an answer from other"""
-        if other.__class__ == self.__class__:
-            return (other.service + 0x40) == self.service or \
-                   (self.service == 0x7f and
-                    self.request_service_id == other.service)
+        if other.__class__ != self.__class__:
+            return False
+        if self.service == 0x7f:
+            return self.payload.answers(other)
+        if self.service == (other.service + 0x40):
+            if isinstance(self.payload, NoPayload) or \
+                    isinstance(other.payload, NoPayload):
+                return True
+            else:
+                return self.payload.answers(other.payload)
         return False

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/pid/pids.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/pid/pids.py Changed

@@ -1,5 +1,3 @@
-# flake8: noqa: F405
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Andreas Korb <andreas.d.korb@gmail.com>
@@ -11,6 +9,7 @@
 from scapy.packet import Packet, bind_layers
 from scapy.fields import PacketListField
 
+from scapy.contrib.automotive.obd.services import OBD_S01, OBD_S02
 from scapy.contrib.automotive.obd.pid.pids_00_1F import *
 from scapy.contrib.automotive.obd.pid.pids_20_3F import *
 from scapy.contrib.automotive.obd.pid.pids_40_5F import *
@@ -31,6 +30,10 @@
         PacketListField("data_records", [], OBD_S01_PR_Record)
     ]
 
+    def answers(self, other):
+        return other.__class__ == OBD_S01 \
+            and all(r.pid in other.pid for r in self.data_records)
+
 
 class OBD_S02_PR_Record(Packet):
     fields_desc = [
@@ -45,6 +48,11 @@
         PacketListField("data_records", [], OBD_S02_PR_Record)
     ]
 
+    def answers(self, other):
+        return other.__class__ == OBD_S02 \
+            and all(r.pid in [o.pid for o in other.requests]
+                    for r in self.data_records)
+
 
 bind_layers(OBD_S01_PR_Record, OBD_PID00, pid=0x00)
 bind_layers(OBD_S01_PR_Record, OBD_PID01, pid=0x01)

scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/scanner.py Added

@@ -0,0 +1,260 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Andreas Korb <andreas.korb@e-mundo.de>
+# Copyright (C) Friedrich Feigel <friedrich.feigel@e-mundo.de>
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = OnBoardDiagnosticScanner
+# scapy.contrib.status = loads
+
+
+from scapy.contrib.automotive.obd.obd import OBD, OBD_S03, OBD_S07, OBD_S0A, \
+    OBD_S01, OBD_S06, OBD_S08, OBD_S09, OBD_NR, OBD_S02, OBD_S02_Record
+from scapy.contrib.automotive.enumerator import Scanner, Enumerator
+from scapy.config import conf
+from scapy.themes import BlackAndWhite
+
+
+class OBD_Enumerator(Enumerator):
+    def scan(self, state, requests, exit_scan_on_first_negative_response=False,
+             retry_if_busy_returncode=True, retries=3, timeout=1, **kwargs):
+        # remove verbose from kwargs to not spam the output
+        kwargs.pop("verbose", None)
+        for req in requests:
+            res = None
+            for _ in range(retries):
+                res = self.sock.sr1(req, timeout=timeout, verbose=False,
+                                    **kwargs)
+                if not retry_if_busy_returncode:
+                    break
+                elif res and res.service == 0x7f and \
+                        res.response_code == 0x21:
+                    continue
+
+            self.results.append(Enumerator.ScanResult(state, req, res))
+            if res and res.service == 0x7f and \
+                    exit_scan_on_first_negative_response:
+                break
+        self.update_stats()
+        self.state_completed[state] = True
+
+    @property
+    def filtered_results(self):
+        return [r for r in super(OBD_Enumerator, self).filtered_results
+                if r.resp.service != 0x7f]
+
+    def show_negative_response_details(self, dump=False):
+        nrs = [r.resp for r in self.results if r.resp is not None and
+               r.resp.service == 0x7f]
+        s = ""
+        if len(nrs):
+            nrcs = set([nr.response_code for nr in nrs])
+            s += "These negative response codes were received " + \
+                " ".join([hex(c) for c in nrcs]) + "\n"
+            for nrc in nrcs:
+                s += "\tNRC 0x%02x: %s received %d times" % (
+                    nrc, OBD_NR(response_code=nrc).sprintf(
+                        "%OBD_NR.response_code%"),
+                    len([nr for nr in nrs if nr.response_code == nrc]))
+                s += "\n"
+        if dump:
+            return s + "\n"
+        else:
+            print(s)
+
+    @staticmethod
+    def get_label(response,
+                  positive_case="PR: PositiveResponse",
+                  negative_case="NR: NegativeResponse"):
+        return Enumerator.get_label(
+            response, positive_case,
+            response.sprintf("NR: %OBD_NR.response_code%"))
+
+
+class OBD_Service_Enumerator(OBD_Enumerator):
+    def get_pkts(self, p_range):
+        raise NotImplementedError
+
+    def get_supported(self, state, **kwargs):
+        pkts = self.get_pkts(range(0, 0xff, 0x20))
+        super(OBD_Service_Enumerator, self).scan(
+            state, pkts, exit_scan_on_first_negative_response=True, **kwargs)
+        supported = list()
+        for _, _, r in self.filtered_results:
+            dr = r.data_records[0]
+            key = next(iter((dr.lastlayer().fields.keys())))
+            supported += [int(i[-2:], 16) for i in
+                          getattr(dr, key, ["xxx00"])]
+        return [i for i in supported if i % 0x20]
+
+    def scan(self, state, full_scan=False, **kwargs):
+        if full_scan:
+            supported_pids = range(0x100)
+        else:
+            supported_pids = self.get_supported(state, **kwargs)
+        pkts = self.get_pkts(supported_pids)
+        super(OBD_Service_Enumerator, self).scan(state, pkts, **kwargs)
+
+    @staticmethod
+    def print_payload(resp):
+        backup_ct = conf.color_theme
+        conf.color_theme = BlackAndWhite()
+        load = repr(resp.data_records[0].lastlayer())
+        conf.color_theme = backup_ct
+        return load
+
+
+class OBD_DTC_Enumerator(OBD_Enumerator):
+    request = None
+
+    def scan(self, state, full_scan=False, **kwargs):
+        pkts = [self.request]
+        super(OBD_DTC_Enumerator, self).scan(state, pkts, **kwargs)
+
+    @staticmethod
+    def print_payload(resp):
+        backup_ct = conf.color_theme
+        conf.color_theme = BlackAndWhite()
+        load = repr(resp.dtcs)
+        conf.color_theme = backup_ct
+        return load
+
+
+class OBD_S03_Enumerator(OBD_DTC_Enumerator):
+    description = "Available DTCs in OBD service 03"
+    request = OBD() / OBD_S03()
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, _, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_DTC_Enumerator.print_payload(res))
+        return "Service 03", "%d DTCs" % res.count, label
+
+
+class OBD_S07_Enumerator(OBD_DTC_Enumerator):
+    description = "Available DTCs in OBD service 07"
+    request = OBD() / OBD_S07()
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, _, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_DTC_Enumerator.print_payload(res))
+        return "Service 07", "%d DTCs" % res.count, label
+
+
+class OBD_S0A_Enumerator(OBD_DTC_Enumerator):
+    description = "Available DTCs in OBD service 10"
+    request = OBD() / OBD_S0A()
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, _, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_DTC_Enumerator.print_payload(res))
+        return "Service 0A", "%d DTCs" % res.count, label
+
+
+class OBD_S01_Enumerator(OBD_Service_Enumerator):
+    description = "Available data in OBD service 01"
+
+    def get_pkts(self, p_range):
+        return (OBD() / OBD_S01(pid=[x]) for x in p_range)
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, _, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_Service_Enumerator.print_payload(res))
+        return ("Service 01",
+                "%s" % res.data_records[0].lastlayer().name,
+                label)
+
+
+class OBD_S02_Enumerator(OBD_Service_Enumerator):
+    description = "Available data in OBD service 02"
+
+    def get_pkts(self, p_range):
+        return (OBD() / OBD_S02(requests=[OBD_S02_Record(pid=[x])])
+                for x in p_range)
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, _, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_Service_Enumerator.print_payload(res))
+        return ("Service 02",
+                "%s" % res.data_records[0].lastlayer().name,
+                label)
+
+
+class OBD_S06_Enumerator(OBD_Service_Enumerator):
+    description = "Available data in OBD service 06"
+
+    def get_pkts(self, p_range):
+        return (OBD() / OBD_S06(mid=[x]) for x in p_range)
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, req, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_Service_Enumerator.print_payload(res))
+        return ("Service 06",
+                "0x%02x %s" % (
+                    req.mid[0],
+                    res.data_records[0].sprintf("%OBD_S06_PR_Record.mid%")),
+                label)
+
+
+class OBD_S08_Enumerator(OBD_Service_Enumerator):
+    description = "Available data in OBD service 08"
+
+    def get_pkts(self, p_range):
+        return (OBD() / OBD_S08(tid=[x]) for x in p_range)
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, req, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_Service_Enumerator.print_payload(res))
+        return ("Service 08",
+                "0x%02x %s" % (req.tid[0],
+                               res.data_records[0].lastlayer().name),
+                label)
+
+
+class OBD_S09_Enumerator(OBD_Service_Enumerator):
+    description = "Available data in OBD service 09"
+
+    def get_pkts(self, p_range):
+        return (OBD() / OBD_S09(iid=[x]) for x in p_range)
+
+    @staticmethod
+    def get_table_entry(tup):
+        _, req, res = tup
+        label = OBD_Enumerator.get_label(
+            res,
+            positive_case=lambda: OBD_Service_Enumerator.print_payload(res))
+        return ("Service 09",
+                "0x%02x %s" % (req.iid[0],
+                               res.data_records[0].lastlayer().name),
+                label)
+
+
+class OBD_Scanner(Scanner):
+    default_enumerator_clss = [
+        OBD_S01_Enumerator, OBD_S02_Enumerator, OBD_S06_Enumerator,
+        OBD_S08_Enumerator, OBD_S09_Enumerator, OBD_S03_Enumerator,
+        OBD_S07_Enumerator, OBD_S0A_Enumerator]
+
+    def enter_state(self, state):
+        return True

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/services.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/services.py Changed

@@ -10,6 +10,7 @@
     PacketListField, XBitField, XByteEnumField, FieldListField, FieldLenField
 from scapy.packet import Packet
 from scapy.contrib.automotive.obd.packet import OBD_Packet
+from scapy.config import conf
 
 
 class OBD_DTC(OBD_Packet):
@@ -48,6 +49,11 @@
         XByteEnumField('response_code', 0, responses)
     ]
 
+    def answers(self, other):
+        return self.request_service_id == other.service and \
+            (self.response_code != 0x78 or
+             conf.contribs['OBD']['treat-response-pending-as-answer'])
+
 
 class OBD_S01(Packet):
     name = "S1_CurrentData"
@@ -81,6 +87,9 @@
         PacketListField('dtcs', [], OBD_DTC, count_from=lambda pkt: pkt.count)
     ]
 
+    def answers(self, other):
+        return other.__class__ == OBD_S03
+
 
 class OBD_S04(Packet):
     name = "S4_ClearDTCs"
@@ -89,6 +98,9 @@
 class OBD_S04_PR(Packet):
     name = "S4_ClearDTCsPositiveResponse"
 
+    def answers(self, other):
+        return other.__class__ == OBD_S04
+
 
 class OBD_S06(Packet):
     name = "S6_OnBoardDiagnosticMonitoring"
@@ -108,6 +120,9 @@
         PacketListField('dtcs', [], OBD_DTC, count_from=lambda pkt: pkt.count)
     ]
 
+    def answers(self, other):
+        return other.__class__ == OBD_S07
+
 
 class OBD_S08(Packet):
     name = "S8_RequestControlOfSystem"
@@ -133,3 +148,6 @@
         FieldLenField('count', None, count_of='dtcs', fmt='B'),
         PacketListField('dtcs', [], OBD_DTC, count_from=lambda pkt: pkt.count)
     ]
+
+    def answers(self, other):
+        return other.__class__ == OBD_S0A

scapy-2.4.3.tar.gz/scapy/contrib/automotive/obd/tid/tids.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/obd/tid/tids.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/automotive/someip.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/someip.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # MIT License
 
 # Copyright (c) 2018 Jose Amores
@@ -30,43 +28,20 @@
 # scapy.contrib.description = Scalable service-Oriented MiddlewarE/IP (SOME/IP)
 # scapy.contrib.status = loads
 
+import ctypes
+import collections
 import struct
 
 from scapy.layers.inet import TCP, UDP
-from scapy.compat import raw
+from scapy.layers.inet6 import IP6Field
+from scapy.compat import raw, orb
 from scapy.config import conf
 from scapy.modules.six.moves import range
-from scapy.packet import Packet, bind_layers
-from scapy.fields import ShortField, BitEnumField, ConditionalField, \
-    BitField, PacketField, IntField, ByteField, ByteEnumField
-
-
-class _SOMEIP_MessageId(Packet):
-    """ MessageId subpacket."""
-    name = "MessageId"
-    fields_desc = [
-        ShortField("srv_id", 0),
-        BitEnumField("sub_id", 0, 1, {0: "METHOD_ID", 1: "EVENT_ID"}),
-        ConditionalField(BitField("method_id", 0, 15),
-                         lambda pkt: pkt.sub_id == 0),
-        ConditionalField(BitField("event_id", 0, 15),
-                         lambda pkt: pkt.sub_id == 1)
-    ]
-
-    def extract_padding(self, s):
-        return "", s
-
-
-class _SOMEIP_RequestId(Packet):
-    """ RequestId subpacket."""
-    name = "RequestId"
-    fields_desc = [
-        ShortField("client_id", 0),
-        ShortField("session_id", 0)
-    ]
-
-    def extract_padding(self, s):
-        return "", s
+from scapy.packet import Packet, Raw, bind_top_down, bind_bottom_up
+from scapy.fields import XShortField, BitEnumField, ConditionalField, \
+    BitField, XBitField, IntField, XByteField, ByteEnumField, \
+    ShortField, X3BytesField, StrLenField, IPField, FieldLenField, \
+    PacketListField, XIntField
 
 
 class SOMEIP(Packet):
@@ -108,13 +83,17 @@
     name = "SOME/IP"
 
     fields_desc = [
-        PacketField("msg_id", _SOMEIP_MessageId(),
-                    _SOMEIP_MessageId),
+        XShortField("srv_id", 0),
+        BitEnumField("sub_id", 0, 1, {0: "METHOD_ID", 1: "EVENT_ID"}),
+        ConditionalField(XBitField("method_id", 0, 15),
+                         lambda pkt: pkt.sub_id == 0),
+        ConditionalField(XBitField("event_id", 0, 15),
+                         lambda pkt: pkt.sub_id == 1),
         IntField("len", None),
-        PacketField("req_id", _SOMEIP_RequestId(),
-                    _SOMEIP_RequestId),
-        ByteField("proto_ver", PROTOCOL_VERSION),
-        ByteField("iface_ver", INTERFACE_VERSION),
+        XShortField("client_id", 0),
+        XShortField("session_id", 0),
+        XByteField("proto_ver", PROTOCOL_VERSION),
+        XByteField("iface_ver", INTERFACE_VERSION),
         ByteEnumField("msg_type", TYPE_REQUEST, {
             TYPE_REQUEST: "REQUEST",
             TYPE_REQUEST_NO_RET: "REQUEST_NO_RETURN",
@@ -217,9 +196,331 @@
 
 
 def _bind_someip_layers():
+    bind_top_down(UDP, SOMEIP, sport=30490, dport=30490)
+
     for i in range(15):
-        bind_layers(UDP, SOMEIP, sport=30490 + i)
-        bind_layers(TCP, SOMEIP, sport=30490 + i)
+        bind_bottom_up(UDP, SOMEIP, sport=30490 + i)
+        bind_bottom_up(TCP, SOMEIP, sport=30490 + i)
+        bind_bottom_up(UDP, SOMEIP, dport=30490 + i)
+        bind_bottom_up(TCP, SOMEIP, dport=30490 + i)
 
 
 _bind_someip_layers()
+
+
+class _SDPacketBase(Packet):
+    """ base class to be used among all SD Packet definitions."""
+    def extract_padding(self, s):
+        return "", s
+
+
+SDENTRY_TYPE_SRV_FINDSERVICE = 0x00
+SDENTRY_TYPE_SRV_OFFERSERVICE = 0x01
+SDENTRY_TYPE_SRV = (SDENTRY_TYPE_SRV_FINDSERVICE,
+                    SDENTRY_TYPE_SRV_OFFERSERVICE)
+SDENTRY_TYPE_EVTGRP_SUBSCRIBE = 0x06
+SDENTRY_TYPE_EVTGRP_SUBSCRIBE_ACK = 0x07
+SDENTRY_TYPE_EVTGRP = (SDENTRY_TYPE_EVTGRP_SUBSCRIBE,
+                       SDENTRY_TYPE_EVTGRP_SUBSCRIBE_ACK)
+SDENTRY_OVERALL_LEN = 16
+
+
+def _MAKE_SDENTRY_COMMON_FIELDS_DESC(type):
+    return [
+        XByteField("type", type),
+        XByteField("index_1", 0),
+        XByteField("index_2", 0),
+        XBitField("n_opt_1", 0, 4),
+        XBitField("n_opt_2", 0, 4),
+        XShortField("srv_id", 0),
+        XShortField("inst_id", 0),
+        XByteField("major_ver", 0),
+        X3BytesField("ttl", 0)
+    ]
+
+
+class SDEntry_Service(_SDPacketBase):
+    name = "Service Entry"
+    fields_desc = _MAKE_SDENTRY_COMMON_FIELDS_DESC(
+        SDENTRY_TYPE_SRV_FINDSERVICE)
+    fields_desc += [
+        XIntField("minor_ver", 0)
+    ]
+
+
+class SDEntry_EventGroup(_SDPacketBase):
+    name = "Eventgroup Entry"
+    fields_desc = _MAKE_SDENTRY_COMMON_FIELDS_DESC(
+        SDENTRY_TYPE_EVTGRP_SUBSCRIBE)
+    fields_desc += [
+        XBitField("res", 0, 12),
+        XBitField("cnt", 0, 4),
+        XShortField("eventgroup_id", 0)
+    ]
+
+
+def _sdentry_class(payload, **kargs):
+    TYPE_PAYLOAD_I = 0
+    pl_type = orb(payload[TYPE_PAYLOAD_I])
+    cls = None
+
+    if pl_type in SDENTRY_TYPE_SRV:
+        cls = SDEntry_Service
+    elif pl_type in SDENTRY_TYPE_EVTGRP:
+        cls = SDEntry_EventGroup
+
+    return cls(payload, **kargs)
+
+
+def _sdoption_class(payload, **kargs):
+    pl_type = orb(payload[2])
+
+    cls = {
+        SDOPTION_CFG_TYPE: SDOption_Config,
+        SDOPTION_LOADBALANCE_TYPE: SDOption_LoadBalance,
+        SDOPTION_IP4_ENDPOINT_TYPE: SDOption_IP4_EndPoint,
+        SDOPTION_IP4_MCAST_TYPE: SDOption_IP4_Multicast,
+        SDOPTION_IP4_SDENDPOINT_TYPE: SDOption_IP4_SD_EndPoint,
+        SDOPTION_IP6_ENDPOINT_TYPE: SDOption_IP6_EndPoint,
+        SDOPTION_IP6_MCAST_TYPE: SDOption_IP6_Multicast,
+        SDOPTION_IP6_SDENDPOINT_TYPE: SDOption_IP6_SD_EndPoint
+    }.get(pl_type, Raw)
+
+    return cls(payload, **kargs)
+
+
+# SD Option
+SDOPTION_CFG_TYPE = 0x01
+SDOPTION_LOADBALANCE_TYPE = 0x02
+SDOPTION_LOADBALANCE_LEN = 0x05
+SDOPTION_IP4_ENDPOINT_TYPE = 0x04
+SDOPTION_IP4_ENDPOINT_LEN = 0x0009
+SDOPTION_IP4_MCAST_TYPE = 0x14
+SDOPTION_IP4_MCAST_LEN = 0x0009
+SDOPTION_IP4_SDENDPOINT_TYPE = 0x24
+SDOPTION_IP4_SDENDPOINT_LEN = 0x0009
+SDOPTION_IP6_ENDPOINT_TYPE = 0x06
+SDOPTION_IP6_ENDPOINT_LEN = 0x0015
+SDOPTION_IP6_MCAST_TYPE = 0x16
+SDOPTION_IP6_MCAST_LEN = 0x0015
+SDOPTION_IP6_SDENDPOINT_TYPE = 0x26
+SDOPTION_IP6_SDENDPOINT_LEN = 0x0015
+
+
+def _MAKE_COMMON_SDOPTION_FIELDS_DESC(type, length=None):
+    return [
+        ShortField("len", length),
+        XByteField("type", type),
+        XByteField("res_hdr", 0)
+    ]
+
+
+def _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC():
+    return [
+        XByteField("res_tail", 0),
+        ByteEnumField("l4_proto", 0x11, {0x06: "TCP", 0x11: "UDP"}),
+        ShortField("port", 0)
+    ]
+
+
+class SDOption_Config(_SDPacketBase):
+    name = "Config Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(SDOPTION_CFG_TYPE) + [
+        StrLenField("cfg_str", "\x00", length_from=lambda pkt: pkt.len - 1)
+    ]
+
+    def post_build(self, pkt, pay):
+        if self.len is None:
+            length = len(self.cfg_str) + 1  # res_hdr field takes 1 byte
+            pkt = struct.pack("!H", length) + pkt[2:]
+        return pkt + pay
+
+    @staticmethod
+    def make_string(data):
+        # Build a valid null-terminated configuration string from a dict or a
+        # list with key-value pairs.
+        #
+        # Example:
+        #    >>> SDOption_Config.make_string({ "hello": "world" })
+        #    b'\x0bhello=world\x00'
+        #
+        #    >>> SDOption_Config.make_string([
+        #    ...     ("x", "y"),
+        #    ...     ("abc", "def"),
+        #    ...     ("123", "456")
+        #    ... ])
+        #    b'\x03x=y\x07abc=def\x07123=456\x00'
+
+        if isinstance(data, dict):
+            data = data.items()
+
+        # combine entries
+        data = ("{}={}".format(k, v) for k, v in data)
+        # prepend length
+        data = ("{}{}".format(chr(len(v)), v) for v in data)
+        # concatenate
+        data = "".join(data)
+        data += "\x00"
+
+        return data.encode("utf8")
+
+
+class SDOption_LoadBalance(_SDPacketBase):
+    name = "LoadBalance Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_LOADBALANCE_TYPE, SDOPTION_LOADBALANCE_LEN)
+    fields_desc += [
+        ShortField("priority", 0),
+        ShortField("weight", 0)
+    ]
+
+
+class SDOption_IP4_EndPoint(_SDPacketBase):
+    name = "IP4 EndPoint Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP4_ENDPOINT_TYPE, SDOPTION_IP4_ENDPOINT_LEN)
+    fields_desc += [
+        IPField("addr", "0.0.0.0"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+class SDOption_IP4_Multicast(_SDPacketBase):
+    name = "IP4 Multicast Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP4_MCAST_TYPE, SDOPTION_IP4_MCAST_LEN)
+    fields_desc += [
+        IPField("addr", "0.0.0.0"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+class SDOption_IP4_SD_EndPoint(_SDPacketBase):
+    name = "IP4 SDEndPoint Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP4_SDENDPOINT_TYPE, SDOPTION_IP4_SDENDPOINT_LEN)
+    fields_desc += [
+        IPField("addr", "0.0.0.0"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+class SDOption_IP6_EndPoint(_SDPacketBase):
+    name = "IP6 EndPoint Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP6_ENDPOINT_TYPE, SDOPTION_IP6_ENDPOINT_LEN)
+    fields_desc += [
+        IP6Field("addr", "::"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+class SDOption_IP6_Multicast(_SDPacketBase):
+    name = "IP6 Multicast Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP6_MCAST_TYPE, SDOPTION_IP6_MCAST_LEN)
+    fields_desc += [
+        IP6Field("addr", "::"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+class SDOption_IP6_SD_EndPoint(_SDPacketBase):
+    name = "IP6 SDEndPoint Option"
+    fields_desc = _MAKE_COMMON_SDOPTION_FIELDS_DESC(
+        SDOPTION_IP6_SDENDPOINT_TYPE, SDOPTION_IP6_SDENDPOINT_LEN)
+    fields_desc += [
+        IP6Field("addr", "::"),
+    ] + _MAKE_COMMON_IP_SDOPTION_FIELDS_DESC()
+
+
+##
+# SD PACKAGE DEFINITION
+##
+class SD(_SDPacketBase):
+    """
+    SD Packet
+
+    NOTE :   when adding 'entries' or 'options', do not use list.append()
+        method but create a new list
+    e.g. :  p = SD()
+            p.option_array = [SDOption_Config(),SDOption_IP6_EndPoint()]
+    """
+    SOMEIP_MSGID_SRVID = 0xffff
+    SOMEIP_MSGID_SUBID = 0x1
+    SOMEIP_MSGID_EVENTID = 0x100
+    SOMEIP_CLIENT_ID = 0x0000
+    SOMEIP_MINIMUM_SESSION_ID = 0x0001
+    SOMEIP_PROTO_VER = 0x01
+    SOMEIP_IFACE_VER = 0x01
+    SOMEIP_MSG_TYPE = SOMEIP.TYPE_NOTIFICATION
+    SOMEIP_RETCODE = SOMEIP.RET_E_OK
+
+    _sdFlag = collections.namedtuple('Flag', 'mask offset')
+    FLAGSDEF = {
+        "REBOOT": _sdFlag(mask=0x80, offset=7),
+        "UNICAST": _sdFlag(mask=0x40, offset=6)
+    }
+
+    name = "SD"
+    fields_desc = [
+        XByteField("flags", 0),
+        X3BytesField("res", 0),
+        FieldLenField("len_entry_array", None,
+                      length_of="entry_array", fmt="!I"),
+        PacketListField("entry_array", None, cls=_sdentry_class,
+                        length_from=lambda pkt: pkt.len_entry_array),
+        FieldLenField("len_option_array", None,
+                      length_of="option_array", fmt="!I"),
+        PacketListField("option_array", None, cls=_sdoption_class,
+                        length_from=lambda pkt: pkt.len_option_array)
+    ]
+
+    def get_flag(self, name):
+        name = name.upper()
+        if name in self.FLAGSDEF:
+            return ((self.flags & self.FLAGSDEF[name].mask) >>
+                    self.FLAGSDEF[name].offset)
+        else:
+            return None
+
+    def set_flag(self, name, value):
+        name = name.upper()
+        if name in self.FLAGSDEF:
+            self.flags = (self.flags &
+                          (ctypes.c_ubyte(~self.FLAGSDEF[name].mask).value)) \
+                | ((value & 0x01) << self.FLAGSDEF[name].offset)
+
+    def set_entryArray(self, entry_list):
+        if isinstance(entry_list, list):
+            self.entry_array = entry_list
+        else:
+            self.entry_array = [entry_list]
+
+    def set_optionArray(self, option_list):
+        if isinstance(option_list, list):
+            self.option_array = option_list
+        else:
+            self.option_array = [option_list]
+
+
+bind_top_down(SOMEIP, SD,
+              srv_id=SD.SOMEIP_MSGID_SRVID,
+              sub_id=SD.SOMEIP_MSGID_SUBID,
+              client_id=SD.SOMEIP_CLIENT_ID,
+              session_id=SD.SOMEIP_MINIMUM_SESSION_ID,
+              event_id=SD.SOMEIP_MSGID_EVENTID,
+              proto_ver=SD.SOMEIP_PROTO_VER,
+              iface_ver=SD.SOMEIP_IFACE_VER,
+              msg_type=SD.SOMEIP_MSG_TYPE,
+              retcode=SD.SOMEIP_RETCODE)
+
+bind_bottom_up(SOMEIP, SD,
+               srv_id=SD.SOMEIP_MSGID_SRVID,
+               sub_id=SD.SOMEIP_MSGID_SUBID,
+               event_id=SD.SOMEIP_MSGID_EVENTID,
+               proto_ver=SD.SOMEIP_PROTO_VER,
+               iface_ver=SD.SOMEIP_IFACE_VER,
+               msg_type=SD.SOMEIP_MSG_TYPE,
+               retcode=SD.SOMEIP_RETCODE)
+
+# FIXME: Service Discovery messages shall be transported over UDP
+#        (TR_SOMEIP_00248)
+# FIXME: The port 30490 (UDP and TCP as well) shall be only used for SOME/IP-SD
+#        and not used for applications communicating over SOME/IP
+#        (TR_SOMEIP_00020)

scapy-2.4.3.tar.gz/scapy/contrib/automotive/uds.py -> scapy-2.4.4.tar.gz/scapy/contrib/automotive/uds.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Nils Weiss <nils@we155.de>
@@ -9,14 +7,16 @@
 # scapy.contrib.status = loads
 
 import struct
+from itertools import product
 from scapy.fields import ByteEnumField, StrField, ConditionalField, \
     BitEnumField, BitField, XByteField, FieldListField, \
     XShortField, X3BytesField, XIntField, ByteField, \
     ShortField, ObservableDict, XShortEnumField, XByteEnumField
-from scapy.packet import Packet, bind_layers
+from scapy.packet import Packet, bind_layers, NoPayload
 from scapy.config import conf
 from scapy.error import log_loading
 from scapy.utils import PeriodicSenderThread
+from scapy.contrib.isotp import ISOTP
 
 """
 UDS
@@ -34,7 +34,7 @@
     conf.contribs['UDS'] = {'treat-response-pending-as-answer': False}
 
 
-class UDS(Packet):
+class UDS(ISOTP):
     services = ObservableDict(
         {0x10: 'DiagnosticSessionControl',
          0x11: 'ECUReset',
@@ -93,14 +93,17 @@
     ]
 
     def answers(self, other):
-        """DEV: true if self is an answer from other"""
-        if other.__class__ == self.__class__:
-            return (other.service + 0x40) == self.service or \
-                   (self.service == 0x7f and
-                    self.requestServiceId == other.service and
-                    (self.negativeResponseCode != 0x78 or
-                     conf.contribs['UDS']['treat-response-pending-as-answer']))
-        return 0
+        if other.__class__ != self.__class__:
+            return False
+        if self.service == 0x7f:
+            return self.payload.answers(other)
+        if self.service == (other.service + 0x40):
+            if isinstance(self.payload, NoPayload) or \
+                    isinstance(other.payload, NoPayload):
+                return len(self) <= len(other)
+            else:
+                return self.payload.answers(other.payload)
+        return False
 
     def hashret(self):
         if self.service == 0x7f:
@@ -110,18 +113,23 @@
 
 # ########################DSC###################################
 class UDS_DSC(Packet):
-    diagnosticSessionTypes = {
+    diagnosticSessionTypes = ObservableDict({
         0x00: 'ISOSAEReserved',
         0x01: 'defaultSession',
         0x02: 'programmingSession',
         0x03: 'extendedDiagnosticSession',
         0x04: 'safetySystemDiagnosticSession',
-        0x7F: 'ISOSAEReserved'}
+        0x7F: 'ISOSAEReserved'})
     name = 'DiagnosticSessionControl'
     fields_desc = [
         ByteEnumField('diagnosticSessionType', 0, diagnosticSessionTypes)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_DSC.diagnosticSessionType%")
+
 
 bind_layers(UDS, UDS_DSC, service=0x10)
 
@@ -134,6 +142,19 @@
         StrField('sessionParameterRecord', B"")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_DSC and \
+            other.diagnosticSessionType == self.diagnosticSessionType
+
+    @staticmethod
+    def modifies_ecu_state(pkt, ecu):
+        ecu.current_session = pkt.diagnosticSessionType
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_DSCPR.diagnosticSessionType%")
+
 
 bind_layers(UDS, UDS_DSCPR, service=0x50)
 
@@ -153,6 +174,11 @@
         ByteEnumField('resetType', 0, resetTypes)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_ER.resetType%")
+
 
 bind_layers(UDS, UDS_ER, service=0x11)
 
@@ -165,6 +191,18 @@
                          lambda pkt: pkt.resetType == 0x04)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_ER
+
+    @staticmethod
+    def modifies_ecu_state(_, ecu):
+        ecu.reset()
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_ER.resetType%")
+
 
 bind_layers(UDS, UDS_ERPR, service=0x51)
 
@@ -180,6 +218,15 @@
                          lambda pkt: pkt.securityAccessType % 2 == 0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        if pkt.securityAccessType % 2 == 1:
+            return pkt.sprintf("%UDS.service%"),\
+                (pkt.securityAccessType, None)
+        else:
+            return pkt.sprintf("%UDS.service%"),\
+                (pkt.securityAccessType, pkt.securityKey)
+
 
 bind_layers(UDS, UDS_SA, service=0x27)
 
@@ -192,6 +239,24 @@
                          lambda pkt: pkt.securityAccessType % 2 == 1),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_SA \
+            and other.securityAccessType == self.securityAccessType
+
+    @staticmethod
+    def modifies_ecu_state(pkt, ecu):
+        if pkt.securityAccessType % 2 == 0:
+            ecu.current_security_level = pkt.securityAccessType
+
+    @staticmethod
+    def get_log(pkt):
+        if pkt.securityAccessType % 2 == 0:
+            return pkt.sprintf("%UDS.service%"),\
+                (pkt.securityAccessType, None)
+        else:
+            return pkt.sprintf("%UDS.service%"),\
+                (pkt.securityAccessType, pkt.securitySeed)
+
 
 bind_layers(UDS, UDS_SAPR, service=0x67)
 
@@ -233,6 +298,11 @@
                       15: 'Disable/Enable network'})
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_CC.controlType%")
+
 
 bind_layers(UDS, UDS_CC, service=0x28)
 
@@ -243,6 +313,19 @@
         ByteEnumField('controlType', 0, UDS_CC.controlTypes)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_CC \
+            and other.controlType == self.controlType
+
+    @staticmethod
+    def modifies_ecu_state(pkt, ecu):
+        ecu.communication_control = pkt.controlType
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_CCPR.controlType%")
+
 
 bind_layers(UDS, UDS_CCPR, service=0x68)
 
@@ -254,6 +337,10 @@
         ByteField('subFunction', 0)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.subFunction
+
 
 bind_layers(UDS, UDS_TP, service=0x3E)
 
@@ -264,6 +351,13 @@
         ByteField('zeroSubFunction', 0)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_TP
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.zeroSubFunction
+
 
 bind_layers(UDS, UDS_TPPR, service=0x7E)
 
@@ -298,6 +392,11 @@
                          lambda pkt: pkt.timingParameterAccessType == 0x3)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_ATP \
+            and other.timingParameterAccessType == \
+            self.timingParameterAccessType
+
 
 bind_layers(UDS, UDS_ATPPR, service=0xC3)
 
@@ -309,6 +408,10 @@
         StrField('securityDataRequestRecord', B"")
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.securityDataRequestRecord
+
 
 bind_layers(UDS, UDS_SDT, service=0x84)
 
@@ -319,6 +422,13 @@
         StrField('securityDataResponseRecord', B"")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_SDT
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.securityDataResponseRecord
+
 
 bind_layers(UDS, UDS_SDTPR, service=0xC4)
 
@@ -336,6 +446,11 @@
         StrField('DTCSettingControlOptionRecord', B"")
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_CDTCS.DTCSettingType%")
+
 
 bind_layers(UDS, UDS_CDTCS, service=0x85)
 
@@ -346,6 +461,14 @@
         ByteEnumField('DTCSettingType', 0, UDS_CDTCS.DTCSettingTypes)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_CDTCS
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_CDTCSPR.DTCSettingType%")
+
 
 bind_layers(UDS, UDS_CDTCSPR, service=0xC5)
 
@@ -377,6 +500,10 @@
         StrField('eventTypeRecord', B"")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_ROE \
+            and other.eventType == self.eventType
+
 
 bind_layers(UDS, UDS_ROEPR, service=0xC6)
 
@@ -402,6 +529,11 @@
                          lambda pkt: pkt.linkControlType == 0x2)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS.linkControlType%")
+
 
 bind_layers(UDS, UDS_LC, service=0x87)
 
@@ -412,6 +544,15 @@
         ByteEnumField('linkControlType', 0, UDS_LC.linkControlTypes)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_LC \
+            and other.linkControlType == self.linkControlType
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS.linkControlType%")
+
 
 bind_layers(UDS, UDS_LCPR, service=0xC7)
 
@@ -421,11 +562,16 @@
     dataIdentifiers = ObservableDict()
     name = 'ReadDataByIdentifier'
     fields_desc = [
-        FieldListField("identifiers", [],
+        FieldListField("identifiers", [0],
                        XShortEnumField('dataIdentifier', 0,
                                        dataIdentifiers))
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_RDBI.identifiers%")
+
 
 bind_layers(UDS, UDS_RDBI, service=0x22)
 
@@ -437,6 +583,15 @@
                         UDS_RDBI.dataIdentifiers),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RDBI \
+            and self.dataIdentifier in other.identifiers
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_RDBIPR.dataIdentifier%")
+
 
 bind_layers(UDS, UDS_RDBIPR, service=0x62)
 
@@ -465,6 +620,12 @@
                          lambda pkt: pkt.memorySizeLen == 4),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        addr = getattr(pkt, "memoryAddress%d" % pkt.memoryAddressLen)
+        size = getattr(pkt, "memorySize%d" % pkt.memorySizeLen)
+        return pkt.sprintf("%UDS.service%"), (addr, size)
+
 
 bind_layers(UDS, UDS_RMBA, service=0x23)
 
@@ -475,6 +636,13 @@
         StrField('dataRecord', None, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RMBA
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.dataRecord
+
 
 bind_layers(UDS, UDS_RMBAPR, service=0x63)
 
@@ -482,8 +650,9 @@
 # #########################RSDBI###################################
 class UDS_RSDBI(Packet):
     name = 'ReadScalingDataByIdentifier'
+    dataIdentifiers = ObservableDict()
     fields_desc = [
-        XShortField('dataIdentifier', 0)
+        XShortEnumField('dataIdentifier', 0, dataIdentifiers)
     ]
 
 
@@ -494,11 +663,15 @@
 class UDS_RSDBIPR(Packet):
     name = 'ReadScalingDataByIdentifierPositiveResponse'
     fields_desc = [
-        XShortField('dataIdentifier', 0),
+        XShortEnumField('dataIdentifier', 0, UDS_RSDBI.dataIdentifiers),
         ByteField('scalingByte', 0),
         StrField('dataRecord', None, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RSDBI \
+            and other.dataIdentifier == self.dataIdentifier
+
 
 bind_layers(UDS, UDS_RSDBIPR, service=0x64)
 
@@ -531,6 +704,10 @@
         StrField('dataRecord', None, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RDBPI \
+            and other.periodicDataIdentifier == self.periodicDataIdentifier
+
 
 bind_layers(UDS, UDS_RDBPIPR, service=0x6A)
 
@@ -540,8 +717,11 @@
 # instead of using just the dataRecord
 class UDS_DDDI(Packet):
     name = 'DynamicallyDefineDataIdentifier'
+    subFunctions = {0x1: "defineByIdentifier",
+                    0x2: "defineByMemoryAddress",
+                    0x3: "clearDynamicallyDefinedDataIdentifier"}
     fields_desc = [
-        ByteField('definitionMode', 0),
+        ByteEnumField('subFunction', 0, subFunctions),
         StrField('dataRecord', 0, fmt="B")
     ]
 
@@ -552,10 +732,14 @@
 class UDS_DDDIPR(Packet):
     name = 'DynamicallyDefineDataIdentifierPositiveResponse'
     fields_desc = [
-        ByteField('definitionMode', 0),
+        ByteEnumField('subFunction', 0, UDS_DDDI.subFunctions),
         XShortField('dynamicallyDefinedDataIdentifier', 0)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_DDDI \
+            and other.subFunction == self.subFunction
+
 
 bind_layers(UDS, UDS_DDDIPR, service=0x6C)
 
@@ -568,6 +752,11 @@
                         UDS_RDBI.dataIdentifiers)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_WDBI.dataIdentifier%")
+
 
 bind_layers(UDS, UDS_WDBI, service=0x2E)
 
@@ -579,6 +768,15 @@
                         UDS_RDBI.dataIdentifiers),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_WDBI \
+            and other.dataIdentifier == self.dataIdentifier
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            pkt.sprintf("%UDS_WDBIPR.dataIdentifier%")
+
 
 bind_layers(UDS, UDS_WDBIPR, service=0x6E)
 
@@ -609,6 +807,12 @@
 
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        addr = getattr(pkt, "memoryAddress%d" % pkt.memoryAddressLen)
+        size = getattr(pkt, "memorySize%d" % pkt.memorySizeLen)
+        return pkt.sprintf("%UDS.service%"), (addr, size, pkt.dataRecord)
+
 
 bind_layers(UDS, UDS_WMBA, service=0x3D)
 
@@ -636,6 +840,17 @@
                          lambda pkt: pkt.memorySizeLen == 4)
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_WMBA \
+            and other.memorySizeLen == self.memorySizeLen \
+            and other.memoryAddressLen == self.memoryAddressLen
+
+    @staticmethod
+    def get_log(pkt):
+        addr = getattr(pkt, "memoryAddress%d" % pkt.memoryAddressLen)
+        size = getattr(pkt, "memorySize%d" % pkt.memorySizeLen)
+        return pkt.sprintf("%UDS.service%"), (addr, size)
+
 
 bind_layers(UDS, UDS_WMBAPR, service=0x7D)
 
@@ -649,10 +864,30 @@
         ByteField('groupOfDTCLowByte', 0),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), (pkt.groupOfDTCHighByte,
+                                              pkt.groupOfDTCMiddleByte,
+                                              pkt.groupOfDTCLowByte)
+
 
 bind_layers(UDS, UDS_CDTCI, service=0x14)
 
 
+class UDS_CDTCIPR(Packet):
+    name = 'ClearDiagnosticInformationPositiveResponse'
+
+    def answers(self, other):
+        return other.__class__ == UDS_CDTCI
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), None
+
+
+bind_layers(UDS, UDS_CDTCIPR, service=0x54)
+
+
 # #########################RDTCI###################################
 class UDS_RDTCI(Packet):
     reportTypes = {
@@ -704,6 +939,10 @@
                          lambda pkt: pkt.reportType in [0x07, 0x08]),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), repr(pkt)
+
 
 bind_layers(UDS, UDS_RDTCI, service=0x19)
 
@@ -738,6 +977,14 @@
                                                         0x10, 0x14])
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RDTCI \
+            and other.reportType == self.reportType
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), repr(pkt)
+
 
 bind_layers(UDS, UDS_RDTCIPR, service=0x59)
 
@@ -750,13 +997,21 @@
         2: 'stopRoutine',
         3: 'requestRoutineResults'
     }
+    routineControlIdentifiers = ObservableDict()
     name = 'RoutineControl'
     fields_desc = [
         ByteEnumField('routineControlType', 0, routineControlTypes),
-        XShortField('routineIdentifier', 0),
+        XShortEnumField('routineIdentifier', 0, routineControlIdentifiers),
         StrField('routineControlOptionRecord', 0, fmt="B"),
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"),\
+            (pkt.routineControlType,
+             pkt.routineIdentifier,
+             pkt.routineControlOptionRecord)
+
 
 bind_layers(UDS, UDS_RC, service=0x31)
 
@@ -766,19 +1021,31 @@
     fields_desc = [
         ByteEnumField('routineControlType', 0,
                       UDS_RC.routineControlTypes),
-        XShortField('routineIdentifier', 0),
+        XShortEnumField('routineIdentifier', 0,
+                        UDS_RC.routineControlIdentifiers),
         StrField('routineStatusRecord', 0, fmt="B"),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RC \
+            and other.routineControlType == self.routineControlType
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"),\
+            (pkt.routineControlType,
+             pkt.routineIdentifier,
+             pkt.routineStatusRecord)
+
 
 bind_layers(UDS, UDS_RCPR, service=0x71)
 
 
 # #########################RD###################################
 class UDS_RD(Packet):
-    dataFormatIdentifiers = {
+    dataFormatIdentifiers = ObservableDict({
         0: 'noCompressionNoEncryption'
-    }
+    })
     name = 'RequestDownload'
     fields_desc = [
         ByteEnumField('dataFormatIdentifier', 0, dataFormatIdentifiers),
@@ -802,6 +1069,12 @@
                          lambda pkt: pkt.memorySizeLen == 4)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        addr = getattr(pkt, "memoryAddress%d" % pkt.memoryAddressLen)
+        size = getattr(pkt, "memorySize%d" % pkt.memorySizeLen)
+        return pkt.sprintf("%UDS.service%"), (addr, size)
+
 
 bind_layers(UDS, UDS_RD, service=0x34)
 
@@ -809,13 +1082,18 @@
 class UDS_RDPR(Packet):
     name = 'RequestDownloadPositiveResponse'
     fields_desc = [
-        ByteEnumField('routineControlType', 0,
-                      UDS_RC.routineControlTypes),
         BitField('memorySizeLen', 0, 4),
-        BitField('memoryAddressLen', 0, 4),
+        BitField('reserved', 0, 4),
         StrField('maxNumberOfBlockLength', 0, fmt="B"),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RD
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.memorySizeLen
+
 
 bind_layers(UDS, UDS_RDPR, service=0x74)
 
@@ -846,6 +1124,12 @@
                          lambda pkt: pkt.memorySizeLen == 4)
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        addr = getattr(pkt, "memoryAddress%d" % pkt.memoryAddressLen)
+        size = getattr(pkt, "memorySize%d" % pkt.memorySizeLen)
+        return pkt.sprintf("%UDS.service%"), (addr, size)
+
 
 bind_layers(UDS, UDS_RU, service=0x35)
 
@@ -853,13 +1137,18 @@
 class UDS_RUPR(Packet):
     name = 'RequestUploadPositiveResponse'
     fields_desc = [
-        ByteEnumField('routineControlType', 0,
-                      UDS_RC.routineControlTypes),
         BitField('memorySizeLen', 0, 4),
-        BitField('memoryAddressLen', 0, 4),
+        BitField('reserved', 0, 4),
         StrField('maxNumberOfBlockLength', 0, fmt="B"),
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RU
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.memorySizeLen
+
 
 bind_layers(UDS, UDS_RUPR, service=0x75)
 
@@ -872,6 +1161,11 @@
         StrField('transferRequestParameterRecord', 0, fmt="B")
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"),\
+            (pkt.blockSequenceCounter, pkt.transferRequestParameterRecord)
+
 
 bind_layers(UDS, UDS_TD, service=0x36)
 
@@ -883,6 +1177,14 @@
         StrField('transferResponseParameterRecord', 0, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_TD \
+            and other.blockSequenceCounter == self.blockSequenceCounter
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.blockSequenceCounter
+
 
 bind_layers(UDS, UDS_TDPR, service=0x76)
 
@@ -894,6 +1196,11 @@
         StrField('transferRequestParameterRecord', 0, fmt="B")
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"),\
+            pkt.transferRequestParameterRecord
+
 
 bind_layers(UDS, UDS_RTE, service=0x37)
 
@@ -904,6 +1211,14 @@
         StrField('transferResponseParameterRecord', 0, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_RTE
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"),\
+            pkt.transferResponseParameterRecord
+
 
 bind_layers(UDS, UDS_RTEPR, service=0x77)
 
@@ -911,12 +1226,17 @@
 # #########################IOCBI###################################
 class UDS_IOCBI(Packet):
     name = 'InputOutputControlByIdentifier'
+    dataIdentifiers = ObservableDict()
     fields_desc = [
-        XShortField('dataIdentifier', 0),
+        XShortEnumField('dataIdentifier', 0, dataIdentifiers),
         ByteField('controlOptionRecord', 0),
         StrField('controlEnableMaskRecord', 0, fmt="B")
     ]
 
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.dataIdentifier
+
 
 bind_layers(UDS, UDS_IOCBI, service=0x2F)
 
@@ -928,12 +1248,20 @@
         StrField('controlStatusRecord', 0, fmt="B")
     ]
 
+    def answers(self, other):
+        return other.__class__ == UDS_IOCBI \
+            and other.dataIdentifier == self.dataIdentifier
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), pkt.dataIdentifier
+
 
 bind_layers(UDS, UDS_IOCBIPR, service=0x6F)
 
 
-# #########################NRC###################################
-class UDS_NRC(Packet):
+# #########################NR###################################
+class UDS_NR(Packet):
     negativeResponseCodes = {
         0x00: 'positiveResponse',
         0x10: 'generalReject',
@@ -981,14 +1309,25 @@
         0x92: 'voltageTooHigh',
         0x93: 'voltageTooLow',
     }
-    name = 'NegativeResponseCode'
+    name = 'NegativeResponse'
     fields_desc = [
         XByteEnumField('requestServiceId', 0, UDS.services),
         ByteEnumField('negativeResponseCode', 0, negativeResponseCodes)
     ]
 
+    def answers(self, other):
+        return self.requestServiceId == other.service and \
+            (self.negativeResponseCode != 0x78 or
+             conf.contribs['UDS']['treat-response-pending-as-answer'])
+
+    @staticmethod
+    def get_log(pkt):
+        return pkt.sprintf("%UDS.service%"), \
+            (pkt.sprintf("%UDS_NR.requestServiceId%"),
+             pkt.sprintf("%UDS_NR.negativeResponseCode%"))
 
-bind_layers(UDS, UDS_NRC, service=0x7f)
+
+bind_layers(UDS, UDS_NR, service=0x7f)
 
 
 # ##################################################################
@@ -1006,3 +1345,68 @@
             interval: interval between two packets
         """
         PeriodicSenderThread.__init__(self, sock, pkt, interval)
+
+
+def UDS_SessionEnumerator(sock, session_range=range(0x100), reset_wait=1.5):
+    """ Enumerates session ID's in given range
+        and returns list of UDS()/UDS_DSC() packets
+        with valid session types
+
+    Args:
+        sock: socket where packets are sent
+        session_range: range for session ID's
+        reset_wait: wait time in sec after every packet
+    """
+    pkts = (req for tup in
+            product(UDS() / UDS_DSC(diagnosticSessionType=session_range),
+                    UDS() / UDS_ER(resetType='hardReset')) for req in tup)
+    results, _ = sock.sr(pkts, timeout=len(session_range) * reset_wait * 2 + 1,
+                         verbose=False, inter=reset_wait)
+    return [req for req, res in results if req is not None and
+            req.service != 0x11 and
+            (res.service == 0x50 or
+             res.negativeResponseCode not in [0x10, 0x11, 0x12])]
+
+
+def UDS_ServiceEnumerator(sock, session="DefaultSession",
+                          filter_responses=True):
+    """ Enumerates every service ID
+        and returns list of tuples. Each tuple contains
+        the session and the respective positive response
+
+    Args:
+        sock: socket where packet is sent periodically
+        session: session in which the services are enumerated
+    """
+    pkts = (UDS(service=x) for x in set(x & ~0x40 for x in range(0x100)))
+    found_services = sock.sr(pkts, timeout=5, verbose=False)
+    return [(session, p) for _, p in found_services[0] if
+            p.service != 0x7f or
+            (p.negativeResponseCode not in [0x10, 0x11] or not
+            filter_responses)]
+
+
+def getTableEntry(tup):
+    """ Helping function for make_lined_table.
+        Returns the session and response code of tup.
+
+    Args:
+        tup: tuple with session and UDS response package
+
+    Example:
+        make_lined_table([('DefaultSession', UDS()/UDS_SAPR(),
+                           'ExtendedDiagnosticSession', UDS()/UDS_IOCBI())],
+                           getTableEntry)
+    """
+    session, pkt = tup
+    if pkt.service == 0x7f:
+        return (session,
+                "0x%02x: %s" % (pkt.requestServiceId,
+                                pkt.sprintf("%UDS_NR.requestServiceId%")),
+                pkt.sprintf("%UDS_NR.negativeResponseCode%"))
+    else:
+        return (session,
+                "0x%02x: %s" % (pkt.service & ~0x40,
+                                pkt.get_field('service').
+                                i2s[pkt.service & ~0x40]),
+                "PositiveResponse")

scapy-2.4.4.tar.gz/scapy/contrib/automotive/volkswagen Added

scapy-2.4.4.tar.gz/scapy/contrib/automotive/volkswagen/__init__.py Added

scapy-2.4.4.tar.gz/scapy/contrib/automotive/volkswagen/definitions.py Added

@@ -0,0 +1,3185 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Nils Weiss <nils@we155.de>
+# Copyright (C) Jonas Schmidt <jonas.schmidt@st.othr.de>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Volkswagen specific definitions for UDS
+# scapy.contrib.status = skip
+
+
+from scapy.contrib.automotive.uds import UDS_RDBI, UDS_RC, UDS_RD
+
+
+UDS_RDBI.dataIdentifiers[0x00bd] = "Theft Protection - Download GFA-Key"
+UDS_RDBI.dataIdentifiers[0x00be] = "Theft Protection - Download IKA-Key"
+UDS_RDBI.dataIdentifiers[0x00fd] = "IUMPR-ID3"
+UDS_RDBI.dataIdentifiers[0x00fe] = "IUMPR-ID2"
+UDS_RDBI.dataIdentifiers[0x00ff] = "IUMPR-ID1"
+UDS_RDBI.dataIdentifiers[0x02cc] = "Vehicle_identification_number_provisional"
+UDS_RDBI.dataIdentifiers[0x02e0] = "Immobilizer - Challenge"
+UDS_RDBI.dataIdentifiers[0x02e1] = "Immobilizer - Login"
+UDS_RDBI.dataIdentifiers[0x02e2] = "Immobilizer - Download Powertrain"
+UDS_RDBI.dataIdentifiers[0x02e3] = "Immobilizer - Download IMS"
+UDS_RDBI.dataIdentifiers[0x02e4] = "Transponder ID current Key"
+UDS_RDBI.dataIdentifiers[0x02e5] = "Transponder ID Key 1"
+UDS_RDBI.dataIdentifiers[0x02e6] = "Transponder ID Key 2"
+UDS_RDBI.dataIdentifiers[0x02e7] = "Transponder ID Key 3"
+UDS_RDBI.dataIdentifiers[0x02e8] = "Transponder ID Key 4"
+UDS_RDBI.dataIdentifiers[0x02e9] = "Transponder ID Key 5"
+UDS_RDBI.dataIdentifiers[0x02ea] = "Transponder ID Key 6"
+UDS_RDBI.dataIdentifiers[0x02eb] = "Transponder ID Key 7"
+UDS_RDBI.dataIdentifiers[0x02ec] = "Transponder ID Key 8"
+UDS_RDBI.dataIdentifiers[0x02ed] = "State of Immobilizer"
+UDS_RDBI.dataIdentifiers[0x02ee] = "State of Immobilizer Slaves"
+UDS_RDBI.dataIdentifiers[0x02ef] = "State Blocking Time"
+UDS_RDBI.dataIdentifiers[0x02f1] = "Immobilizer - Slave Login"
+UDS_RDBI.dataIdentifiers[0x02f6] = "Download WFS SHE"
+UDS_RDBI.dataIdentifiers[0x02f9] = "CRC32 Checksum of FAZIT Identification String"
+UDS_RDBI.dataIdentifiers[0x02fa] = "Adapted_transponders_checksum"
+UDS_RDBI.dataIdentifiers[0x02fb] = "Immobilizer - Download WFS 4"
+UDS_RDBI.dataIdentifiers[0x02ff] = "Immobilizer_snapshot"
+UDS_RDBI.dataIdentifiers[0x0407] = "VW Logical Software Block Counter Of Programming Attempts"
+UDS_RDBI.dataIdentifiers[0x040f] = "VW Logical Software Block Lock Value"
+UDS_RDBI.dataIdentifiers[0x0410] = "Bootloader TP Blocksize"
+UDS_RDBI.dataIdentifiers[0x04a3] = "Gateway Component List"
+UDS_RDBI.dataIdentifiers[0x0600] = "VW Coding Value"
+UDS_RDBI.dataIdentifiers[0x0610] = "Control_unit_for_wiper_motor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0611] = "Slave_list_VW_spare_part_number"
+UDS_RDBI.dataIdentifiers[0x0612] = "Slave_list_VW_software_version_number"
+UDS_RDBI.dataIdentifiers[0x0613] = "Slave_list_VW_ecu_hardware_version_number"
+UDS_RDBI.dataIdentifiers[0x0614] = "Slave_list_VW_hardware_number"
+UDS_RDBI.dataIdentifiers[0x0615] = "Slave_list_ecu_serial_number"
+UDS_RDBI.dataIdentifiers[0x0616] = "Slave_list_VW_FAZIT_identification_string"
+UDS_RDBI.dataIdentifiers[0x0617] = "Slave_list_VW_system_name_or_engine_type"
+UDS_RDBI.dataIdentifiers[0x0618] = "Left_rear_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0619] = "Right_rear_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x061a] = "Slave_component_list"
+UDS_RDBI.dataIdentifiers[0x061b] = "Slave_component_list_databus_identification"
+UDS_RDBI.dataIdentifiers[0x061c] = "Slave_component_list_ecu_identification"
+UDS_RDBI.dataIdentifiers[0x061d] = "Slave_component_list_present"
+UDS_RDBI.dataIdentifiers[0x061e] = "Right_headlamp_power_output_stage_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x061f] = "Sensor_for_anti_theft_alarm_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0620] = "Rear_lid_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0621] = "Alarm_horn_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0622] = "Automatic_day_night_interior_mirror_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0623] = "Sun_roof_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0624] = "Steering_column_lock_actuator_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0625] = "Anti_theft_tilt_system_control_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0626] = "Tire_pressure_monitor_antenna_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0627] = "Heated_windshield_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0628] = "Rear_light_left_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0629] = "Ceiling_light_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062a] = "Left_front_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062b] = "Right_front_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062c] = "Control_module_for_auxiliary_air_heater_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062d] = "Ioniser_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062e] = "Multi_function_steering_wheel_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x062f] = "Left_rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0630] = "Right_rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0631] = "Left_rear_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0632] = "Right_rear_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0633] = "Display_unit_1_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0634] = "Battery_monitoring_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0635] = "Roof_blind_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0636] = "Sun_roof_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0637] = "Display_unit_2_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0638] = "Telephone_handset_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0639] = "Traffic_data_aerial_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063a] = "Chip_card_reader_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063b] = "Hands_free_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063c] = "Telephone_handset_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063d] = "Display_unit_front_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063e] = "Multimedia_operating_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x063f] = "Digital_sound_system_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x0640] = "Control_unit_for_wiper_motor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0641] = "Rain_light_recognition_sensor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0642] = "Light_switch_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0643] = "Garage_door_opener_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0644] = "Garage_door_opener_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0645] = "Ignition_key_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0646] = "Left_front_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0647] = "Right_front_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0648] = "Left_rear_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0649] = "Right_rear_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064a] = "Data_medium_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064b] = "Drivers_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064c] = "Front_passengers_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064d] = "Left_headlamp_power_output_stage_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064e] = "Right_headlamp_power_output_stage_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x064f] = "Sensor_for_anti_theft_alarm_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0650] = "Rear_lid_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0651] = "Alarm_horn_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0652] = "Automatic_day_night_interior_mirror_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0653] = "Sun_roof_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0654] = "Steering_column_lock_actuator_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0655] = "Anti_theft_tilt_system_control_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0656] = "Tire_pressure_monitor_antenna_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0657] = "Heated_windshield_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0658] = "Rear_light_left_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0659] = "Ceiling_light_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065a] = "Left_front_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065b] = "Right_front_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065c] = "Control_module_for_auxiliary_air_heater_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065d] = "Ioniser_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065e] = "Multi_function_steering_wheel_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x065f] = "Left_rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0660] = "Right_rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0661] = "Left_rear_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0662] = "Right_rear_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0663] = "Display_unit_1_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0664] = "Battery_monitoring_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0665] = "Roof_blind_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0666] = "Sun_roof_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0667] = "Display_unit_2_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0668] = "Telephone_handset_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0669] = "Traffic_data_aerial_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066a] = "Chip_card_reader_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066b] = "Hands_free_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066c] = "Telephone_handset_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066d] = "Display_unit_front_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066e] = "Multimedia_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x066f] = "Digital_sound_system_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x0670] = "Control_unit_for_wiper_motor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0671] = "Rain_light_recognition_sensor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0672] = "Light_switch_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0673] = "Garage_door_opener_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0674] = "Garage_door_opener_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0675] = "Ignition_key_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0676] = "Left_front_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0677] = "Right_front_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0678] = "Left_rear_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0679] = "Right_rear_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067a] = "Data_medium_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067b] = "Drivers_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067c] = "Front_passengers_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067d] = "Left_headlamp_power_output_stage_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067e] = "Right_headlamp_power_output_stage_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x067f] = "Sensor_for_anti_theft_alarm_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0680] = "Rear_lid_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0681] = "Alarm_horn_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0682] = "Automatic_day_night_interior_mirror_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0683] = "Sun_roof_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0684] = "Steering_column_lock_actuator_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0685] = "Anti_theft_tilt_system_control_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0686] = "Tire_pressure_monitor_antenna_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0687] = "Heated_windshield_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0688] = "Rear_light_left_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0689] = "Ceiling_light_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068a] = "Left_front_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068b] = "Right_front_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068c] = "Control_module_for_auxiliary_air_heater_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068d] = "Ioniser_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068e] = "Multi_function_steering_wheel_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x068f] = "Left_rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0690] = "Right_rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0691] = "Left_rear_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0692] = "Right_rear_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0693] = "Display_unit_1_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0694] = "Battery_monitoring_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0695] = "Roof_blind_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0696] = "Sun_roof_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0697] = "Display_unit_2_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0698] = "Telephone_handset_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0699] = "Traffic_data_aerial_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069a] = "Chip_card_reader_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069b] = "Hands_free_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069c] = "Telephone_handset_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069d] = "Display_unit_front_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069e] = "Multimedia_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x069f] = "Digital_sound_system_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06a0] = "Control_unit_for_wiper_motor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a1] = "Rain_light_recognition_sensor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a2] = "Light_switch_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a3] = "Garage_door_opener_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a4] = "Garage_door_opener_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a5] = "Ignition_key_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a6] = "Left_front_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a7] = "Right_front_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a8] = "Left_rear_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06a9] = "Right_rear_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06aa] = "Data_medium_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ab] = "Drivers_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ac] = "Front_passengers_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ad] = "Left_headlamp_power_output_stage_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ae] = "Right_headlamp_power_output_stage_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06af] = "Sensor_for_anti_theft_alarm_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b0] = "Rear_lid_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b1] = "Alarm_horn_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b2] = "Automatic_day_night_interior_mirror_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b3] = "Sun_roof_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b4] = "Steering_column_lock_actuator_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b5] = "Anti_theft_tilt_system_control_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b6] = "Tire_pressure_monitor_antenna_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b7] = "Heated_windshield_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b8] = "Rear_light_left_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06b9] = "Ceiling_light_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ba] = "Left_front_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06bb] = "Right_front_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06bc] = "Control_module_for_auxiliary_air_heater_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06bd] = "Ioniser_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06be] = "Multi_function_steering_wheel_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06bf] = "Left_rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c0] = "Right_rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c1] = "Left_rear_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c2] = "Right_rear_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c3] = "Display_unit_1_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c4] = "Battery_monitoring_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c5] = "Roof_blind_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c6] = "Sun_roof_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c7] = "Display_unit_2_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c8] = "Telephone_handset_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06c9] = "Traffic_data_aerial_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ca] = "Chip_card_reader_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06cb] = "Hands_free_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06cc] = "Telephone_handset_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06cd] = "Display_unit_front_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06ce] = "Multimedia_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06cf] = "Digital_sound_system_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x06d0] = "Control_unit_for_wiper_motor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d1] = "Rain_light_recognition_sensor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d2] = "Light_switch_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d3] = "Garage_door_opener_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d4] = "Garage_door_opener_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d5] = "Ignition_key_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d6] = "Left_front_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d7] = "Right_front_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d8] = "Left_rear_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06d9] = "Right_rear_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06da] = "Data_medium_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06db] = "Drivers_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06dc] = "Front_passengers_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06dd] = "Left_headlamp_power_output_stage_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06de] = "Right_headlamp_power_output_stage_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06df] = "Sensor_for_anti_theft_alarm_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e0] = "Rear_lid_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e1] = "Alarm_horn_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e2] = "Automatic_day_night_interior_mirror_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e3] = "Sun_roof_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e4] = "Steering_column_lock_actuator_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e5] = "Anti_theft_tilt_system_control_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e6] = "Tire_pressure_monitor_antenna_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e7] = "Heated_windshield_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e8] = "Rear_light_left_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06e9] = "Ceiling_light_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ea] = "Left_front_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06eb] = "Right_front_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ec] = "Control_module_for_auxiliary_air_heater_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ed] = "Ioniser_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ee] = "Multi_function_steering_wheel_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ef] = "Left_rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f0] = "Right_rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f1] = "Left_rear_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f2] = "Right_rear_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f3] = "Display_unit_1_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f4] = "Battery_monitoring_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f5] = "Roof_blind_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f6] = "Sun_roof_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f7] = "Display_unit_2_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f8] = "Telephone_handset_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06f9] = "Traffic_data_aerial_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06fa] = "Chip_card_reader_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06fb] = "Hands_free_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06fc] = "Telephone_handset_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06fd] = "Display_unit_front_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06fe] = "Multimedia_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x06ff] = "Digital_sound_system_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x0700] = "Control_unit_for_wiper_motor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0701] = "Rain_light_recognition_sensor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0702] = "Light_switch_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0703] = "Garage_door_opener_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0704] = "Garage_door_opener_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0705] = "Ignition_key_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0706] = "Left_front_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0707] = "Right_front_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0708] = "Left_rear_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0709] = "Right_rear_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070a] = "Data_medium_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070b] = "Drivers_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070c] = "Front_passengers_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070d] = "Left_headlamp_power_output_stage_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070e] = "Right_headlamp_power_output_stage_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x070f] = "Sensor_for_anti_theft_alarm_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0710] = "Rear_lid_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0711] = "Alarm_horn_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0712] = "Automatic_day_night_interior_mirror_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0713] = "Sun_roof_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0714] = "Steering_column_lock_actuator_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0715] = "Anti_theft_tilt_system_control_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0716] = "Tire_pressure_monitor_antenna_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0717] = "Heated_windshield_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0718] = "Rear_light_left_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0719] = "Ceiling_light_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071a] = "Left_front_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071b] = "Right_front_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071c] = "Control_module_for_auxiliary_air_heater_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071d] = "Ioniser_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071e] = "Multi_function_steering_wheel_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x071f] = "Left_rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0720] = "Right_rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0721] = "Left_rear_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0722] = "Right_rear_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0723] = "Display_unit_1_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0724] = "Battery_monitoring_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0725] = "Roof_blind_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0726] = "Sun_roof_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0727] = "Display_unit_2_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0728] = "Telephone_handset_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0729] = "Traffic_data_aerial_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072a] = "Chip_card_reader_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072b] = "Hands_free_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072c] = "Telephone_handset_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072d] = "Display_unit_front_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072e] = "Multimedia_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x072f] = "Digital_sound_system_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x0730] = "Control_unit_for_wiper_motor_System_Name"
+UDS_RDBI.dataIdentifiers[0x0731] = "Rain_light_recognition_sensor_System_Name"
+UDS_RDBI.dataIdentifiers[0x0732] = "Light_switch_System_Name"
+UDS_RDBI.dataIdentifiers[0x0733] = "Garage_door_opener_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0734] = "Garage_door_opener_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x0735] = "Ignition_key_System_Name"
+UDS_RDBI.dataIdentifiers[0x0736] = "Left_front_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0737] = "Right_front_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0738] = "Left_rear_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0739] = "Right_rear_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x073a] = "Data_medium_System_Name"
+UDS_RDBI.dataIdentifiers[0x073b] = "Drivers_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x073c] = "Front_passengers_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x073d] = "Left_headlamp_power_output_stage_System_Name"
+UDS_RDBI.dataIdentifiers[0x073e] = "Right_headlamp_power_output_stage_System_Name"
+UDS_RDBI.dataIdentifiers[0x073f] = "Sensor_for_anti_theft_alarm_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x0740] = "Rear_lid_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x0741] = "Alarm_horn_System_Name"
+UDS_RDBI.dataIdentifiers[0x0742] = "Automatic_day_night_interior_mirror_System_Name"
+UDS_RDBI.dataIdentifiers[0x0743] = "Sun_roof_System_Name"
+UDS_RDBI.dataIdentifiers[0x0744] = "Steering_column_lock_actuator_System_Name"
+UDS_RDBI.dataIdentifiers[0x0745] = "Anti_theft_tilt_system_control_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x0746] = "Tire_pressure_monitor_antenna_System_Name"
+UDS_RDBI.dataIdentifiers[0x0747] = "Heated_windshield_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0748] = "Rear_light_left_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x0749] = "Ceiling_light_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x074a] = "Left_front_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x074b] = "Right_front_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x074c] = "Control_module_for_auxiliary_air_heater_System_Name"
+UDS_RDBI.dataIdentifiers[0x074d] = "Ioniser_System_Name"
+UDS_RDBI.dataIdentifiers[0x074e] = "Multi_function_steering_wheel_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x074f] = "Left_rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0750] = "Right_rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0751] = "Left_rear_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0752] = "Right_rear_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0753] = "Display_unit_1_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x0754] = "Battery_monitoring_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x0755] = "Roof_blind_System_Name"
+UDS_RDBI.dataIdentifiers[0x0756] = "Sun_roof_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x0757] = "Display_unit_2_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x0758] = "Telephone_handset_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x0759] = "Traffic_data_aerial_System_Name"
+UDS_RDBI.dataIdentifiers[0x075a] = "Chip_card_reader_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x075b] = "Hands_free_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x075c] = "Telephone_handset_System_Name"
+UDS_RDBI.dataIdentifiers[0x075d] = "Display_unit_front_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x075e] = "Multimedia_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x075f] = "Digital_sound_system_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x07a0] = "Control_unit_for_wiper_motor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a1] = "Rain_light_recognition_sensor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a2] = "Light_switch_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a3] = "Garage_door_opener_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a4] = "Garage_door_opener_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a5] = "Ignition_key_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a6] = "Left_front_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a7] = "Right_front_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a8] = "Left_rear_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07a9] = "Right_rear_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07aa] = "Data_medium_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ab] = "Drivers_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ac] = "Front_passengers_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ad] = "Left_headlamp_power_output_stage_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ae] = "Right_headlamp_power_output_stage_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07af] = "Sensor_for_anti_theft_alarm_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b0] = "Rear_lid_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b1] = "Alarm_horn_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b2] = "Automatic_day_night_interior_mirror_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b3] = "Sun_roof_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b4] = "Steering_column_lock_actuator_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b5] = "Anti_theft_tilt_system_control_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b6] = "Tire_pressure_monitor_antenna_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b7] = "Heated_windshield_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b8] = "Rear_light_left_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07b9] = "Ceiling_light_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ba] = "Left_front_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07bb] = "Right_front_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07bc] = "Control_module_for_auxiliary_air_heater_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07bd] = "Ioniser_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07be] = "Multi_function_steering_wheel_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07bf] = "Left_rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c0] = "Right_rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c1] = "Left_rear_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c2] = "Right_rear_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c3] = "Display_unit_1_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c4] = "Battery_monitoring_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c5] = "Roof_blind_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c6] = "Sun_roof_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c7] = "Display_unit_2_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c8] = "Telephone_handset_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07c9] = "Traffic_data_aerial_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ca] = "Chip_card_reader_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07cb] = "Hands_free_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07cc] = "Telephone_handset_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07cd] = "Display_unit_front_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07ce] = "Multimedia_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x07cf] = "Digital_sound_system_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x0902] = "Activation of Development CAN-Messages"
+UDS_RDBI.dataIdentifiers[0x2a26] = "Gateway Component List present"
+UDS_RDBI.dataIdentifiers[0x2a27] = "Gateway_Component_List_Sleepindication"
+UDS_RDBI.dataIdentifiers[0x2a28] = "Gateway Component List dtc"
+UDS_RDBI.dataIdentifiers[0x2a29] = "Gateway Component List DiagProt"
+UDS_RDBI.dataIdentifiers[0x2a2d] = "Gateway_component_list_databus_identification"
+UDS_RDBI.dataIdentifiers[0x2ee0] = "Gateway_component_list_diag_path"
+UDS_RDBI.dataIdentifiers[0x2ee1] = "Gateway_component_list_ecu_authentication"
+UDS_RDBI.dataIdentifiers[0x3610] = "Electrically_adjustable_steering_column_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3611] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3612] = "Rear_spoiler_adjustment_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3613] = "Roof_blind_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3614] = "Motor_for_wind_deflector_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3615] = "Voltage_stabilizer_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3616] = "Switch_module_for_driver_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3617] = "Switch_module_for_front_passenger_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3618] = "Switch_module_for_rear_seat_driver_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3619] = "Switch_module_for_rear_seat_front_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x361a] = "Switch_module_2_for_driver_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x361b] = "Switch_module_2_for_front_passenger_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x361c] = "Switch_module_2_for_rear_seat_front_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x361d] = "Compact_disc_database_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3629] = "LED_headlamp_powermodule_2_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x362a] = "LED_headlamp_powermodule_2_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x362c] = "Multimedia_operating_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x362e] = "Data_medium_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x362f] = "Analog_clock_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3630] = "Relative_Air_Humidity_Interior_Sender_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3631] = "Sensor_controlled_power_rear_lid_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3632] = "Battery_monitoring_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3633] = "Air_conditioning_compressor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3634] = "Control_module_for_auxiliary_blower_motors_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3635] = "High_beam_powermodule_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3636] = "High_beam_powermodule_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3637] = "Coolant_heater_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x3640] = "Electrically_adjustable_steering_column_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3641] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3642] = "Rear_spoiler_adjustment_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3643] = "Roof_blind_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3644] = "Motor_for_wind_deflector_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3645] = "Voltage_stabilizer_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3646] = "Switch_module_for_driver_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3647] = "Switch_module_for_front_passenger_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3648] = "Switch_module_for_rear_seat_driver_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3649] = "Switch_module_for_rear_seat_front_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x364a] = "Switch_module_2_for_driver_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x364b] = "Switch_module_2_for_front_passenger_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x364c] = "Switch_module_2_for_rear_seat_front_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x364d] = "Compact_disc_database_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3659] = "LED_headlamp_powermodule_2_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x365a] = "LED_headlamp_powermodule_2_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x365c] = "Multimedia_operating_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x365e] = "Data_medium_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x365f] = "Analog_clock_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3660] = "Relative_Air_Humidity_Interior_Sender_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3661] = "Sensor_controlled_power_rear_lid_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3662] = "Battery_monitoring_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3663] = "Air_conditioning_compressor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3664] = "Control_module_for_auxiliary_blower_motors_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3665] = "High_beam_powermodule_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3666] = "High_beam_powermodule_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3667] = "Coolant_heater_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x3670] = "Electrically_adjustable_steering_column_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3671] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3672] = "Rear_spoiler_adjustment_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3673] = "Roof_blind_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3674] = "Motor_for_wind_deflector_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3675] = "Voltage_stabilizer_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3676] = "Switch_module_for_driver_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3677] = "Switch_module_for_front_passenger_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3678] = "Switch_module_for_rear_seat_driver_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3679] = "Switch_module_for_rear_seat_front_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x367a] = "Switch_module_2_for_driver_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x367b] = "Switch_module_2_for_front_passenger_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x367c] = "Switch_module_2_for_rear_seat_front_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x367d] = "Compact_disc_database_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3689] = "LED_headlamp_powermodule_2_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x368a] = "LED_headlamp_powermodule_2_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x368c] = "Multimedia_operating_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x368e] = "Data_medium_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x368f] = "Analog_clock_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3690] = "Relative_Air_Humidity_Interior_Sender_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3691] = "Sensor_controlled_power_rear_lid_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3692] = "Battery_monitoring_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3693] = "Air_conditioning_compressor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3694] = "Control_module_for_auxiliary_blower_motors_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3695] = "High_beam_powermodule_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3696] = "High_beam_powermodule_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3697] = "Coolant_heater_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36a0] = "Electrically_adjustable_steering_column_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a1] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a2] = "Rear_spoiler_adjustment_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a3] = "Roof_blind_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a4] = "Motor_for_wind_deflector_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a5] = "Voltage_stabilizer_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a6] = "Switch_module_for_driver_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a7] = "Switch_module_for_front_passenger_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a8] = "Switch_module_for_rear_seat_driver_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36a9] = "Switch_module_for_rear_seat_front_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36aa] = "Switch_module_2_for_driver_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36ab] = "Switch_module_2_for_front_passenger_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36ac] = "Switch_module_2_for_rear_seat_front_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36ad] = "Compact_disc_database_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36b9] = "LED_headlamp_powermodule_2_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36ba] = "LED_headlamp_powermodule_2_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36bc] = "Multimedia_operating_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36be] = "Data_medium_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36bf] = "Analog_clock_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c0] = "Relative_Air_Humidity_Interior_Sender_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c1] = "Sensor_controlled_power_rear_lid_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c2] = "Battery_monitoring_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c3] = "Air_conditioning_compressor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c4] = "Control_module_for_auxiliary_blower_motors_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c5] = "High_beam_powermodule_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c6] = "High_beam_powermodule_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36c7] = "Coolant_heater_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x36d0] = "Electrically_adjustable_steering_column_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d1] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d2] = "Rear_spoiler_adjustment_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d3] = "Roof_blind_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d4] = "Motor_for_wind_deflector_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d5] = "Voltage_stabilizer_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d6] = "Switch_module_for_driver_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d7] = "Switch_module_for_front_passenger_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d8] = "Switch_module_for_rear_seat_driver_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36d9] = "Switch_module_for_rear_seat_front_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36da] = "Switch_module_2_for_driver_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36db] = "Switch_module_2_for_front_passenger_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36dc] = "Switch_module_2_for_rear_seat_front_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36dd] = "Compact_disc_database_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36e9] = "LED_headlamp_powermodule_2_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36ea] = "LED_headlamp_powermodule_2_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36ec] = "Multimedia_operating_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36ee] = "Data_medium_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36ef] = "Analog_clock_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f0] = "Relative_Air_Humidity_Interior_Sender_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f1] = "Sensor_controlled_power_rear_lid_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f2] = "Battery_monitoring_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f3] = "Air_conditioning_compressor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f4] = "Control_module_for_auxiliary_blower_motors_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f5] = "High_beam_powermodule_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f6] = "High_beam_powermodule_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x36f7] = "Coolant_heater_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x3700] = "Electrically_adjustable_steering_column_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3701] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3702] = "Rear_spoiler_adjustment_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3703] = "Roof_blind_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3704] = "Motor_for_wind_deflector_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3705] = "Voltage_stabilizer_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3706] = "Switch_module_for_driver_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3707] = "Switch_module_for_front_passenger_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3708] = "Switch_module_for_rear_seat_driver_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3709] = "Switch_module_for_rear_seat_front_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x370a] = "Switch_module_2_for_driver_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x370b] = "Switch_module_2_for_front_passenger_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x370c] = "Switch_module_2_for_rear_seat_front_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x370d] = "Compact_disc_database_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3719] = "LED_headlamp_powermodule_2_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x371a] = "LED_headlamp_powermodule_2_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x371c] = "Multimedia_operating_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x371e] = "Data_medium_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x371f] = "Analog_clock_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3720] = "Relative_Air_Humidity_Interior_Sender_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3721] = "Sensor_controlled_power_rear_lid_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3722] = "Battery_monitoring_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3723] = "Air_conditioning_compressor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3724] = "Control_module_for_auxiliary_blower_motors_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3725] = "High_beam_powermodule_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3726] = "High_beam_powermodule_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3727] = "Coolant_heater_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x3730] = "Electrically_adjustable_steering_column_System_Name"
+UDS_RDBI.dataIdentifiers[0x3731] = "Relative_humidity_sensor_in_fresh_air_intake_duct_System_Name"
+UDS_RDBI.dataIdentifiers[0x3732] = "Rear_spoiler_adjustment_System_Name"
+UDS_RDBI.dataIdentifiers[0x3733] = "Roof_blind_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x3734] = "Motor_for_wind_deflector_System_Name"
+UDS_RDBI.dataIdentifiers[0x3735] = "Voltage_stabilizer_System_Name"
+UDS_RDBI.dataIdentifiers[0x3736] = "Switch_module_for_driver_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x3737] = "Switch_module_for_front_passenger_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x3738] = "Switch_module_for_rear_seat_driver_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x3739] = "Switch_module_for_rear_seat_front_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x373a] = "Switch_module_2_for_driver_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x373b] = "Switch_module_2_for_front_passenger_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x373c] = "Switch_module_2_for_rear_seat_front_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x373d] = "Compact_disc_database_System_Name"
+UDS_RDBI.dataIdentifiers[0x3749] = "LED_headlamp_powermodule_2_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x374a] = "LED_headlamp_powermodule_2_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x374c] = "Multimedia_operating_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x374e] = "Data_medium_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x374f] = "Analog_clock_System_Name"
+UDS_RDBI.dataIdentifiers[0x3750] = "Relative_Air_Humidity_Interior_Sender_System_Name"
+UDS_RDBI.dataIdentifiers[0x3751] = "Sensor_controlled_power_rear_lid_System_Name"
+UDS_RDBI.dataIdentifiers[0x3752] = "Battery_monitoring_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x3753] = "Air_conditioning_compressor_System_Name"
+UDS_RDBI.dataIdentifiers[0x3754] = "Control_module_for_auxiliary_blower_motors_System_Name"
+UDS_RDBI.dataIdentifiers[0x3755] = "High_beam_powermodule_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x3756] = "High_beam_powermodule_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x3757] = "Coolant_heater_System_Name"
+UDS_RDBI.dataIdentifiers[0x37a0] = "Electrically_adjustable_steering_column_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a1] = "Relative_humidity_sensor_in_fresh_air_intake_duct_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a2] = "Rear_spoiler_adjustment_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a3] = "Roof_blind_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a4] = "Motor_for_wind_deflector_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a5] = "Voltage_stabilizer_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a6] = "Switch_module_for_driver_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a7] = "Switch_module_for_front_passenger_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a8] = "Switch_module_for_rear_seat_driver_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37a9] = "Switch_module_for_rear_seat_front_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37aa] = "Switch_module_2_for_driver_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37ab] = "Switch_module_2_for_front_passenger_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37ac] = "Switch_module_2_for_rear_seat_front_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37ad] = "Compact_disc_database_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37b9] = "LED_headlamp_powermodule_2_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37ba] = "LED_headlamp_powermodule_2_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37bc] = "Multimedia_operating_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37be] = "Data_medium_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37bf] = "Analog_clock_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c0] = "Relative_Air_Humidity_Interior_Sender_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c1] = "Sensor_controlled_power_rear_lid_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c2] = "Battery_monitoring_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c3] = "Air_conditioning_compressor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c4] = "Control_module_for_auxiliary_blower_motors_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c5] = "High_beam_powermodule_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c6] = "High_beam_powermodule_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x37c7] = "Coolant_heater_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x5867] = "In_use_monitor_performance_ratio_1"
+UDS_RDBI.dataIdentifiers[0x5868] = "In_use_monitor_performance_ratio_2"
+UDS_RDBI.dataIdentifiers[0x5869] = "In_use_monitor_performance_ratio_3"
+UDS_RDBI.dataIdentifiers[0x6001] = "Control_unit_for_wiper_motor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6002] = "Rain_light_recognition_sensor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6003] = "Light_switch_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6004] = "Garage_door_opener_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6005] = "Garage_door_opener_operating_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6006] = "Ignition_key_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6007] = "Left_front_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6008] = "Right_front_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6009] = "Left_rear_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600a] = "LED_headlamp_powermodule_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600b] = "LED_headlamp_powermodule_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600c] = "LED_headlamp_powermodule_2_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600d] = "LED_headlamp_powermodule_2_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600e] = "Operating_and_display_unit_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x600f] = "Operating_and_display_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6010] = "Right_rear_seat_ventilation_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6011] = "Data_medium_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6012] = "Drivers_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6013] = "Front_passengers_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6014] = "Left_headlamp_power_output_stage_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6015] = "Right_headlamp_power_output_stage_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6016] = "Sensor_for_anti_theft_alarm_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6017] = "Rear_lid_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6018] = "Alarm_horn_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6019] = "Automatic_day_night_interior_mirror_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601a] = "Remote_control_auxiliary_heater_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601b] = "Fresh_air_blower_front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601c] = "Fresh_air_blower_back_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601d] = "Alternator_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601e] = "Interior_light_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x601f] = "Refrigerant_pressure_and_temperature_sender_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6020] = "Sun_roof_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6021] = "Steering_column_lock_actuator_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6022] = "Anti_theft_tilt_system_control_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6023] = "Tire_pressure_monitor_antenna_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6024] = "Heated_windshield_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6025] = "Rear_light_left_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6026] = "Ceiling_light_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6027] = "Left_front_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6028] = "Right_front_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6029] = "Control_module_for_auxiliary_air_heater_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602a] = "Belt Pretensioner left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602b] = "Belt Pretensioner right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602c] = "Occupant Detection_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602d] = "Selector_lever_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602e] = "NOx_sensor_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x602f] = "NOx_sensor_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6030] = "Ioniser_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6031] = "Multi_function_steering_wheel_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6032] = "Left_rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6033] = "Right_rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6034] = "Left_rear_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6035] = "Right_rear_massage_seat_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6036] = "Display_unit_1_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6037] = "Battery_monitoring_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6038] = "Roof_blind_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6039] = "Sun_roof_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603a] = "Steering_angle_sender_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603b] = "Lane_change_assistant 2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603c] = "Pitch_rate_sender_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603d] = "ESP_sensor_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603e] = "Electronic_ignition_lock_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x603f] = "Air_quality_sensor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6040] = "Display_unit_2_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6041] = "Telephone_handset_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6042] = "Chip_card_reader_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6043] = "Traffic_data_aerial_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6044] = "Hands_free_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6045] = "Telephone_handset_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6046] = "Display_unit_front_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6047] = "Multimedia_operating_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6048] = "Digital_sound_system_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6049] = "Electrically_adjustable_steering_column_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604a] = "Interface_for_external_multimedia_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604b] = "Relative_Air_Humidity_Interior_Sender_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604c] = "Drivers_door_rear_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604d] = "Passengers_rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604e] = "Sensor_controlled_power_rear_lid_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x604f] = "Camera_for_night_vision_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6050] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6051] = "Rear_spoiler_adjustment_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6052] = "Roof_blind_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6053] = "Motor_for_wind_deflector_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6054] = "Voltage_stabilizer_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6055] = "Switch_module_for_driver_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6056] = "Switch_module_for_front_passenger_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6057] = "Switch_module_for_rear_seat_driver_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6058] = "Switch_module_for_rear_seat_front_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6059] = "Switch_module_2_for_driver_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605a] = "Battery_charger_unit_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605b] = "Battery_charger_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605c] = "Battery_charger_unit_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605d] = "Air_conditioning_compressor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605e] = "Neck_heating_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x605f] = "Neck_heating_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6060] = "Switch_module_2_for_front_passenger_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6061] = "Switch_module_2_for_rear_seat_front_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6062] = "Compact_disc_database_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6063] = "Rear_climatronic_operating_and_display_unit_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6064] = "Rear_climatronic_operating_and_display_unit_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6065] = "Door_handle_front_left_Kessy_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6066] = "Door_handle_front_right_Kessy_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6067] = "Door_handle_rear_left_Kessy_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6068] = "Door_handle_rear_right_Kessy_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6069] = "Power_converter_DC_AC_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606a] = "Battery_monitoring_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606b] = "Matrix_headlamp_powermodule_1_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606c] = "Matrix_headlamp_powermodule_1_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606d] = "High_beam_powermodule_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606e] = "High_beam_powermodule_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x606f] = "Air_suspension_compressor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6070] = "Rear_brake_actuator_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6071] = "Rear_brake_actuator_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6072] = "Analog_clock_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6073] = "Rear_door_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6079] = "Data_medium_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607a] = "Operating_unit_center_console_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607b] = "Operating_unit_center_console_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607c] = "Operating_unit_center_console_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607d] = "Operating_unit_center_console_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607e] = "Interface_for_radiodisplay_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x607f] = "Parkassist_entry_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6086] = "Belt_pretensioner_3rd_row_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6087] = "Belt_pretensioner_3rd_row_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6088] = "Injection_valve_heater_control_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6089] = "Steering_column_switch_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608a] = "Brake_assistance_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608b] = "Trailer_articulation_angle_sensor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608c] = "Cup_holder_with_heater_and_cooling_element_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608d] = "Range_of_vision_sensing_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608e] = "Convenience_and_driver_assist_operating_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x608f] = "Cradle_rear_climatronic_operating_and_display_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6090] = "Trailer_weight_nose_weight_detection_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6091] = "Sensor_carbon_dioxide_concentration_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6092] = "Sensor_fine_dust_concentration_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6093] = "Volume_control_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6094] = "Belt_buckle_presenter_2nd_row_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6095] = "Belt_buckle_presenter_2nd_row_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6096] = "Operating_and_display_unit_6_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6097] = "Active_accelerator_pedal_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6098] = "Multimedia_operating_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6099] = "Display_unit_3_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609a] = "Display_unit_4_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609b] = "Display_unit_5_for_multimedia_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609c] = "Control_module_for_auxiliary_blower_motors_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609d] = "Operating_and_display_unit_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609e] = "Operating_and_display_unit_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x609f] = "Operating_and_display_unit_5_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a0] = "Side Sensor Driver Front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a1] = "Side Sensor Passenger Front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a2] = "Side Sensor Driver Rear_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a3] = "Side Sensor Passenger Rear_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a4] = "Front Sensor Driver_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a5] = "Front Sensor Passenger_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a6] = "Pedestrian Protection Driver_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a7] = "Pedestrian Protection Passenger_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a8] = "Rear Sensor Center_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60a9] = "Pedestrian Protection Center_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60aa] = "Pedestrian Protection Contact_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ab] = "Pedestrian_protection_driver_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ac] = "Pedestrian_protection_passenger_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ad] = "Central_sensor_XY_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ae] = "Refrigerant_pressure_and_temperature_sender_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60af] = "Refrigerant_pressure_and_temperature_sender_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b0] = "Switch_for_rear_multicontour_seat_driver_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b1] = "Valve_block_1_in_driver_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b2] = "Valve_block_2_in_driver_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b3] = "Valve_block_3_in_driver_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b4] = "Switch_for_rear_multicontour_seat_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b5] = "Valve_block_1_in_passenger_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b6] = "Valve_block_2_in_passenger_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b7] = "Valve_block_3_in_passenger_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b8] = "Switch_for_front_multicontour_seat_driver_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60b9] = "Valve_block_1_in_driver_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ba] = "Valve_block_2_in_driver_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60bb] = "Valve_block_3_in_driver_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60bc] = "Switch_for_front_multicontour_seat_passenger_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60bd] = "Valve_block_1_in_passenger_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60be] = "Valve_block_2_in_passenger_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60bf] = "Valve_block_3_in_passenger_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c0] = "Coolant_heater_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c1] = "Seat_backrest_fan_1_front_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c2] = "Seat_backrest_fan_2_front_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c3] = "Seat_cushion_fan_1_front_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c4] = "Seat_cushion_fan_2_front_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c5] = "Seat_backrest_fan_1_front_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c6] = "Seat_backrest_fan_2_front_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c7] = "Seat_cushion_fan_1_front_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c8] = "Seat_cushion_fan_2_front_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60c9] = "Operating_and_display_unit_1_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ca] = "Operating_and_display_unit_2_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60cb] = "Operating_and_display_unit_3_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60cc] = "Operating_and_display_unit_4_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60cd] = "Operating_and_display_unit_5_for_air_conditioning_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ce] = "Pedestrian_protection_left_hand_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60cf] = "Pedestrian_protection_right_hand_side_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d0] = "Battery_junction_box_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d1] = "Cell_module_controller_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d2] = "Cell_module_controller_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d3] = "Cell_module_controller_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d4] = "Cell_module_controller_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d5] = "Cell_module_controller_5_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d6] = "Cell_module_controller_6_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d7] = "Cell_module_controller_7_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d8] = "Cell_module_controller_8_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60d9] = "Cell_module_controller_9_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60da] = "Cell_module_controller_10_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60db] = "Cell_module_controller_11_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60dc] = "Cell_module_controller_12_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60dd] = "Seat_backrest_fan_1_rear_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60de] = "Seat_backrest_fan_2_rear_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60df] = "Seat_cushion_fan_1_rear_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e0] = "Seat_cushion_fan_2_rear_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e1] = "Seat_backrest_fan_1_rear_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e2] = "Seat_backrest_fan_2_rear_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e3] = "Seat_cushion_fan_1_rear_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e4] = "Seat_cushion_fan_2_rear_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e5] = "Auxiliary_blower_motor_control_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e6] = "Auxiliary_blower_motor_control_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e7] = "Infrared_sender_for_front_observation_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e8] = "Starter_generator_control_module_sub_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60e9] = "Media_player_1_sub_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ea] = "Media_player_2_sub_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60eb] = "Dedicated_short_range_communication_aerial_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ec] = "Refrigerant_pressure_and_temperature_sender_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ed] = "Refrigerant_pressure_and_temperature_sender_5_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ee] = "Refrigerant_pressure_and_temperature_sender_6_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ef] = "Air_coolant_actuator_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f0] = "Air_coolant_actuator_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f1] = "Cell_module_controller_13_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f2] = "Cell_module_controller_14_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f3] = "Cell_module_controller_15_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f5] = "Seat_heating_rear_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f6] = "LED_warning_indicator_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f7] = "Automatic_transmission_fluid_pump_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f8] = "Manual_transmission_fluid_pump_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60f9] = "Convenience_and_driver_assist_operating_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60fb] = "Air_coolant_actuator_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60fc] = "Valve_block_4_in_driver_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60fd] = "Valve_block_4_in_passenger_side_rear_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60fe] = "Valve_block_4_in_driver_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x60ff] = "Valve_block_4_in_passenger_side_front_seat_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6101] = "Rear_climatronic_operating_and_display_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6102] = "Refrigerant_expansion_valve_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6103] = "Refrigerant_expansion_valve_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6104] = "Refrigerant_expansion_valve_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6105] = "Refrigerant_shut_off_valve_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6106] = "Refrigerant_shut_off_valve_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6107] = "Refrigerant_shut_off_valve_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6108] = "Refrigerant_shut_off_valve_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6109] = "Refrigerant_shut_off_valve_5_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610a] = "Sunlight_sensor_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610b] = "Near_field_communication_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610c] = "Clutch_control_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610d] = "Electrical_charger_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610e] = "Rear_light_left_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x610f] = "Rear_light_right_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6110] = "Rear_light_right_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6111] = "Sunlight_sensor_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6112] = "Radiator_shutter_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6113] = "Radiator_shutter_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6114] = "Radiator_shutter_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6115] = "Radiator_shutter_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6118] = "Special_key_operating_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6119] = "Radio_interface_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611a] = "Video_self_protection_recorder_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611b] = "Special_vehicle_assist_interface_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611c] = "Electric_system_disconnection_diode_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611e] = "Belt_pretensioner_2nd_row_left_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x611f] = "Belt_pretensioner_2nd_row_right_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6120] = "Electrical_variable_camshaft_phasing_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6121] = "Electrical_variable_camshaft_phasing_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6122] = "Wireless_operating_unit_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6123] = "Wireless_operating_unit_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6124] = "Front_windshield_washer_pump_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6125] = "Air_quality_sensor_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6126] = "Fragrancing_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6127] = "Coolant_valve_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6128] = "Near_field_communication_control_module_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6129] = "Interior_monitoring_rear_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612a] = "Cooler_fan_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612b] = "Control_unit_heating_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612c] = "Control_unit_heating_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612d] = "Control_unit_heating_3_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612e] = "Control_unit_heating_4_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x612f] = "Operating_unit_drive_mode_selection_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6130] = "Side_sensor_a-pillar_driver_front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6131] = "Side_sensor_a-pillar_passenger_front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6132] = "Sensor_high_voltage_system_1_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6133] = "Side_sensor_b-pillar_driver_front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6134] = "Side_sensor_b-pillar_passenger_front_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6135] = "Multi_function_steering_wheel_control_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6136] = "Gear_selection_display_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6137] = "Cooler_fan_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6138] = "Gear_selector_control_module_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6139] = "Interior_light_module_2_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613a] = "Radio_control_center_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613b] = "Multimedia_extension_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613c] = "Control_unit_differential_lock_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613d] = "Control_unit_ride_control_system_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613e] = "Control_unit_hands_on_detection_steering_wheel_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x613f] = "Front_climatronic_operating_and_display_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6140] = "Auxiliary_display_unit_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6141] = "Card_reader_tv_tuner_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6142] = "Park_lock_actuator_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6143] = "Media_connector_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6144] = "Catalyst_heating_Coding_Values"
+UDS_RDBI.dataIdentifiers[0x6201] = "Control_unit_for_wiper_motor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6202] = "Rain_light_recognition_sensor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6203] = "Light_switch_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6204] = "Garage_door_opener_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6205] = "Garage_door_opener_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6206] = "Ignition_key_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6207] = "Left_front_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6208] = "Right_front_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6209] = "Left_rear_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620a] = "LED_headlamp_powermodule_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620b] = "LED_headlamp_powermodule_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620c] = "LED_headlamp_powermodule_2_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620d] = "LED_headlamp_powermodule_2_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620e] = "Operating_and_display_unit_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x620f] = "Operating_and_display_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6210] = "Right_rear_seat_ventilation_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6211] = "Data_medium_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6212] = "Drivers_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6213] = "Front_passengers_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6214] = "Left_headlamp_power_output_stage_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6215] = "Right_headlamp_power_output_stage_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6216] = "Sensor_for_anti_theft_alarm_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6217] = "Rear_lid_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6218] = "Alarm_horn_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6219] = "Automatic_day_night_interior_mirror_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621a] = "Remote_control_auxiliary_heater_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621b] = "Fresh_air_blower_front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621c] = "Fresh_air_blower_back_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621d] = "Alternator_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621e] = "Interior_light_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x621f] = "Refrigerant_pressure_and_temperature_sender_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6220] = "Sun_roof_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6221] = "Steering_column_lock_actuator_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6222] = "Anti_theft_tilt_system_control_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6223] = "Tire_pressure_monitor_antenna_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6224] = "Heated_windshield_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6225] = "Rear_light_left_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6226] = "Ceiling_light_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6227] = "Left_front_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6228] = "Right_front_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6229] = "Control_module_for_auxiliary_air_heater_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622a] = "Belt Pretensioner left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622b] = "Belt Pretensioner right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622c] = "Occupant Detection_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622d] = "Selector_lever_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622e] = "NOx_sensor_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x622f] = "NOx_sensor_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6230] = "Ioniser_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6231] = "Multi_function_steering_wheel_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6232] = "Left_rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6233] = "Right_rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6234] = "Left_rear_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6235] = "Right_rear_massage_seat_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6236] = "Display_unit_1_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6237] = "Battery_monitoring_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6238] = "Roof_blind_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6239] = "Sun_roof_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623a] = "Steering_angle_sender_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623b] = "Lane_change_assistant 2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623c] = "Pitch_rate_sender_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623d] = "ESP_sensor_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623e] = "Electronic_ignition_lock_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x623f] = "Air_quality_sensor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6240] = "Display_unit_2_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6241] = "Telephone_handset_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6242] = "Chip_card_reader_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6243] = "Traffic_data_aerial_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6244] = "Hands_free_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6245] = "Telephone_handset_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6246] = "Display_unit_front_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6247] = "Multimedia_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6248] = "Digital_sound_system_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6249] = "Electrically_adjustable_steering_column_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624a] = "Interface_for_external_multimedia_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624b] = "Relative_Air_Humidity_Interior_Sender_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624c] = "Drivers_door_rear_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624d] = "Passengers_rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624e] = "Sensor_controlled_power_rear_lid_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x624f] = "Camera_for_night_vision_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6250] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6251] = "Rear_spoiler_adjustment_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6252] = "Roof_blind_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6253] = "Motor_for_wind_deflector_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6254] = "Voltage_stabilizer_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6255] = "Switch_module_for_driver_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6256] = "Switch_module_for_front_passenger_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6257] = "Switch_module_for_rear_seat_driver_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6258] = "Switch_module_for_rear_seat_front_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6259] = "Switch_module_2_for_driver_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625a] = "Battery_charger_unit_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625b] = "Battery_charger_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625c] = "Battery_charger_unit_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625d] = "Air_conditioning_compressor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625e] = "Neck_heating_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x625f] = "Neck_heating_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6260] = "Switch_module_2_for_front_passenger_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6261] = "Switch_module_2_for_rear_seat_front_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6262] = "Compact_disc_database_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6263] = "Rear_climatronic_operating_and_display_unit_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6264] = "Rear_climatronic_operating_and_display_unit_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6265] = "Door_handle_front_left_Kessy_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6266] = "Door_handle_front_right_Kessy_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6267] = "Door_handle_rear_left_Kessy_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6268] = "Door_handle_rear_right_Kessy_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6269] = "Power_converter_DC_AC_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626a] = "Battery_monitoring_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626b] = "Matrix_headlamp_powermodule_1_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626c] = "Matrix_headlamp_powermodule_1_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626d] = "High_beam_powermodule_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626e] = "High_beam_powermodule_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x626f] = "Air_suspension_compressor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6270] = "Rear_brake_actuator_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6271] = "Rear_brake_actuator_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6272] = "Analog_clock_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6273] = "Rear_door_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6279] = "Data_medium_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627a] = "Operating_unit_center_console_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627b] = "Operating_unit_center_console_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627c] = "Operating_unit_center_console_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627d] = "Operating_unit_center_console_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627e] = "Interface_for_radiodisplay_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x627f] = "Parkassist_entry_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6286] = "Belt_pretensioner_3rd_row_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6287] = "Belt_pretensioner_3rd_row_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6288] = "Injection_valve_heater_control_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6289] = "Steering_column_switch_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628a] = "Brake_assistance_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628b] = "Trailer_articulation_angle_sensor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628c] = "Cup_holder_with_heater_and_cooling_element_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628d] = "Range_of_vision_sensing_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628e] = "Convenience_and_driver_assist_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x628f] = "Cradle_rear_climatronic_operating_and_display_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6290] = "Trailer_weight_nose_weight_detection_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6291] = "Sensor_carbon_dioxide_concentration_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6292] = "Sensor_fine_dust_concentration_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6293] = "Volume_control_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6294] = "Belt_buckle_presenter_2nd_row_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6295] = "Belt_buckle_presenter_2nd_row_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6296] = "Operating_and_display_unit_6_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6297] = "Active_accelerator_pedal_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6298] = "Multimedia_operating_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6299] = "Display_unit_3_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629a] = "Display_unit_4_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629b] = "Display_unit_5_for_multimedia_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629c] = "Control_module_for_auxiliary_blower_motors_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629d] = "Operating_and_display_unit_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629e] = "Operating_and_display_unit_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x629f] = "Operating_and_display_unit_5_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a0] = "Side Sensor Driver Front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a1] = "Side Sensor Passenger Front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a2] = "Side Sensor Driver Rear_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a3] = "Side Sensor Passenger Rear_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a4] = "Front Sensor Driver_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a5] = "Front Sensor Passenger_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a6] = "Pedestrian Protection Driver_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a7] = "Pedestrian Protection Passenger_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a8] = "Rear Sensor Center_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62a9] = "Pedestrian Protection Center_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62aa] = "Pedestrian Protection Contact_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ab] = "Pedestrian_protection_driver_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ac] = "Pedestrian_protection_passenger_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ad] = "Central_sensor_XY_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ae] = "Refrigerant_pressure_and_temperature_sender_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62af] = "Refrigerant_pressure_and_temperature_sender_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b0] = "Switch_for_rear_multicontour_seat_driver_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b1] = "Valve_block_1_in_driver_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b2] = "Valve_block_2_in_driver_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b3] = "Valve_block_3_in_driver_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b4] = "Switch_for_rear_multicontour_seat_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b5] = "Valve_block_1_in_passenger_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b6] = "Valve_block_2_in_passenger_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b7] = "Valve_block_3_in_passenger_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b8] = "Switch_for_front_multicontour_seat_driver_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62b9] = "Valve_block_1_in_driver_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ba] = "Valve_block_2_in_driver_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62bb] = "Valve_block_3_in_driver_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62bc] = "Switch_for_front_multicontour_seat_passenger_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62bd] = "Valve_block_1_in_passenger_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62be] = "Valve_block_2_in_passenger_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62bf] = "Valve_block_3_in_passenger_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c0] = "Coolant_heater_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c1] = "Seat_backrest_fan_1_front_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c2] = "Seat_backrest_fan_2_front_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c3] = "Seat_cushion_fan_1_front_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c4] = "Seat_cushion_fan_2_front_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c5] = "Seat_backrest_fan_1_front_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c6] = "Seat_backrest_fan_2_front_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c7] = "Seat_cushion_fan_1_front_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c8] = "Seat_cushion_fan_2_front_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62c9] = "Operating_and_display_unit_1_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ca] = "Operating_and_display_unit_2_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62cb] = "Operating_and_display_unit_3_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62cc] = "Operating_and_display_unit_4_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62cd] = "Operating_and_display_unit_5_for_air_conditioning_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ce] = "Pedestrian_protection_left_hand_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62cf] = "Pedestrian_protection_right_hand_side_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d0] = "Battery_junction_box_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d1] = "Cell_module_controller_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d2] = "Cell_module_controller_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d3] = "Cell_module_controller_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d4] = "Cell_module_controller_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d5] = "Cell_module_controller_5_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d6] = "Cell_module_controller_6_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d7] = "Cell_module_controller_7_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d8] = "Cell_module_controller_8_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62d9] = "Cell_module_controller_9_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62da] = "Cell_module_controller_10_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62db] = "Cell_module_controller_11_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62dc] = "Cell_module_controller_12_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62dd] = "Seat_backrest_fan_1_rear_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62de] = "Seat_backrest_fan_2_rear_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62df] = "Seat_cushion_fan_1_rear_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e0] = "Seat_cushion_fan_2_rear_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e1] = "Seat_backrest_fan_1_rear_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e2] = "Seat_backrest_fan_2_rear_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e3] = "Seat_cushion_fan_1_rear_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e4] = "Seat_cushion_fan_2_rear_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e5] = "Auxiliary_blower_motor_control_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e6] = "Auxiliary_blower_motor_control_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e7] = "Infrared_sender_for_front_observation_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e8] = "Starter_generator_control_module_sub_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62e9] = "Media_player_1_sub_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ea] = "Media_player_2_sub_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62eb] = "Dedicated_short_range_communication_aerial_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ec] = "Refrigerant_pressure_and_temperature_sender_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ed] = "Refrigerant_pressure_and_temperature_sender_5_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ee] = "Refrigerant_pressure_and_temperature_sender_6_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ef] = "Air_coolant_actuator_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f0] = "Air_coolant_actuator_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f1] = "Cell_module_controller_13_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f2] = "Cell_module_controller_14_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f3] = "Cell_module_controller_15_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f5] = "Seat_heating_rear_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f6] = "LED_warning_indicator_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f7] = "Automatic_transmission_fluid_pump_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f8] = "Manual_transmission_fluid_pump_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62f9] = "Convenience_and_driver_assist_operating_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62fb] = "Air_coolant_actuator_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62fc] = "Valve_block_4_in_driver_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62fd] = "Valve_block_4_in_passenger_side_rear_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62fe] = "Valve_block_4_in_driver_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x62ff] = "Valve_block_4_in_passenger_side_front_seat_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6301] = "Rear_climatronic_operating_and_display_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6302] = "Refrigerant_expansion_valve_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6303] = "Refrigerant_expansion_valve_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6304] = "Refrigerant_expansion_valve_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6305] = "Refrigerant_shut_off_valve_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6306] = "Refrigerant_shut_off_valve_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6307] = "Refrigerant_shut_off_valve_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6308] = "Refrigerant_shut_off_valve_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6309] = "Refrigerant_shut_off_valve_5_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630a] = "Sunlight_sensor_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630b] = "Near_field_communication_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630c] = "Clutch_control_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630d] = "Electrical_charger_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630e] = "Rear_light_left_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x630f] = "Rear_light_right_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6310] = "Rear_light_right_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6311] = "Sunlight_sensor_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6312] = "Radiator_shutter_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6313] = "Radiator_shutter_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6314] = "Radiator_shutter_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6315] = "Radiator_shutter_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6318] = "Special_key_operating_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6319] = "Radio_interface_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631a] = "Video_self_protection_recorder_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631b] = "Special_vehicle_assist_interface_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631c] = "Electric_system_disconnection_diode_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631e] = "Belt_pretensioner_2nd_row_left_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x631f] = "Belt_pretensioner_2nd_row_right_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6320] = "Electrical_variable_camshaft_phasing_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6321] = "Electrical_variable_camshaft_phasing_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6322] = "Wireless_operating_unit_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6323] = "Wireless_operating_unit_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6324] = "Front_windshield_washer_pump_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6325] = "Air_quality_sensor_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6326] = "Fragrancing_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6327] = "Coolant_valve_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6328] = "Near_field_communication_control_module_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6329] = "Interior_monitoring_rear_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632a] = "Cooler_fan_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632b] = "Control_unit_heating_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632c] = "Control_unit_heating_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632d] = "Control_unit_heating_3_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632e] = "Control_unit_heating_4_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x632f] = "Operating_unit_drive_mode_selection_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6330] = "Side_sensor_a-pillar_driver_front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6331] = "Side_sensor_a-pillar_passenger_front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6332] = "Sensor_high_voltage_system_1_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6333] = "Side_sensor_b-pillar_driver_front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6334] = "Side_sensor_b-pillar_passenger_front_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6335] = "Multi_function_steering_wheel_control_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6336] = "Gear_selection_display_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6337] = "Cooler_fan_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6338] = "Gear_selector_control_module_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6339] = "Interior_light_module_2_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633a] = "Radio_control_center_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633b] = "Multimedia_extension_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633c] = "Control_unit_differential_lock_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633d] = "Control_unit_ride_control_system_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633e] = "Control_unit_hands_on_detection_steering_wheel_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x633f] = "Front_climatronic_operating_and_display_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6340] = "Auxiliary_display_unit_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6341] = "Card_reader_tv_tuner_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6342] = "Park_lock_actuator_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6343] = "Media_connector_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6344] = "Catalyst_heating_Spare_Part_Number"
+UDS_RDBI.dataIdentifiers[0x6401] = "Control_unit_for_wiper_motor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6402] = "Rain_light_recognition_sensor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6403] = "Light_switch_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6404] = "Garage_door_opener_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6405] = "Garage_door_opener_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6406] = "Ignition_key_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6407] = "Left_front_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6408] = "Right_front_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6409] = "Left_rear_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640a] = "LED_headlamp_powermodule_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640b] = "LED_headlamp_powermodule_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640c] = "LED_headlamp_powermodule_2_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640d] = "LED_headlamp_powermodule_2_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640e] = "Operating_and_display_unit_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x640f] = "Operating_and_display_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6410] = "Right_rear_seat_ventilation_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6411] = "Data_medium_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6412] = "Drivers_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6413] = "Front_passengers_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6414] = "Left_headlamp_power_output_stage_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6415] = "Right_headlamp_power_output_stage_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6416] = "Sensor_for_anti_theft_alarm_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6417] = "Rear_lid_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6418] = "Alarm_horn_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6419] = "Automatic_day_night_interior_mirror_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641a] = "Remote_control_auxiliary_heater_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641b] = "Fresh_air_blower_front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641c] = "Fresh_air_blower_back_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641d] = "Alternator_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641e] = "Interior_light_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x641f] = "Refrigerant_pressure_and_temperature_sender_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6420] = "Sun_roof_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6421] = "Steering_column_lock_actuator_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6422] = "Anti_theft_tilt_system_control_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6423] = "Tire_pressure_monitor_antenna_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6424] = "Heated_windshield_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6425] = "Rear_light_left_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6426] = "Ceiling_light_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6427] = "Left_front_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6428] = "Right_front_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6429] = "Control_module_for_auxiliary_air_heater_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642a] = "Belt Pretensioner left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642b] = "Belt Pretensioner right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642c] = "Occupant Detection_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642d] = "Selector_lever_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642e] = "NOx_sensor_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x642f] = "NOx_sensor_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6430] = "Ioniser_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6431] = "Multi_function_steering_wheel_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6432] = "Left_rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6433] = "Right_rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6434] = "Left_rear_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6435] = "Right_rear_massage_seat_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6436] = "Display_unit_1_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6437] = "Battery_monitoring_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6438] = "Roof_blind_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6439] = "Sun_roof_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643a] = "Steering_angle_sender_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643b] = "Lane_change_assistant 2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643c] = "Pitch_rate_sender_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643d] = "ESP_sensor_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643e] = "Electronic_ignition_lock_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x643f] = "Air_quality_sensor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6440] = "Display_unit_2_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6441] = "Telephone_handset_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6442] = "Chip_card_reader_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6443] = "Traffic_data_aerial_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6444] = "Hands_free_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6445] = "Telephone_handset_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6446] = "Display_unit_front_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6447] = "Multimedia_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6448] = "Digital_sound_system_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6449] = "Electrically_adjustable_steering_column_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644a] = "Interface_for_external_multimedia_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644b] = "Relative_Air_Humidity_Interior_Sender_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644c] = "Drivers_door_rear_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644d] = "Passengers_rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644e] = "Sensor_controlled_power_rear_lid_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x644f] = "Camera_for_night_vision_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6450] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6451] = "Rear_spoiler_adjustment_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6452] = "Roof_blind_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6453] = "Motor_for_wind_deflector_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6454] = "Voltage_stabilizer_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6455] = "Switch_module_for_driver_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6456] = "Switch_module_for_front_passenger_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6457] = "Switch_module_for_rear_seat_driver_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6458] = "Switch_module_for_rear_seat_front_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6459] = "Switch_module_2_for_driver_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645a] = "Battery_charger_unit_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645b] = "Battery_charger_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645c] = "Battery_charger_unit_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645d] = "Air_conditioning_compressor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645e] = "Neck_heating_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x645f] = "Neck_heating_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6460] = "Switch_module_2_for_front_passenger_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6461] = "Switch_module_2_for_rear_seat_front_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6462] = "Compact_disc_database_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6463] = "Rear_climatronic_operating_and_display_unit_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6464] = "Rear_climatronic_operating_and_display_unit_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6465] = "Door_handle_front_left_Kessy_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6466] = "Door_handle_front_right_Kessy_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6467] = "Door_handle_rear_left_Kessy_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6468] = "Door_handle_rear_right_Kessy_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6469] = "Power_converter_DC_AC_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646a] = "Battery_monitoring_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646b] = "Matrix_headlamp_powermodule_1_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646c] = "Matrix_headlamp_powermodule_1_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646d] = "High_beam_powermodule_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646e] = "High_beam_powermodule_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x646f] = "Air_suspension_compressor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6470] = "Rear_brake_actuator_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6471] = "Rear_brake_actuator_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6472] = "Analog_clock_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6473] = "Rear_door_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6479] = "Data_medium_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647a] = "Operating_unit_center_console_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647b] = "Operating_unit_center_console_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647c] = "Operating_unit_center_console_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647d] = "Operating_unit_center_console_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647e] = "Interface_for_radiodisplay_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x647f] = "Parkassist_entry_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6486] = "Belt_pretensioner_3rd_row_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6487] = "Belt_pretensioner_3rd_row_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6488] = "Injection_valve_heater_control_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6489] = "Steering_column_switch_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648a] = "Brake_assistance_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648b] = "Trailer_articulation_angle_sensor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648c] = "Cup_holder_with_heater_and_cooling_element_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648d] = "Range_of_vision_sensing_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648e] = "Convenience_and_driver_assist_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x648f] = "Cradle_rear_climatronic_operating_and_display_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6490] = "Trailer_weight_nose_weight_detection_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6491] = "Sensor_carbon_dioxide_concentration_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6492] = "Sensor_fine_dust_concentration_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6493] = "Volume_control_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6494] = "Belt_buckle_presenter_2nd_row_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6495] = "Belt_buckle_presenter_2nd_row_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6496] = "Operating_and_display_unit_6_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6497] = "Active_accelerator_pedal_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6498] = "Multimedia_operating_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6499] = "Display_unit_3_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649a] = "Display_unit_4_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649b] = "Display_unit_5_for_multimedia_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649c] = "Control_module_for_auxiliary_blower_motors_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649d] = "Operating_and_display_unit_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649e] = "Operating_and_display_unit_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x649f] = "Operating_and_display_unit_5_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a0] = "Side Sensor Driver Front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a1] = "Side Sensor Passenger Front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a2] = "Side Sensor Driver Rear_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a3] = "Side Sensor Passenger Rear_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a4] = "Front Sensor Driver_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a5] = "Front Sensor Passenger_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a6] = "Pedestrian Protection Driver_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a7] = "Pedestrian Protection Passenger_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a8] = "Rear Sensor Center_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64a9] = "Pedestrian Protection Center_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64aa] = "Pedestrian Protection Contact_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ab] = "Pedestrian_protection_driver_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ac] = "Pedestrian_protection_passenger_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ad] = "Central_sensor_XY_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ae] = "Refrigerant_pressure_and_temperature_sender_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64af] = "Refrigerant_pressure_and_temperature_sender_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b0] = "Switch_for_rear_multicontour_seat_driver_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b1] = "Valve_block_1_in_driver_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b2] = "Valve_block_2_in_driver_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b3] = "Valve_block_3_in_driver_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b4] = "Switch_for_rear_multicontour_seat_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b5] = "Valve_block_1_in_passenger_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b6] = "Valve_block_2_in_passenger_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b7] = "Valve_block_3_in_passenger_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b8] = "Switch_for_front_multicontour_seat_driver_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64b9] = "Valve_block_1_in_driver_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ba] = "Valve_block_2_in_driver_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64bb] = "Valve_block_3_in_driver_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64bc] = "Switch_for_front_multicontour_seat_passenger_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64bd] = "Valve_block_1_in_passenger_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64be] = "Valve_block_2_in_passenger_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64bf] = "Valve_block_3_in_passenger_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c0] = "Coolant_heater_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c1] = "Seat_backrest_fan_1_front_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c2] = "Seat_backrest_fan_2_front_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c3] = "Seat_cushion_fan_1_front_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c4] = "Seat_cushion_fan_2_front_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c5] = "Seat_backrest_fan_1_front_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c6] = "Seat_backrest_fan_2_front_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c7] = "Seat_cushion_fan_1_front_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c8] = "Seat_cushion_fan_2_front_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64c9] = "Operating_and_display_unit_1_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ca] = "Operating_and_display_unit_2_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64cb] = "Operating_and_display_unit_3_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64cc] = "Operating_and_display_unit_4_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64cd] = "Operating_and_display_unit_5_for_air_conditioning_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ce] = "Pedestrian_protection_left_hand_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64cf] = "Pedestrian_protection_right_hand_side_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d0] = "Battery_junction_box_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d1] = "Cell_module_controller_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d2] = "Cell_module_controller_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d3] = "Cell_module_controller_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d4] = "Cell_module_controller_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d5] = "Cell_module_controller_5_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d6] = "Cell_module_controller_6_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d7] = "Cell_module_controller_7_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d8] = "Cell_module_controller_8_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64d9] = "Cell_module_controller_9_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64da] = "Cell_module_controller_10_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64db] = "Cell_module_controller_11_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64dc] = "Cell_module_controller_12_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64dd] = "Seat_backrest_fan_1_rear_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64de] = "Seat_backrest_fan_2_rear_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64df] = "Seat_cushion_fan_1_rear_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e0] = "Seat_cushion_fan_2_rear_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e1] = "Seat_backrest_fan_1_rear_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e2] = "Seat_backrest_fan_2_rear_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e3] = "Seat_cushion_fan_1_rear_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e4] = "Seat_cushion_fan_2_rear_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e5] = "Auxiliary_blower_motor_control_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e6] = "Auxiliary_blower_motor_control_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e7] = "Infrared_sender_for_front_observation_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e8] = "Starter_generator_control_module_sub_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64e9] = "Media_player_1_sub_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ea] = "Media_player_2_sub_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64eb] = "Dedicated_short_range_communication_aerial_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ec] = "Refrigerant_pressure_and_temperature_sender_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ed] = "Refrigerant_pressure_and_temperature_sender_5_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ee] = "Refrigerant_pressure_and_temperature_sender_6_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ef] = "Air_coolant_actuator_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f0] = "Air_coolant_actuator_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f1] = "Cell_module_controller_13_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f2] = "Cell_module_controller_14_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f3] = "Cell_module_controller_15_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f5] = "Seat_heating_rear_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f6] = "LED_warning_indicator_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f7] = "Automatic_transmission_fluid_pump_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f8] = "Manual_transmission_fluid_pump_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64f9] = "Convenience_and_driver_assist_operating_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64fb] = "Air_coolant_actuator_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64fc] = "Valve_block_4_in_driver_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64fd] = "Valve_block_4_in_passenger_side_rear_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64fe] = "Valve_block_4_in_driver_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x64ff] = "Valve_block_4_in_passenger_side_front_seat_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6501] = "Rear_climatronic_operating_and_display_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6502] = "Refrigerant_expansion_valve_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6503] = "Refrigerant_expansion_valve_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6504] = "Refrigerant_expansion_valve_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6505] = "Refrigerant_shut_off_valve_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6506] = "Refrigerant_shut_off_valve_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6507] = "Refrigerant_shut_off_valve_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6508] = "Refrigerant_shut_off_valve_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6509] = "Refrigerant_shut_off_valve_5_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650a] = "Sunlight_sensor_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650b] = "Near_field_communication_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650c] = "Clutch_control_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650d] = "Electrical_charger_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650e] = "Rear_light_left_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x650f] = "Rear_light_right_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6510] = "Rear_light_right_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6511] = "Sunlight_sensor_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6512] = "Radiator_shutter_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6513] = "Radiator_shutter_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6514] = "Radiator_shutter_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6515] = "Radiator_shutter_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6518] = "Special_key_operating_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6519] = "Radio_interface_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651a] = "Video_self_protection_recorder_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651b] = "Special_vehicle_assist_interface_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651c] = "Electric_system_disconnection_diode_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651e] = "Belt_pretensioner_2nd_row_left_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x651f] = "Belt_pretensioner_2nd_row_right_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6520] = "Electrical_variable_camshaft_phasing_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6521] = "Electrical_variable_camshaft_phasing_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6522] = "Wireless_operating_unit_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6523] = "Wireless_operating_unit_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6524] = "Front_windshield_washer_pump_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6525] = "Air_quality_sensor_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6526] = "Fragrancing_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6527] = "Coolant_valve_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6528] = "Near_field_communication_control_module_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6529] = "Interior_monitoring_rear_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652a] = "Cooler_fan_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652b] = "Control_unit_heating_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652c] = "Control_unit_heating_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652d] = "Control_unit_heating_3_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652e] = "Control_unit_heating_4_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x652f] = "Operating_unit_drive_mode_selection_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6530] = "Side_sensor_a-pillar_driver_front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6531] = "Side_sensor_a-pillar_passenger_front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6532] = "Sensor_high_voltage_system_1_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6533] = "Side_sensor_b-pillar_driver_front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6534] = "Side_sensor_b-pillar_passenger_front_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6535] = "Multi_function_steering_wheel_control_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6536] = "Gear_selection_display_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6537] = "Cooler_fan_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6538] = "Gear_selector_control_module_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6539] = "Interior_light_module_2_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653a] = "Radio_control_center_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653b] = "Multimedia_extension_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653c] = "Control_unit_differential_lock_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653d] = "Control_unit_ride_control_system_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653e] = "Control_unit_hands_on_detection_steering_wheel_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x653f] = "Front_climatronic_operating_and_display_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6540] = "Auxiliary_display_unit_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6541] = "Card_reader_tv_tuner_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6542] = "Park_lock_actuator_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6543] = "Media_connector_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6544] = "Catalyst_heating_Application_Software_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6601] = "Control_unit_for_wiper_motor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6602] = "Rain_light_recognition_sensor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6603] = "Light_switch_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6604] = "Garage_door_opener_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6605] = "Garage_door_opener_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6606] = "Ignition_key_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6607] = "Left_front_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6608] = "Right_front_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6609] = "Left_rear_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660a] = "LED_headlamp_powermodule_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660b] = "LED_headlamp_powermodule_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660c] = "LED_headlamp_powermodule_2_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660d] = "LED_headlamp_powermodule_2_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660e] = "Operating_and_display_unit_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x660f] = "Operating_and_display_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6610] = "Right_rear_seat_ventilation_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6611] = "Data_medium_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6612] = "Drivers_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6613] = "Front_passengers_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6614] = "Left_headlamp_power_output_stage_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6615] = "Right_headlamp_power_output_stage_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6616] = "Sensor_for_anti_theft_alarm_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6617] = "Rear_lid_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6618] = "Alarm_horn_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6619] = "Automatic_day_night_interior_mirror_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661a] = "Remote_control_auxiliary_heater_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661b] = "Fresh_air_blower_front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661c] = "Fresh_air_blower_back_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661d] = "Alternator_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661e] = "Interior_light_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x661f] = "Refrigerant_pressure_and_temperature_sender_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6620] = "Sun_roof_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6621] = "Steering_column_lock_actuator_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6622] = "Anti_theft_tilt_system_control_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6623] = "Tire_pressure_monitor_antenna_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6624] = "Heated_windshield_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6625] = "Rear_light_left_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6626] = "Ceiling_light_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6627] = "Left_front_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6628] = "Right_front_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6629] = "Control_module_for_auxiliary_air_heater_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662a] = "Belt Pretensioner left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662b] = "Belt Pretensioner right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662c] = "Occupant Detection_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662d] = "Selector_lever_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662e] = "NOx_sensor_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x662f] = "NOx_sensor_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6630] = "Ioniser_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6631] = "Multi_function_steering_wheel_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6632] = "Left_rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6633] = "Right_rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6634] = "Left_rear_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6635] = "Right_rear_massage_seat_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6636] = "Display_unit_1_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6637] = "Battery_monitoring_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6638] = "Roof_blind_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6639] = "Sun_roof_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663a] = "Steering_angle_sender_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663b] = "Lane_change_assistant 2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663c] = "Pitch_rate_sender_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663d] = "ESP_sensor_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663e] = "Electronic_ignition_lock_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x663f] = "Air_quality_sensor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6640] = "Display_unit_2_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6641] = "Telephone_handset_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6642] = "Chip_card_reader_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6643] = "Traffic_data_aerial_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6644] = "Hands_free_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6645] = "Telephone_handset_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6646] = "Display_unit_front_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6647] = "Multimedia_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6648] = "Digital_sound_system_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6649] = "Electrically_adjustable_steering_column_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664a] = "Interface_for_external_multimedia_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664b] = "Relative_Air_Humidity_Interior_Sender_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664c] = "Drivers_door_rear_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664d] = "Passengers_rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664e] = "Sensor_controlled_power_rear_lid_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x664f] = "Camera_for_night_vision_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6650] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6651] = "Rear_spoiler_adjustment_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6652] = "Roof_blind_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6653] = "Motor_for_wind_deflector_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6654] = "Voltage_stabilizer_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6655] = "Switch_module_for_driver_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6656] = "Switch_module_for_front_passenger_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6657] = "Switch_module_for_rear_seat_driver_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6658] = "Switch_module_for_rear_seat_front_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6659] = "Switch_module_2_for_driver_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665a] = "Battery_charger_unit_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665b] = "Battery_charger_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665c] = "Battery_charger_unit_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665d] = "Air_conditioning_compressor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665e] = "Neck_heating_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x665f] = "Neck_heating_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6660] = "Switch_module_2_for_front_passenger_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6661] = "Switch_module_2_for_rear_seat_front_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6662] = "Compact_disc_database_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6663] = "Rear_climatronic_operating_and_display_unit_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6664] = "Rear_climatronic_operating_and_display_unit_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6665] = "Door_handle_front_left_Kessy_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6666] = "Door_handle_front_right_Kessy_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6667] = "Door_handle_rear_left_Kessy_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6668] = "Door_handle_rear_right_Kessy_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6669] = "Power_converter_DC_AC_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666a] = "Battery_monitoring_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666b] = "Matrix_headlamp_powermodule_1_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666c] = "Matrix_headlamp_powermodule_1_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666d] = "High_beam_powermodule_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666e] = "High_beam_powermodule_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x666f] = "Air_suspension_compressor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6670] = "Rear_brake_actuator_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6671] = "Rear_brake_actuator_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6672] = "Analog_clock_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6673] = "Rear_door_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6679] = "Data_medium_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667a] = "Operating_unit_center_console_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667b] = "Operating_unit_center_console_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667c] = "Operating_unit_center_console_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667d] = "Operating_unit_center_console_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667e] = "Interface_for_radiodisplay_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x667f] = "Parkassist_entry_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6686] = "Belt_pretensioner_3rd_row_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6687] = "Belt_pretensioner_3rd_row_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6688] = "Injection_valve_heater_control_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6689] = "Steering_column_switch_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668a] = "Brake_assistance_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668b] = "Trailer_articulation_angle_sensor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668c] = "Cup_holder_with_heater_and_cooling_element_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668d] = "Range_of_vision_sensing_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668e] = "Convenience_and_driver_assist_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x668f] = "Cradle_rear_climatronic_operating_and_display_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6690] = "Trailer_weight_nose_weight_detection_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6691] = "Sensor_carbon_dioxide_concentration_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6692] = "Sensor_fine_dust_concentration_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6693] = "Volume_control_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6694] = "Belt_buckle_presenter_2nd_row_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6695] = "Belt_buckle_presenter_2nd_row_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6696] = "Operating_and_display_unit_6_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6697] = "Active_accelerator_pedal_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6698] = "Multimedia_operating_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6699] = "Display_unit_3_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669a] = "Display_unit_4_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669b] = "Display_unit_5_for_multimedia_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669c] = "Control_module_for_auxiliary_blower_motors_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669d] = "Operating_and_display_unit_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669e] = "Operating_and_display_unit_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x669f] = "Operating_and_display_unit_5_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a0] = "Side Sensor Driver Front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a1] = "Side Sensor Passenger Front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a2] = "Side Sensor Driver Rear_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a3] = "Side Sensor Passenger Rear_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a4] = "Front Sensor Driver_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a5] = "Front Sensor Passenger_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a6] = "Pedestrian Protection Driver_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a7] = "Pedestrian Protection Passenger_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a8] = "Rear Sensor Center_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66a9] = "Pedestrian Protection Center_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66aa] = "Pedestrian Protection Contact_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ab] = "Pedestrian_protection_driver_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ac] = "Pedestrian_protection_passenger_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ad] = "Central_sensor_XY_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ae] = "Refrigerant_pressure_and_temperature_sender_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66af] = "Refrigerant_pressure_and_temperature_sender_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b0] = "Switch_for_rear_multicontour_seat_driver_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b1] = "Valve_block_1_in_driver_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b2] = "Valve_block_2_in_driver_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b3] = "Valve_block_3_in_driver_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b4] = "Switch_for_rear_multicontour_seat_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b5] = "Valve_block_1_in_passenger_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b6] = "Valve_block_2_in_passenger_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b7] = "Valve_block_3_in_passenger_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b8] = "Switch_for_front_multicontour_seat_driver_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66b9] = "Valve_block_1_in_driver_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ba] = "Valve_block_2_in_driver_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66bb] = "Valve_block_3_in_driver_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66bc] = "Switch_for_front_multicontour_seat_passenger_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66bd] = "Valve_block_1_in_passenger_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66be] = "Valve_block_2_in_passenger_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66bf] = "Valve_block_3_in_passenger_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c0] = "Coolant_heater_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c1] = "Seat_backrest_fan_1_front_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c2] = "Seat_backrest_fan_2_front_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c3] = "Seat_cushion_fan_1_front_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c4] = "Seat_cushion_fan_2_front_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c5] = "Seat_backrest_fan_1_front_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c6] = "Seat_backrest_fan_2_front_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c7] = "Seat_cushion_fan_1_front_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c8] = "Seat_cushion_fan_2_front_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66c9] = "Operating_and_display_unit_1_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ca] = "Operating_and_display_unit_2_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66cb] = "Operating_and_display_unit_3_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66cc] = "Operating_and_display_unit_4_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66cd] = "Operating_and_display_unit_5_for_air_conditioning_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ce] = "Pedestrian_protection_left_hand_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66cf] = "Pedestrian_protection_right_hand_side_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d0] = "Battery_junction_box_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d1] = "Cell_module_controller_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d2] = "Cell_module_controller_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d3] = "Cell_module_controller_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d4] = "Cell_module_controller_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d5] = "Cell_module_controller_5_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d6] = "Cell_module_controller_6_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d7] = "Cell_module_controller_7_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d8] = "Cell_module_controller_8_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66d9] = "Cell_module_controller_9_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66da] = "Cell_module_controller_10_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66db] = "Cell_module_controller_11_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66dc] = "Cell_module_controller_12_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66dd] = "Seat_backrest_fan_1_rear_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66de] = "Seat_backrest_fan_2_rear_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66df] = "Seat_cushion_fan_1_rear_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e0] = "Seat_cushion_fan_2_rear_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e1] = "Seat_backrest_fan_1_rear_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e2] = "Seat_backrest_fan_2_rear_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e3] = "Seat_cushion_fan_1_rear_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e4] = "Seat_cushion_fan_2_rear_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e5] = "Auxiliary_blower_motor_control_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e6] = "Auxiliary_blower_motor_control_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e7] = "Infrared_sender_for_front_observation_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e8] = "Starter_generator_control_module_sub_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66e9] = "Media_player_1_sub_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ea] = "Media_player_2_sub_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66eb] = "Dedicated_short_range_communication_aerial_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ec] = "Refrigerant_pressure_and_temperature_sender_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ed] = "Refrigerant_pressure_and_temperature_sender_5_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ee] = "Refrigerant_pressure_and_temperature_sender_6_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ef] = "Air_coolant_actuator_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f0] = "Air_coolant_actuator_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f1] = "Cell_module_controller_13_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f2] = "Cell_module_controller_14_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f3] = "Cell_module_controller_15_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f5] = "Seat_heating_rear_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f6] = "LED_warning_indicator_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f7] = "Automatic_transmission_fluid_pump_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f8] = "Manual_transmission_fluid_pump_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66f9] = "Convenience_and_driver_assist_operating_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66fb] = "Air_coolant_actuator_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66fc] = "Valve_block_4_in_driver_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66fd] = "Valve_block_4_in_passenger_side_rear_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66fe] = "Valve_block_4_in_driver_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x66ff] = "Valve_block_4_in_passenger_side_front_seat_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6701] = "Rear_climatronic_operating_and_display_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6702] = "Refrigerant_expansion_valve_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6703] = "Refrigerant_expansion_valve_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6704] = "Refrigerant_expansion_valve_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6705] = "Refrigerant_shut_off_valve_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6706] = "Refrigerant_shut_off_valve_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6707] = "Refrigerant_shut_off_valve_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6708] = "Refrigerant_shut_off_valve_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6709] = "Refrigerant_shut_off_valve_5_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670a] = "Sunlight_sensor_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670b] = "Near_field_communication_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670c] = "Clutch_control_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670d] = "Electrical_charger_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670e] = "Rear_light_left_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x670f] = "Rear_light_right_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6710] = "Rear_light_right_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6711] = "Sunlight_sensor_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6712] = "Radiator_shutter_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6713] = "Radiator_shutter_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6714] = "Radiator_shutter_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6715] = "Radiator_shutter_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6718] = "Special_key_operating_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6719] = "Radio_interface_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671a] = "Video_self_protection_recorder_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671b] = "Special_vehicle_assist_interface_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671c] = "Electric_system_disconnection_diode_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671e] = "Belt_pretensioner_2nd_row_left_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x671f] = "Belt_pretensioner_2nd_row_right_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6720] = "Electrical_variable_camshaft_phasing_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6721] = "Electrical_variable_camshaft_phasing_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6722] = "Wireless_operating_unit_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6723] = "Wireless_operating_unit_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6724] = "Front_windshield_washer_pump_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6725] = "Air_quality_sensor_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6726] = "Fragrancing_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6727] = "Coolant_valve_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6728] = "Near_field_communication_control_module_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6729] = "Interior_monitoring_rear_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672a] = "Cooler_fan_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672b] = "Control_unit_heating_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672c] = "Control_unit_heating_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672d] = "Control_unit_heating_3_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672e] = "Control_unit_heating_4_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x672f] = "Operating_unit_drive_mode_selection_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6730] = "Side_sensor_a-pillar_driver_front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6731] = "Side_sensor_a-pillar_passenger_front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6732] = "Sensor_high_voltage_system_1_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6733] = "Side_sensor_b-pillar_driver_front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6734] = "Side_sensor_b-pillar_passenger_front_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6735] = "Multi_function_steering_wheel_control_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6736] = "Gear_selection_display_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6737] = "Cooler_fan_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6738] = "Gear_selector_control_module_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6739] = "Interior_light_module_2_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673a] = "Radio_control_center_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673b] = "Multimedia_extension_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673c] = "Control_unit_differential_lock_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673d] = "Control_unit_ride_control_system_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673e] = "Control_unit_hands_on_detection_steering_wheel_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x673f] = "Front_climatronic_operating_and_display_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6740] = "Auxiliary_display_unit_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6741] = "Card_reader_tv_tuner_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6742] = "Park_lock_actuator_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6743] = "Media_connector_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6744] = "Catalyst_heating_Hardware_Number"
+UDS_RDBI.dataIdentifiers[0x6801] = "Control_unit_for_wiper_motor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6802] = "Rain_light_recognition_sensor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6803] = "Light_switch_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6804] = "Garage_door_opener_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6805] = "Garage_door_opener_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6806] = "Ignition_key_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6807] = "Left_front_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6808] = "Right_front_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6809] = "Left_rear_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680a] = "LED_headlamp_powermodule_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680b] = "LED_headlamp_powermodule_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680c] = "LED_headlamp_powermodule_2_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680d] = "LED_headlamp_powermodule_2_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680e] = "Operating_and_display_unit_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x680f] = "Operating_and_display_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6810] = "Right_rear_seat_ventilation_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6811] = "Data_medium_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6812] = "Drivers_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6813] = "Front_passengers_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6814] = "Left_headlamp_power_output_stage_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6815] = "Right_headlamp_power_output_stage_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6816] = "Sensor_for_anti_theft_alarm_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6817] = "Rear_lid_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6818] = "Alarm_horn_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6819] = "Automatic_day_night_interior_mirror_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681a] = "Remote_control_auxiliary_heater_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681b] = "Fresh_air_blower_front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681c] = "Fresh_air_blower_back_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681d] = "Alternator_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681e] = "Interior_light_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x681f] = "Refrigerant_pressure_and_temperature_sender_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6820] = "Sun_roof_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6821] = "Steering_column_lock_actuator_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6822] = "Anti_theft_tilt_system_control_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6823] = "Tire_pressure_monitor_antenna_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6824] = "Heated_windshield_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6825] = "Rear_light_left_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6826] = "Ceiling_light_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6827] = "Left_front_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6828] = "Right_front_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6829] = "Control_module_for_auxiliary_air_heater_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682a] = "Belt Pretensioner left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682b] = "Belt Pretensioner right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682c] = "Occupant Detection_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682d] = "Selector_lever_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682e] = "NOx_sensor_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x682f] = "NOx_sensor_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6830] = "Ioniser_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6831] = "Multi_function_steering_wheel_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6832] = "Left_rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6833] = "Right_rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6834] = "Left_rear_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6835] = "Right_rear_massage_seat_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6836] = "Display_unit_1_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6837] = "Battery_monitoring_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6838] = "Roof_blind_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6839] = "Sun_roof_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683a] = "Steering_angle_sender_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683b] = "Lane_change_assistant 2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683c] = "Pitch_rate_sender_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683d] = "ESP_sensor_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683e] = "Electronic_ignition_lock_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x683f] = "Air_quality_sensor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6840] = "Display_unit_2_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6841] = "Telephone_handset_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6842] = "Chip_card_reader_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6843] = "Traffic_data_aerial_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6844] = "Hands_free_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6845] = "Telephone_handset_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6846] = "Display_unit_front_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6847] = "Multimedia_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6848] = "Digital_sound_system_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6849] = "Electrically_adjustable_steering_column_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684a] = "Interface_for_external_multimedia_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684b] = "Relative_Air_Humidity_Interior_Sender_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684c] = "Drivers_door_rear_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684d] = "Passengers_rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684e] = "Sensor_controlled_power_rear_lid_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x684f] = "Camera_for_night_vision_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6850] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6851] = "Rear_spoiler_adjustment_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6852] = "Roof_blind_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6853] = "Motor_for_wind_deflector_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6854] = "Voltage_stabilizer_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6855] = "Switch_module_for_driver_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6856] = "Switch_module_for_front_passenger_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6857] = "Switch_module_for_rear_seat_driver_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6858] = "Switch_module_for_rear_seat_front_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6859] = "Switch_module_2_for_driver_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685a] = "Battery_charger_unit_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685b] = "Battery_charger_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685c] = "Battery_charger_unit_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685d] = "Air_conditioning_compressor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685e] = "Neck_heating_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x685f] = "Neck_heating_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6860] = "Switch_module_2_for_front_passenger_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6861] = "Switch_module_2_for_rear_seat_front_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6862] = "Compact_disc_database_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6863] = "Rear_climatronic_operating_and_display_unit_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6864] = "Rear_climatronic_operating_and_display_unit_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6865] = "Door_handle_front_left_Kessy_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6866] = "Door_handle_front_right_Kessy_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6867] = "Door_handle_rear_left_Kessy_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6868] = "Door_handle_rear_right_Kessy_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6869] = "Power_converter_DC_AC_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686a] = "Battery_monitoring_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686b] = "Matrix_headlamp_powermodule_1_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686c] = "Matrix_headlamp_powermodule_1_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686d] = "High_beam_powermodule_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686e] = "High_beam_powermodule_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x686f] = "Air_suspension_compressor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6870] = "Rear_brake_actuator_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6871] = "Rear_brake_actuator_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6872] = "Analog_clock_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6873] = "Rear_door_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6879] = "Data_medium_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687a] = "Operating_unit_center_console_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687b] = "Operating_unit_center_console_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687c] = "Operating_unit_center_console_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687d] = "Operating_unit_center_console_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687e] = "Interface_for_radiodisplay_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x687f] = "Parkassist_entry_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6886] = "Belt_pretensioner_3rd_row_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6887] = "Belt_pretensioner_3rd_row_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6888] = "Injection_valve_heater_control_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6889] = "Steering_column_switch_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688a] = "Brake_assistance_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688b] = "Trailer_articulation_angle_sensor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688c] = "Cup_holder_with_heater_and_cooling_element_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688d] = "Range_of_vision_sensing_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688e] = "Convenience_and_driver_assist_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x688f] = "Cradle_rear_climatronic_operating_and_display_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6890] = "Trailer_weight_nose_weight_detection_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6891] = "Sensor_carbon_dioxide_concentration_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6892] = "Sensor_fine_dust_concentration_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6893] = "Volume_control_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6894] = "Belt_buckle_presenter_2nd_row_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6895] = "Belt_buckle_presenter_2nd_row_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6896] = "Operating_and_display_unit_6_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6897] = "Active_accelerator_pedal_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6898] = "Multimedia_operating_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6899] = "Display_unit_3_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689a] = "Display_unit_4_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689b] = "Display_unit_5_for_multimedia_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689c] = "Control_module_for_auxiliary_blower_motors_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689d] = "Operating_and_display_unit_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689e] = "Operating_and_display_unit_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x689f] = "Operating_and_display_unit_5_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a0] = "Side Sensor Driver Front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a1] = "Side Sensor Passenger Front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a2] = "Side Sensor Driver Rear_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a3] = "Side Sensor Passenger Rear_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a4] = "Front Sensor Driver_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a5] = "Front Sensor Passenger_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a6] = "Pedestrian Protection Driver_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a7] = "Pedestrian Protection Passenger_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a8] = "Rear Sensor Center_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68a9] = "Pedestrian Protection Center_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68aa] = "Pedestrian Protection Contact_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ab] = "Pedestrian_protection_driver_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ac] = "Pedestrian_protection_passenger_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ad] = "Central_sensor_XY_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ae] = "Refrigerant_pressure_and_temperature_sender_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68af] = "Refrigerant_pressure_and_temperature_sender_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b0] = "Switch_for_rear_multicontour_seat_driver_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b1] = "Valve_block_1_in_driver_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b2] = "Valve_block_2_in_driver_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b3] = "Valve_block_3_in_driver_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b4] = "Switch_for_rear_multicontour_seat_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b5] = "Valve_block_1_in_passenger_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b6] = "Valve_block_2_in_passenger_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b7] = "Valve_block_3_in_passenger_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b8] = "Switch_for_front_multicontour_seat_driver_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68b9] = "Valve_block_1_in_driver_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ba] = "Valve_block_2_in_driver_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68bb] = "Valve_block_3_in_driver_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68bc] = "Switch_for_front_multicontour_seat_passenger_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68bd] = "Valve_block_1_in_passenger_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68be] = "Valve_block_2_in_passenger_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68bf] = "Valve_block_3_in_passenger_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c0] = "Coolant_heater_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c1] = "Seat_backrest_fan_1_front_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c2] = "Seat_backrest_fan_2_front_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c3] = "Seat_cushion_fan_1_front_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c4] = "Seat_cushion_fan_2_front_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c5] = "Seat_backrest_fan_1_front_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c6] = "Seat_backrest_fan_2_front_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c7] = "Seat_cushion_fan_1_front_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c8] = "Seat_cushion_fan_2_front_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68c9] = "Operating_and_display_unit_1_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ca] = "Operating_and_display_unit_2_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68cb] = "Operating_and_display_unit_3_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68cc] = "Operating_and_display_unit_4_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68cd] = "Operating_and_display_unit_5_for_air_conditioning_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ce] = "Pedestrian_protection_left_hand_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68cf] = "Pedestrian_protection_right_hand_side_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d0] = "Battery_junction_box_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d1] = "Cell_module_controller_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d2] = "Cell_module_controller_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d3] = "Cell_module_controller_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d4] = "Cell_module_controller_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d5] = "Cell_module_controller_5_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d6] = "Cell_module_controller_6_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d7] = "Cell_module_controller_7_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d8] = "Cell_module_controller_8_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68d9] = "Cell_module_controller_9_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68da] = "Cell_module_controller_10_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68db] = "Cell_module_controller_11_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68dc] = "Cell_module_controller_12_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68dd] = "Seat_backrest_fan_1_rear_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68de] = "Seat_backrest_fan_2_rear_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68df] = "Seat_cushion_fan_1_rear_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e0] = "Seat_cushion_fan_2_rear_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e1] = "Seat_backrest_fan_1_rear_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e2] = "Seat_backrest_fan_2_rear_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e3] = "Seat_cushion_fan_1_rear_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e4] = "Seat_cushion_fan_2_rear_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e5] = "Auxiliary_blower_motor_control_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e6] = "Auxiliary_blower_motor_control_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e7] = "Infrared_sender_for_front_observation_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e8] = "Starter_generator_control_module_sub_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68e9] = "Media_player_1_sub_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ea] = "Media_player_2_sub_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68eb] = "Dedicated_short_range_communication_aerial_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ec] = "Refrigerant_pressure_and_temperature_sender_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ed] = "Refrigerant_pressure_and_temperature_sender_5_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ee] = "Refrigerant_pressure_and_temperature_sender_6_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ef] = "Air_coolant_actuator_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f0] = "Air_coolant_actuator_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f1] = "Cell_module_controller_13_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f2] = "Cell_module_controller_14_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f3] = "Cell_module_controller_15_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f5] = "Seat_heating_rear_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f6] = "LED_warning_indicator_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f7] = "Automatic_transmission_fluid_pump_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f8] = "Manual_transmission_fluid_pump_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68f9] = "Convenience_and_driver_assist_operating_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68fb] = "Air_coolant_actuator_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68fc] = "Valve_block_4_in_driver_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68fd] = "Valve_block_4_in_passenger_side_rear_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68fe] = "Valve_block_4_in_driver_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x68ff] = "Valve_block_4_in_passenger_side_front_seat_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6901] = "Rear_climatronic_operating_and_display_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6902] = "Refrigerant_expansion_valve_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6903] = "Refrigerant_expansion_valve_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6904] = "Refrigerant_expansion_valve_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6905] = "Refrigerant_shut_off_valve_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6906] = "Refrigerant_shut_off_valve_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6907] = "Refrigerant_shut_off_valve_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6908] = "Refrigerant_shut_off_valve_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6909] = "Refrigerant_shut_off_valve_5_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690a] = "Sunlight_sensor_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690b] = "Near_field_communication_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690c] = "Clutch_control_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690d] = "Electrical_charger_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690e] = "Rear_light_left_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x690f] = "Rear_light_right_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6910] = "Rear_light_right_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6911] = "Sunlight_sensor_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6912] = "Radiator_shutter_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6913] = "Radiator_shutter_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6914] = "Radiator_shutter_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6915] = "Radiator_shutter_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6918] = "Special_key_operating_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6919] = "Radio_interface_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691a] = "Video_self_protection_recorder_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691b] = "Special_vehicle_assist_interface_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691c] = "Electric_system_disconnection_diode_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691e] = "Belt_pretensioner_2nd_row_left_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x691f] = "Belt_pretensioner_2nd_row_right_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6920] = "Electrical_variable_camshaft_phasing_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6921] = "Electrical_variable_camshaft_phasing_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6922] = "Wireless_operating_unit_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6923] = "Wireless_operating_unit_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6924] = "Front_windshield_washer_pump_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6925] = "Air_quality_sensor_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6926] = "Fragrancing_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6927] = "Coolant_valve_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6928] = "Near_field_communication_control_module_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6929] = "Interior_monitoring_rear_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692a] = "Cooler_fan_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692b] = "Control_unit_heating_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692c] = "Control_unit_heating_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692d] = "Control_unit_heating_3_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692e] = "Control_unit_heating_4_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x692f] = "Operating_unit_drive_mode_selection_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6930] = "Side_sensor_a-pillar_driver_front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6931] = "Side_sensor_a-pillar_passenger_front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6932] = "Sensor_high_voltage_system_1_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6933] = "Side_sensor_b-pillar_driver_front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6934] = "Side_sensor_b-pillar_passenger_front_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6935] = "Multi_function_steering_wheel_control_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6936] = "Gear_selection_display_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6937] = "Cooler_fan_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6938] = "Gear_selector_control_module_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6939] = "Interior_light_module_2_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693a] = "Radio_control_center_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693b] = "Multimedia_extension_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693c] = "Control_unit_differential_lock_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693d] = "Control_unit_ride_control_system_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693e] = "Control_unit_hands_on_detection_steering_wheel_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x693f] = "Front_climatronic_operating_and_display_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6940] = "Auxiliary_display_unit_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6941] = "Card_reader_tv_tuner_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6942] = "Park_lock_actuator_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6943] = "Media_connector_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6944] = "Catalyst_heating_Hardware_Version_Number"
+UDS_RDBI.dataIdentifiers[0x6a01] = "Control_unit_for_wiper_motor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a02] = "Rain_light_recognition_sensor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a03] = "Light_switch_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a04] = "Garage_door_opener_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a05] = "Garage_door_opener_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a06] = "Ignition_key_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a07] = "Left_front_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a08] = "Right_front_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a09] = "Left_rear_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0a] = "LED_headlamp_powermodule_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0b] = "LED_headlamp_powermodule_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0c] = "LED_headlamp_powermodule_2_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0d] = "LED_headlamp_powermodule_2_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0e] = "Operating_and_display_unit_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a0f] = "Operating_and_display_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a10] = "Right_rear_seat_ventilation_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a11] = "Data_medium_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a12] = "Drivers_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a13] = "Front_passengers_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a14] = "Left_headlamp_power_output_stage_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a15] = "Right_headlamp_power_output_stage_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a16] = "Sensor_for_anti_theft_alarm_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a17] = "Rear_lid_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a18] = "Alarm_horn_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a19] = "Automatic_day_night_interior_mirror_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1a] = "Remote_control_auxiliary_heater_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1b] = "Fresh_air_blower_front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1c] = "Fresh_air_blower_back_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1d] = "Alternator_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1e] = "Interior_light_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a1f] = "Refrigerant_pressure_and_temperature_sender_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a20] = "Sun_roof_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a21] = "Steering_column_lock_actuator_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a22] = "Anti_theft_tilt_system_control_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a23] = "Tire_pressure_monitor_antenna_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a24] = "Heated_windshield_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a25] = "Rear_light_left_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a26] = "Ceiling_light_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a27] = "Left_front_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a28] = "Right_front_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a29] = "Control_module_for_auxiliary_air_heater_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2a] = "Belt Pretensioner left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2b] = "Belt Pretensioner right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2c] = "Occupant Detection_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2d] = "Selector_lever_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2e] = "NOx_sensor_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a2f] = "NOx_sensor_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a30] = "Ioniser_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a31] = "Multi_function_steering_wheel_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a32] = "Left_rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a33] = "Right_rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a34] = "Left_rear_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a35] = "Right_rear_massage_seat_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a36] = "Display_unit_1_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a37] = "Battery_monitoring_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a38] = "Roof_blind_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a39] = "Sun_roof_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3a] = "Steering_angle_sender_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3b] = "Lane_change_assistant 2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3c] = "Pitch_rate_sender_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3d] = "ESP_sensor_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3e] = "Electronic_ignition_lock_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a3f] = "Air_quality_sensor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a40] = "Display_unit_2_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a41] = "Telephone_handset_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a42] = "Chip_card_reader_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a43] = "Traffic_data_aerial_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a44] = "Hands_free_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a45] = "Telephone_handset_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a46] = "Display_unit_front_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a47] = "Multimedia_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a48] = "Digital_sound_system_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a49] = "Electrically_adjustable_steering_column_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4a] = "Interface_for_external_multimedia_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4b] = "Relative_Air_Humidity_Interior_Sender_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4c] = "Drivers_door_rear_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4d] = "Passengers_rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4e] = "Sensor_controlled_power_rear_lid_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a4f] = "Camera_for_night_vision_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a50] = "Relative_humidity_sensor_in_fresh_air_intake_duct_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a51] = "Rear_spoiler_adjustment_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a52] = "Roof_blind_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a53] = "Motor_for_wind_deflector_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a54] = "Voltage_stabilizer_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a55] = "Switch_module_for_driver_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a56] = "Switch_module_for_front_passenger_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a57] = "Switch_module_for_rear_seat_driver_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a58] = "Switch_module_for_rear_seat_front_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a59] = "Switch_module_2_for_driver_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5a] = "Battery_charger_unit_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5b] = "Battery_charger_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5c] = "Battery_charger_unit_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5d] = "Air_conditioning_compressor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5e] = "Neck_heating_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a5f] = "Neck_heating_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a60] = "Switch_module_2_for_front_passenger_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a61] = "Switch_module_2_for_rear_seat_front_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a62] = "Compact_disc_database_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a63] = "Rear_climatronic_operating_and_display_unit_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a64] = "Rear_climatronic_operating_and_display_unit_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a65] = "Door_handle_front_left_Kessy_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a66] = "Door_handle_front_right_Kessy_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a67] = "Door_handle_rear_left_Kessy_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a68] = "Door_handle_rear_right_Kessy_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a69] = "Power_converter_DC_AC_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6a] = "Battery_monitoring_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6b] = "Matrix_headlamp_powermodule_1_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6c] = "Matrix_headlamp_powermodule_1_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6d] = "High_beam_powermodule_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6e] = "High_beam_powermodule_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a6f] = "Air_suspension_compressor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a70] = "Rear_brake_actuator_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a71] = "Rear_brake_actuator_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a72] = "Analog_clock_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a73] = "Rear_door_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a79] = "Data_medium_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7a] = "Operating_unit_center_console_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7b] = "Operating_unit_center_console_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7c] = "Operating_unit_center_console_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7d] = "Operating_unit_center_console_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7e] = "Interface_for_radiodisplay_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a7f] = "Parkassist_entry_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a86] = "Belt_pretensioner_3rd_row_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a87] = "Belt_pretensioner_3rd_row_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a88] = "Injection_valve_heater_control_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a89] = "Steering_column_switch_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8a] = "Brake_assistance_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8b] = "Trailer_articulation_angle_sensor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8c] = "Cup_holder_with_heater_and_cooling_element_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8d] = "Range_of_vision_sensing_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8e] = "Convenience_and_driver_assist_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a8f] = "Cradle_rear_climatronic_operating_and_display_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a90] = "Trailer_weight_nose_weight_detection_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a91] = "Sensor_carbon_dioxide_concentration_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a92] = "Sensor_fine_dust_concentration_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a93] = "Volume_control_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a94] = "Belt_buckle_presenter_2nd_row_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a95] = "Belt_buckle_presenter_2nd_row_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a96] = "Operating_and_display_unit_6_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a97] = "Active_accelerator_pedal_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a98] = "Multimedia_operating_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a99] = "Display_unit_3_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9a] = "Display_unit_4_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9b] = "Display_unit_5_for_multimedia_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9c] = "Control_module_for_auxiliary_blower_motors_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9d] = "Operating_and_display_unit_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9e] = "Operating_and_display_unit_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6a9f] = "Operating_and_display_unit_5_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa0] = "Side Sensor Driver Front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa1] = "Side Sensor Passenger Front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa2] = "Side Sensor Driver Rear_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa3] = "Side Sensor Passenger Rear_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa4] = "Front Sensor Driver_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa5] = "Front Sensor Passenger_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa6] = "Pedestrian Protection Driver_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa7] = "Pedestrian Protection Passenger_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa8] = "Rear Sensor Center_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aa9] = "Pedestrian Protection Center_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aaa] = "Pedestrian Protection Contact_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aab] = "Pedestrian_protection_driver_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aac] = "Pedestrian_protection_passenger_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aad] = "Central_sensor_XY_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aae] = "Refrigerant_pressure_and_temperature_sender_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aaf] = "Refrigerant_pressure_and_temperature_sender_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab0] = "Switch_for_rear_multicontour_seat_driver_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab1] = "Valve_block_1_in_driver_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab2] = "Valve_block_2_in_driver_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab3] = "Valve_block_3_in_driver_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab4] = "Switch_for_rear_multicontour_seat_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab5] = "Valve_block_1_in_passenger_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab6] = "Valve_block_2_in_passenger_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab7] = "Valve_block_3_in_passenger_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab8] = "Switch_for_front_multicontour_seat_driver_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ab9] = "Valve_block_1_in_driver_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aba] = "Valve_block_2_in_driver_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6abb] = "Valve_block_3_in_driver_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6abc] = "Switch_for_front_multicontour_seat_passenger_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6abd] = "Valve_block_1_in_passenger_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6abe] = "Valve_block_2_in_passenger_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6abf] = "Valve_block_3_in_passenger_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac0] = "Coolant_heater_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac1] = "Seat_backrest_fan_1_front_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac2] = "Seat_backrest_fan_2_front_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac3] = "Seat_cushion_fan_1_front_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac4] = "Seat_cushion_fan_2_front_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac5] = "Seat_backrest_fan_1_front_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac6] = "Seat_backrest_fan_2_front_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac7] = "Seat_cushion_fan_1_front_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac8] = "Seat_cushion_fan_2_front_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ac9] = "Operating_and_display_unit_1_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aca] = "Operating_and_display_unit_2_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6acb] = "Operating_and_display_unit_3_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6acc] = "Operating_and_display_unit_4_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6acd] = "Operating_and_display_unit_5_for_air_conditioning_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ace] = "Pedestrian_protection_left_hand_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6acf] = "Pedestrian_protection_right_hand_side_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad0] = "Battery_junction_box_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad1] = "Cell_module_controller_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad2] = "Cell_module_controller_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad3] = "Cell_module_controller_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad4] = "Cell_module_controller_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad5] = "Cell_module_controller_5_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad6] = "Cell_module_controller_6_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad7] = "Cell_module_controller_7_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad8] = "Cell_module_controller_8_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ad9] = "Cell_module_controller_9_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ada] = "Cell_module_controller_10_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6adb] = "Cell_module_controller_11_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6adc] = "Cell_module_controller_12_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6add] = "Seat_backrest_fan_1_rear_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ade] = "Seat_backrest_fan_2_rear_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6adf] = "Seat_cushion_fan_1_rear_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae0] = "Seat_cushion_fan_2_rear_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae1] = "Seat_backrest_fan_1_rear_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae2] = "Seat_backrest_fan_2_rear_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae3] = "Seat_cushion_fan_1_rear_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae4] = "Seat_cushion_fan_2_rear_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae5] = "Auxiliary_blower_motor_control_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae6] = "Auxiliary_blower_motor_control_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae7] = "Infrared_sender_for_front_observation_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae8] = "Starter_generator_control_module_sub_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6ae9] = "Media_player_1_sub_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aea] = "Media_player_2_sub_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aeb] = "Dedicated_short_range_communication_aerial_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aec] = "Refrigerant_pressure_and_temperature_sender_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aed] = "Refrigerant_pressure_and_temperature_sender_5_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aee] = "Refrigerant_pressure_and_temperature_sender_6_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aef] = "Air_coolant_actuator_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af0] = "Air_coolant_actuator_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af1] = "Cell_module_controller_13_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af2] = "Cell_module_controller_14_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af3] = "Cell_module_controller_15_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af5] = "Seat_heating_rear_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af6] = "LED_warning_indicator_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af7] = "Automatic_transmission_fluid_pump_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af8] = "Manual_transmission_fluid_pump_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6af9] = "Convenience_and_driver_assist_operating_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6afb] = "Air_coolant_actuator_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6afc] = "Valve_block_4_in_driver_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6afd] = "Valve_block_4_in_passenger_side_rear_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6afe] = "Valve_block_4_in_driver_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6aff] = "Valve_block_4_in_passenger_side_front_seat_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b01] = "Rear_climatronic_operating_and_display_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b02] = "Refrigerant_expansion_valve_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b03] = "Refrigerant_expansion_valve_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b04] = "Refrigerant_expansion_valve_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b05] = "Refrigerant_shut_off_valve_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b06] = "Refrigerant_shut_off_valve_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b07] = "Refrigerant_shut_off_valve_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b08] = "Refrigerant_shut_off_valve_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b09] = "Refrigerant_shut_off_valve_5_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0a] = "Sunlight_sensor_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0b] = "Near_field_communication_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0c] = "Clutch_control_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0d] = "Electrical_charger_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0e] = "Rear_light_left_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b0f] = "Rear_light_right_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b10] = "Rear_light_right_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b11] = "Sunlight_sensor_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b12] = "Radiator_shutter_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b13] = "Radiator_shutter_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b14] = "Radiator_shutter_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b15] = "Radiator_shutter_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b18] = "Special_key_operating_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b19] = "Radio_interface_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1a] = "Video_self_protection_recorder_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1b] = "Special_vehicle_assist_interface_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1c] = "Electric_system_disconnection_diode_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1d] = "Cradle_rear_climatronic_operating_and_display_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1e] = "Belt_pretensioner_2nd_row_left_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b1f] = "Belt_pretensioner_2nd_row_right_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b20] = "Electrical_variable_camshaft_phasing_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b21] = "Electrical_variable_camshaft_phasing_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b22] = "Wireless_operating_unit_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b23] = "Wireless_operating_unit_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b24] = "Front_windshield_washer_pump_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b25] = "Air_quality_sensor_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b26] = "Fragrancing_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b27] = "Coolant_valve_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b28] = "Near_field_communication_control_module_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b29] = "Interior_monitoring_rear_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2a] = "Cooler_fan_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2b] = "Control_unit_heating_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2c] = "Control_unit_heating_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2d] = "Control_unit_heating_3_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2e] = "Control_unit_heating_4_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b2f] = "Operating_unit_drive_mode_selection_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b30] = "Side_sensor_a-pillar_driver_front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b31] = "Side_sensor_a-pillar_passenger_front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b32] = "Sensor_high_voltage_system_1_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b33] = "Side_sensor_b-pillar_driver_front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b34] = "Side_sensor_b-pillar_passenger_front_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b35] = "Multi_function_steering_wheel_control_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b36] = "Gear_selection_display_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b37] = "Cooler_fan_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b38] = "Gear_selector_control_module_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b39] = "Interior_light_module_2_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3a] = "Radio_control_center_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3b] = "Multimedia_extension_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3c] = "Control_unit_differential_lock_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3d] = "Control_unit_ride_control_system_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3e] = "Control_unit_hands_on_detection_steering_wheel_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b3f] = "Front_climatronic_operating_and_display_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b40] = "Auxiliary_display_unit_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b41] = "Card_reader_tv_tuner_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b42] = "Park_lock_actuator_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b43] = "Media_connector_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6b44] = "Catalyst_heating_Serial_Number"
+UDS_RDBI.dataIdentifiers[0x6c01] = "Control_unit_for_wiper_motor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c02] = "Rain_light_recognition_sensor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c03] = "Light_switch_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c04] = "Garage_door_opener_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c05] = "Garage_door_opener_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c06] = "Ignition_key_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c07] = "Left_front_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c08] = "Right_front_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c09] = "Left_rear_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0a] = "LED_headlamp_powermodule_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0b] = "LED_headlamp_powermodule_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0c] = "LED_headlamp_powermodule_2_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0d] = "LED_headlamp_powermodule_2_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0e] = "Operating_and_display_unit_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c0f] = "Operating_and_display_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c10] = "Right_rear_seat_ventilation_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c11] = "Data_medium_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c12] = "Drivers_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c13] = "Front_passengers_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c14] = "Left_headlamp_power_output_stage_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c15] = "Right_headlamp_power_output_stage_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c16] = "Sensor_for_anti_theft_alarm_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c17] = "Rear_lid_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c18] = "Alarm_horn_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c19] = "Automatic_day_night_interior_mirror_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1a] = "Remote_control_auxiliary_heater_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1b] = "Fresh_air_blower_front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1c] = "Fresh_air_blower_back_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1d] = "Alternator_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1e] = "Interior_light_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c1f] = "Refrigerant_pressure_and_temperature_sender_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c20] = "Sun_roof_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c21] = "Steering_column_lock_actuator_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c22] = "Anti_theft_tilt_system_control_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c23] = "Tire_pressure_monitor_antenna_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c24] = "Heated_windshield_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c25] = "Rear_light_left_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c26] = "Ceiling_light_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c27] = "Left_front_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c28] = "Right_front_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c29] = "Control_module_for_auxiliary_air_heater_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2a] = "Belt Pretensioner left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2b] = "Belt Pretensioner right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2c] = "Occupant Detection_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2d] = "Selector_lever_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2e] = "NOx_sensor_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c2f] = "NOx_sensor_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c30] = "Ioniser_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c31] = "Multi_function_steering_wheel_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c32] = "Left_rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c33] = "Right_rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c34] = "Left_rear_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c35] = "Right_rear_massage_seat_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c36] = "Display_unit_1_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c37] = "Battery_monitoring_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c38] = "Roof_blind_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c39] = "Sun_roof_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3a] = "Steering_angle_sender_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3b] = "Lane_change_assistant 2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3c] = "Pitch_rate_sender_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3d] = "ESP_sensor_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3e] = "Electronic_ignition_lock_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c3f] = "Air_quality_sensor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c40] = "Display_unit_2_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c41] = "Telephone_handset_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c42] = "Chip_card_reader_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c43] = "Traffic_data_aerial_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c44] = "Hands_free_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c45] = "Telephone_handset_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c46] = "Display_unit_front_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c47] = "Multimedia_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c48] = "Digital_sound_system_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c49] = "Electrically_adjustable_steering_column_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4a] = "Interface_for_external_multimedia_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4b] = "Relative_Air_Humidity_Interior_Sender_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4c] = "Drivers_door_rear_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4d] = "Passengers_rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4e] = "Sensor_controlled_power_rear_lid_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c4f] = "Camera_for_night_vision_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c50] = "Relative_humidity_sensor_in_fresh_air_intake_duct_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c51] = "Rear_spoiler_adjustment_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c52] = "Roof_blind_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c53] = "Motor_for_wind_deflector_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c54] = "Voltage_stabilizer_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c55] = "Switch_module_for_driver_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c56] = "Switch_module_for_front_passenger_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c57] = "Switch_module_for_rear_seat_driver_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c58] = "Switch_module_for_rear_seat_front_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c59] = "Switch_module_2_for_driver_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5a] = "Battery_charger_unit_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5b] = "Battery_charger_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5c] = "Battery_charger_unit_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5d] = "Air_conditioning_compressor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5e] = "Neck_heating_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c5f] = "Neck_heating_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c60] = "Switch_module_2_for_front_passenger_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c61] = "Switch_module_2_for_rear_seat_front_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c62] = "Compact_disc_database_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c63] = "Rear_climatronic_operating_and_display_unit_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c64] = "Rear_climatronic_operating_and_display_unit_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c65] = "Door_handle_front_left_Kessy_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c66] = "Door_handle_front_right_Kessy_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c67] = "Door_handle_rear_left_Kessy_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c68] = "Door_handle_rear_right_Kessy_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c69] = "Power_converter_DC_AC_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6a] = "Battery_monitoring_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6b] = "Matrix_headlamp_powermodule_1_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6c] = "Matrix_headlamp_powermodule_1_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6d] = "High_beam_powermodule_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6e] = "High_beam_powermodule_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c6f] = "Air_suspension_compressor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c70] = "Rear_brake_actuator_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c71] = "Rear_brake_actuator_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c72] = "Analog_clock_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c73] = "Rear_door_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c79] = "Data_medium_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7a] = "Operating_unit_center_console_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7b] = "Operating_unit_center_console_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7c] = "Operating_unit_center_console_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7d] = "Operating_unit_center_console_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7e] = "Interface_for_radiodisplay_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c7f] = "Parkassist_entry_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c86] = "Belt_pretensioner_3rd_row_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c87] = "Belt_pretensioner_3rd_row_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c88] = "Injection_valve_heater_control_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c89] = "Steering_column_switch_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8a] = "Brake_assistance_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8b] = "Trailer_articulation_angle_sensor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8c] = "Cup_holder_with_heater_and_cooling_element_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8d] = "Range_of_vision_sensing_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8e] = "Convenience_and_driver_assist_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c8f] = "Cradle_rear_climatronic_operating_and_display_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c90] = "Trailer_weight_nose_weight_detection_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c91] = "Sensor_carbon_dioxide_concentration_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c92] = "Sensor_fine_dust_concentration_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c93] = "Volume_control_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c94] = "Belt_buckle_presenter_2nd_row_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c95] = "Belt_buckle_presenter_2nd_row_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c96] = "Operating_and_display_unit_6_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c97] = "Active_accelerator_pedal_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c98] = "Multimedia_operating_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c99] = "Display_unit_3_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9a] = "Display_unit_4_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9b] = "Display_unit_5_for_multimedia_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9c] = "Control_module_for_auxiliary_blower_motors_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9d] = "Operating_and_display_unit_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9e] = "Operating_and_display_unit_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6c9f] = "Operating_and_display_unit_5_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca0] = "Side Sensor Driver Front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca1] = "Side Sensor Passenger Front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca2] = "Side Sensor Driver Rear_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca3] = "Side Sensor Passenger Rear_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca4] = "Front Sensor Driver_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca5] = "Front Sensor Passenger_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca6] = "Pedestrian Protection Driver_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca7] = "Pedestrian Protection Passenger_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca8] = "Rear Sensor Center_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ca9] = "Pedestrian Protection Center_System_Name"
+UDS_RDBI.dataIdentifiers[0x6caa] = "Pedestrian Protection Contact_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cab] = "Pedestrian_protection_driver_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cac] = "Pedestrian_protection_passenger_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cad] = "Central_sensor_XY_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cae] = "Refrigerant_pressure_and_temperature_sender_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6caf] = "Refrigerant_pressure_and_temperature_sender_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb0] = "Switch_for_rear_multicontour_seat_driver_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb1] = "Valve_block_1_in_driver_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb2] = "Valve_block_2_in_driver_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb3] = "Valve_block_3_in_driver_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb4] = "Switch_for_rear_multicontour_seat_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb5] = "Valve_block_1_in_passenger_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb6] = "Valve_block_2_in_passenger_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb7] = "Valve_block_3_in_passenger_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb8] = "Switch_for_front_multicontour_seat_driver_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cb9] = "Valve_block_1_in_driver_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cba] = "Valve_block_2_in_driver_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cbb] = "Valve_block_3_in_driver_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cbc] = "Switch_for_front_multicontour_seat_passenger_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cbd] = "Valve_block_1_in_passenger_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cbe] = "Valve_block_2_in_passenger_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cbf] = "Valve_block_3_in_passenger_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc0] = "Coolant_heater_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc1] = "Seat_backrest_fan_1_front_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc2] = "Seat_backrest_fan_2_front_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc3] = "Seat_cushion_fan_1_front_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc4] = "Seat_cushion_fan_2_front_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc5] = "Seat_backrest_fan_1_front_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc6] = "Seat_backrest_fan_2_front_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc7] = "Seat_cushion_fan_1_front_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc8] = "Seat_cushion_fan_2_front_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cc9] = "Operating_and_display_unit_1_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cca] = "Operating_and_display_unit_2_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ccb] = "Operating_and_display_unit_3_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ccc] = "Operating_and_display_unit_4_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ccd] = "Operating_and_display_unit_5_for_air_conditioning_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cce] = "Pedestrian_protection_left_hand_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ccf] = "Pedestrian_protection_right_hand_side_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd0] = "Battery_junction_box_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd1] = "Cell_module_controller_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd2] = "Cell_module_controller_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd3] = "Cell_module_controller_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd4] = "Cell_module_controller_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd5] = "Cell_module_controller_5_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd6] = "Cell_module_controller_6_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd7] = "Cell_module_controller_7_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd8] = "Cell_module_controller_8_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cd9] = "Cell_module_controller_9_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cda] = "Cell_module_controller_10_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cdb] = "Cell_module_controller_11_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cdc] = "Cell_module_controller_12_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cdd] = "Seat_backrest_fan_1_rear_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cde] = "Seat_backrest_fan_2_rear_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cdf] = "Seat_cushion_fan_1_rear_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce0] = "Seat_cushion_fan_2_rear_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce1] = "Seat_backrest_fan_1_rear_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce2] = "Seat_backrest_fan_2_rear_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce3] = "Seat_cushion_fan_1_rear_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce4] = "Seat_cushion_fan_2_rear_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce5] = "Auxiliary_blower_motor_control_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce6] = "Auxiliary_blower_motor_control_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce7] = "Infrared_sender_for_front_observation_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce8] = "Starter_generator_control_module_sub_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ce9] = "Media_player_1_sub_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cea] = "Media_player_2_sub_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ceb] = "Dedicated_short_range_communication_aerial_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cec] = "Refrigerant_pressure_and_temperature_sender_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6ced] = "Refrigerant_pressure_and_temperature_sender_5_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cee] = "Refrigerant_pressure_and_temperature_sender_6_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cef] = "Air_coolant_actuator_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf0] = "Air_coolant_actuator_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf1] = "Cell_module_controller_13_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf2] = "Cell_module_controller_14_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf3] = "Cell_module_controller_15_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf5] = "Seat_heating_rear_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf6] = "LED_warning_indicator_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf7] = "Automatic_transmission_fluid_pump_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf8] = "Manual_transmission_fluid_pump_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cf9] = "Convenience_and_driver_assist_operating_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cfb] = "Air_coolant_actuator_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cfc] = "Valve_block_4_in_driver_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cfd] = "Valve_block_4_in_passenger_side_rear_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cfe] = "Valve_block_4_in_driver_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6cff] = "Valve_block_4_in_passenger_side_front_seat_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d01] = "Rear_climatronic_operating_and_display_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d02] = "Refrigerant_expansion_valve_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d03] = "Refrigerant_expansion_valve_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d04] = "Refrigerant_expansion_valve_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d05] = "Refrigerant_shut_off_valve_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d06] = "Refrigerant_shut_off_valve_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d07] = "Refrigerant_shut_off_valve_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d08] = "Refrigerant_shut_off_valve_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d09] = "Refrigerant_shut_off_valve_5_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0a] = "Sunlight_sensor_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0b] = "Near_field_communication_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0c] = "Clutch_control_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0d] = "Electrical_charger_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0e] = "Rear_light_left_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d0f] = "Rear_light_right_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d10] = "Rear_light_right_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d11] = "Sunlight_sensor_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d12] = "Radiator_shutter_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d13] = "Radiator_shutter_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d14] = "Radiator_shutter_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d15] = "Radiator_shutter_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d18] = "Special_key_operating_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d19] = "Radio_interface_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1a] = "Video_self_protection_recorder_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1b] = "Special_vehicle_assist_interface_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1c] = "Electric_system_disconnection_diode_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1d] = "Cradle_rear_climatronic_operating_and_display_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1e] = "Belt_pretensioner_2nd_row_left_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d1f] = "Belt_pretensioner_2nd_row_right_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d20] = "Electrical_variable_camshaft_phasing_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d21] = "Electrical_variable_camshaft_phasing_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d22] = "Wireless_operating_unit_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d23] = "Wireless_operating_unit_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d24] = "Front_windshield_washer_pump_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d25] = "Air_quality_sensor_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d26] = "Fragrancing_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d27] = "Coolant_valve_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d28] = "Near_field_communication_control_module_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d29] = "Interior_monitoring_rear_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2a] = "Cooler_fan_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2b] = "Control_unit_heating_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2c] = "Control_unit_heating_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2d] = "Control_unit_heating_3_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2e] = "Control_unit_heating_4_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d2f] = "Operating_unit_drive_mode_selection_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d30] = "Side_sensor_a-pillar_driver_front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d31] = "Side_sensor_a-pillar_passenger_front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d32] = "Sensor_high_voltage_system_1_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d33] = "Side_sensor_b-pillar_driver_front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d34] = "Side_sensor_b-pillar_passenger_front_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d35] = "Multi_function_steering_wheel_control_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d36] = "Gear_selection_display_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d37] = "Cooler_fan_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d38] = "Gear_selector_control_module_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d39] = "Interior_light_module_2_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3a] = "Radio_control_center_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3b] = "Multimedia_extension_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3c] = "Control_unit_differential_lock_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3d] = "Control_unit_ride_control_system_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3e] = "Control_unit_hands_on_detection_steering_wheel_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d3f] = "Front_climatronic_operating_and_display_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d40] = "Auxiliary_display_unit_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d41] = "Card_reader_tv_tuner_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d42] = "Park_lock_actuator_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d43] = "Media_connector_System_Name"
+UDS_RDBI.dataIdentifiers[0x6d44] = "Catalyst_heating_System_Name"
+UDS_RDBI.dataIdentifiers[0x6e01] = "Control_unit_for_wiper_motor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e02] = "Rain_light_recognition_sensor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e03] = "Light_switch_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e04] = "Garage_door_opener_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e05] = "Garage_door_opener_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e06] = "Ignition_key_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e07] = "Left_front_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e08] = "Right_front_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e09] = "Left_rear_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0a] = "LED_headlamp_powermodule_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0b] = "LED_headlamp_powermodule_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0c] = "LED_headlamp_powermodule_2_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0d] = "LED_headlamp_powermodule_2_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0e] = "Operating_and_display_unit_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e0f] = "Operating_and_display_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e10] = "Right_rear_seat_ventilation_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e11] = "Data_medium_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e12] = "Drivers_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e13] = "Front_passengers_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e14] = "Left_headlamp_power_output_stage_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e15] = "Right_headlamp_power_output_stage_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e16] = "Sensor_for_anti_theft_alarm_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e17] = "Rear_lid_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e18] = "Alarm_horn_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e19] = "Automatic_day_night_interior_mirror_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1a] = "Remote_control_auxiliary_heater_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1b] = "Fresh_air_blower_front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1c] = "Fresh_air_blower_back_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1d] = "Alternator_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1e] = "Interior_light_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e1f] = "Refrigerant_pressure_and_temperature_sender_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e20] = "Sun_roof_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e21] = "Steering_column_lock_actuator_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e22] = "Anti_theft_tilt_system_control_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e23] = "Tire_pressure_monitor_antenna_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e24] = "Heated_windshield_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e25] = "Rear_light_left_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e26] = "Ceiling_light_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e27] = "Left_front_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e28] = "Right_front_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e29] = "Control_module_for_auxiliary_air_heater_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2a] = "Belt Pretensioner left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2b] = "Belt Pretensioner right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2c] = "Occupant Detection_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2d] = "Selector_lever_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2e] = "NOx_sensor_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e2f] = "NOx_sensor_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e30] = "Ioniser_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e31] = "Multi_function_steering_wheel_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e32] = "Left_rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e33] = "Right_rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e34] = "Left_rear_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e35] = "Right_rear_massage_seat_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e36] = "Display_unit_1_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e37] = "Battery_monitoring_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e38] = "Roof_blind_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e39] = "Sun_roof_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3a] = "Steering_angle_sender_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3b] = "Lane_change_assistant 2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3c] = "Pitch_rate_sender_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3d] = "ESP_sensor_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3e] = "Electronic_ignition_lock_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e3f] = "Air_quality_sensor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e40] = "Display_unit_2_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e41] = "Telephone_handset_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e42] = "Chip_card_reader_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e43] = "Traffic_data_aerial_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e44] = "Hands_free_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e45] = "Telephone_handset_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e46] = "Display_unit_front_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e47] = "Multimedia_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e48] = "Digital_sound_system_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e49] = "Electrically_adjustable_steering_column_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4a] = "Interface_for_external_multimedia_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4b] = "Relative_Air_Humidity_Interior_Sender_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4c] = "Drivers_door_rear_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4d] = "Passengers_rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4e] = "Sensor_controlled_power_rear_lid_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e4f] = "Camera_for_night_vision_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e50] = "Relative_humidity_sensor_in_fresh_air_intake_duct_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e51] = "Rear_spoiler_adjustment_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e52] = "Roof_blind_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e53] = "Motor_for_wind_deflector_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e54] = "Voltage_stabilizer_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e55] = "Switch_module_for_driver_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e56] = "Switch_module_for_front_passenger_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e57] = "Switch_module_for_rear_seat_driver_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e58] = "Switch_module_for_rear_seat_front_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e59] = "Switch_module_2_for_driver_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5a] = "Battery_charger_unit_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5b] = "Battery_charger_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5c] = "Battery_charger_unit_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5d] = "Air_conditioning_compressor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5e] = "Neck_heating_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e5f] = "Neck_heating_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e60] = "Switch_module_2_for_front_passenger_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e61] = "Switch_module_2_for_rear_seat_front_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e62] = "Compact_disc_database_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e63] = "Rear_climatronic_operating_and_display_unit_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e64] = "Rear_climatronic_operating_and_display_unit_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e65] = "Door_handle_front_left_Kessy_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e66] = "Door_handle_front_right_Kessy_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e67] = "Door_handle_rear_left_Kessy_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e68] = "Door_handle_rear_right_Kessy_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e69] = "Power_converter_DC_AC_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6a] = "Battery_monitoring_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6b] = "Matrix_headlamp_powermodule_1_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6c] = "Matrix_headlamp_powermodule_1_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6d] = "High_beam_powermodule_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6e] = "High_beam_powermodule_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e6f] = "Air_suspension_compressor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e70] = "Rear_brake_actuator_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e71] = "Rear_brake_actuator_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e72] = "Analog_clock_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e73] = "Rear_door_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e79] = "Data_medium_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7a] = "Operating_unit_center_console_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7b] = "Operating_unit_center_console_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7c] = "Operating_unit_center_console_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7d] = "Operating_unit_center_console_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7e] = "Interface_for_radiodisplay_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e7f] = "Parkassist_entry_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e86] = "Belt_pretensioner_3rd_row_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e87] = "Belt_pretensioner_3rd_row_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e88] = "Injection_valve_heater_control_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e89] = "Steering_column_switch_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8a] = "Brake_assistance_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8b] = "Trailer_articulation_angle_sensor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8c] = "Cup_holder_with_heater_and_cooling_element_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8d] = "Range_of_vision_sensing_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8e] = "Convenience_and_driver_assist_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e8f] = "Cradle_rear_climatronic_operating_and_display_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e90] = "Trailer_weight_nose_weight_detection_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e91] = "Sensor_carbon_dioxide_concentration_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e92] = "Sensor_fine_dust_concentration_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e93] = "Volume_control_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e94] = "Belt_buckle_presenter_2nd_row_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e95] = "Belt_buckle_presenter_2nd_row_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e96] = "Operating_and_display_unit_6_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e97] = "Active_accelerator_pedal_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e98] = "Multimedia_operating_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e99] = "Display_unit_3_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9a] = "Display_unit_4_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9b] = "Display_unit_5_for_multimedia_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9c] = "Control_module_for_auxiliary_blower_motors_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9d] = "Operating_and_display_unit_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9e] = "Operating_and_display_unit_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6e9f] = "Operating_and_display_unit_5_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea0] = "Side Sensor Driver Front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea1] = "Side Sensor Passenger Front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea2] = "Side Sensor Driver Rear_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea3] = "Side Sensor Passenger Rear_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea4] = "Front Sensor Driver_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea5] = "Front Sensor Passenger_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea6] = "Pedestrian Protection Driver_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea7] = "Pedestrian Protection Passenger_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea8] = "Rear Sensor Center_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ea9] = "Pedestrian Protection Center_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eaa] = "Pedestrian Protection Contact_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eab] = "Pedestrian_protection_driver_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eac] = "Pedestrian_protection_passenger_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ead] = "Central_sensor_XY_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eae] = "Refrigerant_pressure_and_temperature_sender_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eaf] = "Refrigerant_pressure_and_temperature_sender_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb0] = "Switch_for_rear_multicontour_seat_driver_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb1] = "Valve_block_1_in_driver_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb2] = "Valve_block_2_in_driver_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb3] = "Valve_block_3_in_driver_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb4] = "Switch_for_rear_multicontour_seat_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb5] = "Valve_block_1_in_passenger_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb6] = "Valve_block_2_in_passenger_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb7] = "Valve_block_3_in_passenger_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb8] = "Switch_for_front_multicontour_seat_driver_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eb9] = "Valve_block_1_in_driver_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eba] = "Valve_block_2_in_driver_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ebb] = "Valve_block_3_in_driver_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ebc] = "Switch_for_front_multicontour_seat_passenger_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ebd] = "Valve_block_1_in_passenger_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ebe] = "Valve_block_2_in_passenger_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ebf] = "Valve_block_3_in_passenger_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec0] = "Coolant_heater_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec1] = "Seat_backrest_fan_1_front_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec2] = "Seat_backrest_fan_2_front_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec3] = "Seat_cushion_fan_1_front_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec4] = "Seat_cushion_fan_2_front_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec5] = "Seat_backrest_fan_1_front_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec6] = "Seat_backrest_fan_2_front_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec7] = "Seat_cushion_fan_1_front_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec8] = "Seat_cushion_fan_2_front_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ec9] = "Operating_and_display_unit_1_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eca] = "Operating_and_display_unit_2_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ecb] = "Operating_and_display_unit_3_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ecc] = "Operating_and_display_unit_4_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ecd] = "Operating_and_display_unit_5_for_air_conditioning_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ece] = "Pedestrian_protection_left_hand_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ecf] = "Pedestrian_protection_right_hand_side_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed0] = "Battery_junction_box_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed1] = "Cell_module_controller_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed2] = "Cell_module_controller_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed3] = "Cell_module_controller_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed4] = "Cell_module_controller_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed5] = "Cell_module_controller_5_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed6] = "Cell_module_controller_6_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed7] = "Cell_module_controller_7_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed8] = "Cell_module_controller_8_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ed9] = "Cell_module_controller_9_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eda] = "Cell_module_controller_10_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6edb] = "Cell_module_controller_11_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6edc] = "Cell_module_controller_12_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6edd] = "Seat_backrest_fan_1_rear_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ede] = "Seat_backrest_fan_2_rear_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6edf] = "Seat_cushion_fan_1_rear_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee0] = "Seat_cushion_fan_2_rear_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee1] = "Seat_backrest_fan_1_rear_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee2] = "Seat_backrest_fan_2_rear_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee3] = "Seat_cushion_fan_1_rear_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee4] = "Seat_cushion_fan_2_rear_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee5] = "Auxiliary_blower_motor_control_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee6] = "Auxiliary_blower_motor_control_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee7] = "Infrared_sender_for_front_observation_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee8] = "Starter_generator_control_module_sub_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ee9] = "Media_player_1_sub_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eea] = "Media_player_2_sub_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eeb] = "Dedicated_short_range_communication_aerial_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eec] = "Refrigerant_pressure_and_temperature_sender_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eed] = "Refrigerant_pressure_and_temperature_sender_5_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eee] = "Refrigerant_pressure_and_temperature_sender_6_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eef] = "Air_coolant_actuator_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef0] = "Air_coolant_actuator_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef1] = "Cell_module_controller_13_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef2] = "Cell_module_controller_14_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef3] = "Cell_module_controller_15_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef5] = "Seat_heating_rear_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef6] = "LED_warning_indicator_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef7] = "Automatic_transmission_fluid_pump_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef8] = "Manual_transmission_fluid_pump_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6ef9] = "Convenience_and_driver_assist_operating_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6efb] = "Air_coolant_actuator_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6efc] = "Valve_block_4_in_driver_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6efd] = "Valve_block_4_in_passenger_side_rear_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6efe] = "Valve_block_4_in_driver_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6eff] = "Valve_block_4_in_passenger_side_front_seat_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f01] = "Rear_climatronic_operating_and_display_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f02] = "Refrigerant_expansion_valve_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f03] = "Refrigerant_expansion_valve_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f04] = "Refrigerant_expansion_valve_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f05] = "Refrigerant_shut_off_valve_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f06] = "Refrigerant_shut_off_valve_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f07] = "Refrigerant_shut_off_valve_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f08] = "Refrigerant_shut_off_valve_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f09] = "Refrigerant_shut_off_valve_5_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0a] = "Sunlight_sensor_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0b] = "Near_field_communication_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0c] = "Clutch_control_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0d] = "Electrical_charger_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0e] = "Rear_light_left_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f0f] = "Rear_light_right_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f10] = "Rear_light_right_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f11] = "Sunlight_sensor_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f12] = "Radiator_shutter_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f13] = "Radiator_shutter_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f14] = "Radiator_shutter_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f15] = "Radiator_shutter_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f18] = "Special_key_operating_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f19] = "Radio_interface_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1a] = "Video_self_protection_recorder_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1b] = "Special_vehicle_assist_interface_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1c] = "Electric_system_disconnection_diode_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1d] = "Cradle_rear_climatronic_operating_and_display_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1e] = "Belt_pretensioner_2nd_row_left_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f1f] = "Belt_pretensioner_2nd_row_right_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f20] = "Electrical_variable_camshaft_phasing_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f21] = "Electrical_variable_camshaft_phasing_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f22] = "Wireless_operating_unit_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f23] = "Wireless_operating_unit_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f24] = "Front_windshield_washer_pump_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f25] = "Air_quality_sensor_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f26] = "Fragrancing_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f27] = "Coolant_valve_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f28] = "Near_field_communication_control_module_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f29] = "Interior_monitoring_rear_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2a] = "Cooler_fan_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2b] = "Control_unit_heating_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2c] = "Control_unit_heating_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2d] = "Control_unit_heating_3_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2e] = "Control_unit_heating_4_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f2f] = "Operating_unit_drive_mode_selection_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f30] = "Side_sensor_a-pillar_driver_front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f31] = "Side_sensor_a-pillar_passenger_front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f32] = "Sensor_high_voltage_system_1_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f33] = "Side_sensor_b-pillar_driver_front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f34] = "Side_sensor_b-pillar_passenger_front_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f35] = "Multi_function_steering_wheel_control_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f36] = "Gear_selection_display_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f37] = "Cooler_fan_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f38] = "Gear_selector_control_module_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f39] = "Interior_light_module_2_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3a] = "Radio_control_center_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3b] = "Multimedia_extension_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3c] = "Control_unit_differential_lock_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3d] = "Control_unit_ride_control_system_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3e] = "Control_unit_hands_on_detection_steering_wheel_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f3f] = "Front_climatronic_operating_and_display_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f40] = "Auxiliary_display_unit_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f41] = "Card_reader_tv_tuner_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f42] = "Park_lock_actuator_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f43] = "Media_connector_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0x6f44] = "Catalyst_heating_VW_Slave_FAZIT_string"
+UDS_RDBI.dataIdentifiers[0xef90] = "Secure_hardware_extension_status"
+UDS_RDBI.dataIdentifiers[0xf15a] = "Fingerprint"
+UDS_RDBI.dataIdentifiers[0xf15b] = "Fingerprint And Programming Date Of Logical Software Blocks"
+UDS_RDBI.dataIdentifiers[0xf17c] = "VW FAZIT Identification String"
+UDS_RDBI.dataIdentifiers[0xf186] = "Active Diagnostic Session"
+UDS_RDBI.dataIdentifiers[0xf187] = "VW Spare Part Number"
+UDS_RDBI.dataIdentifiers[0xf189] = "VW Application Software Version Number"
+UDS_RDBI.dataIdentifiers[0xf18a] = "System Supplier Identifier"
+UDS_RDBI.dataIdentifiers[0xf18c] = "ECU Serial Number"
+UDS_RDBI.dataIdentifiers[0xf190] = "Vehicle Identification Number"
+UDS_RDBI.dataIdentifiers[0xf191] = "VW ECU Hardware Number"
+UDS_RDBI.dataIdentifiers[0xf192] = "System Supplier ECU Hardware Number"
+UDS_RDBI.dataIdentifiers[0xf193] = "System Supplier ECU Hardware Version Number"
+UDS_RDBI.dataIdentifiers[0xf194] = "System Supplier ECU Software Number"
+UDS_RDBI.dataIdentifiers[0xf195] = "System Supplier ECU Software Version Number"
+UDS_RDBI.dataIdentifiers[0xf197] = "VW System Name Or Engine Type"
+UDS_RDBI.dataIdentifiers[0xf19e] = "ASAM ODX File Identifier"
+UDS_RDBI.dataIdentifiers[0xf1a0] = "VW Data Set Number Or ECU Data Container Number"
+UDS_RDBI.dataIdentifiers[0xf1a1] = "VW Data Set Version Number"
+UDS_RDBI.dataIdentifiers[0xf1a2] = "ASAM ODX File Version"
+UDS_RDBI.dataIdentifiers[0xf1a3] = "VW ECU Hardware Version Number"
+UDS_RDBI.dataIdentifiers[0xf1aa] = "VW Workshop System Name"
+UDS_RDBI.dataIdentifiers[0xf1ab] = "VW Logical Software Block Version"
+UDS_RDBI.dataIdentifiers[0xf1ad] = "Engine Code Letters"
+UDS_RDBI.dataIdentifiers[0xf1af] = "AUTOSAR_standard_application_software_identification"
+UDS_RDBI.dataIdentifiers[0xf1b0] = "VWClear_diagnostic_information_date_functional"
+UDS_RDBI.dataIdentifiers[0xf1b1] = "VW_Application_data_set_identification"
+UDS_RDBI.dataIdentifiers[0xf1b2] = "Function_software_identification"
+UDS_RDBI.dataIdentifiers[0xf1b3] = "VW_Data_set_name"
+UDS_RDBI.dataIdentifiers[0xf1b5] = "Busmaster_description"
+UDS_RDBI.dataIdentifiers[0xf1b6] = "System_identification"
+UDS_RDBI.dataIdentifiers[0xf1b7] = "Gateway_component_list_ECU_node_address"
+UDS_RDBI.dataIdentifiers[0xf1d5] = "FDS_project_data"
+UDS_RDBI.dataIdentifiers[0xf1df] = "ECU Programming Information"
+
+
+UDS_RC.routineControlTypes[0x0202] = "Check Memory"
+UDS_RC.routineControlTypes[0x0203] = "Check Programming Preconditions"
+UDS_RC.routineControlTypes[0x0317] = "Reset of Adaption Values"
+UDS_RC.routineControlTypes[0x0366] = "Reset of all Adaptions"
+UDS_RC.routineControlTypes[0x03e7] = "Reset to Factory Settings"
+UDS_RC.routineControlTypes[0x045a] = "Clear user defined DTC information"
+UDS_RC.routineControlTypes[0x0544] = "Verify partial software checksum"
+UDS_RC.routineControlTypes[0x0594] = "Check upload preconditions"
+UDS_RC.routineControlTypes[0xff00] = "Erase Memory"
+UDS_RC.routineControlTypes[0xff01] = "Check Programming Dependencies"
+
+
+UDS_RD.dataFormatIdentifiers[0x0000] = "Uncompressed"
+UDS_RD.dataFormatIdentifiers[0x0001] = "Compression Method 1"
+UDS_RD.dataFormatIdentifiers[0x0002] = "Compression Method 2"
+UDS_RD.dataFormatIdentifiers[0x0003] = "Compression Method 3"
+UDS_RD.dataFormatIdentifiers[0x0004] = "Compression Method 4"
+UDS_RD.dataFormatIdentifiers[0x0005] = "Compression Method 5"
+UDS_RD.dataFormatIdentifiers[0x0006] = "Compression Method 6"
+UDS_RD.dataFormatIdentifiers[0x0007] = "Compression Method 7"
+UDS_RD.dataFormatIdentifiers[0x0008] = "Compression Method 8"
+UDS_RD.dataFormatIdentifiers[0x0009] = "Compression Method 9"
+UDS_RD.dataFormatIdentifiers[0x000a] = "Compression Method 10"
+UDS_RD.dataFormatIdentifiers[0x000b] = "Compression Method 11"
+UDS_RD.dataFormatIdentifiers[0x000c] = "Compression Method 12"
+UDS_RD.dataFormatIdentifiers[0x000d] = "Compression Method 13"
+UDS_RD.dataFormatIdentifiers[0x000e] = "Compression Method 14"
+UDS_RD.dataFormatIdentifiers[0x000f] = "Compression Method 15"

scapy-2.4.3.tar.gz/scapy/contrib/avs.py -> scapy-2.4.4.tar.gz/scapy/contrib/avs.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/bfd.py Added

@@ -0,0 +1,42 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Parag Bhide
+# This program is published under GPLv2 license
+
+"""
+BFD - Bidirectional Forwarding Detection - RFC 5880, 5881
+"""
+
+# scapy.contrib.description = BFD
+# scapy.contrib.status = loads
+
+from scapy.packet import Packet, bind_layers, bind_bottom_up
+from scapy.fields import BitField, FlagsField, XByteField
+from scapy.layers.inet import UDP
+
+
+class BFD(Packet):
+    name = "BFD"
+    fields_desc = [
+        BitField("version", 1, 3),
+        BitField("diag", 0, 5),
+        BitField("sta", 3, 2),
+        FlagsField("flags", 0x00, 6, ['P', 'F', 'C', 'A', 'D', 'M']),
+        XByteField("detect_mult", 0x03),
+        XByteField("len", 24),
+        BitField("my_discriminator", 0x11111111, 32),
+        BitField("your_discriminator", 0x22222222, 32),
+        BitField("min_tx_interval", 1000000000, 32),
+        BitField("min_rx_interval", 1000000000, 32),
+        BitField("echo_rx_interval", 1000000000, 32)]
+
+    def mysummary(self):
+        return self.sprintf(
+            "BFD (my_disc=%BFD.my_discriminator%,"
+            "your_disc=%BFD.my_discriminator%)"
+        )
+
+
+bind_bottom_up(UDP, BFD, dport=3784)
+bind_bottom_up(UDP, BFD, sport=3784)
+bind_layers(UDP, BFD, sport=3784, dport=3784)

scapy-2.4.3.tar.gz/scapy/contrib/bgp.py -> scapy-2.4.4.tar.gz/scapy/contrib/bgp.py Changed

@@ -35,7 +35,6 @@
                           MultiEnumField)
 from scapy.layers.inet import TCP
 from scapy.layers.inet6 import IP6Field
-from scapy.utils import issubtype
 from scapy.config import conf, ConfClass
 from scapy.compat import orb, chb
 from scapy.error import log_runtime
@@ -604,21 +603,6 @@
             raise _BGPInvalidDataException(err)
         return s
 
-    # Every BGP capability object inherits from BGPCapability.
-    def haslayer(self, cls):
-        if cls == "BGPCapability":
-            if isinstance(self, BGPCapability):
-                return True
-        elif issubtype(cls, BGPCapability):
-            if isinstance(self, cls):
-                return True
-        return super(BGPCapability, self).haslayer(cls)
-
-    def getlayer(self, cls, nb=1, _track=None, _subclass=True, **flt):
-        return super(BGPCapability, self).getlayer(
-            cls, nb=nb, _track=_track, _subclass=True, **flt
-        )
-
     def post_build(self, p, pay):
         length = 0
         if self.length is None:
@@ -635,6 +619,7 @@
     """
 
     name = "BGP Capability"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 0, _capabilities),
         FieldLenField("length", None, fmt="B", length_of="cap_data"),
@@ -655,6 +640,7 @@
     """
 
     name = "Multiprotocol Extensions for BGP-4"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, _capabilities),
         ByteField("length", 4),
@@ -763,6 +749,7 @@
     """
 
     name = "Outbound Route Filtering Capability"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 3, _capabilities),
         ByteField("length", None),
@@ -800,6 +787,7 @@
                        ByteEnumField("flags", 0, gr_address_family_flags)]
 
     name = "Graceful Restart Capability"
+    match_subclass = True
     fields_desc = [ByteEnumField("code", 64, _capabilities),
                    ByteField("length", None),
                    BitField("restart_flags", 0, 4),
@@ -819,6 +807,7 @@
     """
 
     name = "Support for 4-octet AS number capability"
+    match_subclass = True
     fields_desc = [ByteEnumField("code", 65, _capabilities),
                    ByteField("length", 4),
                    IntField("asn", 0)]

scapy-2.4.3.tar.gz/scapy/contrib/bp.py -> scapy-2.4.4.tar.gz/scapy/contrib/bp.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/cansocket.py -> scapy-2.4.4.tar.gz/scapy/contrib/cansocket.py Changed

@@ -21,22 +21,27 @@
     if conf.contribs['CANSocket']['use-python-can']:
         from can import BusABC as can_BusABC    # noqa: F401
         PYTHON_CAN = True
+    else:
+        PYTHON_CAN = False
 except ImportError:
     log_loading.info("Can't import python-can.")
 except KeyError:
-    log_loading.info("Specify 'conf.contribs['CANSocket'] = "
-                     "{'use-python-can': True}' to enable python-can.")
+    log_loading.info("Configuration 'conf.contribs['CANSocket'] not found.")
 
 
 if PYTHON_CAN:
-    from scapy.contrib.cansocket_python_can import (CANSocket,   # noqa: F401
-                                                    srcan, CAN_FRAME_SIZE, CAN_INV_FILTER)  # noqa: E501
-elif LINUX and six.PY3:
-    log_loading.info("Use native CANSocket. Specify "
-                     "'conf.contribs['CANSocket'] = "
-                     "{'use-python-can': True}' to enable python-can.")
-    from scapy.contrib.cansocket_native import (CANSocket,   # noqa: F401
-                                                srcan, CAN_FRAME_SIZE, CAN_INV_FILTER)  # noqa: E501
+    log_loading.info("Using python-can CANSocket.")
+    log_loading.info("Specify 'conf.contribs['CANSocket'] = "
+                     "{'use-python-can': False}' to enable native CANSockets.")
+    from scapy.contrib.cansocket_python_can import (PythonCANSocket, CANSocket, CAN_FRAME_SIZE, CAN_INV_FILTER)  # noqa: E501 F401
+
+elif LINUX and six.PY3 and not conf.use_pypy:
+    log_loading.info("Using native CANSocket.")
+    log_loading.info("Specify 'conf.contribs['CANSocket'] = "
+                     "{'use-python-can': True}' "
+                     "to enable python-can CANSockets.")
+    from scapy.contrib.cansocket_native import (NativeCANSocket, CANSocket, CAN_FRAME_SIZE, CAN_INV_FILTER)  # noqa: E501 F401
+
 else:
     log_loading.info("No CAN support available. Install python-can or "
                      "use Linux and python3.")

scapy-2.4.3.tar.gz/scapy/contrib/cansocket_native.py -> scapy-2.4.4.tar.gz/scapy/contrib/cansocket_native.py Changed

@@ -7,7 +7,7 @@
 # scapy.contrib.status = loads
 
 """
-Native CANSocket.
+NativeCANSocket.
 """
 
 import struct
@@ -20,22 +20,28 @@
 from scapy.packet import Padding
 from scapy.arch.linux import get_last_packet_timestamp
 
-conf.contribs['NativeCANSocket'] = {'iface': "can0"}
+conf.contribs['NativeCANSocket'] = {'channel': "can0"}
 
 CAN_FRAME_SIZE = 16
 CAN_INV_FILTER = 0x20000000
 
 
-class CANSocket(SuperSocket):
+class NativeCANSocket(SuperSocket):
     desc = "read/write packets at a given CAN interface using PF_CAN sockets"
-    nonblocking_socket = True
 
-    def __init__(self, iface=None, receive_own_messages=False,
-                 can_filters=None, remove_padding=True, basecls=CAN):
+    def __init__(self, channel=None, receive_own_messages=False,
+                 can_filters=None, remove_padding=True, basecls=CAN, **kwargs):
+        bustype = kwargs.pop("bustype", None)
+        if bustype and bustype != "socketcan":
+            warning("You created a NativeCANSocket. "
+                    "If you're providing the argument 'bustype', please use "
+                    "the correct one to achieve compatibility with python-can"
+                    "/PythonCANSocket. \n'bustype=socketcan'")
+
         self.basecls = basecls
         self.remove_padding = remove_padding
-        self.iface = conf.contribs['NativeCANSocket']['iface'] if \
-            iface is None else iface
+        self.channel = conf.contribs['NativeCANSocket']['channel'] if \
+            channel is None else channel
         self.ins = socket.socket(socket.PF_CAN,
                                  socket.SOCK_RAW,
                                  socket.CAN_RAW)
@@ -44,8 +50,9 @@
                                 socket.CAN_RAW_RECV_OWN_MSGS,
                                 struct.pack("i", receive_own_messages))
         except Exception as exception:
-            Scapy_Exception("Could not modify receive own messages (%s)",
-                            exception)
+            raise Scapy_Exception(
+                "Could not modify receive own messages (%s)", exception
+            )
 
         if can_filters is None:
             can_filters = [{
@@ -63,7 +70,7 @@
                             socket.CAN_RAW_FILTER,
                             struct.pack(can_filter_fmt, *filter_data))
 
-        self.ins.bind((self.iface,))
+        self.ins.bind((self.channel,))
         self.outs = self.ins
 
     def recv(self, x=CAN_FRAME_SIZE):
@@ -82,7 +89,9 @@
 
         # need to change the byte order of the first four bytes,
         # required by the underlying Linux SocketCAN frame format
-        pkt = struct.pack("<I12s", *struct.unpack(">I12s", pkt))
+        if not conf.contribs['CAN']['swap-bytes']:
+            pkt = struct.pack("<I12s", *struct.unpack(">I12s", pkt))
+
         len = pkt[4]
         canpkt = self.basecls(pkt[:len + 8])
         canpkt.time = get_last_packet_timestamp(self.ins)
@@ -99,8 +108,9 @@
             # need to change the byte order of the first four bytes,
             # required by the underlying Linux SocketCAN frame format
             bs = bytes(x)
-            bs = bs + b'\x00' * (CAN_FRAME_SIZE - len(bs))
-            bs = struct.pack("<I12s", *struct.unpack(">I12s", bs))
+            if not conf.contribs['CAN']['swap-bytes']:
+                bs = bs + b'\x00' * (CAN_FRAME_SIZE - len(bs))
+                bs = struct.pack("<I12s", *struct.unpack(">I12s", bs))
             return SuperSocket.send(self, bs)
         except socket.error as msg:
             raise msg
@@ -109,11 +119,4 @@
         self.ins.close()
 
 
-@conf.commands.register
-def srcan(pkt, iface=None, receive_own_messages=False,
-          canfilter=None, basecls=CAN, *args, **kargs):
-    s = CANSocket(iface, receive_own_messages=receive_own_messages,
-                  can_filters=canfilter, basecls=basecls)
-    a, b = s.sr(pkt, *args, **kargs)
-    s.close()
-    return a, b
+CANSocket = NativeCANSocket

scapy-2.4.3.tar.gz/scapy/contrib/cansocket_python_can.py -> scapy-2.4.4.tar.gz/scapy/contrib/cansocket_python_can.py Changed

@@ -12,38 +12,146 @@
 
 import time
 import struct
+import threading
+import copy
+
+from functools import reduce
+from operator import add
+
 from scapy.config import conf
 from scapy.supersocket import SuperSocket
-from scapy.error import warning
 from scapy.layers.can import CAN
-from can import BusABC as can_BusABC
+from scapy.error import warning
+from scapy.modules.six.moves import queue
 from can import Message as can_Message
-from can import CanError as can_Error
+from can import CanError as can_CanError
+from can import BusABC as can_BusABC
+from can.interface import Bus as can_Bus
+
 
 CAN_FRAME_SIZE = 16
 CAN_INV_FILTER = 0x20000000
 
 
-class CANSocket(SuperSocket):
-    nonblocking_socket = True
+class SocketMapper:
+    def __init__(self, bus, sockets):
+        self.bus = bus           # type: can_BusABC
+        self.sockets = sockets   # type: list[SocketWrapper]
+
+    def mux(self):
+        while True:
+            try:
+                msg = self.bus.recv(timeout=0)
+                if msg is None:
+                    return
+                for sock in self.sockets:
+                    if sock._matches_filters(msg):
+                        sock.rx_queue.put(copy.copy(msg))
+            except Exception as e:
+                warning("[MUX] python-can exception caught: %s" % e)
+
+
+class SocketsPool(object):
+    __instance = None
+
+    def __new__(cls):
+        if SocketsPool.__instance is None:
+            SocketsPool.__instance = object.__new__(cls)
+            SocketsPool.__instance.pool = dict()
+            SocketsPool.__instance.pool_mutex = threading.Lock()
+        return SocketsPool.__instance
+
+    def internal_send(self, sender, msg):
+        with self.pool_mutex:
+            try:
+                mapper = self.pool[sender.name]
+                mapper.bus.send(msg)
+                for sock in mapper.sockets:
+                    if sock == sender:
+                        continue
+                    if not sock._matches_filters(msg):
+                        continue
+
+                    m = copy.copy(msg)
+                    m.timestamp = time.time()
+                    sock.rx_queue.put(m)
+            except KeyError:
+                warning("[SND] Socket %s not found in pool" % sender.name)
+            except can_CanError as e:
+                warning("[SND] python-can exception caught: %s" % e)
+
+    def multiplex_rx_packets(self):
+        with self.pool_mutex:
+            for _, t in self.pool.items():
+                t.mux()
+
+    def register(self, socket, *args, **kwargs):
+        k = str(
+            str(kwargs.get("bustype", "unknown_bustype")) + "_" +
+            str(kwargs.get("channel", "unknown_channel"))
+        )
+        with self.pool_mutex:
+            if k in self.pool:
+                t = self.pool[k]
+                t.sockets.append(socket)
+                filters = [s.filters for s in t.sockets
+                           if s.filters is not None]
+                if filters:
+                    t.bus.set_filters(reduce(add, filters))
+                socket.name = k
+            else:
+                bus = can_Bus(*args, **kwargs)
+                socket.name = k
+                self.pool[k] = SocketMapper(bus, [socket])
+
+    def unregister(self, socket):
+        with self.pool_mutex:
+            try:
+                t = self.pool[socket.name]
+                t.sockets.remove(socket)
+                if not t.sockets:
+                    t.bus.shutdown()
+                    del self.pool[socket.name]
+            except KeyError:
+                warning("Socket %s already removed from pool" % socket.name)
+
+
+class SocketWrapper(can_BusABC):
+    """Socket for specific Bus or Interface.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(SocketWrapper, self).__init__(*args, **kwargs)
+        self.rx_queue = queue.Queue()  # type: queue.Queue[can_Message]
+        self.name = None
+        SocketsPool().register(self, *args, **kwargs)
+
+    def _recv_internal(self, timeout):
+        SocketsPool().multiplex_rx_packets()
+        try:
+            return self.rx_queue.get(block=True, timeout=timeout), True
+        except queue.Empty:
+            return None, True
+
+    def send(self, msg, timeout=None):
+        SocketsPool().internal_send(self, msg)
+
+    def shutdown(self):
+        SocketsPool().unregister(self)
+
+
+class PythonCANSocket(SuperSocket):
     desc = "read/write packets at a given CAN interface " \
            "using a python-can bus object"
+    nonblocking_socket = True
 
-    def __init__(self, iface=None, timeout=1.0, basecls=CAN):
-
-        if issubclass(type(iface), can_BusABC):
-            self.basecls = basecls
-            self.iface = iface
-            self.ins = None
-            self.outs = None
-            self.timeout = timeout
-        else:
-            warning("Provide a python-can interface")
+    def __init__(self, **kwargs):
+        self.basecls = kwargs.pop("basecls", CAN)
+        self.iface = SocketWrapper(**kwargs)
 
     def recv_raw(self, x=0xffff):
-        msg = self.iface.recv(timeout=self.timeout)
-        if msg is None:
-            return None, None, None
+        msg = self.iface.recv()
+
         hdr = msg.is_extended_id << 31 | msg.is_remote_frame << 30 | \
             msg.is_error_frame << 29 | msg.arbitration_id
 
@@ -55,38 +163,29 @@
         return self.basecls, pkt_data, msg.timestamp
 
     def send(self, x):
+        msg = can_Message(is_remote_frame=x.flags == 0x2,
+                          is_extended_id=x.flags == 0x4,
+                          is_error_frame=x.flags == 0x1,
+                          arbitration_id=x.identifier,
+                          dlc=x.length,
+                          data=bytes(x)[8:])
         try:
-            msg = can_Message(is_remote_frame=x.flags == 0x2,
-                              extended_id=x.flags == 0x4,
-                              is_error_frame=x.flags == 0x1,
-                              arbitration_id=x.identifier,
-                              dlc=x.length,
-                              data=bytes(x)[8:])
-            if hasattr(x, "sent_time"):
-                x.sent_time = time.time()
-            return self.iface.send(msg)
-        except can_Error as ex:
-            raise ex
+            x.sent_time = time.time()
+        except AttributeError:
+            pass
+        self.iface.send(msg)
 
     @staticmethod
-    def select(sockets, remain=None):
-        """This function is called during sendrecv() routine to select
-        the available sockets.
-        """
-        if remain is not None:
-            max_timeout = remain / len(sockets)
-            for s in sockets:
-                if s.timeout > max_timeout:
-                    s.timeout = max_timeout
-
-        # python-can sockets aren't selectable, so we return all of them
-        # sockets, None (means use the socket's recv() )
-        return sockets, None
-
-
-@conf.commands.register
-def srcan(pkt, iface=None, basecls=CAN, *args, **kargs):
-    s = CANSocket(iface, basecls=basecls)
-    a, b = s.sr(pkt, *args, **kargs)
-    s.close()
-    return a, b
+    def select(sockets, *args, **kwargs):
+        SocketsPool().multiplex_rx_packets()
+        return [s for s in sockets if isinstance(s, PythonCANSocket) and
+                not s.iface.rx_queue.empty()], PythonCANSocket.recv
+
+    def close(self):
+        if self.closed:
+            return
+        super(PythonCANSocket, self).close()
+        self.iface.shutdown()
+
+
+CANSocket = PythonCANSocket

scapy-2.4.3.tar.gz/scapy/contrib/cdp.py -> scapy-2.4.4.tar.gz/scapy/contrib/cdp.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # scapy.contrib.description = Cisco Discovery Protocol (CDP)
 # scapy.contrib.status = loads
 
@@ -48,7 +46,6 @@
                 0x0004: "CDPMsgCapabilities",
                 0x0005: "CDPMsgSoftwareVersion",
                 0x0006: "CDPMsgPlatform",
-                0x0007: "CDPMsgIPPrefix",
                 0x0008: "CDPMsgProtoHello",
                 0x0009: "CDPMsgVTPMgmtDomain",  # CDPv2
                 0x000a: "CDPMsgNativeVLAN",    # CDPv2
@@ -101,7 +98,14 @@
     cls = conf.raw_layer
     if len(p) >= 2:
         t = struct.unpack("!H", p[:2])[0]
-        clsname = _cdp_tlv_cls.get(t, "CDPMsgGeneric")
+        if t == 0x0007 and len(p) > 4:
+            tmp_len = struct.unpack("!H", p[2:4])[0]
+            if tmp_len == 8:
+                clsname = "CDPMsgIPGateway"
+            else:
+                clsname = "CDPMsgIPPrefix"
+        else:
+            clsname = _cdp_tlv_cls.get(t, "CDPMsgGeneric")
         cls = globals()[clsname]
 
     return cls(p, **kargs)
@@ -186,12 +190,12 @@
     fields_desc = [XShortEnumField("type", 0x0002, _cdp_tlv_types),
                    ShortField("len", None),
                    FieldLenField("naddr", None, "addr", "!I"),
-                   PacketListField("addr", [], _CDPGuessAddrRecord, count_from=lambda x:x.naddr)]  # noqa: E501
+                   PacketListField("addr", [], _CDPGuessAddrRecord,
+                                   length_from=lambda x:x.len - 8)]
 
     def post_build(self, pkt, pay):
         if self.len is None:
-            tmp_len = 8 + len(self.addr) * 9
-            pkt = pkt[:2] + struct.pack("!H", tmp_len) + pkt[4:]
+            pkt = pkt[:2] + struct.pack("!H", len(pkt)) + pkt[4:]
         p = pkt + pay
         return p
 
@@ -235,14 +239,23 @@
 # ODR Routing
 
 
-class CDPMsgIPPrefix(CDPMsgGeneric):
-    name = "IP Prefix"
+class CDPMsgIPGateway(CDPMsgGeneric):
+    name = "IP Gateway"
     type = 0x0007
     fields_desc = [XShortEnumField("type", 0x0007, _cdp_tlv_types),
                    ShortField("len", 8),
                    IPField("defaultgw", "192.168.0.1")]
 
 
+class CDPMsgIPPrefix(CDPMsgGeneric):
+    name = "IP Prefix"
+    type = 0x0007
+    fields_desc = [XShortEnumField("type", 0x0007, _cdp_tlv_types),
+                   ShortField("len", 9),
+                   IPField("prefix", "192.168.0.1"),
+                   ByteField("plen", 24)]
+
+
 class CDPMsgProtoHello(CDPMsgGeneric):
     name = "Protocol Hello"
     type = 0x0008
@@ -357,9 +370,9 @@
         This padding is only used for checksum computation.  The original
         packet should not be altered."""
         if len(pkt) % 2:
-            last_chr = pkt[-1]
-            if last_chr <= b'\x80':
-                return pkt[:-1] + b'\x00' + last_chr
+            last_chr = orb(pkt[-1])
+            if last_chr <= 0x80:
+                return pkt[:-1] + b'\x00' + chb(last_chr)
             else:
                 return pkt[:-1] + b'\xff' + chb(orb(last_chr) - 1)
         else:

scapy-2.4.3.tar.gz/scapy/contrib/coap.py -> scapy-2.4.4.tar.gz/scapy/contrib/coap.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/concox.py Added

@@ -0,0 +1,307 @@
+# Copyright (C) 2019 Juciano Cardoso <cjuciano@gmail.com>
+#               2019 Guillaume Valadon <guillaume.valadon@netatmo.com>
+##
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Concox CRX1 unit tests
+# scapy.contrib.status = loads
+
+import binascii
+
+from scapy.packet import Packet, bind_layers
+from scapy.layers.inet import TCP, UDP
+from scapy.fields import BitField, BitEnumField, X3BytesField, ShortField, \
+    XShortField, FieldLenField, PacketLenField, XByteField, XByteEnumField, \
+    ByteEnumField, StrFixedLenField, ConditionalField, FlagsField, ByteField, \
+    IntField, XIntField, StrLenField, ScalingField
+
+PROTOCOL_NUMBERS = {
+    0x01: 'LOGIN MESSAGE',
+    0x13: 'HEARTBEAT',
+    0x12: 'LOCATION',
+    0x16: 'ALARM',
+    0x80: 'ONLINE COMMAND',
+    0x15: 'ONLINE COMMAND REPLYED',
+    0x94: 'INFORMATION TRANSMISSION',
+}
+
+SUBPROTOCOL_NUMBERS = {
+    0x00: "EXTERNAL POWER VOLTAGE",
+    0x04: "TERMINAL STATUS SYNCHRONIZATION",
+    0x05: "DOOR STATUS",
+}
+
+VOLTAGE_LEVELS = {
+    0x00: "No Power (Shutdown)",
+    0x01: "Extremely Low Battery",
+    0x02: "Very Low Battery",
+    0x03: "Low Battery",
+    0x04: "Medium",
+    0x05: "High",
+    0x06: "Very High",
+}
+
+GSM_SIGNAL_STRENGTH = {
+    0x00: "No Signal",
+    0x01: "Extremely Weak Signal",
+    0x02: "Very Weak Signal",
+    0x03: "Good Signal",
+    0x04: "Strong Signal",
+}
+
+LANGUAGE = {
+    0x01: "Chinese",
+    0x02: "English",
+}
+
+
+class BCDStrFixedLenField(StrFixedLenField):
+    def i2h(self, pkt, x):
+        if isinstance(x, bytes):
+            return binascii.b2a_hex(x)
+        return binascii.a2b_hex(x)
+
+
+class CRX1NewPacketContent(Packet):
+    name = "CRX1 New Packet Content"
+    fields_desc = [
+        XByteEnumField('protocol_number', 0x12, PROTOCOL_NUMBERS),
+        # Login
+        ConditionalField(
+            BCDStrFixedLenField('terminal_id', '00000000', length=8), lambda
+            pkt: len(pkt.original) > 5 and pkt.protocol_number == 0x01),
+        # GPS Location
+        ConditionalField(
+            ByteField('year', 0x00), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('month', 0x01), lambda pkt: len(pkt.original) > 5 and pkt
+            .protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('day', 0x01), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('hour', 0x00), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('minute', 0x00), lambda pkt: len(pkt.original) > 5 and
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('second', 0x00), lambda pkt: len(pkt.original) > 5 and
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            BitField('gps_information_length', 0x00, 4), lambda pkt: len(
+                pkt.original) > 5 and pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            BitField('positioning_satellite_number', 0x00, 4), lambda pkt: len(
+                pkt.original) > 5 and pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ScalingField('latitude', 0x00,
+                         scaling=1.0 / 1800000, ndigits=6, fmt="!I"),
+            lambda pkt: len(pkt.original) > 5 and \
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ScalingField('longitude', 0x00,
+                         scaling=1.0 / 1800000, ndigits=6, fmt="!I"),
+            lambda pkt: len(pkt.original) > 5 and \
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('speed', 0x00), lambda pkt: len(pkt.original) > 5 and pkt
+            .protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            BitField('course', 0x00, 10), lambda pkt: len(pkt.original) > 5 and
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            BitEnumField('latitude_hemisphere', 0x00, 1, {
+                0: "South",
+                1: "North"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x12, 0x16)),
+        ConditionalField(
+            BitEnumField('longitude_hemisphere', 0x00, 1, {
+                0: "East",
+                1: "West"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x12, 0x16)),
+        ConditionalField(
+            BitEnumField('gps_been_positioning', 0x00, 1, {
+                0: "No",
+                1: "Yes"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x12, 0x16)),
+        ConditionalField(
+            BitEnumField('gps_status', 0x00, 1, {
+                0: "GPS real-time",
+                1: "Differential positioning"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x12, 0x16)),
+        ConditionalField(
+            BitField('course_status_reserved', 0x00, 2), lambda pkt: len(
+                pkt.original) > 5 and pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            ByteField('lbs_length', 0x00),
+            lambda pkt: len(pkt.original) > 5 and \
+            pkt.protocol_number in (0x16, )),
+        ConditionalField(
+            XShortField('mcc', 0x00), lambda pkt: len(pkt.original) > 5 and pkt
+            .protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            XByteField('mnc', 0x00), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            XShortField('lac', 0x00), lambda pkt: len(pkt.original) > 5 and pkt
+            .protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            X3BytesField('cell_id', 0x00),
+            lambda pkt: len(pkt.original) > 5 and \
+            pkt.protocol_number in (0x12, 0x16)),
+        ConditionalField(
+            IntField('mileage', 0x00), lambda pkt: len(pkt.original) > 5 and
+            pkt.protocol_number in (0x12, ) and len(pkt.original) > 31),
+        # Heartbeat
+        ConditionalField(
+            BitEnumField('defence', 0x00, 1, {
+                0: "Deactivated",
+                1: "Activated"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x13, 0x16)),
+        ConditionalField(
+            BitEnumField('acc', 0x00, 1, {
+                0: "Low",
+                1: "High"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x13, 0x16)),
+        ConditionalField(
+            BitEnumField('charge', 0x00, 1, {
+                0: "Not Charge",
+                1: "Charging"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x13, 0x16)),
+        ConditionalField(
+            BitEnumField(
+                'alarm', 0x00, 3, {
+                    0: "Normal",
+                    1: "Vibration",
+                    2: "Power Cut",
+                    3: "Low Battery",
+                    4: "SOS"
+                }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number
+            in (0x13, 0x16)),
+        ConditionalField(
+            BitEnumField('gps_tracking', 0x00, 1, {
+                0: "Not Charge",
+                1: "Charging"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x13, 0x16)),
+        ConditionalField(
+            BitEnumField('oil_and_eletricity', 0x00, 1, {
+                0: "Connected",
+                1: "Disconnected"
+            }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x13, 0x16)),
+        ConditionalField(
+            ByteEnumField("voltage_level", 0x00, VOLTAGE_LEVELS), lambda pkt:
+            len(pkt.original) > 5 and pkt.protocol_number in (0x13, 0x16)),
+        ConditionalField(
+            ByteEnumField("gsm_signal_strength", 0x00,
+                          GSM_SIGNAL_STRENGTH), lambda pkt: len(pkt.original) >
+            5 and pkt.protocol_number in (0x13, 0x16)),
+        # Online Command
+        ConditionalField(
+            FieldLenField('command_length',
+                          None,
+                          fmt='B',
+                          length_of="command_content"), lambda pkt:
+            len(pkt.original) > 5 and pkt.protocol_number in (0x80, 0x15)),
+        ConditionalField(
+            XIntField('server_flag_bit', 0x00), lambda pkt: len(pkt.original) >
+            5 and pkt.protocol_number in (0x80, 0x15)),
+        ConditionalField(
+            StrLenField(
+                "command_content",
+                "",
+                length_from=lambda pkt: pkt.command_length - 4), lambda pkt:
+            len(pkt.original) > 5 and pkt.protocol_number in (0x80, 0x15)),
+        # Commun
+        ConditionalField(
+            ByteEnumField(
+                "alarm_extended", 0x00, {
+                    0x00: "Normal",
+                    0x01: "SOS",
+                    0x02: "Power cut",
+                    0x03: "Vibration",
+                    0x04: "Enter fence",
+                    0x05: "Exit fence",
+                    0x06: "Over speed",
+                    0x09: "Displacement",
+                    0x0a: "Enter GPS dead zone",
+                    0x0b: "Exit GPS dead zone",
+                    0x0c: "Power on",
+                    0x0d: "GPS First fix notice",
+                    0x0e: "Low battery",
+                    0x0f: "Low battery protection",
+                    0x10: "SIM Change",
+                    0x11: "Power off",
+                    0x12: "Airplane mode",
+                    0x13: "Disassemble",
+                    0x14: "Door",
+                    0xfe: "ACC On",
+                    0xff: "ACC Off",
+                }), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number
+            in (0x13, 0x15, 0x16)),
+        ConditionalField(
+            ByteEnumField("language", 0x00,
+                          LANGUAGE), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x13, 0x15, 0x16)),
+        # Information transmission
+        ConditionalField(
+            ByteEnumField("subprotocol_number", 0x00,
+                          SUBPROTOCOL_NUMBERS), lambda pkt: len(pkt.original) >
+            5 and pkt.protocol_number in (0x94, )),
+        ConditionalField(
+            ShortField('external_battery',
+                       0x00), lambda pkt: len(pkt.original) > 5 and pkt.
+            protocol_number in (0x94, ) and pkt.subprotocol_number == 0x00),
+        ConditionalField(
+            FlagsField('external_io_detection', 0x00, 8, [
+                'door_status',
+                'trigger_status',
+                'io_status',
+            ]), lambda pkt: len(pkt.original) > 5 and pkt.protocol_number in (
+                0x94, ) and pkt.subprotocol_number == 0x05),
+        # Default
+        XShortField('information_serial_number', None),
+        XShortField('crc', None),
+    ]
+
+
+class CRX1New(Packet):
+    name = "CRX1 New"
+    fields_desc = [
+        XShortField('start_bit', 0x7878),
+        ConditionalField(ByteField(
+            'default_packet_length',
+            None,
+        ), lambda pkt: pkt.start_bit == 0x7878),
+        ConditionalField(ShortField(
+            'extended_packet_length',
+            None,
+        ), lambda pkt: pkt.start_bit == 0x7979),
+        ConditionalField(
+            PacketLenField('default_packet_content',
+                           None,
+                           CRX1NewPacketContent,
+                           length_from=lambda pkt: pkt.default_packet_length),
+            lambda pkt: pkt.start_bit == 0x7878),
+        ConditionalField(
+            PacketLenField('extended_packet_content',
+                           None,
+                           CRX1NewPacketContent,
+                           length_from=lambda pkt: pkt.extended_packet_length),
+            lambda pkt: pkt.start_bit == 0x7979),
+        XShortField('end_bit', 0x0d0a),
+    ]
+
+
+bind_layers(TCP, CRX1New, sport=8821, dport=8821)
+bind_layers(UDP, CRX1New, sport=8821, dport=8821)

scapy-2.4.3.tar.gz/scapy/contrib/dce_rpc.py -> scapy-2.4.4.tar.gz/scapy/contrib/dce_rpc.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/dtp.py -> scapy-2.4.4.tar.gz/scapy/contrib/dtp.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/eigrp.py -> scapy-2.4.4.tar.gz/scapy/contrib/eigrp.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/erspan.py Added

@@ -0,0 +1,91 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# This program is published under GPLv2 license
+
+"""
+ERSPAN - Encapsulated Remote SPAN
+"""
+
+# scapy.contrib.description = ERSPAN - Encapsulated Remote SPAN
+# scapy.contrib.status = loads
+
+# This file inspired by scapy-vxlan
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import BitField, BitEnumField, XIntField, \
+    XShortField
+from scapy.layers.l2 import Ether, GRE
+
+
+class ERSPAN(Packet):
+    """
+    A generic ERSPAN packet, pointing by default to ERSPAN II
+    """
+    name = "ERSPAN"
+    fields_desc = []
+
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *args, **kargs):
+        if cls == ERSPAN:
+            return ERSPAN_II
+        return Packet.dispatch_hook(cls, _pkt, *args, **kargs)
+
+
+class ERSPAN_I(ERSPAN):
+    name = "ERSPAN I"
+    match_subclass = True
+    fields_desc = []
+
+
+class ERSPAN_II(ERSPAN):
+    name = "ERSPAN II"
+    match_subclass = True
+    fields_desc = [BitField("ver", 0, 4),
+                   BitField("vlan", 0, 12),
+                   BitField("cos", 0, 3),
+                   BitField("en", 0, 2),
+                   BitField("t", 0, 1),
+                   BitField("session_id", 0, 10),
+                   BitField("reserved", 0, 12),
+                   BitField("index", 0, 20),
+                   ]
+
+
+class ERSPAN_III(ERSPAN):
+    name = "ERSPAN III"
+    match_subclass = True
+    fields_desc = [BitField("ver", 2, 4),
+                   BitField("vlan", 0, 12),
+                   BitField("cos", 0, 3),
+                   BitField("bso", 0, 2),
+                   BitField("t", 0, 1),
+                   BitField("session_id", 0, 10),
+                   XIntField("timestamp", 0x00000000),
+                   XShortField("sgt_other", 0x00000000),
+                   BitField("p", 0, 1),
+                   BitEnumField("ft", 0, 5,
+                                {0: "Ethernet", 2: "IP"}),
+                   BitField("hw", 0, 6),
+                   BitField("d", 0, 1),
+                   BitEnumField("gra", 0, 2,
+                                {0: "100us", 1: "100ns", 2: "IEEE 1588"}),
+                   BitField("o", 0, 1)
+                   ]
+
+
+class ERSPAN_PlatformSpecific(Packet):
+    name = "PlatformSpecific"
+    fields_desc = [BitField("platf_id", 0, 6),
+                   BitField("info1", 0, 26),
+                   XIntField("info2", 0x00000000)]
+
+
+bind_layers(ERSPAN_I, Ether)
+bind_layers(ERSPAN_II, Ether)
+bind_layers(ERSPAN_III, Ether, o=0)
+bind_layers(ERSPAN_III, ERSPAN_PlatformSpecific, o=1)
+bind_layers(ERSPAN_PlatformSpecific, Ether)
+
+bind_layers(GRE, ERSPAN, proto=0x88be, seqnum_present=0)
+bind_layers(GRE, ERSPAN_II, proto=0x88be, seqnum_present=1)
+bind_layers(GRE, ERSPAN_III, proto=0x22eb)

scapy-2.4.3.tar.gz/scapy/contrib/ethercat.py -> scapy-2.4.4.tar.gz/scapy/contrib/ethercat.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/exposure_notification.py Added

@@ -0,0 +1,68 @@
+# -*- mode: python3; indent-tabs-mode: nil; tab-width: 4 -*-
+# exposure_notification.py - Apple/Google Exposure Notification System
+#
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) 2020 Michael Farrell <micolous+git@gmail.com>
+# This program is published under a GPLv2 (or later) license
+#
+# scapy.contrib.description = Apple/Google Exposure Notification System (ENS)
+# scapy.contrib.status = loads
+"""
+Apple/Google Exposure Notification System (ENS), formerly known as
+Privacy-Preserving Contact Tracing Project.
+
+This module parses the Bluetooth Low Energy beacon payloads used by the system.
+This does **not** yet implement any cryptographic functionality.
+
+More info:
+
+* `Apple: Privacy-Preserving Contact Tracing`__
+* `Google: Exposure Notifications`__
+* `Wikipedia: Exposure Notification`__
+
+__ https://www.apple.com/covid19/contacttracing/
+__ https://www.google.com/covid19/exposurenotifications/
+__ https://en.wikipedia.org/wiki/Exposure_Notification
+
+Bluetooth protocol specifications:
+
+* `v1.1`_ (April 2020)
+* `v1.2`_ (April 2020)
+
+.. _v1.1: https://blog.google/documents/58/Contact_Tracing_-_Bluetooth_Specification_v1.1_RYGZbKW.pdf
+.. _v1.2: https://covid19-static.cdn-apple.com/applications/covid19/current/static/contact-tracing/pdf/ExposureNotification-BluetoothSpecificationv1.2.pdf
+"""  # noqa: E501
+
+from scapy.fields import StrFixedLenField
+from scapy.layers.bluetooth import EIR_Hdr, EIR_ServiceData16BitUUID, \
+    EIR_CompleteList16BitServiceUUIDs, LowEnergyBeaconHelper
+from scapy.packet import bind_layers, Packet
+
+
+EXPOSURE_NOTIFICATION_UUID = 0xFD6F
+
+
+class Exposure_Notification_Frame(Packet, LowEnergyBeaconHelper):
+    """Apple/Google BLE Exposure Notification broadcast frame."""
+    name = "Exposure Notification broadcast"
+
+    fields_desc = [
+        # Rolling Proximity Identifier
+        StrFixedLenField("identifier", None, 16),
+        # Associated Encrypted Metadata (added in v1.2)
+        StrFixedLenField("metadata", None, 4),
+    ]
+
+    def build_eir(self):
+        """Builds a list of EIR messages to wrap this frame."""
+
+        return LowEnergyBeaconHelper.base_eir + [
+            EIR_Hdr() / EIR_CompleteList16BitServiceUUIDs(svc_uuids=[
+                EXPOSURE_NOTIFICATION_UUID]),
+            EIR_Hdr() / EIR_ServiceData16BitUUID() / self
+        ]
+
+
+bind_layers(EIR_ServiceData16BitUUID, Exposure_Notification_Frame,
+            svc_uuid=EXPOSURE_NOTIFICATION_UUID)

scapy-2.4.3.tar.gz/scapy/contrib/geneve.py -> scapy-2.4.4.tar.gz/scapy/contrib/geneve.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/gtp.py -> scapy-2.4.4.tar.gz/scapy/contrib/gtp.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # Copyright (C) 2018 Leonardo Monteiro <decastromonteiro@gmail.com>
 #               2017 Alexis Sultan    <alexis.sultan@sfr.com>
 #               2017 Alessio Deiana <adeiana@gmail.com>
@@ -15,7 +13,8 @@
 import struct
 
 
-from scapy.compat import chb, orb
+from scapy.compat import chb, orb, bytes_encode
+from scapy.config import conf
 from scapy.error import warning
 from scapy.fields import BitEnumField, BitField, ByteEnumField, ByteField, \
     ConditionalField, FieldLenField, FieldListField, FlagsField, IntField, \
@@ -148,6 +147,7 @@
     1: "Reserved",
     2: "Reserved",
     64: "UDP Port",
+    133: "PDU Session Container",
     192: "PDCP PDU Number",
     193: "Reserved",
     194: "Reserved"
@@ -168,18 +168,22 @@
             if left == 0xf:
                 ret.append(TBCD_TO_ASCII[right:right + 1])
             else:
-                ret += [TBCD_TO_ASCII[right:right + 1], TBCD_TO_ASCII[left:left + 1]]  # noqa: E501
+                ret += [
+                    TBCD_TO_ASCII[right:right + 1],
+                    TBCD_TO_ASCII[left:left + 1]
+                ]
         return b"".join(ret)
 
     def i2m(self, pkt, val):
-        val = str(val)
-        ret_string = ""
+        if not isinstance(val, bytes):
+            val = bytes_encode(val)
+        ret_string = b""
         for i in range(0, len(val), 2):
             tmp = val[i:i + 2]
             if len(tmp) == 2:
-                ret_string += chr(int(tmp[1] + tmp[0], 16))
+                ret_string += chb(int(tmp[::-1], 16))
             else:
-                ret_string += chr(int("F" + tmp[0], 16))
+                ret_string += chb(int(b"F" + tmp[:1], 16))
         return ret_string
 
 
@@ -218,9 +222,16 @@
                    ByteEnumField("gtp_type", None, GTPmessageType),
                    ShortField("length", None),
                    IntField("teid", 0),
-                   ConditionalField(XBitField("seq", 0, 16), lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1),  # noqa: E501
-                   ConditionalField(ByteField("npdu", 0), lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1),  # noqa: E501
-                   ConditionalField(ByteEnumField("next_ex", 0, ExtensionHeadersTypes), lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1), ]  # noqa: E501
+                   ConditionalField(
+                       XBitField("seq", 0, 16),
+                       lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1),
+                   ConditionalField(
+                       ByteField("npdu", 0),
+                       lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1),
+                   ConditionalField(
+                       ByteEnumField("next_ex", 0, ExtensionHeadersTypes),
+                       lambda pkt:pkt.E == 1 or pkt.S == 1 or pkt.PN == 1),
+                   ]
 
     def post_build(self, p, pay):
         p += pay
@@ -230,11 +241,15 @@
         return p
 
     def hashret(self):
-        return struct.pack("B", self.version) + self.payload.hashret()
+        hsh = struct.pack("B", self.version)
+        if self.seq:
+            hsh += struct.pack("H", self.seq)
+        return hsh + self.payload.hashret()
 
     def answers(self, other):
         return (isinstance(other, GTPHeader) and
                 self.version == other.version and
+                (not self.seq or self.seq == other.seq) and
                 self.payload.answers(other.payload))
 
     @classmethod
@@ -259,6 +274,11 @@
     def guess_payload_class(self, payload):
         # Snooped from Wireshark
         # https://github.com/boundary/wireshark/blob/07eade8124fd1d5386161591b52e177ee6ea849f/epan/dissectors/packet-gtp.c#L8195  # noqa: E501
+        if self.E == 1:
+            if self.next_ex == 0x85:
+                return GTPPDUSessionContainer
+            return GTPHeader.guess_payload_class(self, payload)
+
         if self.gtp_type == 255:
             sub_proto = orb(payload[0])
             if sub_proto >= 0x45 and sub_proto <= 0x4e:
@@ -285,19 +305,71 @@
 }
 
 
+class GTPPDUSessionContainer(Packet):
+    name = "GTP PDU Session Container"
+    fields_desc = [ByteField("ExtHdrLen", None),
+                   BitField("type", 0, 4),
+                   BitField("spare1", 0, 4),
+                   BitField("P", 0, 1),
+                   BitField("R", 0, 1),
+                   BitField("QFI", 0, 6),
+                   ConditionalField(XBitField("PPI", 0, 3),
+                                    lambda pkt: pkt.P == 1),
+                   ConditionalField(XBitField("spare2", 0, 5),
+                                    lambda pkt: pkt.P == 1),
+                   ConditionalField(ByteField("pad1", 0),
+                                    lambda pkt: pkt.P == 1),
+                   ConditionalField(ByteField("pad2", 0),
+                                    lambda pkt: pkt.P == 1),
+                   ConditionalField(ByteField("pad3", 0),
+                                    lambda pkt: pkt.P == 1),
+                   ConditionalField(StrLenField(
+                       "extraPadding",
+                       "",
+                       length_from=lambda pkt: 4 * (pkt.ExtHdrLen) - 4),
+                       lambda pkt: pkt.ExtHdrLen and pkt.ExtHdrLen > 1),
+                   ByteEnumField("NextExtHdr", 0, ExtensionHeadersTypes), ]
+
+    def guess_payload_class(self, payload):
+        if self.NextExtHdr == 0:
+            sub_proto = orb(payload[0])
+            if sub_proto >= 0x45 and sub_proto <= 0x4e:
+                return IP
+            elif (sub_proto & 0xf0) == 0x60:
+                return IPv6
+            else:
+                return PPP
+        return GTPHeader.guess_payload_class(self, payload)
+
+    def post_build(self, p, pay):
+        p += pay
+        if self.ExtHdrLen is None:
+            if self.P == 1:
+                hdr_len = 2
+            else:
+                hdr_len = 1
+            p = struct.pack("!B", hdr_len) + p[1:]
+        return p
+
+
 class GTPEchoRequest(Packet):
     # 3GPP TS 29.060 V9.1.0 (2009-12)
     name = "GTP Echo Request"
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
-
 
 class IE_Base(Packet):
-
     def extract_padding(self, pkt):
         return "", pkt
 
+    def post_build(self, p, pay):
+        if self.fields_desc[1].name == "length":
+            if self.length is None:
+                tmp_len = len(p)
+                if isinstance(self.payload, conf.padding_layer):
+                    tmp_len += len(self.payload.load)
+                p = p[:1] + struct.pack("!H", tmp_len - 2) + p[3:]
+        return p + pay
+
 
 class IE_Cause(IE_Base):
     name = "Cause"
@@ -446,7 +518,9 @@
         return s
 
     def i2m(self, pkt, s):
-        s = b"".join(chb(len(x)) + x for x in s.split("."))
+        if not isinstance(s, bytes):
+            s = bytes_encode(s)
+        s = b"".join(chb(len(x)) + x for x in s.split(b"."))
         return s
 
 
@@ -475,8 +549,17 @@
 class IE_GSNAddress(IE_Base):
     name = "GSN Address"
     fields_desc = [ByteEnumField("ietype", 133, IEType),
-                   ShortField("length", 4),
-                   IPField("address", RandIP())]
+                   ShortField("length", None),
+                   ConditionalField(IPField("ipv4_address", RandIP()),
+                                    lambda pkt: pkt.length == 4),
+                   ConditionalField(IP6Field("ipv6_address", '::1'),
+                                    lambda pkt: pkt.length == 16)]
+
+    def post_build(self, p, pay):
+        if self.length is None:
+            tmp_len = len(p) - 3
+            p = p[:2] + struct.pack("!B", tmp_len) + p[3:]
+        return p
 
 
 class IE_MSInternationalNumber(IE_Base):
@@ -520,82 +603,82 @@
                    ByteField("allocation_retention_prioiry", 1),
 
                    ConditionalField(XBitField("spare", 0x00, 2),
-                                    lambda pkt: pkt.length > 1),
+                                    lambda p: p.length and p.length > 1),
                    ConditionalField(XBitField("delay_class", 0x000, 3),
-                                    lambda pkt: pkt.length > 1),
+                                    lambda p: p.length and p.length > 1),
                    ConditionalField(XBitField("reliability_class", 0x000, 3),
-                                    lambda pkt: pkt.length > 1),
+                                    lambda p: p.length and p.length > 1),
 
                    ConditionalField(XBitField("peak_troughput", 0x0000, 4),
-                                    lambda pkt: pkt.length > 2),
+                                    lambda p: p.length and p.length > 2),
                    ConditionalField(BitField("spare", 0, 1),
-                                    lambda pkt: pkt.length > 2),
+                                    lambda p: p.length and p.length > 2),
                    ConditionalField(XBitField("precedence_class", 0x000, 3),
-                                    lambda pkt: pkt.length > 2),
+                                    lambda p: p.length and p.length > 2),
 
                    ConditionalField(XBitField("spare", 0x000, 3),
-                                    lambda pkt: pkt.length > 3),
+                                    lambda p: p.length and p.length > 3),
                    ConditionalField(XBitField("mean_troughput", 0x00000, 5),
-                                    lambda pkt: pkt.length > 3),
+                                    lambda p: p.length and p.length > 3),
 
                    ConditionalField(XBitField("traffic_class", 0x000, 3),
-                                    lambda pkt: pkt.length > 4),
+                                    lambda p: p.length and p.length > 4),
                    ConditionalField(XBitField("delivery_order", 0x00, 2),
-                                    lambda pkt: pkt.length > 4),
+                                    lambda p: p.length and p.length > 4),
                    ConditionalField(XBitField("delivery_of_err_sdu", 0x000, 3),
-                                    lambda pkt: pkt.length > 4),
+                                    lambda p: p.length and p.length > 4),
 
                    ConditionalField(ByteField("max_sdu_size", None),
-                                    lambda pkt: pkt.length > 5),
+                                    lambda p: p.length and p.length > 5),
                    ConditionalField(ByteField("max_bitrate_up", None),
-                                    lambda pkt: pkt.length > 6),
+                                    lambda p: p.length and p.length > 6),
                    ConditionalField(ByteField("max_bitrate_down", None),
-                                    lambda pkt: pkt.length > 7),
+                                    lambda p: p.length and p.length > 7),
 
                    ConditionalField(XBitField("redidual_ber", 0x0000, 4),
-                                    lambda pkt: pkt.length > 8),
+                                    lambda p: p.length and p.length > 8),
                    ConditionalField(XBitField("sdu_err_ratio", 0x0000, 4),
-                                    lambda pkt: pkt.length > 8),
+                                    lambda p: p.length and p.length > 8),
                    ConditionalField(XBitField("transfer_delay", 0x00000, 6),
-                                    lambda pkt: pkt.length > 9),
+                                    lambda p: p.length and p.length > 9),
                    ConditionalField(XBitField("traffic_handling_prio",
                                               0x000,
                                               2),
-                                    lambda pkt: pkt.length > 9),
+                                    lambda p: p.length and p.length > 9),
 
                    ConditionalField(ByteField("guaranteed_bit_rate_up", None),
-                                    lambda pkt: pkt.length > 10),
+                                    lambda p: p.length and p.length > 10),
                    ConditionalField(ByteField("guaranteed_bit_rate_down",
                                               None),
-                                    lambda pkt: pkt.length > 11),
+                                    lambda p: p.length and p.length > 11),
 
                    ConditionalField(XBitField("spare", 0x000, 3),
-                                    lambda pkt: pkt.length > 12),
+                                    lambda p: p.length and p.length > 12),
                    ConditionalField(BitField("signaling_indication", 0, 1),
-                                    lambda pkt: pkt.length > 12),
+                                    lambda p: p.length and p.length > 12),
                    ConditionalField(XBitField("source_stats_desc", 0x0000, 4),
-                                    lambda pkt: pkt.length > 12),
+                                    lambda p: p.length and p.length > 12),
 
                    ConditionalField(ByteField("max_bitrate_down_ext", None),
-                                    lambda pkt: pkt.length > 13),
+                                    lambda p: p.length and p.length > 13),
                    ConditionalField(ByteField("guaranteed_bitrate_down_ext",
                                               None),
-                                    lambda pkt: pkt.length > 14),
+                                    lambda p: p.length and p.length > 14),
                    ConditionalField(ByteField("max_bitrate_up_ext", None),
-                                    lambda pkt: pkt.length > 15),
+                                    lambda p: p.length and p.length > 15),
                    ConditionalField(ByteField("guaranteed_bitrate_up_ext",
                                               None),
-                                    lambda pkt: pkt.length > 16),
+                                    lambda p: p.length and p.length > 16),
                    ConditionalField(ByteField("max_bitrate_down_ext2", None),
-                                    lambda pkt: pkt.length > 17),
+                                    lambda p: p.length and p.length > 17),
                    ConditionalField(ByteField("guaranteed_bitrate_down_ext2",
                                               None),
-                                    lambda pkt: pkt.length > 18),
+                                    lambda p: p.length and p.length > 18),
                    ConditionalField(ByteField("max_bitrate_up_ext2", None),
-                                    lambda pkt: pkt.length > 19),
+                                    lambda p: p.length and p.length > 19),
                    ConditionalField(ByteField("guaranteed_bitrate_up_ext2",
                                               None),
-                                    lambda pkt: pkt.length > 20)]
+                                    lambda p: p.length and p.length > 20)]
 
 
 class IE_CommonFlags(IE_Base):
@@ -790,35 +873,26 @@
     name = "GTP Echo Response"
     fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
-
     def answers(self, other):
-        return self.seq == other.seq
+        return isinstance(other, GTPEchoRequest)
 
 
 class GTPCreatePDPContextRequest(Packet):
     # 3GPP TS 29.060 V9.1.0 (2009-12)
     name = "GTP Create PDP Context Request"
-    fields_desc = [PacketListField("IE_list", [IE_TEIDI(), IE_NSAPI(), IE_GSNAddress(),  # noqa: E501
-                                               IE_GSNAddress(),
+    fields_desc = [PacketListField("IE_list", [IE_TEIDI(), IE_NSAPI(), IE_GSNAddress(length=4, ipv4_address=RandIP()),  # noqa: E501
+                                               IE_GSNAddress(length=4, ipv4_address=RandIP()),  # noqa: E501
                                                IE_NotImplementedTLV(ietype=135, length=15, data=RandString(15))],  # noqa: E501
                                    IE_Dispatcher)]
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
-
 
 class GTPCreatePDPContextResponse(Packet):
     # 3GPP TS 29.060 V9.1.0 (2009-12)
     name = "GTP Create PDP Context Response"
     fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
-
     def answers(self, other):
-        return self.seq == other.seq
+        return isinstance(other, GTPCreatePDPContextRequest)
 
 
 class GTPUpdatePDPContextRequest(Packet):
@@ -846,17 +920,14 @@
         IE_PrivateExtension()],
         IE_Dispatcher)]
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
-
 
 class GTPUpdatePDPContextResponse(Packet):
     # 3GPP TS 29.060 V9.1.0 (2009-12)
     name = "GTP Update PDP Context Response"
     fields_desc = [PacketListField("IE_list", None, IE_Dispatcher)]
 
-    def hashret(self):
-        return struct.pack("H", self.seq)
+    def answers(self, other):
+        return isinstance(other, GTPUpdatePDPContextRequest)
 
 
 class GTPErrorIndication(Packet):
@@ -884,7 +955,7 @@
                                                IE_TEICP(TEICI=RandInt()),
                                                IE_EndUserAddress(PDPTypeNumber=0x21),  # noqa: E501
                                                IE_AccessPointName(),
-                                               IE_GSNAddress(address="127.0.0.1"),  # noqa: E501
+                                               IE_GSNAddress(ipv4_address="127.0.0.1"),  # noqa: E501
                                                ], IE_Dispatcher)]
 
 
@@ -923,6 +994,8 @@
 bind_bottom_up(UDP, GTP_U_Header, sport=2152)
 bind_layers(UDP, GTP_U_Header, dport=2152, sport=2152)
 bind_layers(GTP_U_Header, GTPErrorIndication, gtp_type=26, S=1)
+bind_layers(GTP_U_Header, GTPPDUSessionContainer,
+            gtp_type=255, E=1, next_ex=0x85)
 bind_top_down(GTP_U_Header, IP, gtp_type=255)
 bind_top_down(GTP_U_Header, IPv6, gtp_type=255)
 bind_top_down(GTP_U_Header, PPP, gtp_type=255)

scapy-2.4.3.tar.gz/scapy/contrib/gtp_v2.py -> scapy-2.4.4.tar.gz/scapy/contrib/gtp_v2.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # Copyright (C) 2017 Alessio Deiana <adeiana@gmail.com>
 # 2017 Alexis Sultan <alexis.sultan@sfr.com>
 
@@ -24,10 +22,27 @@
 
 
 from scapy.compat import orb
-from scapy.fields import BitEnumField, BitField, ByteEnumField, ByteField, \
-    ConditionalField, IntField, IPField, LongField, PacketField, \
-    PacketListField, ShortEnumField, ShortField, StrFixedLenField, \
-    StrLenField, ThreeBytesField, XBitField, XIntField, XShortField
+from scapy.data import IANA_ENTERPRISE_NUMBERS
+from scapy.fields import (
+    BitEnumField,
+    BitField,
+    ByteEnumField,
+    ByteField,
+    ConditionalField,
+    IPField,
+    IntField,
+    PacketField,
+    PacketListField,
+    ShortEnumField,
+    ShortField,
+    StrFixedLenField,
+    StrLenField,
+    ThreeBytesField,
+    XBitField,
+    XIntField,
+    XShortField,
+)
+from scapy.layers.inet6 import IP6Field
 from scapy.packet import bind_layers, Packet, Raw
 from scapy.volatile import RandIP, RandShort
 
@@ -36,23 +51,161 @@
 
 
 RATType = {
+    1: "UTRAN",
+    2: "GERAN",
+    3: "WLAN",
+    4: "GAN",
+    5: "HSPA Evolution",
     6: "EUTRAN",
+    7: "Virtual",
+    8: "EUTRAN-NB-IoT",
+    9: "LTE-M",
+    10: "NR",
 }
 
-GTPmessageType = {1: "echo_request",
-                     2: "echo_response",
-                     32: "create_session_req",
-                     33: "create_session_res",
-                     34: "modify_bearer_req",
-                     35: "modify_bearer_res",
-                     36: "delete_session_req",
-                     37: "delete_session_res",
-                     70: "downlink_data_notif_failure_indic",
-                     170: "realease_bearers_req",
-                     171: "realease_bearers_res",
-                     176: "downlink_data_notif",
-                     177: "downlink_data_notif_ack",
-                  }
+# 3GPP TS 29.274 v16.1.0 table 6.1-1
+GTPmessageType = {
+    1: "echo_request",
+    2: "echo_response",
+    3: "version_not_supported",
+
+    # 4-16: S101 interface, TS 29.276.
+    # 17-24: S121 interface, TS 29.276.
+    # 25-31: Sv interface, TS 29.280.
+
+    # SGSN/MME/ TWAN/ePDG to PGW (S4/S11, S5/S8, S2a, S2b)
+    32: "create_session_req",
+    33: "create_session_res",
+    36: "delete_session_req",
+    37: "delete_session_res",
+
+    # SGSN/MME/ePDG to PGW (S4/S11, S5/S8, S2b)
+    34: "modify_bearer_req",
+    35: "modify_bearer_res",
+
+    # MME to PGW (S11, S5/S8)
+    40: "remote_ue_report_notif",
+    41: "remote_ue_report_ack",
+
+    # SGSN/MME to PGW (S4/S11, S5/S8)
+    38: "change_notif_req",
+    39: "change_notif_res",
+    # 42-46: For future use.
+    164: "resume_notif",
+    165: "resume_ack",
+
+    # Messages without explicit response
+    64: "modify_bearer_cmd",
+    65: "modify_bearer_failure_indic",
+    66: "delete_bearer_cmd",
+    67: "delete_bearer_failure_indic",
+    68: "bearer_resource_cmd",
+    69: "bearer_resource_failure_indic",
+    70: "downlink_data_notif_failure_indic",
+    71: "trace_session_activation",
+    72: "trace_session_deactivation",
+    73: "stop_paging_indic",
+    # 74-94: For future use.
+
+    # PGW to SGSN/MME/ TWAN/ePDG (S5/S8, S4/S11, S2a, S2b)
+    95: "create_bearer_req",
+    96: "create_bearer_res",
+    97: "update_bearer_req",
+    98: "update_bearer_res",
+    99: "delete_bearer_req",
+    100: "delete_bearer_res",
+
+    # PGW to MME, MME to PGW, SGW to PGW, SGW to MME, PGW to TWAN/ePDG,
+    # TWAN/ePDG to PGW (S5/S8, S11, S2a, S2b)
+    101: "delete_pdn_connection_set_req",
+    102: "delete_pdn_connection_set_res",
+
+    # PGW to SGSN/MME (S5, S4/S11)
+    103: "pgw_downlink_triggering_notif",
+    104: "pgw_downlink_triggering_ack",
+    # 105-127: For future use.
+
+    # MME to MME, SGSN to MME, MME to SGSN, SGSN to SGSN, MME to AMF,
+    # AMF to MME (S3/S10/S16/N26)
+    128: "identification_req",
+    129: "identification_res",
+    130: "context_req",
+    131: "context_res",
+    132: "context_ack",
+    133: "forward_relocation_req",
+    134: "forward_relocation_res",
+    135: "forward_relocation_complete_notif",
+    136: "forward_relocation_complete_ack",
+    137: "forward_access_context_notif",
+    138: "forward_access_context_ack",
+    139: "relocation_cancel_req",
+    140: "relocation_cancel_res",
+    141: "configuration_transfer_tunnel",
+    # 142-148: For future use.
+    152: "ran_information_relay",
+
+    # SGSN to MME, MME to SGSN (S3)
+    149: "detach_notif",
+    150: "detach_ack",
+    151: "cs_paging_indic",
+    153: "alert_mme_notif",
+    154: "alert_mme_ack",
+    155: "ue_activity_notif",
+    156: "ue_activity_ack",
+    157: "isr_status_indic",
+    158: "ue_registration_query_req",
+    159: "ue_registration_query_res",
+
+    # SGSN/MME to SGW, SGSN to MME (S4/S11/S3)
+    # SGSN to SGSN (S16), SGW to PGW (S5/S8)
+    162: "suspend_notif",
+    163: "suspend_ack",
+
+    # SGSN/MME to SGW (S4/S11)
+    160: "create_forwarding_tunnel_req",
+    161: "create_forwarding_tunnel_res",
+    166: "create_indirect_data_forwarding_tunnel_req",
+    167: "create_indirect_data_forwarding_tunnel_res",
+    168: "delete_indirect_data_forwarding_tunnel_req",
+    169: "delete_indirect_data_forwarding_tunnel_res",
+    170: "realease_bearers_req",
+    171: "realease_bearers_res",
+    # 172-175: For future use
+
+    # SGW to SGSN/MME (S4/S11)
+    176: "downlink_data_notif",
+    177: "downlink_data_notif_ack",
+    179: "pgw_restart_notif",
+    180: "pgw_restart_notif_ack",
+
+    # SGW to SGSN (S4)
+    # 178: Reserved. Allocated in earlier version of the specification.
+    # 181-199: For future use.
+
+    # SGW to PGW, PGW to SGW (S5/S8)
+    200: "update_pdn_connection_set_req",
+    201: "update_pdn_connection_set_res",
+    # 202-210: For future use.
+
+    # MME to SGW (S11)
+    211: "modify_access_bearers_req",
+    212: "modify_access_bearers_res",
+    # 213-230: For future use.
+
+    # MBMS GW to MME/SGSN (Sm/Sn)
+    231: "mbms_session_start_req",
+    232: "mbms_session_start_res",
+    233: "mbms_session_update_req",
+    234: "mbms_session_update_res",
+    235: "mbms_session_stop_req",
+    236: "mbms_session_stop_res",
+    # 237-239: For future use.
+
+    # Other
+    # 240-247: Reserved for Sv interface (see also types 25 to 31, and
+    #          TS 29.280).
+    # 248-255: For future use.
+}
 
 IEType = {1: "IMSI",
              2: "Cause",
@@ -60,7 +213,7 @@
              71: "APN",
              72: "AMBR",
              73: "EPS Bearer ID",
-             74: "IPv4",
+             74: "IP Address",
              75: "MEI",
              76: "MSISDN",
              77: "Indication",
@@ -69,25 +222,34 @@
              80: "Bearer QoS",
              82: "RAT",
              83: "Serving Network",
+             84: "Bearer TFT",
              86: "ULI",
              87: "F-TEID",
              93: "Bearer Context",
              94: "Charging ID",
              95: "Charging Characteristics",
+             97: "Bearer Flags",
              99: "PDN Type",
+             107: "MM Context (EPS Security Context and Quadruplets)",
+             109: "PDN Connection",
              114: "UE Time zone",
              126: "Port Number",
              127: "APN Restriction",
              128: "Selection Mode",
-             161: "Max MBR/APN-AMBR (MMBR)"
+             132: "FQ-CSID",
+             136: "FQDN",
+             145: "UCI",
+             161: "Max MBR/APN-AMBR (MMBR)",
+             163: "Additional Protocol Configuration Options",
+             170: "ULI Timestamp",
+             172: "RAN/NAS Cause",
+             197: "Extended Protocol Configuration Options",
+             202: "UP Function Selection Indication Flags",
+             255: "Private Extension",
           }
 
-CauseValues = {
-    16: "Request Accepted",
-}
 
-
-class GTPHeader(Packet):
+class GTPHeader(gtp.GTPHeader):
     # 3GPP TS 29.060 V9.1.0 (2009-12)
     # without the version
     name = "GTP v2 Header"
@@ -99,44 +261,41 @@
                    BitField("SPARE", 0, 1),
                    ByteEnumField("gtp_type", None, GTPmessageType),
                    ShortField("length", None),
-                   ConditionalField(IntField("teid", 0),
+                   ConditionalField(XIntField("teid", 0),
                                     lambda pkt:pkt.T == 1),
                    ThreeBytesField("seq", RandShort()),
                    ByteField("SPARE", 0)
                    ]
 
-    def post_build(self, p, pay):
-        p += pay
-        if self.length is None:
-            tmp_len = len(p) - 8
-            p = p[:2] + struct.pack("!H", tmp_len) + p[4:]
-        return p
-
-    def hashret(self):
-        return struct.pack("B", self.version) + self.payload.hashret()
-
-    def answers(self, other):
-        return (isinstance(other, GTPHeader) and
-                self.version == other.version and
-                self.payload.answers(other.payload))
-
 
-class IE_IPv4(gtp.IE_Base):
-    name = "IE IPv4"
+class IE_IP_Address(gtp.IE_Base):
+    name = "IE IP Address"
     fields_desc = [ByteEnumField("ietype", 74, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
-                   IPField("address", RandIP())]
+                   ConditionalField(
+                       IPField("address", RandIP()),
+                       lambda pkt: pkt.length == 4),
+                   ConditionalField(
+                       IP6Field("address6", None),
+                       lambda pkt: pkt.length == 16)]
+
+    def post_build(self, p, pay):
+        if self.length is None:
+            tmp_len = 16 if self.address6 is not None else 4
+            p = p[:1] + struct.pack("!H", tmp_len) + p[2:]
+        return p + pay
 
 
 class IE_MEI(gtp.IE_Base):
     name = "IE MEI"
     fields_desc = [ByteEnumField("ietype", 75, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
-                   LongField("MEI", 0)]
+                   gtp.TBCDByteField("MEI", "175675478970685",
+                                     length_from=lambda x: x.length)]
 
 
 def IE_Dispatcher(s):
@@ -156,7 +315,7 @@
 class IE_EPSBearerID(gtp.IE_Base):
     name = "IE EPS Bearer ID"
     fields_desc = [ByteEnumField("ietype", 73, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    ByteField("EBI", 0)]
@@ -165,7 +324,7 @@
 class IE_RAT(gtp.IE_Base):
     name = "IE RAT"
     fields_desc = [ByteEnumField("ietype", 82, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    ByteEnumField("RAT_type", None, RATType)]
@@ -174,82 +333,197 @@
 class IE_ServingNetwork(gtp.IE_Base):
     name = "IE Serving Network"
     fields_desc = [ByteEnumField("ietype", 83, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    gtp.TBCDByteField("MCC", "", 2),
                    gtp.TBCDByteField("MNC", "", 1)]
 
 
-class ULI_RAI(gtp.IE_Base):
-    name = "IE Tracking Area Identity"
+# User Location Information IE and fields.
+# 3GPP TS 29.274 v16.1.0 section 8.21.
+
+
+class ULI_Field(Packet):
+    """Base class for ULI fields."""
+
+    def extract_padding(self, s):
+        return "", s
+
+
+class ULI_CGI(ULI_Field):
+    name = "Cell Global Identifier"
     fields_desc = [
         gtp.TBCDByteField("MCC", "", 2),
-        # MNC: if the third digit of MCC is 0xf, then the length of
-        # MNC is 1 byte
         gtp.TBCDByteField("MNC", "", 1),
         ShortField("LAC", 0),
-        ShortField("RAC", 0)]
+        ShortField("CI", 0),
+    ]
 
 
-class ULI_SAI(gtp.IE_Base):
-    name = "IE Tracking Area Identity"
+class ULI_SAI(ULI_Field):
+    name = "Service Area Identity"
     fields_desc = [
         gtp.TBCDByteField("MCC", "", 2),
         gtp.TBCDByteField("MNC", "", 1),
         ShortField("LAC", 0),
-        ShortField("SAC", 0)]
+        ShortField("SAC", 0),
+    ]
 
 
-class ULI_TAI(gtp.IE_Base):
-    name = "IE Tracking Area Identity"
+class ULI_RAI(ULI_Field):
+    name = "Routing Area Identity"
     fields_desc = [
         gtp.TBCDByteField("MCC", "", 2),
+        # MNC: if the third digit of MCC is 0xf, then the length of
+        # MNC is 1 byte
         gtp.TBCDByteField("MNC", "", 1),
-        ShortField("TAC", 0)]
+        ShortField("LAC", 0),
+        ShortField("RAC", 0),
+    ]
 
 
-class ULI_ECGI(gtp.IE_Base):
-    name = "IE E-UTRAN Cell Identifier"
+class ULI_TAI(ULI_Field):
+    name = "Tracking Area Identity"
+    fields_desc = [
+        gtp.TBCDByteField("MCC", "", 2),
+        gtp.TBCDByteField("MNC", "", 1),
+        ShortField("TAC", 0),
+    ]
+
+
+class ULI_ECGI(ULI_Field):
+    name = "E-UTRAN Cell Global Identifier"
     fields_desc = [
         gtp.TBCDByteField("MCC", "", 2),
         gtp.TBCDByteField("MNC", "", 1),
         BitField("SPARE", 0, 4),
-        BitField("ECI", 0, 28)]
+        BitField("ECI", 0, 28),
+    ]
+
+
+class ULI_LAI(ULI_Field):
+    name = "Location Area Identifier"
+    fields_desc = [
+        gtp.TBCDByteField("MCC", "", 2),
+        gtp.TBCDByteField("MNC", "", 1),
+        ShortField("LAC", 0),
+    ]
 
 
 class IE_ULI(gtp.IE_Base):
-    name = "IE ULI"
-    fields_desc = [ByteEnumField("ietype", 86, IEType),
-                   ShortField("length", 0),
-                   BitField("CR_flag", 0, 4),
-                   BitField("instance", 0, 4),
-                   BitField("SPARE", 0, 2),
-                   BitField("LAI_Present", 0, 1),
-                   BitField("ECGI_Present", 0, 1),
-                   BitField("TAI_Present", 0, 1),
-                   BitField("RAI_Present", 0, 1),
-                   BitField("SAI_Present", 0, 1),
-                   BitField("CGI_Present", 0, 1),
-                   ConditionalField(
-        PacketField("SAI", 0, ULI_SAI), lambda pkt: bool(pkt.SAI_Present)),
+    name = "IE User Location Information"
+    fields_desc = [
+        ByteEnumField("ietype", 86, IEType),
+        ShortField("length", None),
+        BitField("CR_flag", 0, 4),
+        BitField("instance", 0, 4),
+        BitField("SPARE", 0, 2),
+        BitField("LAI_Present", 0, 1),
+        BitField("ECGI_Present", 0, 1),
+        BitField("TAI_Present", 0, 1),
+        BitField("RAI_Present", 0, 1),
+        BitField("SAI_Present", 0, 1),
+        BitField("CGI_Present", 0, 1),
+        ConditionalField(
+            PacketField("CGI", 0, ULI_CGI),
+            lambda pkt: bool(pkt.CGI_Present)),
+        ConditionalField(
+            PacketField("SAI", 0, ULI_SAI),
+            lambda pkt: bool(pkt.SAI_Present)),
+        ConditionalField(
+            PacketField("RAI", 0, ULI_RAI),
+            lambda pkt: bool(pkt.RAI_Present)),
+        ConditionalField(
+            PacketField("TAI", 0, ULI_TAI),
+            lambda pkt: bool(pkt.TAI_Present)),
         ConditionalField(
-        PacketField("RAI", 0, ULI_RAI), lambda pkt: bool(pkt.RAI_Present)),
+            PacketField("ECGI", 0, ULI_ECGI),
+            lambda pkt: bool(pkt.ECGI_Present)),
         ConditionalField(
-        PacketField("TAI", 0, ULI_TAI), lambda pkt: bool(pkt.TAI_Present)),
-        ConditionalField(PacketField("ECGI", 0, ULI_ECGI),
-                         lambda pkt: bool(pkt.ECGI_Present))]
+            PacketField("LAI", 0, ULI_LAI),
+            lambda pkt: bool(pkt.LAI_Present)),
+    ]
+
+
+class IE_ULI_Timestamp(gtp.IE_Base):
+    name = "IE ULI Timestamp"
+    fields_desc = [
+        ByteEnumField("ietype", 170, IEType),
+        ShortField("length", None),
+        BitField("CR_flag", 0, 4),
+        BitField("instance", 0, 4),
+        XIntField("timestamp", 0)]
+
+
+# 3GPP TS 29.274 v12.12.0 section 8.22
+INTERFACE_TYPES = {
+    0: "S1-U eNodeB GTP-U interface",
+    1: "S1-U SGW GTP-U interface",
+    2: "S12 RNC GTP-U interface",
+    3: "S12 SGW GTP-U interface",
+    4: "S5/S8 SGW GTP-U interface",
+    5: "S5/S8 PGW GTP-U interface",
+    6: "S5/S8 SGW GTP-C interface",
+    7: "S5/S8 PGW GTP-C interface",
+    8: "S5/S8 SGW PMIPv6 interface",
+    9: "S5/S8 PGW PMIPv6 interface",
+    10: "S11 MME GTP-C interface",
+    11: "S11/S4 SGW GTP-C interface",
+    12: "S10 MME GTP-C interface",
+    13: "S3 MME GTP-C interface",
+    14: "S3 SGSN GTP-C interface",
+    15: "S4 SGSN GTP-U interface",
+    16: "S4 SGW GTP-U interface",
+    17: "S4 SGSN GTP-C interface",
+    18: "S16 SGSN GTP-C interface",
+    19: "eNodeB GTP-U interface for DL data forwarding",
+    20: "eNodeB GTP-U interface for UL data forwarding",
+    21: "RNC GTP-U interface for data forwarding",
+    22: "SGSN GTP-U interface for data forwarding",
+    23: "SGW GTP-U interface for DL data forwarding",
+    24: "Sm MBMS GW GTP-C interface",
+    25: "Sn MBMS GW GTP-C interface",
+    26: "Sm MME GTP-C interface",
+    27: "Sn SGSN GTP-C interface",
+    28: "SGW GTP-U interface for UL data forwarding",
+    29: "Sn SGSN GTP-U interface",
+    30: "S2b ePDG GTP-C interface",
+    31: "S2b-U ePDG GTP-U interface",
+    32: "S2b PGW GTP-C interface",
+    33: "S2b-U PGW GTP-U interface",
+    34: "S2a TWAN GTP-U interface",
+    35: "S2a TWAN GTP-C interface",
+    36: "S2a PGW GTP-C interface",
+    37: "S2a PGW GTP-U interface",
+}
+
+
+class IE_UCI(gtp.IE_Base):
+    name = "IE UCI"
+    fields_desc = [ByteEnumField("ietype", 145, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   gtp.TBCDByteField("MCC", "", 2),
+                   gtp.TBCDByteField("MNC", "", 1),
+                   BitField("SPARE", 0, 5),
+                   BitField("CSG_ID", 0, 27),
+                   BitField("AccessMode", 0, 2),
+                   BitField("SPARE", 0, 4),
+                   BitField("LCSG", 0, 1),
+                   BitField("CMI", 0, 1)]
 
 
 class IE_FTEID(gtp.IE_Base):
     name = "IE F-TEID"
     fields_desc = [ByteEnumField("ietype", 87, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    BitField("ipv4_present", 0, 1),
                    BitField("ipv6_present", 0, 1),
-                   BitField("InterfaceType", 0, 6),
+                   BitEnumField("InterfaceType", 0, 6, INTERFACE_TYPES),
                    XIntField("GRE_Key", 0),
                    ConditionalField(
         IPField("ipv4", RandIP()), lambda pkt: pkt.ipv4_present),
@@ -260,17 +534,77 @@
 class IE_BearerContext(gtp.IE_Base):
     name = "IE Bearer Context"
     fields_desc = [ByteEnumField("ietype", 93, IEType),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    PacketListField("IE_list", None, IE_Dispatcher,
                                    length_from=lambda pkt: pkt.length)]
 
 
+class IE_BearerFlags(gtp.IE_Base):
+    name = "IE Bearer Flags"
+    fields_desc = [ByteEnumField("ietype", 97, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("SPARE", 0, 4),
+                   BitField("ASI", 0, 1),
+                   BitField("Vind", 0, 1),
+                   BitField("VB", 0, 1),
+                   BitField("PPC", 0, 1)]
+
+
+class IE_MMContext_EPS(gtp.IE_Base):
+    name = "IE MM Context (EPS Security Context and Quadruplets)"
+    fields_desc = [ByteEnumField("ietype", 107, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("Sec_Mode", 0, 3),
+                   BitField("Nhi", 0, 1),
+                   BitField("Drxi", 0, 1),
+                   BitField("Ksi", 0, 3),
+                   BitField("Num_quint", 0, 3),
+                   BitField("Num_Quad", 0, 3),
+                   BitField("Uambri", 0, 1),
+                   BitField("Osci", 0, 1),
+                   BitField("Sambri", 0, 1),
+                   BitField("Nas_algo", 0, 3),
+                   BitField("Nas_cipher", 0, 4),
+                   ThreeBytesField("Nas_dl_count", 0),
+                   ThreeBytesField("Nas_ul_count", 0),
+                   BitField("Kasme", 0, 256),
+                   ConditionalField(StrLenField("fields", "",
+                                    length_from=lambda x: x.length - 41),
+                                    lambda pkt: pkt.length > 40)]
+
+
+class IE_PDNConnection(gtp.IE_Base):
+    name = "IE PDN Connection"
+    fields_desc = [ByteEnumField("ietype", 109, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   PacketListField("IE_list", None, IE_Dispatcher,
+                                   length_from=lambda pkt: pkt.length)]
+
+
+class IE_FQDN(gtp.IE_Base):
+    name = "IE FQDN"
+    fields_desc = [ByteEnumField("ietype", 136, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   ByteField("fqdn_tr_bit", 0),
+                   StrLenField("fqdn", "", length_from=lambda x: x.length - 1)]
+
+
 class IE_NotImplementedTLV(gtp.IE_Base):
     name = "IE not implemented"
     fields_desc = [ByteEnumField("ietype", 0, IEType),
                    ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
                    StrLenField("data", "", length_from=lambda x: x.length)]
 
 
@@ -284,13 +618,112 @@
                                      length_from=lambda x: x.length)]
 
 
+# 3GPP TS 29.274 v16.1.0 table 8.4-1
+CAUSE_VALUES = {
+    # 0: Reserved. Shall not be sent and if received the Cause shall be treated
+    #    as an invalid IE.
+    # 1: Reserved.
+    2: "Local Detach",
+    3: "Complete Detach",
+    4: "RAT changed from 3GPP to Non-3GPP",
+    5: "ISR deactivation",
+    6: "Error Indication received from RNC/eNodeB/S4-SGSN/MME",
+    7: "IMSI Detach Only",
+    8: "Reactivation Requested",
+    9: "PDN reconnection to this APN disallowed",
+    10: "Access changed from Non-3GPP to 3GPP",
+    11: "PDN connection inactivity timer expires",
+    12: "PGW not responding",
+    13: "Network Failure",
+    14: "QoS parameter mismatch",
+    15: "EPS to 5GS Mobility",
+    16: "Request accepted",
+    17: "Request accepted partially",
+    18: "New PDN type due to network preference",
+    19: "New PDN type due to single address bearer only",
+    # 20-63: Spare. This value range shall be used by Cause values in an
+    #        acceptance response/triggered message.
+    64: "Context Not Found",
+    65: "Invalid Message Format",
+    66: "Version not supported by next peer",
+    67: "Invalid length",
+    68: "Service not supported",
+    69: "Mandatory IE incorrect",
+    70: "Mandatory IE missing",
+    # 71: Shall not be used. See NOTE 2 and NOTE 3.
+    72: "System failure",
+    73: "No resources available",
+    74: "Semantic error in the TFT operation",
+    75: "Syntactic error in the TFT operation",
+    76: "Semantic errors in packet filter(s)",
+    77: "Syntactic errors in packet filter(s)",
+    78: "Missing or unknown APN",
+    # 79: Shall not be used. See NOTE 2 and NOTE 3.
+    80: "GRE key not found",
+    81: "Relocation failure",
+    82: "Denied in RAT",
+    83: "Preferred PDN type not supported",
+    84: "All dynamic addresses are occupied",
+    85: "UE context without TFT already activated",
+    86: "Protocol type not supported",
+    87: "UE not responding",
+    88: "UE refuses",
+    89: "Service denied",
+    90: "Unable to page UE",
+    91: "No memory available",
+    92: "User authentication failed",
+    93: "APN access denied - no subscription",
+    94: "Request rejected (reason not specified)",
+    95: "P-TMSI Signature mismatch",
+    96: "IMSI/IMEI not known",
+    97: "Semantic error in the TAD operation",
+    98: "Syntactic error in the TAD operation",
+    # 99: Shall not be used. See NOTE 2 and NOTE 3.
+    100: "Remote peer not responding",
+    101: "Collision with network initiated request",
+    102: "Unable to page UE due to Suspension",
+    103: "Conditional IE missing",
+    104: "APN Restriction type Incompatible with currently active PDN "
+         "connection",
+    105: "Invalid overall length of the triggered response message and a "
+         "piggybacked initial message",
+    106: "Data forwarding not supported",
+    107: "Invalid reply from remote peer",
+    108: "Fallback to GTPv1",
+    109: "Invalid peer",
+    110: "Temporarily rejected due to handover/TAU/RAU procedure in progress",
+    111: "Modifications not limited to S1-U bearers",
+    112: "Request rejected for a PMIPv6 reason",
+    113: "APN Congestion",
+    114: "Bearer handling not supported",
+    115: "UE already re-attached",
+    116: "Multiple PDN connections for a given APN not allowed",
+    117: "Target access restricted for the subscriber",
+    # 118: Shall not be used. See NOTE 2 and NOTE 3.
+    119: "MME/SGSN refuses due to VPLMN Policy",
+    120: "GTP-C Entity Congestion",
+    121: "Late Overlapping Request",
+    122: "Timed out Request",
+    123: "UE is temporarily not reachable due to power saving",
+    124: "Relocation failure due to NAS message redirection",
+    125: "UE not authorised by OCS or external AAA Server",
+    126: "Multiple accesses to a PDN connection not allowed",
+    127: "Request rejected due to UE capability",
+    128: "S1-U Path Failure",
+    129: "5GC not allowed",
+    # 130-239: Spare. For future use in a triggered/response message.
+    #          See NOTE 4.
+    # 240-255: Spare. For future use in an initial/request message. See NOTE 5.
+}
+
+
 class IE_Cause(gtp.IE_Base):
     name = "IE Cause"
     fields_desc = [ByteEnumField("ietype", 2, IEType),
                    ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
-                   ByteEnumField("Cause", 1, CauseValues),
+                   ByteEnumField("Cause", 1, CAUSE_VALUES),
                    BitField("SPARE", 0, 5),
                    BitField("PCE", 0, 1),
                    BitField("BCE", 0, 1),
@@ -316,6 +749,16 @@
                                       length_from=lambda x: x.length)]
 
 
+class IE_BearerTFT(gtp.IE_Base):
+    name = "IE Bearer TFT"
+    fields_desc = [ByteEnumField("ietype", 84, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   StrLenField("Bearer_TFT", "",
+                               length_from=lambda x: x.length)]
+
+
 class IE_AMBR(gtp.IE_Base):
     name = "IE AMBR"
     fields_desc = [ByteEnumField("ietype", 72, IEType),
@@ -337,28 +780,43 @@
 
 
 class IE_Indication(gtp.IE_Base):
-    name = "IE Cause"
+    name = "IE Indication"
     fields_desc = [ByteEnumField("ietype", 77, IEType),
                    ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
-                   BitField("DAF", 0, 1),
-                   BitField("DTF", 0, 1),
-                   BitField("HI", 0, 1),
-                   BitField("DFI", 0, 1),
-                   BitField("OI", 0, 1),
-                   BitField("ISRSI", 0, 1),
-                   BitField("ISRAI", 0, 1),
-                   BitField("SGWCI", 0, 1),
-                   BitField("SQCI", 0, 1),
-                   BitField("UIMSI", 0, 1),
-                   BitField("CFSI", 0, 1),
-                   BitField("CRSI", 0, 1),
-                   BitField("PS", 0, 1),
-                   BitField("PT", 0, 1),
-                   BitField("SI", 0, 1),
-                   BitField("MSV", 0, 1),
-
+                   ConditionalField(
+                       BitField("DAF", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("DTF", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("HI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("DFI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("OI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("ISRSI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("ISRAI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("SGWCI", 0, 1), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       BitField("SQCI", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("UIMSI", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("CFSI", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("CRSI", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("PS", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("PT", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("SI", 0, 1), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       BitField("MSV", 0, 1), lambda pkt: pkt.length > 1),
                    ConditionalField(
                        BitField("RetLoc", 0, 1), lambda pkt: pkt.length > 2),
                    ConditionalField(
@@ -392,6 +850,70 @@
         BitField("CLII", 0, 1), lambda pkt: pkt.length > 3),
         ConditionalField(
         BitField("CPSR", 0, 1), lambda pkt: pkt.length > 3),
+        ConditionalField(
+        BitField("NSI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("UASI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("DTCI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("BDWI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("PSCI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("PCRI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("AOSI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("AOPI", 0, 1), lambda pkt: pkt.length > 4),
+        ConditionalField(
+        BitField("ROAAI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("EPCOSI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("CPOPCI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("PMTSMI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("S11TF", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("PNSI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("UNACCSI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("WPMSI", 0, 1), lambda pkt: pkt.length > 5),
+        ConditionalField(
+        BitField("5GSNN26", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("REPREFI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("5GSIWKI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("EEVRSI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("LTEMUI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("LTEMPI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("ENBCRSI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("TSPCMI", 0, 1), lambda pkt: pkt.length > 6),
+        ConditionalField(
+        BitField("Spare", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("Spare", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("Spare", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("N5GNMI", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("5GCNRS", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("5GCNRI", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("5SRHOI", 0, 1), lambda pkt: pkt.length > 7),
+        ConditionalField(
+        BitField("ETHPDN", 0, 1), lambda pkt: pkt.length > 7),
 
     ]
 
@@ -415,50 +937,76 @@
     def extract_padding(self, pkt):
         return "", pkt
 
+    def post_build(self, p, pay):
+        if self.length is None:
+            p = p[:1] + struct.pack("!B", len(p) - 2) + p[2:]
+        return p + pay
+
+
+class PCO_Protocol(Packet):
+    # 10.5.6.3 of 3GPP TS 24.008
+    def extract_padding(self, pkt):
+        return "", pkt
+
+    def post_build(self, p, pay):
+        if self.length is None:
+            p = p[:2] + struct.pack("!B", len(p) - 3) + p[3:]
+        return p + pay
+
 
 class PCO_IPv4(PCO_Option):
     name = "IPv4"
     fields_desc = [ByteEnumField("type", None, PCO_OPTION_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    IPField("address", RandIP())]
 
 
 class PCO_Primary_DNS(PCO_Option):
     name = "Primary DNS Server IP Address"
     fields_desc = [ByteEnumField("type", None, PCO_OPTION_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    IPField("address", RandIP())]
 
 
 class PCO_Primary_NBNS(PCO_Option):
     name = "Primary DNS Server IP Address"
     fields_desc = [ByteEnumField("type", None, PCO_OPTION_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    IPField("address", RandIP())]
 
 
 class PCO_Secondary_DNS(PCO_Option):
     name = "Secondary DNS Server IP Address"
     fields_desc = [ByteEnumField("type", None, PCO_OPTION_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    IPField("address", RandIP())]
 
 
 class PCO_Secondary_NBNS(PCO_Option):
     name = "Secondary NBNS Server IP Address"
     fields_desc = [ByteEnumField("type", None, PCO_OPTION_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    IPField("address", RandIP())]
 
 
 PCO_PROTOCOL_TYPES = {
     0x0001: 'P-CSCF IPv6 Address Request',
+    0x0002: 'IM CN Subsystem Signaling Flag',
     0x0003: 'DNS Server IPv6 Address Request',
     0x0005: 'MS Support of Network Requested Bearer Control indicator',
     0x000a: 'IP Allocation via NAS',
     0x000d: 'DNS Server IPv4 Address Request',
     0x000c: 'P-CSCF IPv4 Address Request',
     0x0010: 'IPv4 Link MTU Request',
+    0x0012: 'P-CSCF Re-selection Support',
+    0x001a: 'PDU session ID',
+    0x0022: '5GSM Cause Value',
+    0x0023: 'QoS Rules With Support Indicator',
+    0x0024: 'QoS Flow Descriptions With Support Indicator',
+    0x001b: 'S-NSSAI',
+    0x001c: 'QoS Rules',
+    0x001d: 'Session-AMBR',
+    0x001f: 'QoS Flow Descriptions',
     0x8021: 'IPCP',
     0xc023: 'Password Authentication Protocol',
     0xc223: 'Challenge Handshake Authentication Protocol',
@@ -485,36 +1033,44 @@
     return pkt.length - 4 if pkt.length else 0
 
 
-class PCO_P_CSCF_IPv6_Address_Request(PCO_Option):
+class PCO_P_CSCF_IPv6_Address_Request(PCO_Protocol):
     name = "PCO PCO-P CSCF IPv6 Address Request"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ConditionalField(XBitField("address",
                                               "2001:db8:0:42::", 128),
                                     lambda pkt: pkt.length)]
 
 
-class PCO_DNS_Server_IPv6(PCO_Option):
+class PCO_IM_CN_Subsystem_Signaling_Flag(PCO_Protocol):
+    name = "PCO IM CN Subsystem Signaling Flag"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=len_options)]
+
+
+class PCO_DNS_Server_IPv6(PCO_Protocol):
     name = "PCO DNS Server IPv6 Address Request"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ConditionalField(XBitField("address",
                                               "2001:db8:0:42::", 128),
                                     lambda pkt: pkt.length)]
 
 
-class PCO_SOF(PCO_Option):
+class PCO_SOF(PCO_Protocol):
     name = "PCO MS Support of Network Requested Bearer Control indicator"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ]
 
 
-class PCO_PPP(PCO_Option):
+class PCO_PPP(PCO_Protocol):
     name = "PPP IP Control Protocol"
     fields_desc = [ByteField("Code", 0),
                    ByteField("Identifier", 0),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    PacketListField("Options", None, PCO_option_dispatcher,
                                    length_from=len_options)]
 
@@ -522,50 +1078,129 @@
         return "", pkt
 
 
-class PCO_IP_Allocation_via_NAS(PCO_Option):
+class PCO_IP_Allocation_via_NAS(PCO_Protocol):
     name = "PCO IP Address allocation via NAS Signaling"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    PacketListField("Options", None, PCO_option_dispatcher,
                                    length_from=len_options)]
 
 
-class PCO_P_CSCF_IPv4_Address_Request(PCO_Option):
+class PCO_P_CSCF_IPv4_Address_Request(PCO_Protocol):
     name = "PCO PCO-P CSCF IPv4 Address Request"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ConditionalField(IPField("address", RandIP()),
                                     lambda pkt: pkt.length)]
 
 
-class PCO_DNS_Server_IPv4(PCO_Option):
+class PCO_DNS_Server_IPv4(PCO_Protocol):
     name = "PCO DNS Server IPv4 Address Request"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ConditionalField(IPField("address", RandIP()),
                                     lambda pkt: pkt.length)]
 
 
-class PCO_IPv4_Link_MTU_Request(PCO_Option):
+class PCO_IPv4_Link_MTU_Request(PCO_Protocol):
     name = "PCO IPv4 Link MTU Request"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    ConditionalField(ShortField("MTU_size", 1500),
                                     lambda pkt: pkt.length)]
 
 
-class PCO_IPCP(PCO_Option):
+class PCO_P_CSCF_Re_selection_Support(PCO_Protocol):
+    name = "PCO P-CSCF Re-selection Support"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=len_options)]
+
+
+class PCO_PDU_Session_Id(PCO_Protocol):
+    name = "PCO PDU session ID"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", 1),
+                   ByteField("PduSessionId", 1)]
+
+
+class PCO_5GSM_Cause_Value(PCO_Protocol):
+    name = "PCO 5GSM Cause Value"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=len_options)]
+
+
+class PCO_QoS_Rules_With_Support_Indicator(PCO_Protocol):
+    name = "PCO QoS Rules With Support Indicator"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=lambda pkt: pkt.length)]
+
+
+class PCO_QoS_Flow_Descriptions_With_Support_Indicator(PCO_Protocol):
+    name = "PCO QoS Flow Descriptions With Support Indicator"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=lambda pkt: pkt.length)]
+
+
+class PCO_S_Nssai(PCO_Protocol):
+    name = "PCO S-NSSAI"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   ConditionalField(
+                       ByteField("SST", 0), lambda pkt: pkt.length > 0),
+                   ConditionalField(
+                       ShortField("SD", 0), lambda pkt: pkt.length > 1),
+                   ConditionalField(
+                       ByteField("Hplmn_Sst", 0), lambda pkt: pkt.length >= 4),
+                   ConditionalField(
+                       ShortField("Hplmn_Sd", 0), lambda pkt: pkt.length > 4)]
+
+
+class PCO_Qos_Rules(PCO_Protocol):
+    name = "PCO QoS Rules"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=lambda pkt: pkt.length)]
+
+
+class PCO_Session_AMBR(PCO_Protocol):
+    name = "PCO Session AMBR"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", 6),
+                   ByteField("dlunit", 0),
+                   ShortField("dlambr", 0),
+                   ByteField("ulunit", 0),
+                   ShortField("ulambr", 0)]
+
+
+class PCO_QoS_Flow_Descriptions(PCO_Protocol):
+    name = "PCO QoS Flow Descriptions"
+    fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
+                   ByteField("length", None),
+                   PacketListField("Options", None, PCO_option_dispatcher,
+                                   length_from=lambda pkt: pkt.length)]
+
+
+class PCO_IPCP(PCO_Protocol):
     name = "PCO Internet Protocol Control Protocol"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    PacketField("PPP", None, PCO_PPP)]
 
 
-class PCO_PPP_Auth(PCO_Option):
+class PCO_PPP_Auth(PCO_Protocol):
     name = "PPP Password Authentication Protocol"
     fields_desc = [ByteField("Code", 0),
                    ByteField("Identifier", 0),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    ByteField("PeerID_length", 0),
                    ConditionalField(StrFixedLenField(
                        "PeerID",
@@ -581,18 +1216,18 @@
                        lambda pkt: pkt.Password_length)]
 
 
-class PCO_PasswordAuthentificationProtocol(PCO_Option):
+class PCO_PasswordAuthentificationProtocol(PCO_Protocol):
     name = "PCO Password Authentication Protocol"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    PacketField("PPP", None, PCO_PPP_Auth)]
 
 
-class PCO_PPP_Challenge(PCO_Option):
+class PCO_PPP_Challenge(PCO_Protocol):
     name = "PPP Password Authentication Protocol"
     fields_desc = [ByteField("Code", 0),
                    ByteField("Identifier", 0),
-                   ShortField("length", 0),
+                   ShortField("length", None),
                    ByteField("value_size", 0),
                    ConditionalField(StrFixedLenField(
                        "value", "",
@@ -604,21 +1239,31 @@
                        lambda pkt: pkt.length)]
 
 
-class PCO_ChallengeHandshakeAuthenticationProtocol(PCO_Option):
+class PCO_ChallengeHandshakeAuthenticationProtocol(PCO_Protocol):
     name = "PCO Password Authentication Protocol"
     fields_desc = [ShortEnumField("type", None, PCO_PROTOCOL_TYPES),
-                   ByteField("length", 0),
+                   ByteField("length", None),
                    PacketField("PPP", None, PCO_PPP_Challenge)]
 
 
 PCO_PROTOCOL_CLASSES = {
     0x0001: PCO_P_CSCF_IPv6_Address_Request,
+    0x0002: PCO_IM_CN_Subsystem_Signaling_Flag,
     0x0003: PCO_DNS_Server_IPv6,
     0x0005: PCO_SOF,
     0x000a: PCO_IP_Allocation_via_NAS,
     0x000c: PCO_P_CSCF_IPv4_Address_Request,
     0x000d: PCO_DNS_Server_IPv4,
     0x0010: PCO_IPv4_Link_MTU_Request,
+    0x0012: PCO_P_CSCF_Re_selection_Support,
+    0x001a: PCO_PDU_Session_Id,
+    0x0022: PCO_5GSM_Cause_Value,
+    0x0023: PCO_QoS_Rules_With_Support_Indicator,
+    0x0024: PCO_QoS_Flow_Descriptions_With_Support_Indicator,
+    0x001b: PCO_S_Nssai,
+    0x001c: PCO_Qos_Rules,
+    0x001d: PCO_Session_AMBR,
+    0x001f: PCO_QoS_Flow_Descriptions,
     0x8021: PCO_IPCP,
     0xc023: PCO_PasswordAuthentificationProtocol,
     0xc223: PCO_ChallengeHandshakeAuthenticationProtocol,
@@ -645,6 +1290,32 @@
                                    length_from=lambda pkt: pkt.length - 1)]
 
 
+class IE_EPCO(gtp.IE_Base):
+    name = "IE Extended Protocol Configuration Options"
+    fields_desc = [ByteEnumField("ietype", 197, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("Extension", 0, 1),
+                   BitField("SPARE", 0, 4),
+                   BitField("PPP", 0, 3),
+                   PacketListField("Protocols", None, PCO_protocol_dispatcher,
+                                   length_from=lambda pkt: pkt.length - 1)]
+
+
+class IE_APCO(gtp.IE_Base):
+    name = "IE Additional Protocol Configuration Options"
+    fields_desc = [ByteEnumField("ietype", 163, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("extension", 0, 1),
+                   BitField("SPARE", 0, 4),
+                   BitField("PPP", 0, 3),
+                   PacketListField("Protocols", None, PCO_protocol_dispatcher,
+                                   length_from=lambda pkt: pkt.length - 1)]
+
+
 class IE_PAA(gtp.IE_Base):
     name = "IE PAA"
     fields_desc = [ByteEnumField("ietype", 79, IEType),
@@ -692,7 +1363,7 @@
 
 
 class IE_ChargingCharacteristics(gtp.IE_Base):
-    name = "IE Charging ID"
+    name = "IE Charging Characteristics"
     fields_desc = [ByteEnumField("ietype", 95, IEType),
                    ShortField("length", None),
                    BitField("CR_flag", 0, 4),
@@ -723,7 +1394,7 @@
 class IE_Port_Number(gtp.IE_Base):
     name = "IE Port Number"
     fields_desc = [ByteEnumField("ietype", 126, IEType),
-                   ShortField("length", 2),
+                   ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
                    ShortField("PortNumber", RandShort())]
@@ -750,7 +1421,7 @@
 
 class IE_MMBR(gtp.IE_Base):
     name = "IE Max MBR/APN-AMBR (MMBR)"
-    fields_desc = [ByteEnumField("ietype", 72, IEType),
+    fields_desc = [ByteEnumField("ietype", 161, IEType),
                    ShortField("length", None),
                    BitField("CR_flag", 0, 4),
                    BitField("instance", 0, 4),
@@ -758,13 +1429,67 @@
                    IntField("downlink_rate", 0)]
 
 
+class IE_UPF_SelInd_Flags(gtp.IE_Base):
+    name = "IE UP Function Selection Indication Flags"
+    fields_desc = [ByteEnumField("ietype", 202, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("SPARE", 0, 7),
+                   BitField("DCNR", 0, 1)]
+
+
+class IE_FQCSID(gtp.IE_Base):
+    name = "IE FQ-CSID"
+    fields_desc = [ByteEnumField("ietype", 132, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("nodeid_type", 0, 4),
+                   BitField("num_csid", 0, 4),
+                   ConditionalField(
+                       IPField("nodeid_v4", 0),
+                       lambda pkt: pkt.nodeid_type == 0),
+                   ConditionalField(
+                       XBitField("nodeid_v6", "2001:db8:0:42::", 128),
+                       lambda pkt: pkt.nodeid_type == 1),
+                   ConditionalField(
+                       BitField("nodeid_nonip", 0, 32),
+                       lambda pkt: pkt.nodeid_type == 2),
+                   ShortField("csid", 0)]
+
+
+class IE_Ran_Nas_Cause(gtp.IE_Base):
+    name = "IE RAN/NAS Cause"
+    fields_desc = [ByteEnumField("ietype", 172, IEType),
+                   ShortField("length", None),
+                   BitField("CR_flag", 0, 4),
+                   BitField("instance", 0, 4),
+                   BitField("protocol_type", 0, 4),
+                   BitField("cause_type", 0, 4),
+                   ByteField("cause_value", 0)]
+
+
+# 3GPP TS 29.274 v16.1.0 section 8.67.
+class IE_PrivateExtension(gtp.IE_Base):
+    name = "Private Extension"
+    fields_desc = [
+        ByteEnumField("ietype", 255, IEType),
+        ShortField("length", None),
+        BitField("SPARE", 0, 4),
+        BitField("instance", 0, 4),
+        ShortEnumField("enterprisenum", None, IANA_ENTERPRISE_NUMBERS),
+        StrLenField("proprietaryvalue", "",
+                    length_from=lambda x: x.length - 2)]
+
+
 ietypecls = {1: IE_IMSI,
              2: IE_Cause,
              3: IE_RecoveryRestart,
              71: IE_APN,
              72: IE_AMBR,
              73: IE_EPSBearerID,
-             74: IE_IPv4,
+             74: IE_IP_Address,
              75: IE_MEI,
              76: IE_MSISDN,
              77: IE_Indication,
@@ -773,17 +1498,30 @@
              80: IE_Bearer_QoS,
              82: IE_RAT,
              83: IE_ServingNetwork,
+             84: IE_BearerTFT,
              86: IE_ULI,
              87: IE_FTEID,
              93: IE_BearerContext,
              94: IE_ChargingID,
              95: IE_ChargingCharacteristics,
+             97: IE_BearerFlags,
              99: IE_PDN_type,
+             107: IE_MMContext_EPS,
+             109: IE_PDNConnection,
              114: IE_UE_Timezone,
              126: IE_Port_Number,
              127: IE_APN_Restriction,
              128: IE_SelectionMode,
-             161: IE_MMBR}
+             132: IE_FQCSID,
+             136: IE_FQDN,
+             145: IE_UCI,
+             161: IE_MMBR,
+             163: IE_APCO,
+             170: IE_ULI_Timestamp,
+             172: IE_Ran_Nas_Cause,
+             197: IE_EPCO,
+             202: IE_UPF_SelInd_Flags,
+             255: IE_PrivateExtension}
 
 #
 # GTPv2 Commands
@@ -802,6 +1540,9 @@
 class GTPV2EchoResponse(GTPV2Command):
     name = "GTPv2 Echo Response"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2EchoRequest)
+
 
 class GTPV2CreateSessionRequest(GTPV2Command):
     name = "GTPv2 Create Session Request"
@@ -810,6 +1551,9 @@
 class GTPV2CreateSessionResponse(GTPV2Command):
     name = "GTPv2 Create Session Response"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2CreateSessionRequest)
+
 
 class GTPV2DeleteSessionRequest(GTPV2Command):
     name = "GTPv2 Delete Session Request"
@@ -818,13 +1562,32 @@
 class GTPV2DeleteSessionResponse(GTPV2Command):
     name = "GTPv2 Delete Session Request"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2DeleteSessionRequest)
+
 
 class GTPV2ModifyBearerCommand(GTPV2Command):
     name = "GTPv2 Modify Bearer Command"
 
 
-class GTPV2ModifyBearerFailureNotification(GTPV2Command):
-    name = "GTPv2 Modify Bearer Command"
+class GTPV2ModifyBearerFailureIndication(GTPV2Command):
+    name = "GTPv2 Modify Bearer Failure Indication"
+
+
+class GTPV2DeleteBearerCommand(GTPV2Command):
+    name = "GTPv2 Delete Bearer Command"
+
+
+class GTPV2DeleteBearerFailureIndication(GTPV2Command):
+    name = "GTPv2 Delete Bearer Failure Indication"
+
+
+class GTPV2BearerResourceCommand(GTPV2Command):
+    name = "GTPv2 Bearer Resource Command"
+
+
+class GTPV2BearerResourceFailureIndication(GTPV2Command):
+    name = "GTPv2 Bearer Resource Failure Indication"
 
 
 class GTPV2DownlinkDataNotifFailureIndication(GTPV2Command):
@@ -838,6 +1601,20 @@
 class GTPV2ModifyBearerResponse(GTPV2Command):
     name = "GTPv2 Modify Bearer Response"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2ModifyBearerRequest)
+
+
+class GTPV2CreateBearerRequest(GTPV2Command):
+    name = "GTPv2 Create Bearer Request"
+
+
+class GTPV2CreateBearerResponse(GTPV2Command):
+    name = "GTPv2 Create Bearer Response"
+
+    def answers(self, other):
+        return isinstance(other, GTPV2CreateBearerRequest)
+
 
 class GTPV2UpdateBearerRequest(GTPV2Command):
     name = "GTPv2 Update Bearer Request"
@@ -846,6 +1623,9 @@
 class GTPV2UpdateBearerResponse(GTPV2Command):
     name = "GTPv2 Update Bearer Response"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2UpdateBearerRequest)
+
 
 class GTPV2DeleteBearerRequest(GTPV2Command):
     name = "GTPv2 Delete Bearer Request"
@@ -871,6 +1651,21 @@
     name = "GTPv2 Delete Bearer Response"
 
 
+class GTPV2ContextRequest(GTPV2Command):
+    name = "GTPv2 Context Request"
+
+
+class GTPV2ContextResponse(GTPV2Command):
+    name = "GTPv2 Context Response"
+
+    def answers(self, other):
+        return isinstance(other, GTPV2ContextRequest)
+
+
+class GTPV2ContextAcknowledge(GTPV2Command):
+    name = "GTPv2 Context Acknowledge"
+
+
 class GTPV2CreateIndirectDataForwardingTunnelRequest(GTPV2Command):
     name = "GTPv2 Create Indirect Data Forwarding Tunnel Request"
 
@@ -878,6 +1673,12 @@
 class GTPV2CreateIndirectDataForwardingTunnelResponse(GTPV2Command):
     name = "GTPv2 Create Indirect Data Forwarding Tunnel Response"
 
+    def answers(self, other):
+        return isinstance(
+            other,
+            GTPV2CreateIndirectDataForwardingTunnelRequest
+        )
+
 
 class GTPV2DeleteIndirectDataForwardingTunnelRequest(GTPV2Command):
     name = "GTPv2 Delete Indirect Data Forwarding Tunnel Request"
@@ -886,6 +1687,12 @@
 class GTPV2DeleteIndirectDataForwardingTunnelResponse(GTPV2Command):
     name = "GTPv2 Delete Indirect Data Forwarding Tunnel Response"
 
+    def answers(self, other):
+        return isinstance(
+            other,
+            GTPV2DeleteIndirectDataForwardingTunnelRequest
+        )
+
 
 class GTPV2ReleaseBearerRequest(GTPV2Command):
     name = "GTPv2 Release Bearer Request"
@@ -894,6 +1701,9 @@
 class GTPV2ReleaseBearerResponse(GTPV2Command):
     name = "GTPv2 Release Bearer Response"
 
+    def answers(self, other):
+        return isinstance(other, GTPV2ReleaseBearerRequest)
+
 
 class GTPV2DownlinkDataNotif(GTPV2Command):
     name = "GTPv2 Download Data Notification"
@@ -912,12 +1722,21 @@
 bind_layers(GTPHeader, GTPV2DeleteSessionRequest, gtp_type=36)
 bind_layers(GTPHeader, GTPV2DeleteSessionResponse, gtp_type=37)
 bind_layers(GTPHeader, GTPV2ModifyBearerCommand, gtp_type=64)
-bind_layers(GTPHeader, GTPV2ModifyBearerFailureNotification, gtp_type=65)
+bind_layers(GTPHeader, GTPV2ModifyBearerFailureIndication, gtp_type=65)
+bind_layers(GTPHeader, GTPV2DeleteBearerCommand, gtp_type=66)
+bind_layers(GTPHeader, GTPV2DeleteBearerFailureIndication, gtp_type=67)
+bind_layers(GTPHeader, GTPV2BearerResourceCommand, gtp_type=68)
+bind_layers(GTPHeader, GTPV2BearerResourceFailureIndication, gtp_type=69)
 bind_layers(GTPHeader, GTPV2DownlinkDataNotifFailureIndication, gtp_type=70)
+bind_layers(GTPHeader, GTPV2CreateBearerRequest, gtp_type=95)
+bind_layers(GTPHeader, GTPV2CreateBearerResponse, gtp_type=96)
 bind_layers(GTPHeader, GTPV2UpdateBearerRequest, gtp_type=97)
 bind_layers(GTPHeader, GTPV2UpdateBearerResponse, gtp_type=98)
 bind_layers(GTPHeader, GTPV2DeleteBearerRequest, gtp_type=99)
 bind_layers(GTPHeader, GTPV2DeleteBearerResponse, gtp_type=100)
+bind_layers(GTPHeader, GTPV2ContextRequest, gtp_type=130)
+bind_layers(GTPHeader, GTPV2ContextResponse, gtp_type=131)
+bind_layers(GTPHeader, GTPV2ContextAcknowledge, gtp_type=132)
 bind_layers(GTPHeader, GTPV2SuspendNotification, gtp_type=162)
 bind_layers(GTPHeader, GTPV2SuspendAcknowledge, gtp_type=163)
 bind_layers(GTPHeader, GTPV2ResumeNotification, gtp_type=164)

scapy-2.4.3.tar.gz/scapy/contrib/homeplugav.py -> scapy-2.4.4.tar.gz/scapy/contrib/homeplugav.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # Scapy is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +23,7 @@
     ConditionalField, EnumField, FieldLenField, IntField, LEIntField, \
     LELongField, LEShortField, MACField, PacketListField, ShortField, \
     StrFixedLenField, StrLenField, X3BytesField, XByteField, XIntField, \
-    XLongField, XShortField
+    XLongField, XShortField, LEShortEnumField
 from scapy.layers.l2 import Ether
 from scapy.modules.six.moves import range
 
@@ -165,8 +163,7 @@
         A fragmentation field condition
         TODO: To complete
     """
-    fragTypeTable = [0xA038, 0xA039]
-    return ((pkt.version == 0x01) and (pkt.HPtype in fragTypeTable))
+    return pkt.version == 0x01
 
 
 class MACManagementHeader(Packet):
@@ -477,7 +474,102 @@
                    ]
 
 ######################################################################
-# Read Module Datas
+# Module Operation (for newest chipset like 6410, 7000, 7420 and 7500)
+######################################################################
+
+
+OperationList = {0x0000: "Read",
+                 0x0011: "Write"}
+
+
+class ModuleOperationRequest(Packet):
+    name = "ModuleOperationRequest"
+    fields_desc = [XIntField("reserved", 0),
+                   XByteField("NumOpData", 0x01),
+                   LEShortEnumField("operation", 0x0000, OperationList),
+                   LEShortField("OPDataLength", None),
+                   XIntField("reserved_1", 0),
+                   ConditionalField(LEIntField("SessionID", 0),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   ConditionalField(XByteField("ModuleIDX", 0),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   LEShortField("ModuleID", 0x7002),
+                   LEShortField("ModuleSubID", 0x0000),
+                   ConditionalField(LEShortField("ReadDataLen", 0x0578),
+                                    lambda pkt:(0x0000 == pkt.operation)),
+                   ConditionalField(LEIntField("ReadOffset", 0x00000000),
+                                    lambda pkt:(0x0000 == pkt.operation)),
+                   ConditionalField(FieldLenField("WriteDataLen", None,
+                                                  count_of="ModuleData",
+                                                  fmt="<H"),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   ConditionalField(LEIntField("WriteOffset", 0x00000000),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   ConditionalField(StrLenField("ModuleData", b"\x00",
+                                                length_from=lambda pkt: pkt.WriteDataLen),  # noqa: E501
+                                    lambda pkt:(0x0011 == pkt.operation))]
+
+    def post_build(self, p, pay):
+        if self.operation == 0x0000:
+            if self.OPDataLength is None:
+                _len = 18
+                p = p[:7] + struct.pack('!H', _len) + p[9:]
+        if self.operation == 0x0011:
+            if self.OPDataLength is None:
+                _len = 23 + len(self.ModuleData)
+                p = p[:7] + struct.pack('!H', _len) + p[9:]
+            if self.WriteDataLen is None:
+                _len = len(self.ModuleData)
+                p = p[:22] + struct.pack('!H', _len) + p[24:]
+        return p + pay
+
+
+class ModuleOperationConfirmation(Packet):
+    name = "ModuleOperationConfirmation"
+    fields_desc = [LEShortField("Status", 0x0000),
+                   LEShortField("ErrorCode", 0x0000),
+                   XIntField("reserved", 0),
+                   XByteField("NumOpData", 0x01),
+                   LEShortEnumField("operation", 0x0000, OperationList),
+                   LEShortField("OPDataLength", 0x0012),
+                   XIntField("reserved_1", 0),
+                   ConditionalField(LEIntField("SessionID", 0),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   ConditionalField(XByteField("ModuleIDX", 0),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   LEShortField("ModuleID", 0x7002),
+                   LEShortField("ModuleSubID", 0x0000),
+                   ConditionalField(FieldLenField("ReadDataLen", None,
+                                                  count_of="ModuleData",
+                                                  fmt="<H"),
+                                    lambda pkt:(0x0000 == pkt.operation)),
+                   ConditionalField(LEIntField("ReadOffset", 0x00000000),
+                                    lambda pkt:(0x0000 == pkt.operation)),
+                   ConditionalField(StrLenField("ModuleData", b"\x00",
+                                                length_from=lambda pkt: pkt.ReadDataLen),  # noqa: E501
+                                    lambda pkt:(0x0000 == pkt.operation)),
+                   ConditionalField(LEShortField("WriteDataLen", 0),
+                                    lambda pkt:(0x0011 == pkt.operation)),
+                   ConditionalField(LEIntField("WriteOffset", 0x00000000),
+                                    lambda pkt:(0x0011 == pkt.operation))]
+
+    def post_build(self, p, pay):
+        if self.operation == 0x0011:
+            if self.OPDataLength is None:
+                _len = 18 + len(self.ModuleData)
+                p = p[:7] + struct.pack('h', _len) + p[9:]
+        if self.operation == 0x0000:
+            if self.OPDataLength is None:
+                _len = 23 + len(self.ModuleData)
+                p = p[:7] + struct.pack('h', _len) + p[9:]
+            if self.WriteDataLen is None:
+                _len = len(self.ModuleData)
+                p = p[:17] + struct.pack('h', _len) + p[19:]
+        return p + pay
+
+
+######################################################################
+# Read Module Data
 ######################################################################
 
 
@@ -524,7 +616,7 @@
         return p + pay
 
 ######################################################################
-# Write Module Datas
+# Write Module Data
 ######################################################################
 
 
@@ -1285,8 +1377,12 @@
     """
     name = "HomePlugAV "
     fields_desc = [MACManagementHeader,
-                   ConditionalField(XShortField("FragmentInfo", 0x0), FragmentCond),  # Fragmentation Field  # noqa: E501
-                   VendorMME]
+                   ConditionalField(XShortField("FragmentInfo", 0x0),
+                                    FragmentCond),
+                   ConditionalField(PacketListField("VendorField", VendorMME(),
+                                                    VendorMME,
+                                                    length_from=lambda x: 3),
+                                    lambda pkt:(pkt.version == 0x00))]
 
     def answers(self, other):
         return (isinstance(self, HomePlugAV))
@@ -1297,36 +1393,38 @@
 #   +----------+------------+--------------------+
 #   | Ethernet | HomePlugAV | Elements + Payload |
 #   +----------+------------+--------------------+
-bind_layers(HomePlugAV, GetDeviceVersion, {"HPtype": 0xA001})
-bind_layers(HomePlugAV, StartMACRequest, {"HPtype": 0xA00C})
-bind_layers(HomePlugAV, StartMACConfirmation, {"HPtype": 0xA00D})
-bind_layers(HomePlugAV, ResetDeviceRequest, {"HPtype": 0xA01C})
-bind_layers(HomePlugAV, ResetDeviceConfirmation, {"HPtype": 0xA01D})
-bind_layers(HomePlugAV, NetworkInformationRequest, {"HPtype": 0xA038})
-bind_layers(HomePlugAV, ReadMACMemoryRequest, {"HPtype": 0xA008})
-bind_layers(HomePlugAV, ReadMACMemoryConfirmation, {"HPtype": 0xA009})
-bind_layers(HomePlugAV, ReadModuleDataRequest, {"HPtype": 0xA024})
-bind_layers(HomePlugAV, ReadModuleDataConfirmation, {"HPtype": 0xA025})
-bind_layers(HomePlugAV, WriteModuleDataRequest, {"HPtype": 0xA020})
-bind_layers(HomePlugAV, WriteModuleData2NVMRequest, {"HPtype": 0xA028})
-bind_layers(HomePlugAV, WriteModuleData2NVMConfirmation, {"HPtype": 0xA029})
-bind_layers(HomePlugAV, NetworkInfoConfirmationV10, {"HPtype": 0xA039, "version": 0x00})  # noqa: E501
-bind_layers(HomePlugAV, NetworkInfoConfirmationV11, {"HPtype": 0xA039, "version": 0x01})  # noqa: E501
-bind_layers(NetworkInfoConfirmationV10, NetworkInfoV10, {"HPtype": 0xA039, "version": 0x00})  # noqa: E501
-bind_layers(NetworkInfoConfirmationV11, NetworkInfoV11, {"HPtype": 0xA039, "version": 0x01})  # noqa: E501
-bind_layers(HomePlugAV, HostActionRequired, {"HPtype": 0xA062})
-bind_layers(HomePlugAV, LoopbackRequest, {"HPtype": 0xA048})
-bind_layers(HomePlugAV, LoopbackConfirmation, {"HPtype": 0xA049})
-bind_layers(HomePlugAV, SetEncryptionKeyRequest, {"HPtype": 0xA050})
-bind_layers(HomePlugAV, SetEncryptionKeyConfirmation, {"HPtype": 0xA051})
-bind_layers(HomePlugAV, ReadConfBlockRequest, {"HPtype": 0xA058})
-bind_layers(HomePlugAV, ReadConfBlockConfirmation, {"HPtype": 0xA059})
-bind_layers(HomePlugAV, QUAResetFactoryConfirm, {"HPtype": 0xA07D})
-bind_layers(HomePlugAV, GetNVMParametersRequest, {"HPtype": 0xA010})
-bind_layers(HomePlugAV, GetNVMParametersConfirmation, {"HPtype": 0xA011})
-bind_layers(HomePlugAV, SnifferRequest, {"HPtype": 0xA034})
-bind_layers(HomePlugAV, SnifferConfirmation, {"HPtype": 0xA035})
-bind_layers(HomePlugAV, SnifferIndicate, {"HPtype": 0xA036})
+bind_layers(HomePlugAV, GetDeviceVersion, HPtype=0xA001)
+bind_layers(HomePlugAV, StartMACRequest, HPtype=0xA00C)
+bind_layers(HomePlugAV, StartMACConfirmation, HPtype=0xA00D)
+bind_layers(HomePlugAV, ResetDeviceRequest, HPtype=0xA01C)
+bind_layers(HomePlugAV, ResetDeviceConfirmation, HPtype=0xA01D)
+bind_layers(HomePlugAV, NetworkInformationRequest, HPtype=0xA038)
+bind_layers(HomePlugAV, ReadMACMemoryRequest, HPtype=0xA008)
+bind_layers(HomePlugAV, ReadMACMemoryConfirmation, HPtype=0xA009)
+bind_layers(HomePlugAV, ReadModuleDataRequest, HPtype=0xA024)
+bind_layers(HomePlugAV, ReadModuleDataConfirmation, HPtype=0xA025)
+bind_layers(HomePlugAV, ModuleOperationRequest, HPtype=0xA0B0)
+bind_layers(HomePlugAV, ModuleOperationConfirmation, HPtype=0xA0B1)
+bind_layers(HomePlugAV, WriteModuleDataRequest, HPtype=0xA020)
+bind_layers(HomePlugAV, WriteModuleData2NVMRequest, HPtype=0xA028)
+bind_layers(HomePlugAV, WriteModuleData2NVMConfirmation, HPtype=0xA029)
+bind_layers(HomePlugAV, NetworkInfoConfirmationV10, HPtype=0xA039, version=0x00)  # noqa: E501
+bind_layers(HomePlugAV, NetworkInfoConfirmationV11, HPtype=0xA039, version=0x01)  # noqa: E501
+bind_layers(NetworkInfoConfirmationV10, NetworkInfoV10, HPtype=0xA039, version=0x00)  # noqa: E501
+bind_layers(NetworkInfoConfirmationV11, NetworkInfoV11, HPtype=0xA039, version=0x01)  # noqa: E501
+bind_layers(HomePlugAV, HostActionRequired, HPtype=0xA062)
+bind_layers(HomePlugAV, LoopbackRequest, HPtype=0xA048)
+bind_layers(HomePlugAV, LoopbackConfirmation, HPtype=0xA049)
+bind_layers(HomePlugAV, SetEncryptionKeyRequest, HPtype=0xA050)
+bind_layers(HomePlugAV, SetEncryptionKeyConfirmation, HPtype=0xA051)
+bind_layers(HomePlugAV, ReadConfBlockRequest, HPtype=0xA058)
+bind_layers(HomePlugAV, ReadConfBlockConfirmation, HPtype=0xA059)
+bind_layers(HomePlugAV, QUAResetFactoryConfirm, HPtype=0xA07D)
+bind_layers(HomePlugAV, GetNVMParametersRequest, HPtype=0xA010)
+bind_layers(HomePlugAV, GetNVMParametersConfirmation, HPtype=0xA011)
+bind_layers(HomePlugAV, SnifferRequest, HPtype=0xA034)
+bind_layers(HomePlugAV, SnifferConfirmation, HPtype=0xA035)
+bind_layers(HomePlugAV, SnifferIndicate, HPtype=0xA036)
 
 """
     Credit song : "Western Spaguetti - We are terrorists"

scapy-2.4.4.tar.gz/scapy/contrib/homepluggp.py Added

@@ -0,0 +1,242 @@
+#! /usr/bin/env python
+
+# This file is part of Scapy
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy. If not, see <http://www.gnu.org/licenses/>.
+
+# scapy.contrib.description = HomePlugGP Layer
+# scapy.contrib.status = loads
+
+from __future__ import absolute_import
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import ByteEnumField, ByteField, FieldLenField, \
+    MACField, PacketListField, ShortField, \
+    StrFixedLenField, XIntField, PacketField \
+
+# This layer extends HomePlug AV one
+from scapy.contrib.homeplugav import HomePlugAV, QualcommTypeList
+
+# Copyright (C) HomePlugGP Layer for Scapy by FlUxIuS (Sebastien Dudek)
+# As HomePlug GreenPHY is a subset of HomePlug AV, that is why we use
+# HomePlugAV layer as a base here.
+
+HomePlugGPTypes = {0x6008: "CM_SET_KEY_REQ",
+                   0x6009: "CM_SET_KEY_CNF",
+                   0x6064: "CM_SLAC_PARM_REQ",
+                   0x6065: "CM_SLAC_PARM_CNF",
+                   0x606e: "CM_ATTEN_CHAR_IN",
+                   0x606a: "CM_START_ATTEN_CHAR_IND",
+                   0x606f: "CM_ATTEN_CHAR_RSP",
+                   0x6076: "CM_MNBC_SOUND_IND",
+                   0x607c: "CM_SLAC_MATCH_REQ",
+                   0x607d: "CM_SLAC_MATCH_CNF",
+                   0x6086: "CM_ATTENUATION_CHARACTERISTICS_MME"}
+
+QualcommTypeList.update(HomePlugGPTypes)
+
+HPGP_codes = {0x0: "Success"}
+
+KeyType_list = {0x01: "NMK (AES-128)"}
+
+######################################################################
+# SLAC operations
+######################################################################
+
+
+class CM_SLAC_PARM_REQ(Packet):
+    name = "CM_SLAC_PARM_REQ"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8)]
+
+
+class CM_SLAC_PARM_CNF(Packet):
+    name = "CM_SLAC_PARM_CNF"
+    fields_desc = [MACField("MSoundTargetMAC", "00:00:00:00:00:00"),
+                   ByteField("NumberMSounds", 0x0),
+                   ByteField("TimeOut", 0x0),
+                   ByteField("ResponseType", 0x0),
+                   MACField("ForwardingSTA", "00:00:00:00:00:00"),
+                   ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8)]
+
+
+class HPGP_GROUP(Packet):
+    name = "HPGP_GROUP"
+    fields_desc = [ByteField("group", 0x0)]
+
+    def extract_padding(self, p):
+        return "", p
+
+
+class VS_ATTENUATION_CHARACTERISTICS_MME(Packet):
+    name = "VS_ATTENUATION_CHARACTERISTICS_MME"
+    fields_desc = [MACField("EVMACAddress", "00:00:00:00:00:00"),
+                   FieldLenField("NumberOfGroups", None,
+                                 count_of="Groups", fmt="B"),
+                   ByteField("NumberOfCarrierPerGroupe", 0),
+                   StrFixedLenField("Reserved", b"\x00" * 7, 7),
+                   PacketListField("Groups", "", HPGP_GROUP,
+                                   length_from=lambda pkt: pkt.NumberOfGroups)]
+
+
+class CM_ATTENUATION_CHARACTERISTICS_MME(Packet):
+    name = "CM_ATTENUATION_CHARACTERISTICS_MME"
+    fields_desc = [MACField("EVMACAddress", "00:00:00:00:00:00"),
+                   FieldLenField("NumberOfGroups", None, count_of="Groups",
+                                 fmt="B"),
+                   ByteField("NumberOfCarrierPerGroupe", 0),
+                   PacketListField("Groups", "", HPGP_GROUP,
+                                   length_from=lambda pkt: pkt.NumberOfGroups)]
+
+
+class CM_ATTEN_CHAR_IND(Packet):
+    name = "CM_ATTEN_CHAR_IND"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   MACField("SourceAdress", "00:00:00:00:00:00"),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8),
+                   StrFixedLenField("SourceID", b"\x00" * 17, 17),
+                   StrFixedLenField("ResponseID", b"\x00" * 17, 17),
+                   ByteField("NumberOfSounds", 0x0),
+                   FieldLenField("NumberOfGroups", None, count_of="Groups",
+                                 fmt="B"),
+                   PacketListField("Groups", "", HPGP_GROUP,
+                                   length_from=lambda pkt: pkt.NumberOfGroups)]
+
+
+class CM_ATTEN_CHAR_RSP(Packet):
+    name = "CM_ATTEN_CHAR_RSP"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   MACField("SourceAdress", "00:00:00:00:00:00"),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8),
+                   StrFixedLenField("SourceID", b"\x00" * 17, 17),
+                   StrFixedLenField("ResponseID", b"\x00" * 17, 17),
+                   ByteEnumField("Result", 0x0, HPGP_codes)]
+
+
+class SLAC_varfield(Packet):
+    name = "SLAC_varfield"
+    fields_desc = [StrFixedLenField("EVID", b"\x00" * 17, 17),
+                   MACField("EVMAC", "00:00:00:00:00:00"),
+                   StrFixedLenField("EVSEID", b"\x00" * 17, 17),
+                   MACField("EVSEMAC", "00:00:00:00:00:00"),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8),
+                   StrFixedLenField("RSVD", b"\x00" * 8, 8)]
+
+
+class CM_SLAC_MATCH_REQ(Packet):
+    name = "CM_SLAC_MATCH_REQ"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   FieldLenField("MatchVariableFieldLen", None,
+                                 count_of="VariableField", fmt="H"),
+                   PacketField("VariableField",
+                               SLAC_varfield(),
+                               SLAC_varfield)]
+
+
+class SLAC_varfield_cnf(Packet):
+    name = "SLAC_varfield"
+    fields_desc = [StrFixedLenField("EVID", b"\x00" * 17, 17),
+                   MACField("EVMAC", "00:00:00:00:00:00"),
+                   StrFixedLenField("EVSEID", b"\x00" * 17, 17),
+                   MACField("EVSEMAC", "00:00:00:00:00:00"),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8),
+                   StrFixedLenField("RSVD", b"\x00" * 8, 8),
+                   StrFixedLenField("NetworkID", b"\x00" * 7, 7),
+                   ByteField("Reserved", 0x0),
+                   StrFixedLenField("NMK", b"\x00" * 16, 16)]
+
+
+class CM_SLAC_MATCH_CNF(Packet):
+    name = "CM_SLAC_MATCH_CNF"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   FieldLenField("MatchVariableFieldLen", None,
+                                 count_of="VariableField", fmt="H"),
+                   PacketField("VariableField",
+                               SLAC_varfield_cnf(),
+                               SLAC_varfield_cnf)]
+
+
+class CM_START_ATTEN_CHAR_IND(Packet):
+    name = "CM_START_ATTEN_CHAR_IND"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   ByteField("NumberOfSounds", 0x0),
+                   ByteField("TimeOut", 0x0),
+                   ByteField("ResponseType", 0x0),
+                   MACField("ForwardingSTA", "00:00:00:00:00:00"),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8)]
+
+
+class CM_MNBC_SOUND_IND(Packet):
+    name = "CM_MNBC_SOUND_IND"
+    fields_desc = [ByteField("ApplicationType", 0x0),
+                   ByteField("SecurityType", 0x0),
+                   StrFixedLenField("SenderID", b"\x00" * 17, 17),
+                   ByteField("Countdown", 0x0),
+                   StrFixedLenField("RunID", b"\x00" * 8, 8),
+                   StrFixedLenField("RSVD", b"\x00" * 8, 8),
+                   StrFixedLenField("RandomValue", b"\x00" * 16, 16)]
+
+
+######################################################################
+# Set keys for GP
+######################################################################
+
+
+class CM_SET_KEY_REQ(Packet):
+    name = "CM_SET_KEY_REQ"
+    fields_desc = [ByteEnumField("KeyType", 0x0, KeyType_list),
+                   XIntField("MyNonce", 0),
+                   XIntField("YourNonce", 0),
+                   ByteField("PID", 0),
+                   ShortField("ProtoRunNumber", 0),
+                   ByteField("ProtoMessNumber", 0),
+                   ByteField("CCoCapability", 0),
+                   StrFixedLenField("NetworkID", b"\x00" * 7, 7),
+                   ByteField("NewEncKeySelect", 0),
+                   StrFixedLenField("NewKey", b"\x00" * 16, 16)]
+
+
+class CM_SET_KEY_CNF(Packet):
+    name = "CM_SET_KEY_CNF"
+    fields_desc = [ByteEnumField("Result", 0x0, HPGP_codes),
+                   XIntField("MyNonce", 0),
+                   XIntField("YourNonce", 0),
+                   ByteField("PID", 0),
+                   ShortField("ProtoRunNumber", 0),
+                   ByteField("ProtoMessNumber", 0),
+                   ByteField("CCoCapability", 0)]
+
+
+# END #
+
+
+bind_layers(HomePlugAV, VS_ATTENUATION_CHARACTERISTICS_MME, HPtype=0xA14E)
+bind_layers(HomePlugAV, CM_SLAC_PARM_REQ, HPtype=0x6064)
+bind_layers(HomePlugAV, CM_SLAC_PARM_CNF, HPtype=0x6065)
+bind_layers(HomePlugAV, CM_START_ATTEN_CHAR_IND, HPtype=0x606a)
+bind_layers(HomePlugAV, CM_ATTEN_CHAR_IND, HPtype=0x606e)
+bind_layers(HomePlugAV, CM_ATTEN_CHAR_RSP, HPtype=0x606f)
+bind_layers(HomePlugAV, CM_MNBC_SOUND_IND, HPtype=0x6076)
+bind_layers(HomePlugAV, CM_SLAC_MATCH_REQ, HPtype=0x607c)
+bind_layers(HomePlugAV, CM_SLAC_MATCH_CNF, HPtype=0x607d)
+bind_layers(HomePlugAV, CM_SET_KEY_REQ, HPtype=0x6008)
+bind_layers(HomePlugAV, CM_SET_KEY_CNF, HPtype=0x6009)
+bind_layers(HomePlugAV, CM_ATTENUATION_CHARACTERISTICS_MME, HPtype=0x6086)

scapy-2.4.4.tar.gz/scapy/contrib/homeplugsg.py Added

@@ -0,0 +1,62 @@
+#! /usr/bin/env python
+
+# This file is part of Scapy
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy. If not, see <http://www.gnu.org/licenses/>.
+
+# scapy.contrib.description = HomePlugSG Layer
+# scapy.contrib.status = loads
+
+from __future__ import absolute_import
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import FieldLenField, StrFixedLenField, StrLenField
+
+# Extends HomePlug AV and GP layer
+from scapy.contrib.homeplugav import HomePlugAV, QualcommTypeList
+
+#
+#    Copyright (C) HomePlugSG Layer for Scapy by FlUxIuS (Sebastien Dudek)
+#
+
+# HomePlug GP extension for SG
+
+
+HomePlugSGTypes = {0xA400: "VS_UART_CMD_Req",
+                   0xA401: "VS_UART_CMD_Cnf"}
+
+
+QualcommTypeList.update(HomePlugSGTypes)
+
+# UART commands over HomePlugGP
+
+
+class VS_UART_CMD_REQ(Packet):
+    name = "VS_UART_CMD_REQ"
+    fields_desc = [FieldLenField("UDataLen", None, count_of="UData", fmt="H"),
+                   StrLenField("UData", "UartCommand\x00",
+                               length_from=lambda pkt: pkt.UDataLen)]
+
+
+class VS_UART_CMD_CNF(Packet):
+    name = "VS_UART_CMD_CNF"
+    fields_desc = [StrFixedLenField("reserved", b"\x00", 6),
+                   FieldLenField("UDataLen", None, count_of="UData", fmt="H"),
+                   StrLenField("UData", "UartCommand\x00",
+                               length_from=lambda pkt: pkt.UDataLen)]
+
+
+# END #
+
+bind_layers(HomePlugAV, VS_UART_CMD_REQ, HPtype=0xA400)
+bind_layers(HomePlugAV, VS_UART_CMD_CNF, HPtype=0xA401)

scapy-2.4.3.tar.gz/scapy/contrib/http2.py -> scapy-2.4.4.tar.gz/scapy/contrib/http2.py Changed

@@ -26,7 +26,6 @@
 # scapy.contrib.description=HTTP/2 (RFC 7540, RFC 7541)
 
 # base_classes triggers an unwanted import warning
-# flake8: noqa: F821
 
 from __future__ import absolute_import
 from __future__ import print_function
@@ -36,16 +35,14 @@
 from io import BytesIO
 import struct
 import scapy.modules.six as six
-from scapy.compat import raw, plain_str, bytes_hex, orb, chb, bytes_encode
+from scapy.compat import raw, plain_str, hex_bytes, orb, chb, bytes_encode
 
 # Only required if using mypy-lang for static typing
 # Most symbols are used in mypy-interpreted "comments".
 # Sized must be one of the superclasses of a class implementing __len__
-try:
-    from typing import Optional, List, Union, Callable, Any, Tuple, Sized  # noqa: F401, E501
-except ImportError:
-    class Sized(object):
-        pass
+from scapy.compat import Optional, List, Union, Callable, Any, \
+    Tuple, Sized, Pattern  # noqa: F401
+from scapy.base_classes import Packet_metaclass  # noqa: F401
 
 import scapy.fields as fields
 import scapy.packet as packet
@@ -70,11 +67,11 @@
     def __init__(self, name, default, size):
         # type: (str, int, int) -> None
         """
-        @param str name: this field instance name.
-        @param int default: this field only valid value.
-        @param int size: this bitfield bitlength.
-        @return None
-        @raise AssertionError
+        :param str name: this field instance name.
+        :param int default: this field only valid value.
+        :param int size: this bitfield bitlength.
+        :return: None
+        :raises: AssertionError
         """
         assert(default >= 0)
         # size can be negative if encoding is little-endian (see rev property of bitfields)  # noqa: E501
@@ -85,12 +82,12 @@
     def addfield(self, pkt, s, val):
         # type: (Optional[packet.Packet], Union[str, Tuple[str, int, int]], int) -> Union[str, Tuple[str, int, int]]  # noqa: E501
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param str|(str, int, long) s: either a str if 0 == size%8 or a tuple with the string to add this field to, the  # noqa: E501
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param str|(str, int, long) s: either a str if 0 == size%8 or a tuple with the string to add this field to, the  # noqa: E501
           number of bits already generated and the generated value so far.
-        @param int val: unused; must be equal to default value
-        @return str|(str, int, long): the s string extended with this field machine representation  # noqa: E501
-        @raise AssertionError
+        :param int val: unused; must be equal to default value
+        :return: str|(str, int, long): the s string extended with this field machine representation  # noqa: E501
+        :raises: AssertionError
         """
         assert val == self._magic, 'val parameter must value {}; received: {}'.format(self._magic, val)  # noqa: E501
         return super(HPackMagicBitField, self).addfield(pkt, s, self._magic)
@@ -98,12 +95,12 @@
     def getfield(self, pkt, s):
         # type: (Optional[packet.Packet], Union[str, Tuple[str, int]]) -> Tuple[Union[Tuple[str, int], str], int]  # noqa: E501
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param str|(str, int) s: either a str if size%8==0 or a tuple with the string to parse from and the number of  # noqa: E501
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param str|(str, int) s: either a str if size%8==0 or a tuple with the string to parse from and the number of  # noqa: E501
           bits already consumed by previous bitfield-compatible fields.
-        @return (str|(str, int), int): Returns the remaining string and the parsed value. May return a tuple if there  # noqa: E501
+        :return: (str|(str, int), int): Returns the remaining string and the parsed value. May return a tuple if there  # noqa: E501
           are remaining bits to parse in the first byte. Returned value is equal to default value  # noqa: E501
-        @raise AssertionError
+        :raises: AssertionError
         """
         r = super(HPackMagicBitField, self).getfield(pkt, s)
         assert (
@@ -117,10 +114,10 @@
     def h2i(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
-        @param int x: unused; must be equal to default value
-        @return int; default value
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
+        :param int x: unused; must be equal to default value
+        :return: int; default value
+        :raises: AssertionError
         """
         assert x == self._magic, \
             'EINVAL: x: This field is magic. Do not attempt to modify it. Expected value: {}'.format(self._magic)  # noqa: E501
@@ -129,10 +126,10 @@
     def i2h(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
-        @param int x: unused; must be equal to default value
-        @return int; default value
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
+        :param int x: unused; must be equal to default value
+        :return: int; default value
+        :raises: AssertionError
         """
         assert x == self._magic, \
             'EINVAL: x: This field is magic. Do not attempt to modify it. Expected value: {}'.format(self._magic)  # noqa: E501
@@ -141,10 +138,10 @@
     def m2i(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
-        @param int x: must be the machine representatino of the default value
-        @return int; default value
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
+        :param int x: must be the machine representatino of the default value
+        :return: int; default value
+        :raises: AssertionError
         """
         r = super(HPackMagicBitField, self).m2i(pkt, x)
         assert r == self._magic, 'Invalid value parsed from m2i; error in class guessing detected!'  # noqa: E501
@@ -153,10 +150,10 @@
     def i2m(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
-        @param int x: unused; must be equal to default value
-        @return int; default value
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
+        :param int x: unused; must be equal to default value
+        :return: int; default value
+        :raises: AssertionError
         """
         assert x == self._magic, \
             'EINVAL: x: This field is magic. Do not attempt to modify it. Expected value: {}'.format(self._magic)  # noqa: E501
@@ -165,10 +162,10 @@
     def any2i(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
-        @param int x: unused; must be equal to default value
-        @return int; default value
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused  # noqa: E501
+        :param int x: unused; must be equal to default value
+        :return: int; default value
+        :raises: AssertionError
         """
         assert x == self._magic, \
             'EINVAL: x: This field is magic. Do not attempt to modify it. Expected value: {}'.format(self._magic)  # noqa: E501
@@ -182,24 +179,24 @@
     __slots__ = ['_max_value', 'size', 'rev']
     """
     :var int size: the bit length of the prefix of this AbstractUVarIntField. It  # noqa: E501
-      represents the complement of the number of MSB that are used in the
-      current byte for other purposes by some other BitFields
+        represents the complement of the number of MSB that are used in the
+        current byte for other purposes by some other BitFields
     :var int _max_value: the maximum value that can be stored in the
-      sole prefix. If the integer equals or exceeds this value, the max prefix
-      value is assigned to the size first bits and the multibyte representation
-      is used
+        sole prefix. If the integer equals or exceeds this value, the max prefix
+        value is assigned to the size first bits and the multibyte representation
+        is used
     :var bool rev: is a fake property, also emulated for the sake of
-      compatibility with Bitfields
+        compatibility with Bitfields
     """
 
     def __init__(self, name, default, size):
         # type: (str, Optional[int], int) -> None
         """
-        @param str name: the name of this field instance
-        @param int|None default: positive, null or None default value for this field instance.  # noqa: E501
-        @param int size: the number of bits to consider in the first byte. Valid range is ]0;8]  # noqa: E501
-        @return None
-        @raise AssertionError
+        :param str name: the name of this field instance
+        :param int|None default: positive, null or None default value for this field instance.  # noqa: E501
+        :param int size: the number of bits to consider in the first byte. Valid range is ]0;8]  # noqa: E501
+        :return: None
+        :raises: AssertionError
         """
         assert(default is None or (isinstance(default, six.integer_types) and default >= 0))  # noqa: E501
         assert(0 < size <= 8)
@@ -214,10 +211,10 @@
     def h2i(self, pkt, x):
         # type: (Optional[packet.Packet], Optional[int]) -> Optional[int]
         """
-        @param packet.Packet|None pkt: unused.
-        @param int|None x: the value to convert.
-        @return int|None: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: unused.
+        :param int|None x: the value to convert.
+        :return: int|None: the converted value.
+        :raises: AssertionError
         """
         assert(not isinstance(x, six.integer_types) or x >= 0)
         return x
@@ -225,9 +222,9 @@
     def i2h(self, pkt, x):
         # type: (Optional[packet.Packet], Optional[int]) -> Optional[int]
         """
-        @param packet.Packet|None pkt: unused.
-        @param int|None x: the value to convert.
-        @return: int|None: the converted value.
+        :param packet.Packet|None pkt: unused.
+        :param int|None x: the value to convert.
+        :return:: int|None: the converted value.
         """
         return x
 
@@ -238,9 +235,9 @@
 
           A multibyte representation is indicated by all of the first size bits being set  # noqa: E501
 
-        @param str fb: first byte, as a character.
-        @return bool: True if multibyte repr detected, else False.
-        @raise AssertionError
+        :param str fb: first byte, as a character.
+        :return: bool: True if multibyte repr detected, else False.
+        :raises: AssertionError
         """
         assert(isinstance(fb, int) or len(fb) == 1)
         return (orb(fb) & self._max_value) == self._max_value
@@ -250,10 +247,10 @@
         """ _parse_multi_byte parses x as a multibyte representation to get the
           int value of this AbstractUVarIntField.
 
-        @param str s: the multibyte string to parse.
-        @return int: The parsed int value represented by this AbstractUVarIntField.  # noqa: E501
-        @raise: AssertionError
-        @raise: Scapy_Exception if the input value encodes an integer larger than 1<<64  # noqa: E501
+        :param str s: the multibyte string to parse.
+        :return: int: The parsed int value represented by this AbstractUVarIntField.  # noqa: E501
+        :raises:: AssertionError
+        :raises:: Scapy_Exception if the input value encodes an integer larger than 1<<64  # noqa: E501
         """
 
         assert(len(s) >= 2)
@@ -270,7 +267,7 @@
             value += (byte ^ 0x80) << (7 * (i - 1))
             if value > max_value:
                 raise error.Scapy_Exception(
-                    'out-of-bound value: the string encodes a value that is too large (>2^{64}): {}'.format(value)  # noqa: E501
+                    'out-of-bound value: the string encodes a value that is too large (>2^{{64}}): {}'.format(value)  # noqa: E501
                 )
             i += 1
             assert i < tmp_len, 'EINVAL: x: out-of-bound read: the string ends before the AbstractUVarIntField!'  # noqa: E501
@@ -288,9 +285,9 @@
           were consumed by another field. This field consumes the remaining bits, therefore the int of the tuple must  # noqa: E501
           equal "size".
 
-        @param packet.Packet|None pkt: unused.
-        @param str|(str, int) x: the string to convert. If bits were consumed by a previous bitfield-compatible field.  # noqa: E501
-        @raise AssertionError
+        :param packet.Packet|None pkt: unused.
+        :param str|(str, int) x: the string to convert. If bits were consumed by a previous bitfield-compatible field.  # noqa: E501
+        :raises: AssertionError
         """
         assert(isinstance(x, bytes) or (isinstance(x, tuple) and x[1] >= 0))
 
@@ -312,10 +309,10 @@
     def i2m(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> str
         """
-        @param packet.Packet|None pkt: unused.
-        @param int x: the value to convert.
-        @return str: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: unused.
+        :param int x: the value to convert.
+        :return: str: the converted value.
+        :raises: AssertionError
         """
         assert(x >= 0)
 
@@ -338,10 +335,10 @@
           A "x" value as a string is parsed as a binary encoding of a UVarInt. An int is considered an internal value.  # noqa: E501
           None is returned as is.
 
-        @param packet.Packet|None pkt: the packet containing this field; probably unused.  # noqa: E501
-        @param str|int|None x: the value to convert.
-        @return int|None: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet containing this field; probably unused.  # noqa: E501
+        :param str|int|None x: the value to convert.
+        :return: int|None: the converted value.
+        :raises: AssertionError
         """
         if isinstance(x, type(None)):
             return x
@@ -359,26 +356,32 @@
     def i2repr(self, pkt, x):
         # type: (Optional[packet.Packet], Optional[int]) -> str
         """
-        @param packet.Packet|None pkt: probably unused.
-        @param x: int|None: the positive, null or none value to convert.
-        @return str: the representation of the value.
+        :param packet.Packet|None pkt: probably unused.
+        :param x: int|None: the positive, null or none value to convert.
+        :return: str: the representation of the value.
         """
         return repr(self.i2h(pkt, x))
 
     def addfield(self, pkt, s, val):
         # type: (Optional[packet.Packet], Union[str, Tuple[str, int, int]], int) -> str  # noqa: E501
-        """ An AbstractUVarIntField prefix always consumes the remaining bits
+        """
+          An AbstractUVarIntField prefix always consumes the remaining bits
           of a BitField;if no current BitField is in use (no tuple in
           entry) then the prefix length is 8 bits and the whole byte is to
           be consumed
-        @param packet.Packet|None pkt: the packet containing this field. Probably unused.  # noqa: E501
-        @param str|(str, int, long) s: the string to append this field to. A tuple indicates that some bits were already  # noqa: E501
-          generated by another bitfield-compatible field. This MUST be the case if "size" is not 8. The int is the  # noqa: E501
-          number of bits already generated in the first byte of the str. The long is the value that was generated by the  # noqa: E501
-          previous bitfield-compatible fields.
-        @param int val: the positive or null value to be added.
-        @return str: s concatenated with the machine representation of this field.  # noqa: E501
-        @raise AssertionError
+
+        :param packet.Packet|None pkt: the packet containing this field.
+          Probably unused.
+        :param str|(str, int, long) s: the string to append this field to.
+          A tuple indicates that some bits were already generated by another
+          bitfield-compatible field. This MUST be the case if "size" is not 8.
+          The int is the number of bits already generated in the first byte of
+          the str. The long is the value that was generated by the previous
+          bitfield-compatible fields.
+        :param int val: the positive or null value to be added.
+        :return: str: s concatenated with the machine representation of this
+          field.
+        :raises: AssertionError
         """
         assert(val >= 0)
         if isinstance(s, bytes):
@@ -404,9 +407,9 @@
           of s and which is assumed to expand over multiple bytes
           (value > _max_prefix_value).
 
-        @param str s: the string to parse. It is assumed that it is a multibyte int.  # noqa: E501
-        @return The bytelength of the AbstractUVarIntField.
-        @raise AssertionError
+        :param str s: the string to parse. It is assumed that it is a multibyte int.  # noqa: E501
+        :return: The bytelength of the AbstractUVarIntField.
+        :raises: AssertionError
         """
         assert(len(s) >= 2)
         tmp_len = len(s)
@@ -423,9 +426,9 @@
     def i2len(self, pkt, x):
         # type: (Optional[packet.Packet], int) -> int
         """
-        @param packet.Packet|None pkt: unused.
-        @param int x: the positive or null value whose binary size if requested.  # noqa: E501
-        @raise AssertionError
+        :param packet.Packet|None pkt: unused.
+        :param int x: the positive or null value whose binary size if requested.  # noqa: E501
+        :raises: AssertionError
         """
         assert(x >= 0)
         if x < self._max_value:
@@ -447,12 +450,15 @@
     def getfield(self, pkt, s):
         # type: (Optional[packet.Packet], Union[str, Tuple[str, int]]) -> Tuple[str, int]  # noqa: E501
         """
-        @param packet.Packet|None pkt: the packet instance containing this field; probably unused.  # noqa: E501
-        @param str|(str, int) s: the input value to get this field value from. If size is 8, s is a string, else  # noqa: E501
-        it is a tuple containing the value and an int indicating the number of bits already consumed in the first byte  # noqa: E501
-        of the str. The number of remaining bits to consume in the first byte must be equal to "size".  # noqa: E501
-        @return (str, int): the remaining bytes of s and the parsed value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this
+          field; probably unused.
+        :param str|(str, int) s: the input value to get this field value from.
+          If size is 8, s is a string, else it is a tuple containing the value
+          and an int indicating the number of bits already consumed in the
+          first byte of the str. The number of remaining bits to consume in the
+          first byte must be equal to "size".
+        :return: (str, int): the remaining bytes of s and the parsed value.
+        :raises: AssertionError
         """
         if isinstance(s, tuple):
             assert(len(s) == 2)
@@ -477,7 +483,7 @@
     def randval(self):
         # type: () -> volatile.VolatileValue
         """
-        @return volatile.VolatileValue: a volatile value for this field "long"-compatible internal value.  # noqa: E501
+        :return: volatile.VolatileValue: a volatile value for this field "long"-compatible internal value.  # noqa: E501
         """
         return volatile.RandLong()
 
@@ -486,9 +492,9 @@
     def __init__(self, name, default, size):
         # type: (str, int, int) -> None
         """
-        @param str name: the name of this field instance.
-        @param default: the default value for this field instance. default must be positive or null.  # noqa: E501
-        @raise AssertionError
+        :param str name: the name of this field instance.
+        :param default: the default value for this field instance. default must be positive or null.  # noqa: E501
+        :raises: AssertionError
         """
         assert(default >= 0)
         assert(0 < size <= 8)
@@ -505,10 +511,10 @@
         # type: (Optional[packet.Packet], int) -> int
         """ h2i is overloaded to restrict the acceptable x values (not None)
 
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param int x: the value to convert.
-        @return int: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param int x: the value to convert.
+        :return: int: the converted value.
+        :raises: AssertionError
         """
         ret = super(UVarIntField, self).h2i(pkt, x)
         assert(not isinstance(ret, type(None)) and ret >= 0)
@@ -518,10 +524,10 @@
         # type: (Optional[packet.Packet], int) -> int
         """ i2h is overloaded to restrict the acceptable x values (not None)
 
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param int x: the value to convert.
-        @return int: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param int x: the value to convert.
+        :return: int: the converted value.
+        :raises: AssertionError
         """
         ret = super(UVarIntField, self).i2h(pkt, x)
         assert(not isinstance(ret, type(None)) and ret >= 0)
@@ -531,10 +537,10 @@
         # type: (Optional[packet.Packet], Union[str, int]) -> int
         """ any2i is overloaded to restrict the acceptable x values (not None)
 
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param str|int x: the value to convert.
-        @return int: the converted value.
-        @raise AssertionError
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param str|int x: the value to convert.
+        :return: int: the converted value.
+        :raises: AssertionError
         """
         ret = super(UVarIntField, self).any2i(pkt, x)
         assert(not isinstance(ret, type(None)) and ret >= 0)
@@ -544,9 +550,9 @@
         # type: (Optional[packet.Packet], int) -> str
         """ i2repr is overloaded to restrict the acceptable x values (not None)
 
-        @param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
-        @param int x: the value to convert.
-        @return str: the converted value.
+        :param packet.Packet|None pkt: the packet instance containing this field instance; probably unused.  # noqa: E501
+        :param int x: the value to convert.
+        :return: str: the converted value.
         """
         return super(UVarIntField, self).i2repr(pkt, x)
 
@@ -558,19 +564,19 @@
         # type: (str, Optional[int], int, str, Callable[[int], int]) -> None
         """ Initializes a FieldUVarLenField
 
-        @param str name: The name of this field instance.
-        @param int|None default: the default value of this field instance.
-        @param int size: the number of bits that are occupied by this field in the first byte of a binary string.  # noqa: E501
+        :param str name: The name of this field instance.
+        :param int|None default: the default value of this field instance.
+        :param int size: the number of bits that are occupied by this field in the first byte of a binary string.  # noqa: E501
           size must be in the range ]0;8].
-        @param str length_of: The name of the field this field value is measuring/representing.  # noqa: E501
-        @param callable adjust: A function that modifies the value computed from the "length_of" field.  # noqa: E501
+        :param str length_of: The name of the field this field value is measuring/representing.  # noqa: E501
+        :param callable adjust: A function that modifies the value computed from the "length_of" field.  # noqa: E501
 
         adjust can be used for instance to add a constant to the length_of field  # noqa: E501
          length. For instance, let's say that i2len of the length_of field
          returns 2. If adjust is lambda x: x+1 In that case, this field will
          value 3 at build time.
-        @return None
-        @raise AssertionError
+        :return: None
+        :raises: AssertionError
         """
         assert(default is None or default >= 0)
         assert(0 < size <= 8)
@@ -582,15 +588,15 @@
     def addfield(self, pkt, s, val):
         # type: (Optional[packet.Packet], Union[str, Tuple[str, int, int]], Optional[int]) -> str  # noqa: E501
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance. This parameter must not be  # noqa: E501
+        :param packet.Packet|None pkt: the packet instance containing this field instance. This parameter must not be  # noqa: E501
           None if the val parameter is.
-        @param str|(str, int, long) s: the string to append this field to. A tuple indicates that some bits were already  # noqa: E501
+        :param str|(str, int, long) s: the string to append this field to. A tuple indicates that some bits were already  # noqa: E501
           generated by another bitfield-compatible field. This MUST be the case if "size" is not 8. The int is the  # noqa: E501
           number of bits already generated in the first byte of the str. The long is the value that was generated by the  # noqa: E501
           previous bitfield-compatible fields.
-        @param int|None val: the positive or null value to be added. If None, the value is computed from pkt.  # noqa: E501
-        @return str: s concatenated with the machine representation of this field.  # noqa: E501
-        @raise AssertionError
+        :param int|None val: the positive or null value to be added. If None, the value is computed from pkt.  # noqa: E501
+        :return: str: s concatenated with the machine representation of this field.  # noqa: E501
+        :raises: AssertionError
         """
         if val is None:
             assert isinstance(pkt, packet.Packet), \
@@ -601,11 +607,11 @@
     def i2m(self, pkt, x):
         # type: (Optional[packet.Packet], Optional[int]) -> str
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance. This parameter must not be  # noqa: E501
+        :param packet.Packet|None pkt: the packet instance containing this field instance. This parameter must not be  # noqa: E501
           None if the x parameter is.
-        @param int|None x: the positive or null value to be added. If None, the value is computed from pkt.  # noqa: E501
-        @return str
-        @raise AssertionError
+        :param int|None x: the positive or null value to be added. If None, the value is computed from pkt.  # noqa: E501
+        :return: str
+        :raises: AssertionError
         """
         if x is None:
             assert isinstance(pkt, packet.Packet), \
@@ -618,12 +624,12 @@
         """ Computes the value of this field based on the provided packet and
         the length_of field and the adjust callback
 
-        @param packet.Packet pkt: the packet from which is computed this field value.  # noqa: E501
-        @return int: the computed value for this field.
-        @raise KeyError: the packet nor its payload do not contain an attribute
+        :param packet.Packet pkt: the packet from which is computed this field value.  # noqa: E501
+        :return: int: the computed value for this field.
+        :raises: KeyError: the packet nor its payload do not contain an attribute
           with the length_of name.
-        @raise AssertionError
-        @raise KeyError if _length_of is not one of pkt fields
+        :raises: AssertionError
+        :raises: KeyError if _length_of is not one of pkt fields
         """
         fld, fval = pkt.getfield_and_val(self._length_of)
         val = fld.i2len(pkt, fval)
@@ -645,7 +651,7 @@
     ABC = abc.ABCMeta('ABC', (), {})
 
 
-class HPackStringsInterface(ABC, Sized):
+class HPackStringsInterface(ABC, Sized):  # type: ignore
     @abc.abstractmethod
     def __str__(self):
         pass
@@ -1003,7 +1009,7 @@
         (0x3fffffff, 30)
     ]
 
-    static_huffman_tree = None
+    static_huffman_tree = None  # type: HuffmanNode
 
     @classmethod
     def _huffman_encode_char(cls, c):
@@ -1011,9 +1017,9 @@
         """ huffman_encode_char assumes that the static_huffman_tree was
         previously initialized
 
-        @param str|EOS c: a symbol to encode
-        @return (int, int): the bitstring of the symbol and its bitlength
-        @raise AssertionError
+        :param str|EOS c: a symbol to encode
+        :return: (int, int): the bitstring of the symbol and its bitlength
+        :raises: AssertionError
         """
         if isinstance(c, EOS):
             return cls.static_huffman_code[-1]
@@ -1027,9 +1033,9 @@
         """ huffman_encode returns the bitstring and the bitlength of the
         bitstring representing the string provided as a parameter
 
-        @param str s: the string to encode
-        @return (int, int): the bitstring of s and its bitlength
-        @raise AssertionError
+        :param str s: the string to encode
+        :return: (int, int): the bitstring of s and its bitlength
+        :raises: AssertionError
         """
         i = 0
         ibl = 0
@@ -1054,10 +1060,10 @@
         # type: (int, int) -> str
         """ huffman_decode decodes the bitstring provided as parameters.
 
-        @param int i: the bitstring to decode
-        @param int ibl: the bitlength of i
-        @return str: the string decoded from the bitstring
-        @raise AssertionError, InvalidEncodingException
+        :param int i: the bitstring to decode
+        :param int ibl: the bitlength of i
+        :return: str: the string decoded from the bitstring
+        :raises: AssertionError, InvalidEncodingException
         """
         assert(i >= 0)
         assert(ibl >= 0)
@@ -1113,10 +1119,10 @@
         """ huffman_conv2str converts a bitstring of bit_len bitlength into a
         binary string. It DOES NOT compress/decompress the bitstring!
 
-        @param int bit_str: the bitstring to convert.
-        @param int bit_len: the bitlength of bit_str.
-        @return str: the converted bitstring as a bytestring.
-        @raise AssertionError
+        :param int bit_str: the bitstring to convert.
+        :param int bit_len: the bitlength of bit_str.
+        :return: str: the converted bitstring as a bytestring.
+        :raises: AssertionError
         """
         assert(bit_str >= 0)
         assert(bit_len >= 0)
@@ -1143,9 +1149,9 @@
         representation. It returns a tuple: the bitstring and its bitlength.
         This function DOES NOT compress/decompress the string!
 
-        @param str s: the bytestring to convert.
-        @return (int, int): the bitstring of s, and its bitlength.
-        @raise AssertionError
+        :param str s: the bytestring to convert.
+        :return: (int, int): the bitstring of s, and its bitlength.
+        :raises: AssertionError
         """
         i = 0
         ibl = len(s) * 8
@@ -1162,8 +1168,8 @@
         # type: () -> None
         """ huffman_compute_decode_tree initializes/builds the static_huffman_tree
 
-        @return None
-        @raise InvalidEncodingException if there is an encoding problem
+        :return: None
+        :raises: InvalidEncodingException if there is an encoding problem
         """
         cls.static_huffman_tree = HuffmanNode(None, None)
         i = 0
@@ -1220,10 +1226,10 @@
     def _parse(t, s):
         # type: (bool, str) -> HPackStringsInterface
         """
-        @param bool t: whether this string is a huffman compressed string.
-        @param str s: the string to parse.
-        @return HPackStringsInterface: either a HPackLiteralString or HPackZString, depending on t.  # noqa: E501
-        @raise InvalidEncodingException
+        :param bool t: whether this string is a huffman compressed string.
+        :param str s: the string to parse.
+        :return: HPackStringsInterface: either a HPackLiteralString or HPackZString, depending on t.  # noqa: E501
+        :raises: InvalidEncodingException
         """
         if t:
             i, ibl = HPackZString.huffman_conv2bitstring(s)
@@ -1233,12 +1239,12 @@
     def getfield(self, pkt, s):
         # type: (packet.Packet, str) -> Tuple[str, HPackStringsInterface]
         """
-        @param packet.Packet pkt: the packet instance containing this field instance.  # noqa: E501
-        @param str s: the string to parse this field from.
-        @return (str, HPackStringsInterface): the remaining string after this field was carved out & the extracted  # noqa: E501
+        :param packet.Packet pkt: the packet instance containing this field instance.  # noqa: E501
+        :param str s: the string to parse this field from.
+        :return: (str, HPackStringsInterface): the remaining string after this field was carved out & the extracted  # noqa: E501
           value.
-        @raise KeyError if "type_from" is not a field of pkt or its payloads.
-        @raise InvalidEncodingException
+        :raises: KeyError if "type_from" is not a field of pkt or its payloads.
+        :raises: InvalidEncodingException
         """
         tmp_len = self._length_from(pkt)
         t = pkt.getfieldval(self._type_from) == 1
@@ -1260,12 +1266,12 @@
     def m2i(self, pkt, x):
         # type: (packet.Packet, str) -> HPackStringsInterface
         """
-        @param packet.Packet pkt: the packet instance containing this field instance.  # noqa: E501
-        @param str x: the string to parse.
-        @return HPackStringsInterface: the internal type of the value parsed from x.  # noqa: E501
-        @raise AssertionError
-        @raise InvalidEncodingException
-        @raise KeyError if _type_from is not one of pkt fields.
+        :param packet.Packet pkt: the packet instance containing this field instance.  # noqa: E501
+        :param str x: the string to parse.
+        :return: HPackStringsInterface: the internal type of the value parsed from x.  # noqa: E501
+        :raises: AssertionError
+        :raises: InvalidEncodingException
+        :raises: KeyError if _type_from is not one of pkt fields.
         """
         t = pkt.getfieldval(self._type_from)
         tmp_len = self._length_from(pkt)
@@ -1277,10 +1283,10 @@
     def any2i(self, pkt, x):
         # type: (Optional[packet.Packet], Union[str, HPackStringsInterface]) -> HPackStringsInterface  # noqa: E501
         """
-        @param packet.Packet|None pkt: the packet instance containing this field instance.  # noqa: E501
-        @param str|HPackStringsInterface x: the value to convert
-        @return HPackStringsInterface: the Scapy internal value for this field
-        @raise AssertionError, InvalidEncodingException
+        :param packet.Packet|None pkt: the packet instance containing this field instance.  # noqa: E501
+        :param str|HPackStringsInterface x: the value to convert
+        :return: HPackStringsInterface: the Scapy internal value for this field
+        :raises: AssertionError, InvalidEncodingException
         """
         if isinstance(x, bytes):
             assert(isinstance(pkt, packet.Packet))
@@ -1321,7 +1327,7 @@
     ]
 
     def guess_payload_class(self, payload):
-        # type: (str) -> base_classes.Packet_metaclass
+        # type: (str) -> Packet_metaclass
         # Trick to tell scapy that the remaining bytes of the currently
         # dissected string is not a payload of this packet but of some other
         # underlayer packet
@@ -1344,7 +1350,7 @@
     """
     @classmethod
     def dispatch_hook(cls, s=None, *_args, **_kwds):
-        # type: (Optional[str], *Any, **Any) -> base_classes.Packet_metaclass
+        # type: (Optional[str], *Any, **Any) -> Packet_metaclass
         """dispatch_hook returns the subclass of HPackHeaders that must be used
         to dissect the string.
         """
@@ -1360,7 +1366,7 @@
         return HPackLitHdrFldWithoutIndexing
 
     def guess_payload_class(self, payload):
-        # type: (str) -> base_classes.Packet_metaclass
+        # type: (str) -> Packet_metaclass
         return config.conf.padding_layer
 
 
@@ -1473,8 +1479,8 @@
         To do this computation, the length of the padlen field and the actual
         padding is subtracted to the string that was provided to the pre_dissect  # noqa: E501
         fun of the pkt parameter
-        @return int; length of the data part of the HTTP/2 frame packet provided as parameter  # noqa: E501
-        @raise AssertionError
+        :return: int; length of the data part of the HTTP/2 frame packet provided as parameter  # noqa: E501
+        :raises: AssertionError
         """
         padding_len = self.getfieldval('padlen')
         fld, fval = self.getfield_and_val('padlen')
@@ -1554,8 +1560,8 @@
         To do this computation, the length of the padlen field and the actual
         padding is subtracted to the string that was provided to the pre_dissect  # noqa: E501
         fun of the pkt parameter.
-        @return int; length of the data part of the HTTP/2 frame packet provided as parameter  # noqa: E501
-        @raise AssertionError
+        :return: int; length of the data part of the HTTP/2 frame packet provided as parameter  # noqa: E501
+        :raises: AssertionError
         """
         padding_len = self.getfieldval('padlen')
         fld, fval = self.getfield_and_val('padlen')
@@ -1623,8 +1629,8 @@
         To do this computation, the length of the padlen field, the priority
         information fields and the actual padding is subtracted to the string
         that was provided to the pre_dissect fun of the pkt parameter.
-        @return int: the length of the hdrs field
-        @raise AssertionError
+        :return: int: the length of the hdrs field
+        :raises: AssertionError
         """
 
         padding_len = self.getfieldval('padlen')
@@ -1750,7 +1756,7 @@
     ]
 
     def guess_payload_class(self, payload):
-        # type: (str) -> base_classes.Packet_metaclass
+        # type: (str) -> Packet_metaclass
         return config.conf.padding_layer
 
 
@@ -1777,7 +1783,7 @@
         This is possible because the underlayer packet (H2Frame) overrides
         extract_padding method to provided only the string that must be parsed
         by this packet!
-        @raise AssertionError
+        :raises: AssertionError
         """
 
         # RFC7540 par6.5 p36
@@ -1838,8 +1844,8 @@
         To do this computation, the length of the padlen field, reserved,
         stream_id and the actual padding is subtracted to the string that was
         provided to the pre_dissect fun of the pkt parameter.
-        @return int: the length of the hdrs field
-        @raise AssertionError
+        :return: int: the length of the hdrs field
+        :raises: AssertionError
         """
         fld, padding_len = self.getfield_and_val('padlen')
         padding_len_len = fld.i2len(self, padding_len)
@@ -1885,7 +1891,7 @@
 
     def __init__(self, *args, **kwargs):
         """
-        @raise AssertionError
+        :raises: AssertionError
         """
         # RFC7540 par6.7 p42
         assert(
@@ -1929,7 +1935,7 @@
 
     def __init__(self, *args, **kwargs):
         """
-        @raise AssertionError
+        :raises: AssertionError
         """
         # RFC7540 par6.9 p46
         assert(
@@ -1961,6 +1967,20 @@
 #                                          HTTP/2 Base Frame Packets                                                   #  # noqa: E501
 
 
+_HTTP2_types = {
+    0: 'DataFrm',
+    1: 'HdrsFrm',
+    2: 'PrioFrm',
+    3: 'RstFrm',
+    4: 'SetFrm',
+    5: 'PushFrm',
+    6: 'PingFrm',
+    7: 'GoawayFrm',
+    8: 'WinFrm',
+    9: 'ContFrm'
+}
+
+
 class H2Frame(packet.Packet):
     """ H2Frame implements the frame structure as defined in RFC 7540 par4.1
 
@@ -1970,18 +1990,7 @@
     name = 'HTTP/2 Frame'
     fields_desc = [
         fields.X3BytesField('len', None),
-        fields.EnumField('type', None, {
-            0: 'DataFrm',
-            1: 'HdrsFrm',
-            2: 'PrioFrm',
-            3: 'RstFrm',
-            4: 'SetFrm',
-            5: 'PushFrm',
-            6: 'PingFrm',
-            7: 'GoawayFrm',
-            8: 'WinFrm',
-            9: 'ContFrm'
-        }, "b"),
+        fields.EnumField('type', None, _HTTP2_types, "b"),
         fields.MultiFlagsField('flags', set(), 8, {
             H2DataFrame.type_id: H2DataFrame.flags,
             H2HeadersFrame.type_id: H2HeadersFrame.flags,
@@ -1997,14 +2006,14 @@
     ]
 
     def guess_payload_class(self, payload):
-        # type: (str) -> base_classes.Packet_metaclass
+        # type: (str) -> Packet_metaclass
         """ guess_payload_class returns the Class object to use for parsing a payload
         This function uses the H2Frame.type field value to decide which payload to parse. The implement cannot be  # noqa: E501
         performed using the simple bind_layers helper because sometimes the selection of which Class object to return  # noqa: E501
         also depends on the H2Frame.flags value.
 
-        @param payload:
-        @return:
+        :param payload:
+        :return::
         """
         if len(payload) == 0:
             return packet.NoPayload
@@ -2056,9 +2065,9 @@
     def extract_padding(self, s):
         # type: (str) -> Tuple[str, str]
         """
-        @param str s: the string from which to tell the padding and the payload data apart  # noqa: E501
-        @return (str, str): the padding and the payload data strings
-        @raise AssertionError
+        :param str s: the string from which to tell the padding and the payload data apart  # noqa: E501
+        :return: (str, str): the padding and the payload data strings
+        :raises: AssertionError
         """
         assert isinstance(self.len, six.integer_types) and self.len >= 0, 'Invalid length: negative len?'  # noqa: E501
         assert len(s) >= self.len, 'Invalid length: string too short for this length'  # noqa: E501
@@ -2067,10 +2076,10 @@
     def post_build(self, p, pay):
         # type: (str, str) -> str
         """
-        @param str p: the stringified packet
-        @param str pay: the stringified payload
-        @return str: the stringified packet and payload, with the packet length field "patched"  # noqa: E501
-        @raise AssertionError
+        :param str p: the stringified packet
+        :param str pay: the stringified payload
+        :return: str: the stringified packet and payload, with the packet length field "patched"  # noqa: E501
+        :raises: AssertionError
         """
         # This logic, while awkward in the post_build and more reasonable in
         # a self_build is implemented here for performance tricks reason
@@ -2091,7 +2100,7 @@
     ]
 
     def guess_payload_class(self, payload):
-        # type: (str) -> base_classes.Packet_metaclass
+        # type: (str) -> Packet_metaclass
         return config.conf.padding_layer
 
 
@@ -2114,7 +2123,7 @@
 
 #                                          HTTP/2 Connection Preface                                                   #  # noqa: E501
 # From RFC 7540 par3.5
-H2_CLIENT_CONNECTION_PREFACE = bytes_hex('505249202a20485454502f322e300d0a0d0a534d0d0a0d0a')  # noqa: E501
+H2_CLIENT_CONNECTION_PREFACE = hex_bytes('505249202a20485454502f322e300d0a0d0a534d0d0a0d0a')  # noqa: E501
 
 
 ###############################################################################
@@ -2132,7 +2141,7 @@
     def __init__(self, name, value):
         # type: (str, str) -> None
         """
-        @raise AssertionError
+        :raises: AssertionError
         """
         assert(len(name) > 0)
 
@@ -2185,14 +2194,15 @@
         '_dynamic_table_cap_size',
         '_regexp'
     ]
-    """:var _dynamic_table: the list containing entries requested to be added by
-    the peer and registered with a register() call
+    """
+    :var _dynamic_table: the list containing entries requested to be added by
+        the peer and registered with a register() call
     :var _dynamic_table_max_size: the current maximum size of the dynamic table
-    in bytes. This value is updated with the Dynamic Table Size Update messages
-    defined in RFC 7541 par6.3
+        in bytes. This value is updated with the Dynamic Table Size Update
+        messages defined in RFC 7541 par6.3
     :var _dynamic_table_cap_size: the maximum size of the dynamic table in
-    bytes. This value is updated with the SETTINGS_HEADER_TABLE_SIZE HTTP/2
-    setting.
+        bytes. This value is updated with the SETTINGS_HEADER_TABLE_SIZE HTTP/2
+        setting.
     """
 
     # Manually imported from RFC 7541 Appendix A
@@ -2262,7 +2272,7 @@
 
     # The value of this variable cannot be determined at declaration time. It is  # noqa: E501
     # initialized by an init_static_table call
-    _static_entries_last_idx = None
+    _static_entries_last_idx = None  # type: int
 
     @classmethod
     def init_static_table(cls):
@@ -2272,11 +2282,11 @@
     def __init__(self, dynamic_table_max_size=4096, dynamic_table_cap_size=4096):  # noqa: E501
         # type: (int, int) -> None
         """
-        @param int dynamic_table_max_size: the current maximum size of the dynamic entry table in bytes  # noqa: E501
-        @param int dynamic_table_cap_size: the maximum-maximum size of the dynamic entry table in bytes  # noqa: E501
-        @raises AssertionError
+        :param int dynamic_table_max_size: the current maximum size of the dynamic entry table in bytes  # noqa: E501
+        :param int dynamic_table_cap_size: the maximum-maximum size of the dynamic entry table in bytes  # noqa: E501
+        :raises:s AssertionError
         """
-        self._regexp = None
+        self._regexp = None  # type: Pattern
         if isinstance(type(self)._static_entries_last_idx, type(None)):
             type(self).init_static_table()
 
@@ -2291,13 +2301,13 @@
         # type: (int) -> HPackHdrEntry
         """Gets an element from the header tables (static or dynamic indifferently)
 
-        @param int idx: the index number of the entry to retrieve. If the index
+        :param int idx: the index number of the entry to retrieve. If the index
         value is superior to the last index of the static entry table, then the
         dynamic entry type is requested, following the procedure described in
         RFC 7541 par2.3.3
-        @return HPackHdrEntry: the entry defined at this requested index. If the entry does not exist, KeyError is  # noqa: E501
+        :return: HPackHdrEntry: the entry defined at this requested index. If the entry does not exist, KeyError is  # noqa: E501
           raised
-        @raise KeyError, AssertionError
+        :raises: KeyError, AssertionError
         """
         assert(idx >= 0)
         if idx > type(self)._static_entries_last_idx:
@@ -2314,8 +2324,8 @@
         """Resize the dynamic table. If the new size (ns) must be between 0 and
         the cap size. If the new size is lower than the current size of the
         dynamic table, entries are evicted.
-        @param int ns: the new size of the dynamic table
-        @raise AssertionError
+        :param int ns: the new size of the dynamic table
+        :raises: AssertionError
         """
         assert 0 <= ns <= self._dynamic_table_cap_size, \
             'EINVAL: ns: out-of-range value; expected value is in the range [0;{}['.format(self._dynamic_table_cap_size)  # noqa: E501
@@ -2329,8 +2339,8 @@
         # type: (int) -> None
         """recap changes the maximum size limit of the dynamic table. It also
         proceeds to a resize(), if the new size is lower than the previous one.
-        @param int nc: the new cap of the dynamic table (that is the maximum-maximum size)  # noqa: E501
-        @raise AssertionError
+        :param int nc: the new cap of the dynamic table (that is the maximum-maximum size)  # noqa: E501
+        :raises: AssertionError
         """
         assert(nc >= 0)
         t = self._dynamic_table_cap_size > nc
@@ -2347,9 +2357,9 @@
         fits in less than the current size limit. The optional parameter,
         new_entry_size, allows the resize to happen so that a new entry of this
         size fits in.
-        @param int new_entry_size: if called before adding a new entry, the size of the new entry in bytes (following  # noqa: E501
+        :param int new_entry_size: if called before adding a new entry, the size of the new entry in bytes (following  # noqa: E501
         the RFC7541 definition of the size of an entry)
-        @raise AssertionError
+        :raises: AssertionError
         """
         assert(new_entry_size >= 0)
         cur_sz = len(self)
@@ -2368,8 +2378,8 @@
         A H2Frame with a H2HeadersFrame payload can be provided, as much as a
         python list of HPackHeaders or a single HPackLitHdrFldWithIncrIndexing
         instance.
-        @param HPackLitHdrFldWithIncrIndexing|H2Frame|list of HPackHeaders hdrs: the header(s) to register  # noqa: E501
-        @raise AssertionError
+        :param HPackLitHdrFldWithIncrIndexing|H2Frame|list of HPackHeaders hdrs: the header(s) to register  # noqa: E501
+        :raises: AssertionError
         """
         if isinstance(hdrs, H2Frame):
             hdrs = [hdr for hdr in hdrs.payload.hdrs if isinstance(hdr, HPackLitHdrFldWithIncrIndexing)]  # noqa: E501
@@ -2452,16 +2462,18 @@
 
     def gen_txt_repr(self, hdrs, register=True):
         # type: (Union[H2Frame, List[HPackHeaders]], Optional[bool]) -> str
-        """ gen_txt_repr returns a "textual" representation of the provided
+        """
+        gen_txt_repr returns a "textual" representation of the provided
         headers.
-
         The output of this function is compatible with the input of
         parse_txt_hdrs.
-        @param H2Frame|list of HPackHeaders hdrs: the list of headers to convert to textual representation  # noqa: E501
-        @param bool: whether incremental headers should be added to the dynamic table as we generate the text  # noqa: E501
-            representation
-        @return str: the textual representation of the provided headers
-        @raise AssertionError
+
+        :param H2Frame|list of HPackHeaders hdrs: the list of headers to
+          convert to textual representation.
+        :param bool: whether incremental headers should be added to the dynamic
+          table as we generate the text representation
+        :return: str: the textual representation of the provided headers
+        :raises: AssertionError
         """
         lst = []
         if isinstance(hdrs, H2Frame):
@@ -2503,7 +2515,6 @@
     @staticmethod
     def _optimize_header_length_and_packetify(s):
         # type: (str) -> HPackHdrString
-        # type: (str) -> HPackHdrString
         zs = HPackZString(s)
         if len(zs) >= len(s):
             return HPackHdrString(data=HPackLiteralString(s))
@@ -2526,91 +2537,91 @@
 
         # The value is not indexed for this headers
 
-        hdr_value = self._optimize_header_length_and_packetify(hdr_value)
+        _hdr_value = self._optimize_header_length_and_packetify(hdr_value)
 
         # Searching if the header name is indexed
         idx = self.get_idx_by_name(hdr_name)
         if idx is not None:
             if is_sensitive(
                 hdr_name,
-                hdr_value.getfieldval('data').origin()
+                _hdr_value.getfieldval('data').origin()
             ):
                 return HPackLitHdrFldWithoutIndexing(
                     never_index=1,
                     index=idx,
-                    hdr_value=hdr_value
+                    hdr_value=_hdr_value
                 ), len(
                     HPackHdrEntry(
                         self[idx].name(),
-                        hdr_value.getfieldval('data').origin()
+                        _hdr_value.getfieldval('data').origin()
                     )
                 )
             if should_index(hdr_name):
                 return HPackLitHdrFldWithIncrIndexing(
                     index=idx,
-                    hdr_value=hdr_value
+                    hdr_value=_hdr_value
                 ), len(
                     HPackHdrEntry(
                         self[idx].name(),
-                        hdr_value.getfieldval('data').origin()
+                        _hdr_value.getfieldval('data').origin()
                     )
                 )
             return HPackLitHdrFldWithoutIndexing(
                 index=idx,
-                hdr_value=hdr_value
+                hdr_value=_hdr_value
             ), len(
                 HPackHdrEntry(
                     self[idx].name(),
-                    hdr_value.getfieldval('data').origin()
+                    _hdr_value.getfieldval('data').origin()
                 )
             )
 
-        hdr_name = self._optimize_header_length_and_packetify(hdr_name)
+        _hdr_name = self._optimize_header_length_and_packetify(hdr_name)
 
         if is_sensitive(
-            hdr_name.getfieldval('data').origin(),
-            hdr_value.getfieldval('data').origin()
+            _hdr_name.getfieldval('data').origin(),
+            _hdr_value.getfieldval('data').origin()
         ):
             return HPackLitHdrFldWithoutIndexing(
                 never_index=1,
                 index=0,
-                hdr_name=hdr_name,
-                hdr_value=hdr_value
+                hdr_name=_hdr_name,
+                hdr_value=_hdr_value
             ), len(
                 HPackHdrEntry(
-                    hdr_name.getfieldval('data').origin(),
-                    hdr_value.getfieldval('data').origin()
+                    _hdr_name.getfieldval('data').origin(),
+                    _hdr_value.getfieldval('data').origin()
                 )
             )
-        if should_index(hdr_name.getfieldval('data').origin()):
+        if should_index(_hdr_name.getfieldval('data').origin()):
             return HPackLitHdrFldWithIncrIndexing(
                 index=0,
-                hdr_name=hdr_name,
-                hdr_value=hdr_value
+                hdr_name=_hdr_name,
+                hdr_value=_hdr_value
             ), len(
                 HPackHdrEntry(
-                    hdr_name.getfieldval('data').origin(),
-                    hdr_value.getfieldval('data').origin()
+                    _hdr_name.getfieldval('data').origin(),
+                    _hdr_value.getfieldval('data').origin()
                 )
             )
         return HPackLitHdrFldWithoutIndexing(
             index=0,
-            hdr_name=hdr_name,
-            hdr_value=hdr_value
+            hdr_name=_hdr_name,
+            hdr_value=_hdr_value
         ), len(
             HPackHdrEntry(
-                hdr_name.getfieldval('data').origin(),
-                hdr_value.getfieldval('data').origin()
+                _hdr_name.getfieldval('data').origin(),
+                _hdr_value.getfieldval('data').origin()
             )
         )
 
-    def _parse_header_line(self, l):
+    def _parse_header_line(self, line):
         # type: (str) -> Union[Tuple[None, None], Tuple[str, str]]
 
         if self._regexp is None:
             self._regexp = re.compile(br'^(?::([a-z\-0-9]+)|([a-z\-0-9]+):)\s+(.+)$')  # noqa: E501
 
-        hdr_line = l.rstrip()
+        hdr_line = line.rstrip()
         grp = self._regexp.match(hdr_line)
 
         if grp is None or len(grp.groups()) != 3:
@@ -2633,32 +2644,40 @@
                        register=True,  # type: bool
                        ):
         # type: (...) -> H2Seq
-        """ parse_txt_hdrs parses headers expressed in text and converts them
-        into a series of H2Frames with the "correct" flags. A body can be provided  # noqa: E501
-        in which case, the data frames are added, bearing the End Stream flag,
-        instead of the H2HeadersFrame/H2ContinuationFrame. The generated frames
-        may respect max_frm_sz (SETTINGS_MAX_FRAME_SIZE) and
-        max_hdr_lst_sz (SETTINGS_MAX_HEADER_LIST_SIZE) if provided. The headers
-        are split into multiple headers fragment (and H2Frames) to respect these  # noqa: E501
-        limits. Also, a callback can be provided to tell if a header should be
-        never indexed (sensitive headers, such as cookies), and another callback  # noqa: E501
-        say if the header should be registered into the index table at all.
+        """
+        parse_txt_hdrs parses headers expressed in text and converts them
+        into a series of H2Frames with the "correct" flags. A body can be
+        provided in which case, the data frames are added, bearing the End
+        Stream flag, instead of the H2HeadersFrame/H2ContinuationFrame.
+        The generated frames may respect max_frm_sz (SETTINGS_MAX_FRAME_SIZE)
+        and max_hdr_lst_sz (SETTINGS_MAX_HEADER_LIST_SIZE) if provided.
+        The headers are split into multiple headers fragment (and H2Frames)
+        to respect these limits. Also, a callback can be provided to tell if
+        a header should be never indexed (sensitive headers, such as cookies),
+        and another callback say if the header should be registered into the
+        index table at all.
         For an header to be registered, the is_sensitive callback must return
         False AND the should_index callback should return True. This is the
         default behavior.
 
-        @param str s: the string to parse for headers
-        @param int stream_id: the stream id to use in the generated H2Frames
-        @param str|None body: the eventual body of the request, that is added to the generated frames  # noqa: E501
-        @param int max_frm_sz: the maximum frame size. This is used to split the headers and data frames according to  # noqa: E501
-        the maximum frame size negotiated for this connection
-        @param int max_hdr_lst_sz: the maximum size of a "header fragment" as defined in RFC7540  # noqa: E501
-        @param callable is_sensitive: callback that returns True if the provided header is sensible and must be stored  # noqa: E501
-        in a header packet requesting this header never to be indexed
-        @param callable should_index: callback that returns True if the provided header should be stored in a header  # noqa: E501
-        packet requesting indexation in the dynamic header table.
-        @param bool register: whether to register new headers with incremental indexing as we parse them  # noqa: E501
-        @raise Exception
+        :param str s: the string to parse for headers
+        :param int stream_id: the stream id to use in the generated H2Frames
+        :param str/None body: the eventual body of the request, that is added
+          to the generated frames
+        :param int max_frm_sz: the maximum frame size. This is used to split
+          the headers and data frames according to the maximum frame size
+          negotiated for this connection.
+        :param int max_hdr_lst_sz: the maximum size of a "header fragment" as
+          defined in RFC7540
+        :param callable is_sensitive: callback that returns True if the
+          provided header is sensible and must be stored in a header packet
+          requesting this header never to be indexed
+        :param callable should_index: callback that returns True if the
+          provided header should be stored in a header packet requesting
+          indexation in the dynamic header table.
+        :param bool register: whether to register new headers with incremental
+          indexing as we parse them
+        :raises: Exception
         """
 
         sio = BytesIO(s)

scapy-2.4.3.tar.gz/scapy/contrib/ibeacon.py -> scapy-2.4.4.tar.gz/scapy/contrib/ibeacon.py Changed

@@ -18,8 +18,8 @@
 
 """
 
-from scapy.fields import ByteEnumField, LenField, PacketListField, \
-    ShortField, SignedByteField, UUIDField
+from scapy.fields import ByteEnumField, ConditionalField, LenField, \
+    PacketListField, ShortField, SignedByteField, UUIDField
 from scapy.layers.bluetooth import EIR_Hdr, EIR_Manufacturer_Specific_Data, \
     LowEnergyBeaconHelper
 from scapy.packet import bind_layers, Packet
@@ -35,6 +35,7 @@
     name = "Apple BLE submessage"
     fields_desc = [
         ByteEnumField("subtype", None, {
+            0x01: "overflow",
             0x02: "ibeacon",
             0x05: "airdrop",
             0x07: "airpods",
@@ -43,11 +44,18 @@
             0x0c: "handoff",
             0x10: "nearby",
         }),
-        LenField("len", None, fmt="B")
+        ConditionalField(
+            # "overflow" messages omit `len` field
+            LenField("len", None, fmt="B"),
+            lambda pkt: pkt.subtype != 0x01
+        ),
     ]
 
     def extract_padding(self, s):
         # Needed to end each EIR_Element packet and make PacketListField work.
+        if self.subtype == 0x01:
+            # Overflow messages are always 16 bytes.
+            return s[:16], s[16:]
         return s[:self.len], s[self.len:]
 
     # These methods are here in case you only want to send 1 submessage.

scapy-2.4.3.tar.gz/scapy/contrib/icmp_extensions.py -> scapy-2.4.4.tar.gz/scapy/contrib/icmp_extensions.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/ife.py -> scapy-2.4.4.tar.gz/scapy/contrib/ife.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/igmp.py -> scapy-2.4.4.tar.gz/scapy/contrib/igmp.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # Scapy is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,8 +12,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Scapy. If not, see <http://www.gnu.org/licenses/>.
 
-# flake8: noqa: E501
-
 # scapy.contrib.description = Internet Group Management Protocol v1/v2 (IGMP/IGMPv2)
 # scapy.contrib.status = loads
 
@@ -38,24 +34,23 @@
 class IGMP(Packet):
     """IGMP Message Class for v1 and v2.
 
-This class is derived from class Packet. You  need call "igmpize()"
-so the packet is transformed according the RFC when sent.
-a=Ether(src="00:01:02:03:04:05")
-b=IP(src="1.2.3.4")
-c=IGMP(type=0x12, gaddr="224.2.3.4")
-x = a/b/c
-x[IGMP].igmpize()
-sendp(a/b/c, iface="en0")
-
-    Parameters:
-      type    IGMP type field, 0x11, 0x12, 0x16 or 0x17
-      mrcode  Maximum Response time (zero for v1)
-      gaddr   Multicast Group Address 224.x.x.x/4
+    This class is derived from class Packet. You  need call "igmpize()"
+    so the packet is transformed according the RFC when sent.
+    a=Ether(src="00:01:02:03:04:05")
+    b=IP(src="1.2.3.4")
+    c=IGMP(type=0x12, gaddr="224.2.3.4")
+    x = a/b/c
+    x[IGMP].igmpize()
+    sendp(a/b/c, iface="en0")
 
-See RFC2236, Section 2. Introduction for definitions of proper
-IGMPv2 message format   http://www.faqs.org/rfcs/rfc2236.html
+        Parameters:
+          type    IGMP type field, 0x11, 0x12, 0x16 or 0x17
+          mrcode  Maximum Response time (zero for v1)
+          gaddr   Multicast Group Address 224.x.x.x/4
 
-  """
+    See RFC2236, Section 2. Introduction for definitions of proper
+    IGMPv2 message format   http://www.faqs.org/rfcs/rfc2236.html
+    """
     name = "IGMP"
 
     igmptypes = {0x11: "Group Membership Query",
@@ -96,17 +91,17 @@
         """Called to explicitly fixup the packet according to the IGMP RFC
 
         The rules are:
-        General:
-            1.  the Max Response time is meaningful only in Membership Queries and should be zero
-        IP:
-            1. Send General Group Query to 224.0.0.1 (all systems)
-            2. Send Leave Group to 224.0.0.2 (all routers)
-            3a.Otherwise send the packet to the group address
-            3b.Send reports/joins to the group address
-            4. ttl = 1 (RFC 2236, section 2)
-            5. send the packet with the router alert IP option (RFC 2236, section 2)
-        Ether:
-            1. Recalculate destination
+        - General:
+        1.  the Max Response time is meaningful only in Membership Queries and should be zero
+        - IP:
+        1. Send General Group Query to 224.0.0.1 (all systems)
+        2. Send Leave Group to 224.0.0.2 (all routers)
+        3a.Otherwise send the packet to the group address
+        3b.Send reports/joins to the group address
+        4. ttl = 1 (RFC 2236, section 2)
+        5. send the packet with the router alert IP option (RFC 2236, section 2)
+        - Ether:
+        1. Recalculate destination
 
         Returns:
             True    The tuple ether/ip/self passed all check and represents
@@ -119,6 +114,7 @@
         adjusted to ensure correct formatting and assignment. The Ethernet header
         is then adjusted to the proper IGMP packet format.
         """
+        from scapy.contrib.igmpv3 import IGMPv3
         gaddr = self.gaddr if hasattr(self, "gaddr") and self.gaddr else "0.0.0.0"  # noqa: E501
         underlayer = self.underlayer
         if self.type not in [0x11, 0x30]:                               # General Rule 1  # noqa: E501
@@ -136,6 +132,8 @@
                 underlayer.dst = "224.0.0.2"                           # IP rule 2  # noqa: E501
             elif ((self.type == 0x12) or (self.type == 0x16)) and (isValidMCAddr(gaddr)):  # noqa: E501
                 underlayer.dst = gaddr                                 # IP rule 3b  # noqa: E501
+            elif (self.type in [0x11, 0x22, 0x30, 0x31, 0x32] and isinstance(self, IGMPv3)):
+                pass
             else:
                 warning("Invalid IGMP Type detected !")
                 return False
@@ -146,7 +144,6 @@
             if _root.haslayer(Ether):
                 # Force recalculate Ether dst
                 _root[Ether].dst = getmacbyip(underlayer.dst)          # Ether rule 1  # noqa: E501
-        from scapy.contrib.igmpv3 import IGMPv3
         if isinstance(self, IGMPv3):
             self.encode_maxrespcode()
         return True

scapy-2.4.3.tar.gz/scapy/contrib/igmpv3.py -> scapy-2.4.4.tar.gz/scapy/contrib/igmpv3.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # Scapy is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,10 +47,12 @@
     Fields 'type'  through 'qqic' are directly assignable.
     For 'numsrc', do not assign a value.
     Instead add to the 'srcaddrs' list to auto-set 'numsrc'. To
-    assign values to 'srcaddrs', use the following methods:
+    assign values to 'srcaddrs', use the following methods::
+
       c = IGMPv3()
       c.srcaddrs = ['1.2.3.4', '5.6.7.8']
       c.srcaddrs += ['192.168.10.24']
+
     At this point, 'c.numsrc' is three (3)
 
     'chksum' is automagically calculated before the packet is sent.
@@ -161,7 +161,7 @@
 
 
 class IGMPv3mra(Packet):
-    """IGMP Multicas Router Advertisement extension for IGMPv3.
+    """IGMP Multicast Router Advertisement extension for IGMPv3.
     Payload of IGMPv3 when type=0x30"""
     name = "IGMPv3mra"
     fields_desc = [ShortField("qryIntvl", 0),

scapy-2.4.3.tar.gz/scapy/contrib/ikev2.py -> scapy-2.4.4.tar.gz/scapy/contrib/ikev2.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/isis.py -> scapy-2.4.4.tar.gz/scapy/contrib/isis.py Changed

@@ -41,13 +41,13 @@
 
         Currently it (partially) supports the packaging/encoding
         requirements of the following RFCs:
-         * RFC 1195 (only the TCP/IP related part)
-         * RFC 3358 (optional checksums)
-         * RFC 5301 (dynamic hostname extension)
-         * RFC 5302 (domain-wide prefix distribution)
-         * RFC 5303 (three-way handshake)
-         * RFC 5304 (cryptographic authentication)
-         * RFC 5308 (routing IPv6 with IS-IS)
+        * RFC 1195 (only the TCP/IP related part)
+        * RFC 3358 (optional checksums)
+        * RFC 5301 (dynamic hostname extension)
+        * RFC 5302 (domain-wide prefix distribution)
+        * RFC 5303 (three-way handshake)
+        * RFC 5304 (cryptographic authentication)
+        * RFC 5308 (routing IPv6 with IS-IS)
 
     :TODO:
 
@@ -148,6 +148,7 @@
 
 class _ISIS_RandId(RandString):
     def __init__(self, template):
+        RandString.__init__(self)
         self.bytecount = template.count("*")
         self.format = template.replace("*", "%02X")
 
@@ -165,8 +166,16 @@
 
 class _ISIS_RandAreaId(_ISIS_RandId):
     def __init__(self, bytecount=None):
-        self.bytecount = random.randint(1, 13) if bytecount is None else bytecount  # noqa: E501
-        self.format = "%02X" + (".%02X%02X" * ((self.bytecount - 1) // 2)) + ("" if ((self.bytecount - 1) % 2) == 0 else ".%02X")  # noqa: E501
+        template = "*" + (
+            ".**" * ((self.bytecount - 1) // 2)
+        ) + (
+            "" if ((self.bytecount - 1) % 2) == 0 else ".*"
+        )
+        super(_ISIS_RandAreaId, self).__init__(template)
+        if bytecount is None:
+            self.bytecount = random.randint(1, 13)
+        else:
+            self.bytecount = bytecount
 
 
 class ISIS_AreaIdField(Field):

scapy-2.4.3.tar.gz/scapy/contrib/isotp.py -> scapy-2.4.4.tar.gz/scapy/contrib/isotp.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Nils Weiss <nils@we155.de>
@@ -20,7 +18,9 @@
 import struct
 import socket
 import time
-from threading import Thread, Event, Lock, Semaphore
+import traceback
+import heapq
+from threading import Thread, Event, Lock
 
 from scapy.packet import Packet
 from scapy.fields import BitField, FlagsField, StrLenField, \
@@ -31,8 +31,8 @@
 import scapy.modules.six as six
 import scapy.automaton as automaton
 import six.moves.queue as queue
-from scapy.error import Scapy_Exception, warning, log_loading
-from scapy.supersocket import SuperSocket
+from scapy.error import Scapy_Exception, warning, log_loading, log_runtime
+from scapy.supersocket import SuperSocket, SO_TIMESTAMPNS
 from scapy.config import conf
 from scapy.consts import LINUX
 from scapy.contrib.cansocket import PYTHON_CAN
@@ -126,7 +126,12 @@
             frame_data = struct.pack('B', len(self.data)) + self.data
             if self.exdst:
                 frame_data = struct.pack('B', self.exdst) + frame_data
-            pkt = CAN(identifier=self.dst, data=frame_data)
+
+            if self.dst is None or self.dst <= 0x7ff:
+                pkt = CAN(identifier=self.dst, data=frame_data)
+            else:
+                pkt = CAN(identifier=self.dst, flags="extended",
+                          data=frame_data)
             return [pkt]
 
         # Construct the first frame
@@ -138,7 +143,11 @@
             frame_header = struct.pack('B', self.exdst) + frame_header
         idx = 8 - len(frame_header)
         frame_data = self.data[0:idx]
-        frame = CAN(identifier=self.dst, data=frame_header + frame_data)
+        if self.dst is None or self.dst <= 0x7ff:
+            frame = CAN(identifier=self.dst, data=frame_header + frame_data)
+        else:
+            frame = CAN(identifier=self.dst, flags="extended",
+                        data=frame_header + frame_data)
 
         # Construct consecutive frames
         n = 1
@@ -152,7 +161,11 @@
 
             if self.exdst:
                 frame_header = struct.pack('B', self.exdst) + frame_header
-            pkt = CAN(identifier=self.dst, data=frame_header + frame_data)
+            if self.dst is None or self.dst <= 0x7ff:
+                pkt = CAN(identifier=self.dst, data=frame_header + frame_data)
+            else:
+                pkt = CAN(identifier=self.dst, flags="extended",
+                          data=frame_header + frame_data)
             pkts.append(pkt)
         return pkts
 
@@ -187,6 +200,10 @@
 
         return results[0]
 
+    def __eq__(self, other):
+        # Don't compare src, dst, exsrc and exdst.
+        return super(ISOTP, self).__eq__(other)
+
 
 class ISOTPHeader(CAN):
     name = 'ISOTPHeader'
@@ -306,7 +323,7 @@
     next = __next__
 
 
-class ISOTPMessageBuilder:
+class ISOTPMessageBuilder(object):
     """
     Utility class to build ISOTP messages out of CAN frames, used by both
     ISOTP.defragment() and ISOTPSession.
@@ -320,12 +337,16 @@
     and the resulting ISOTP frames can be extracted using the pop() method.
     """
 
-    class Bucket:
-        def __init__(self, total_len, first_piece):
-            self.pieces = [first_piece]
+    class Bucket(object):
+        def __init__(self, total_len, first_piece, ts=None):
+            self.pieces = list()
             self.total_len = total_len
-            self.current_len = len(first_piece)
+            self.current_len = 0
             self.ready = None
+            self.src = None
+            self.exsrc = None
+            self.time = ts
+            self.push(first_piece)
 
         def push(self, piece):
             self.pieces.append(piece)
@@ -337,7 +358,7 @@
                     isotp_data = "".join(map(str, self.pieces))
                 self.ready = isotp_data[:self.total_len]
 
-    def __init__(self, use_ext_addr=None, basecls=None):
+    def __init__(self, use_ext_addr=None, did=None, basecls=None):
         """
         Initialize a ISOTPMessageBuilder object
 
@@ -353,6 +374,14 @@
         self.buckets = {}
         self.use_ext_addr = use_ext_addr
         self.basecls = basecls or ISOTP
+        self.dst_ids = None
+        self.last_ff = None
+        self.last_ff_ex = None
+        if did is not None:
+            if hasattr(did, "__iter__"):
+                self.dst_ids = did
+            else:
+                self.dst_ids = [did]
 
     def feed(self, can):
         """Attempt to feed an incoming CAN frame into the state machine"""
@@ -360,16 +389,18 @@
             for p in can:
                 self.feed(p)
             return
-        if not isinstance(can, CAN):
-            raise Scapy_Exception("argument is not a CAN frame")
         identifier = can.identifier
+
+        if self.dst_ids is not None and identifier not in self.dst_ids:
+            return
+
         data = bytes(can.data)
 
         if len(data) > 1 and self.use_ext_addr is not True:
-            self._try_feed(identifier, None, data)
+            self._try_feed(identifier, None, data, can.time)
         if len(data) > 2 and self.use_ext_addr is not False:
             ea = six.indexbytes(data, 0)
-            self._try_feed(identifier, ea, data[1:])
+            self._try_feed(identifier, ea, data[1:], can.time)
 
     @property
     def count(self):
@@ -383,11 +414,12 @@
     def pop(self, identifier=None, ext_addr=None):
         """
         Returns a built ISOTP message
+
         :param identifier: if not None, only return isotp messages with this
                            destination
         :param ext_addr: if identifier is not None, only return isotp messages
                          with this extended address for destination
-        :return: an ISOTP packet, or None if no message is ready
+        :returns: an ISOTP packet, or None if no message is ready
         """
 
         if identifier is not None:
@@ -409,14 +441,21 @@
 
     @staticmethod
     def _build(t, basecls=ISOTP):
-        p = basecls(t[2])
+        bucket = t[2]
+        p = basecls(bucket.ready)
         if hasattr(p, "dst"):
             p.dst = t[0]
         if hasattr(p, "exdst"):
             p.exdst = t[1]
+        if hasattr(p, "src"):
+            p.src = bucket.src
+        if hasattr(p, "exsrc"):
+            p.exsrc = bucket.exsrc
+        if hasattr(p, "time"):
+            p.time = bucket.time
         return p
 
-    def _feed_first_frame(self, identifier, ea, data):
+    def _feed_first_frame(self, identifier, ea, data, ts):
         if len(data) < 3:
             # At least 3 bytes are necessary: 2 for length and 1 for data
             return False
@@ -429,10 +468,14 @@
             isotp_data = data[6:]
 
         key = (ea, identifier, 1)
-        self.buckets[key] = self.Bucket(expected_length, isotp_data)
+        if ea is None:
+            self.last_ff = key
+        else:
+            self.last_ff_ex = key
+        self.buckets[key] = self.Bucket(expected_length, isotp_data, ts)
         return True
 
-    def _feed_single_frame(self, identifier, ea, data):
+    def _feed_single_frame(self, identifier, ea, data, ts):
         if len(data) < 2:
             # At least 2 bytes are necessary: 1 for length and 1 for data
             return False
@@ -444,7 +487,8 @@
             # CAN frame has less data than expected
             return False
 
-        self.ready.append((identifier, ea, isotp_data))
+        self.ready.append((identifier, ea,
+                           self.Bucket(length, isotp_data, ts)))
         return True
 
     def _feed_consecutive_frame(self, identifier, ea, data):
@@ -472,35 +516,77 @@
             key = (ea, identifier, next_seq)
             self.buckets[key] = bucket
         else:
-            self.ready.append((identifier, ea, bucket.ready))
+            self.ready.append((identifier, ea, bucket))
+
+        return True
+
+    def _feed_flow_control_frame(self, identifier, ea, data):
+        if len(data) < 3:
+            # At least 2 bytes are necessary: 1 for sequence number and
+            # 1 for data
+            return False
+
+        keys = [self.last_ff, self.last_ff_ex]
+        if not any(keys):
+            return False
+
+        buckets = [self.buckets.pop(k, None) for k in keys]
 
+        self.last_ff = None
+        self.last_ff_ex = None
+
+        if not any(buckets):
+            # There is no message constructor waiting for this frame
+            return False
+
+        for key, bucket in zip(keys, buckets):
+            if bucket is None:
+                continue
+            bucket.src = identifier
+            bucket.exsrc = ea
+            self.buckets[key] = bucket
         return True
 
-    def _try_feed(self, identifier, ea, data):
+    def _try_feed(self, identifier, ea, data, ts):
         first_byte = six.indexbytes(data, 0)
         if len(data) > 1 and first_byte & 0xf0 == N_PCI_SF:
-            self._feed_single_frame(identifier, ea, data)
+            self._feed_single_frame(identifier, ea, data, ts)
         if len(data) > 2 and first_byte & 0xf0 == N_PCI_FF:
-            self._feed_first_frame(identifier, ea, data)
+            self._feed_first_frame(identifier, ea, data, ts)
         if len(data) > 1 and first_byte & 0xf0 == N_PCI_CF:
             self._feed_consecutive_frame(identifier, ea, data)
+        if len(data) > 1 and first_byte & 0xf0 == N_PCI_FC:
+            self._feed_flow_control_frame(identifier, ea, data)
 
 
 class ISOTPSession(DefaultSession):
     """Defragment ISOTP packets 'on-the-flow'.
+
     Usage:
-      >>> sniff(session=ISOTPSession)
+    >>> sniff(session=ISOTPSession)
     """
 
-    def __init__(self, *args, **karg):
-        DefaultSession.__init__(self, *args)
-        self.m = ISOTPMessageBuilder(**karg)
+    def __init__(self, *args, **kwargs):
+        DefaultSession.__init__(self, *args, **kwargs)
+        self.m = ISOTPMessageBuilder(
+            use_ext_addr=kwargs.pop("use_ext_addr", None),
+            did=kwargs.pop("did", None),
+            basecls=kwargs.pop("basecls", None))
 
     def on_packet_received(self, pkt):
+        if not pkt:
+            return
+        if isinstance(pkt, list):
+            for p in pkt:
+                ISOTPSession.on_packet_received(self, p)
+            return
         self.m.feed(pkt)
         while len(self.m) > 0:
             rcvd = self.m.pop()
-            DefaultSession.on_packet_received(self, rcvd)
+            if self._supersession:
+                self._supersession.on_packet_received(rcvd)
+            else:
+                DefaultSession.on_packet_received(self, rcvd)
 
 
 class ISOTPSoftSocket(SuperSocket):
@@ -516,23 +602,18 @@
     A thread is needed for receiving CAN frames in the background, and since
     the lower layer CAN implementation is not guaranteed to have a functioning
     POSIX select(), each ISOTP socket needs its own CAN receiver thread.
-    Additionally, 2 timers are necessary to keep track of the timeouts and
-    frame separation times, and each timer is implemented in its own thread.
-    In total, each ISOTPSoftSocket spawns 3 background threads when
-    constructed, which must be terminated afterwards by calling the close()
-    method.
     SuperSocket automatically calls the close() method when the GC destroys an
     ISOTPSoftSocket. However, note that if any thread holds a reference to
     an ISOTPSoftSocket object, it will not be collected by the GC.
 
     The implementation of the ISOTP protocol, along with the necessary
-    threads, are stored in the ISOTPSocketImplementation class, and therefore:
+    thread, are stored in the ISOTPSocketImplementation class, and therefore:
 
     * There no reference from ISOTPSocketImplementation to ISOTPSoftSocket
     * ISOTPSoftSocket can be normally garbage collected
     * Upon destruction, ISOTPSoftSocket.close() will be called
     * ISOTPSoftSocket.close() will call ISOTPSocketImplementation.close()
-    * All background threads can be stopped by the garbage collector
+    * RX background thread can be stopped by the garbage collector
     """
 
     nonblocking_socket = True
@@ -569,8 +650,8 @@
         """
 
         if six.PY3 and LINUX and isinstance(can_socket, six.string_types):
-            from scapy.contrib.cansocket import CANSocket
-            can_socket = CANSocket(can_socket)
+            from scapy.contrib.cansocket_native import NativeCANSocket
+            can_socket = NativeCANSocket(can_socket)
         elif isinstance(can_socket, six.string_types):
             raise Scapy_Exception("Provide a CANSocket object instead")
 
@@ -600,10 +681,11 @@
         self.basecls = basecls
 
     def close(self):
-        self.impl.close()
-        self.outs = None
-        self.ins = None
-        SuperSocket.close(self)
+        if not self.closed:
+            self.impl.close()
+            self.outs = None
+            self.ins = None
+            SuperSocket.close(self)
 
     def begin_send(self, p):
         """Begin the transmission of message p. This method returns after
@@ -645,7 +727,10 @@
         blocking = remain is None or remain > 0
 
         def find_ready_sockets():
-            return list(filter(lambda x: not x.ins.rx_queue.empty(), sockets))
+            return list(filter(lambda x: (x.ins is not None) and
+                                         (x.ins.rx_queue is not None) and
+                                         (not x.ins.rx_queue.empty()),
+                               sockets))
 
         ready_sockets = find_ready_sockets()
         if len(ready_sockets) > 0 or not blocking:
@@ -668,6 +753,8 @@
                     s.ins.rx_callbacks.remove(my_cb)
                 except ValueError:
                     pass
+                except AttributeError:
+                    pass
 
         ready_sockets = find_ready_sockets()
         return ready_sockets, None
@@ -706,7 +793,8 @@
 
     def start(self):
         Thread.start(self)
-        self._thread_started.wait()
+        if not self._thread_started.wait(5):
+            raise Scapy_Exception("CAN RX thread not started in 5s.")
 
     def run(self):
         self._thread_started.set()
@@ -732,82 +820,221 @@
         self.exiting = True
 
 
-class TimeoutThread(Thread):
-    """
-    Utility class implementing a timer, useful for both timeouts and
-    waiting between sent CAN frames.
-    Contrary to the threading.Timer implementation, this timer thread can be
-    reused for multiple timeouts. This avoids the overhead of creating a new
-    pthread every time a timeout is planned.
-    """
+class TimeoutScheduler:
+    """A timeout scheduler which uses a single thread for all timeouts, unlike
+    python's own Timer objects which use a thread each."""
+    VERBOSE = False
+    GRACE = .1
+    _mutex = Lock()
+    _event = Event()
+    _thread = None
+    _handles = []  # must use heapq functions!
 
-    def __init__(self):
-        Thread.__init__(self)
+    @staticmethod
+    def schedule(timeout, callback):
+        """Schedules the execution of a timeout.
+
+        The function `callback` will be called in `timeout` seconds.
+
+        Returns a handle that can be used to remove the timeout."""
+        when = TimeoutScheduler._time() + timeout
+        handle = TimeoutScheduler.Handle(when, callback)
+        handles = TimeoutScheduler._handles
+
+        with TimeoutScheduler._mutex:
+            # Add the handler to the heap, keeping the invariant
+            # Time complexity is O(log n)
+            heapq.heappush(handles, handle)
+            must_interrupt = (handles[0] == handle)
+
+            # Start the scheduling thread if it is not started already
+            if TimeoutScheduler._thread is None:
+                t = Thread(target=TimeoutScheduler._task)
+                must_interrupt = False
+                TimeoutScheduler._thread = t
+                TimeoutScheduler._event.clear()
+                t.start()
+
+        if must_interrupt:
+            # if the new timeout got in front of the one we are currently
+            # waiting on, the current wait operation must be aborted and
+            # updated with the new timeout
+            TimeoutScheduler._event.set()
+
+        # Return the handle to the timeout so that the user can cancel it
+        return handle
 
-        self._thread_started = Event()
-        self._cancelled = Event()
-        self._ready_sem = Semaphore(1)
-        self._busy_sem = Semaphore(0)
-        self._timeout = 1
-        self._callback = None
-        self._exception = None
-        self._killed = False
-        self._dead = False
+    @staticmethod
+    def cancel(handle):
+        """Provided its handle, cancels the execution of a timeout."""
+
+        handles = TimeoutScheduler._handles
+        with TimeoutScheduler._mutex:
+            if handle in handles:
+                # Time complexity is O(n)
+                handle._cb = None
+                handles.remove(handle)
+                heapq.heapify(handles)
+
+                if len(handles) == 0:
+                    # set the event to stop the wait - this kills the thread
+                    TimeoutScheduler._event.set()
+            else:
+                raise Scapy_Exception("Handle not found")
 
-        self.name = "ISOTP Timer " + self.name
+    @staticmethod
+    def clear():
+        """Cancels the execution of all timeouts."""
+        with TimeoutScheduler._mutex:
+            TimeoutScheduler._handles.clear()
 
-    def run(self):
-        self._thread_started.set()
+        # set the event to stop the wait - this kills the thread
+        TimeoutScheduler._event.set()
 
-        try:
-            while not self._killed:
-                self._busy_sem.acquire()
-                f = self._cancelled.wait(self._timeout)
-                self._ready_sem.release()
-                if f is False:
-                    if self._callback is not None:
-                        self._callback()
+    @staticmethod
+    def _peek_next():
+        """Returns the next timeout to execute, or `None` if list is empty,
+        without modifying the list"""
+        with TimeoutScheduler._mutex:
+            handles = TimeoutScheduler._handles
+            if len(handles) == 0:
+                return None
+            else:
+                return handles[0]
 
-        except Exception as ex:
-            self._exception = ex
-            warning(self.name + " is now stopped")
-            raise ex
+    @staticmethod
+    def _wait(handle):
+        """Waits until it is time to execute the provided handle, or until
+        another thread calls _event.set()"""
+
+        if handle is None:
+            when = TimeoutScheduler.GRACE
+        else:
+            when = handle._when
+
+        # Check how much time until the next timeout
+        now = TimeoutScheduler._time()
+        to_wait = when - now
+
+        # Wait until the next timeout,
+        # or until event.set() gets called in another thread.
+        if to_wait > 0:
+            log_runtime.debug("TimeoutScheduler Thread going to sleep @ %f " +
+                              "for %fs", now, to_wait)
+            interrupted = TimeoutScheduler._event.wait(to_wait)
+            new = TimeoutScheduler._time()
+            log_runtime.debug("TimeoutScheduler Thread awake @ %f, slept for" +
+                              " %f, interrupted=%d", new, new - now,
+                              interrupted)
+
+        # Clear the event so that we can wait on it again,
+        # Must be done before doing the callbacks to avoid losing a set().
+        TimeoutScheduler._event.clear()
+
+    @staticmethod
+    def _task():
+        """Executed in a background thread, this thread will automatically
+        start when the first timeout is added and stop when the last timeout
+        is removed or executed."""
+
+        log_runtime.debug("TimeoutScheduler Thread spawning @ %f",
+                          TimeoutScheduler._time())
+
+        time_empty = None
+
+        try:
+            while 1:
+                handle = TimeoutScheduler._peek_next()
+                if handle is None:
+                    now = TimeoutScheduler._time()
+                    if time_empty is None:
+                        time_empty = now
+                    # 100 ms of grace time before killing the thread
+                    if TimeoutScheduler.GRACE < now - time_empty:
+                        return
+                TimeoutScheduler._wait(handle)
+                TimeoutScheduler._poll()
 
         finally:
-            self._dead = True
+            # Worst case scenario: if this thread dies, the next scheduled
+            # timeout will start a new one
+            log_runtime.debug("TimeoutScheduler Thread dying @ %f",
+                              TimeoutScheduler._time())
+            TimeoutScheduler._thread = None
 
-    def start(self):
-        """Start the thread, and make sure it is running"""
-        Thread.start(self)
-        self._thread_started.wait()
+    @staticmethod
+    def _poll():
+        """Execute all the callbacks that were due until now"""
+
+        handles = TimeoutScheduler._handles
+        handle = None
+        while 1:
+            with TimeoutScheduler._mutex:
+                now = TimeoutScheduler._time()
+                if len(handles) == 0 or handles[0]._when > now:
+                    # There is nothing to execute yet
+                    return
 
-    def set_timeout(self, timeout, callback):
-        """Call 'callback' in 'timeout' seconds, unless cancelled."""
-        if not self._ready_sem.acquire(False):
-            raise Scapy_Exception("Timer was already started")
+                # Time complexity is O(log n)
+                handle = heapq.heappop(handles)
+                callback = None
+                if handle is not None:
+                    callback = handle._cb
+                    handle._cb = True
 
-        self._callback = callback
-        self._timeout = timeout
-        self._cancelled.clear()
-        self._busy_sem.release()
+            # Call the callback here, outside of the mutex
+            if callback is not None:
+                try:
+                    callback()
+                except Exception:
+                    traceback.print_exc()
 
-    def cancel(self):
-        """Stop the timer without executing the callback."""
-        self._cancelled.set()
-        if not self._dead:
-            self._ready_sem.acquire()
-            self._ready_sem.release()
+    @staticmethod
+    def _time():
+        if six.PY2:
+            return time.time()
+        return time.monotonic()
+
+    class Handle:
+        """Handle for a timeout, consisting of a callback and a time when it
+        should be executed."""
+        __slots__ = '_when', '_cb'
+
+        def __init__(self, when, cb):
+            self._when = when
+            self._cb = cb
+
+        def cancel(self):
+            """Cancels this timeout, preventing it from executing its
+            callback"""
+            if self._cb is None:
+                raise Scapy_Exception("cancel() called on "
+                                      "previous canceled Handle")
+            else:
+                if isinstance(self._cb, bool):
+                    # Handle was already executed.
+                    # We don't need to cancel anymore
+                    return False
+                else:
+                    self._cb = None
+                    TimeoutScheduler.cancel(self)
+                    return True
 
-    def stop(self):
-        """Stop the thread, making this object unusable."""
-        if not self._dead:
-            self._killed = True
-            self._cancelled.set()
-            self._busy_sem.release()
-            self.join()
-            if not self._ready_sem.acquire(False):
-                warning("ISOTP Timer thread may not have stopped "
-                        "correctly")
+        def __cmp__(self, other):
+            diff = self._when - other._when
+            return 0 if diff == 0 else (1 if diff > 0 else -1)
+
+        def __lt__(self, other):
+            return self._when < other._when
+
+        def __le__(self, other):
+            return self._when <= other._when
+
+        def __gt__(self, other):
+            return self._when > other._when
+
+        def __ge__(self, other):
+            return self._when >= other._when
 
 
 """ISOTPSoftSocket definitions."""
@@ -833,7 +1060,7 @@
     https://github.com/hartkopp/can-isotp/blob/master/net/can/isotp.c
 
     This class is separated from ISOTPSoftSocket to make sure the background
-    threads can't hold a reference to ISOTPSoftSocket, allowing it to be
+    thread can't hold a reference to ISOTPSoftSocket, allowing it to be
     collected by the GC.
     """
 
@@ -911,8 +1138,8 @@
         self.rx_ll_dl = 0
         self.tx_state = ISOTP_IDLE
 
-        self.tx_timer = TimeoutThread()
-        self.rx_timer = TimeoutThread()
+        self.tx_timeout_handle = None
+        self.rx_timeout_handle = None
         self.rx_thread = CANReceiverThread(can_socket, self.on_can_recv)
 
         self.tx_mutex = Lock()
@@ -925,8 +1152,6 @@
         self.tx_callbacks = []
         self.rx_callbacks = []
 
-        self.tx_timer.start()
-        self.rx_timer.start()
         self.rx_thread.start()
 
     def __del__(self):
@@ -935,22 +1160,24 @@
     def can_send(self, load):
         if self.padding:
             load += bytearray(CAN_MAX_DLEN - len(load))
-        self.can_socket.send(CAN(identifier=self.src_id, data=load))
+        if self.src_id is None or self.src_id <= 0x7ff:
+            self.can_socket.send(CAN(identifier=self.src_id, data=load))
+        else:
+            self.can_socket.send(CAN(identifier=self.src_id, flags="extended",
+                                     data=load))
 
     def on_can_recv(self, p):
         if not isinstance(p, CAN):
             raise Scapy_Exception("argument is not a CAN frame")
         if p.identifier != self.dst_id:
-            if not self.filter_warning_emitted:
-                warning("You should put a filter for identifier=%x on your"
+            if not self.filter_warning_emitted and conf.verb >= 2:
+                warning("You should put a filter for identifier=%x on your "
                         "CAN socket" % self.dst_id)
                 self.filter_warning_emitted = True
         else:
             self.on_recv(p)
 
     def close(self):
-        self.rx_timer.stop()
-        self.tx_timer.stop()
         self.rx_thread.stop()
 
     def _rx_timer_handler(self):
@@ -962,7 +1189,8 @@
                 # we did not get new data frames in time.
                 # reset rx state
                 self.rx_state = ISOTP_IDLE
-                warning("RX state was reset due to timeout")
+                if conf.verb > 2:
+                    warning("RX state was reset due to timeout")
 
     def _tx_timer_handler(self):
         """Method called every time the tx_timer times out, which can happen in
@@ -1004,15 +1232,15 @@
                     if self.txfc_bs != 0 and self.tx_bs >= self.txfc_bs:
                         # stop and wait for FC
                         self.tx_state = ISOTP_WAIT_FC
-                        self.tx_timer.set_timeout(self.fc_timeout,
-                                                  self._tx_timer_handler)
+                        self.tx_timeout_handle = TimeoutScheduler.schedule(
+                            self.fc_timeout, self._tx_timer_handler)
                         return
 
                     if self.tx_gap == 0:
                         continue
                     else:
-                        self.tx_timer.set_timeout(self.tx_gap,
-                                                  self._tx_timer_handler)
+                        self.tx_timeout_handle = TimeoutScheduler.schedule(
+                            self.tx_gap, self._tx_timer_handler)
 
     def on_recv(self, cf):
         """Function that must be called every time a CAN frame is received, to
@@ -1052,7 +1280,9 @@
                 self.tx_state != ISOTP_WAIT_FIRST_FC):
             return 0
 
-        self.tx_timer.cancel()
+        if self.tx_timeout_handle is not None:
+            self.tx_timeout_handle.cancel()
+            self.tx_timeout_handle = None
 
         if len(data) < 3:
             self.tx_state = ISOTP_IDLE
@@ -1085,11 +1315,13 @@
             self.tx_bs = 0
             self.tx_state = ISOTP_SENDING
             # start cyclic timer for sending CF frame
-            self.tx_timer.set_timeout(self.tx_gap, self._tx_timer_handler)
+            self.tx_timeout_handle = TimeoutScheduler.schedule(
+                self.tx_gap, self._tx_timer_handler)
         elif isotp_fc == ISOTP_FC_WT:
             # start timer to wait for next FC frame
             self.tx_state = ISOTP_WAIT_FC
-            self.tx_timer.set_timeout(self.fc_timeout, self._tx_timer_handler)
+            self.tx_timeout_handle = TimeoutScheduler.schedule(
+                self.fc_timeout, self._tx_timer_handler)
         elif isotp_fc == ISOTP_FC_OVFLW:
             # overflow in receiver side
             self.tx_state = ISOTP_IDLE
@@ -1106,9 +1338,13 @@
 
     def _recv_sf(self, data):
         """Process a received 'Single Frame' frame"""
-        self.rx_timer.cancel()
+        if self.rx_timeout_handle is not None:
+            self.rx_timeout_handle.cancel()
+            self.rx_timeout_handle = None
+
         if self.rx_state != ISOTP_IDLE:
-            warning("RX state was reset because single frame was received")
+            if conf.verb > 2:
+                warning("RX state was reset because single frame was received")
             self.rx_state = ISOTP_IDLE
 
         length = six.indexbytes(data, 0) & 0xf
@@ -1124,9 +1360,13 @@
 
     def _recv_ff(self, data):
         """Process a received 'First Frame' frame"""
-        self.rx_timer.cancel()
+        if self.rx_timeout_handle is not None:
+            self.rx_timeout_handle.cancel()
+            self.rx_timeout_handle = None
+
         if self.rx_state != ISOTP_IDLE:
-            warning("RX state was reset because first frame was received")
+            if conf.verb > 2:
+                warning("RX state was reset because first frame was received")
             self.rx_state = ISOTP_IDLE
 
         if len(data) < 7:
@@ -1165,7 +1405,8 @@
 
         # wait for a CF
         self.rx_bs = 0
-        self.rx_timer.set_timeout(self.cf_timeout, self._rx_timer_handler)
+        self.rx_timeout_handle = TimeoutScheduler.schedule(
+            self.cf_timeout, self._rx_timer_handler)
 
         return 0
 
@@ -1174,7 +1415,9 @@
         if self.rx_state != ISOTP_WAIT_DATA:
             return 0
 
-        self.rx_timer.cancel()
+        if self.rx_timeout_handle is not None:
+            self.rx_timeout_handle.cancel()
+            self.rx_timeout_handle = None
 
         # CFs are never longer than the FF
         if len(data) > self.rx_ll_dl:
@@ -1184,13 +1427,15 @@
         if len(data) < self.rx_ll_dl:
             # this is only allowed for the last CF
             if self.rx_len - self.rx_idx > self.rx_ll_dl:
-                warning("Received a CF with insuffifient length")
+                if conf.verb > 2:
+                    warning("Received a CF with insufficient length")
                 return 1
 
         if six.indexbytes(data, 0) & 0x0f != self.rx_sn:
             # Wrong sequence number
-            warning("RX state was reset because wrong sequence number was "
-                    "received")
+            if conf.verb > 2:
+                warning("RX state was reset because wrong sequence number was "
+                        "received")
             self.rx_state = ISOTP_IDLE
             return 1
 
@@ -1222,7 +1467,8 @@
                 self.can_send(load)
 
         # wait for another CF
-        self.rx_timer.set_timeout(self.cf_timeout, self._rx_timer_handler)
+        self.rx_timeout_handle = TimeoutScheduler.schedule(
+            self.cf_timeout, self._rx_timer_handler)
         return 0
 
     def begin_send(self, x):
@@ -1267,7 +1513,8 @@
             self.tx_idx = len(load)
 
             self.tx_state = ISOTP_WAIT_FIRST_FC
-            self.tx_timer.set_timeout(self.fc_timeout, self._tx_timer_handler)
+            self.tx_timeout_handle = TimeoutScheduler.schedule(
+                self.fc_timeout, self._tx_timer_handler)
 
     def send(self, p):
         """Send an ISOTP frame and block until the message is sent or an error
@@ -1276,9 +1523,11 @@
             self.begin_send(p)
 
             # Wait until the tx callback is called
-            self.tx_done.wait()
+            send_done = self.tx_done.wait(30)
             if self.tx_exception is not None:
                 raise Scapy_Exception(self.tx_exception)
+            if not send_done:
+                raise Scapy_Exception("ISOTP send not completed in 30s")
             return
 
     def recv(self, timeout=None):
@@ -1371,6 +1620,7 @@
         can_isotp_fc_options_fmt = "@3B"
         can_isotp_ll_options_fmt = "@3B"
         sockaddr_can_fmt = "@H3I"
+        auxdata_available = True
 
         def __build_can_isotp_options(
                 self,
@@ -1538,8 +1788,17 @@
                      padding=False,
                      transmit_time=100,
                      basecls=ISOTP):
-            self.iface = conf.contribs['NativeCANSocket']['iface'] \
-                if iface is None else iface
+
+            if not isinstance(iface, six.string_types):
+                if hasattr(iface, "ins") and hasattr(iface.ins, "getsockname"):
+                    iface = iface.ins.getsockname()
+                    if isinstance(iface, tuple):
+                        iface = iface[0]
+                else:
+                    raise Scapy_Exception("Provide a string or a CANSocket "
+                                          "object as iface parameter")
+
+            self.iface = iface or conf.contribs['NativeCANSocket']['iface']
             self.can_socket = socket.socket(socket.PF_CAN, socket.SOCK_DGRAM,
                                             CAN_ISOTP)
             self.__set_option_flags(self.can_socket,
@@ -1560,8 +1819,13 @@
             self.can_socket.setsockopt(SOL_CAN_ISOTP,
                                        CAN_ISOTP_LL_OPTS,
                                        self.__build_can_isotp_ll_options())
+            self.can_socket.setsockopt(
+                socket.SOL_SOCKET,
+                SO_TIMESTAMPNS,
+                1
+            )
 
-            self.__bind_socket(self.can_socket, iface, sid, did)
+            self.__bind_socket(self.can_socket, self.iface, sid, did)
             self.ins = self.can_socket
             self.outs = self.can_socket
             if basecls is None:
@@ -1574,7 +1838,7 @@
             (cls, pkt_data, time)
             """  # noqa: E501
             try:
-                pkt = self.can_socket.recvfrom(x)[0]
+                pkt, _, ts = self._recv_raw(self.ins, x)
             except BlockingIOError:  # noqa: F821
                 warning('Captured no data, socket in non-blocking mode.')
                 return None
@@ -1586,7 +1850,8 @@
                 warning("Captured no data.")
                 return None
 
-            ts = get_last_packet_timestamp(self.can_socket)
+            if ts is None:
+                ts = get_last_packet_timestamp(self.ins)
             return self.basecls, pkt, ts
 
         def recv(self, x=0xffff):
@@ -1632,11 +1897,12 @@
         sock.send(packet)
 
 
-def get_isotp_packet(identifier=0x0, extended=False):
+def get_isotp_packet(identifier=0x0, extended=False, extended_can_id=False):
     """ Craft ISO TP packet
     Args:
         identifier: identifier of crafted packet
         extended: boolean if packet uses extended address
+        extended_can_id: boolean if CAN should use extended Ids
     """
 
     if extended:
@@ -1646,6 +1912,8 @@
     else:
         pkt = ISOTPHeader() / ISOTP_FF()
         pkt.data = b'\x00\x00\x00\x00\x00\x00'
+    if extended_can_id:
+        pkt.flags = "extended"
 
     pkt.identifier = identifier
     pkt.message_size = 100
@@ -1706,7 +1974,7 @@
     and not in noise_ids
     append it to id_list
     """
-    if packet.flags:
+    if packet.flags and packet.flags != "extended":
         return
 
     if noise_ids is not None and packet.identifier in noise_ids:
@@ -1735,7 +2003,7 @@
 
 
 def scan(sock, scan_range=range(0x800), noise_ids=None, sniff_time=0.1,
-         verbose=False):
+         extended_can_id=False, verbose=False):
     """Scan and return dictionary of detections
 
     Args:
@@ -1746,6 +2014,7 @@
                        received during scan
             sniff_time: time the scan waits for isotp flow control responses
                         after sending a first frame
+            extended_can_id: Send extended can frames
             verbose: displays information during scan
 
     ISOTP-Scan - NO extended IDs
@@ -1759,23 +2028,38 @@
                                                 verbose),
                    timeout=sniff_time,
                    started_callback=lambda: sock.send(
-                       get_isotp_packet(value)))
-    return return_values
+                       get_isotp_packet(value, False, extended_can_id)))
+
+    cleaned_ret_val = dict()
 
+    for tested_id in return_values.keys():
+        for value in range(max(0, tested_id - 2), tested_id + 2, 1):
+            sock.sniff(prn=lambda pkt: get_isotp_fc(value, cleaned_ret_val,
+                                                    noise_ids, False, pkt,
+                                                    verbose),
+                       timeout=sniff_time * 10,
+                       started_callback=lambda: sock.send(
+                       get_isotp_packet(value, False, extended_can_id)))
 
-def scan_extended(sock, scan_range=range(0x800), scan_block_size=100,
-                  noise_ids=None, sniff_time=0.1, verbose=False):
-    """Scan with extended addresses and return dictionary of detections
+    return cleaned_ret_val
+
+
+def scan_extended(sock, scan_range=range(0x800), scan_block_size=32,
+                  extended_scan_range=range(0x100), noise_ids=None,
+                  sniff_time=0.1, extended_can_id=False, verbose=False):
+    """Scan with ISOTP extended addresses and return dictionary of detections
 
     Args:
             sock: socket for can interface
             scan_range: hexadecimal range of IDs to scan.
                         Default is 0x0 - 0x7ff
             scan_block_size: count of packets send at once
+            extended_scan_range: range to search for extended ISOTP addresses
             noise_ids: list of packet IDs which will not be considered when
                        received during scan
             sniff_time: time the scan waits for isotp flow control responses
                         after sending a first frame
+            extended_can_id: Send extended can frames
             verbose: displays information during scan
 
     If an answer-packet found -> slow scan with
@@ -1788,72 +2072,81 @@
     scan_block_size = scan_block_size or 1
 
     for value in scan_range:
-        pkt = get_isotp_packet(value, extended=True)
+        pkt = get_isotp_packet(value, extended=True,
+                               extended_can_id=extended_can_id)
         id_list = []
-
-        for extended_id in range(0, 256, scan_block_size):
-            sock.sniff(prn=lambda p: get_isotp_fc(extended_id, id_list,
+        r = list(extended_scan_range)
+        for ext_isotp_id in range(r[0], r[-1], scan_block_size):
+            sock.sniff(prn=lambda p: get_isotp_fc(ext_isotp_id, id_list,
                                                   noise_ids, True, p,
                                                   verbose),
                        timeout=sniff_time * 3,
-                       started_callback=send_multiple_ext(sock, extended_id,
-                                                          pkt,
-                                                          scan_block_size))
+                       started_callback=lambda: send_multiple_ext(
+                           sock, ext_isotp_id, pkt, scan_block_size))
             # sleep to prevent flooding
-            time.sleep(1)
+            time.sleep(sniff_time)
 
         # remove duplicate IDs
         id_list = list(set(id_list))
-        for extended_id in id_list:
-            for ext_id in range(extended_id, min(extended_id +
-                                                 scan_block_size, 256)):
+        for ext_isotp_id in id_list:
+            for ext_id in range(max(ext_isotp_id - 2, 0),
+                                min(ext_isotp_id + scan_block_size + 2, 256)):
                 pkt.extended_address = ext_id
                 full_id = (value << 8) + ext_id
                 sock.sniff(prn=lambda pkt: get_isotp_fc(full_id,
                                                         return_values,
                                                         noise_ids, True,
                                                         pkt, verbose),
-                           timeout=sniff_time,
+                           timeout=sniff_time * 2,
                            started_callback=lambda: sock.send(pkt))
+
     return return_values
 
 
-def ISOTPScan(sock, scan_range=range(0x7ff + 1), extended_addressing=False,
+def ISOTPScan(sock,
+              scan_range=range(0x7ff + 1),
+              extended_addressing=False,
+              extended_scan_range=range(0x100),
               noise_listen_time=2,
               sniff_time=0.1,
               output_format=None,
-              can_interface="can0",
+              can_interface=None,
+              extended_can_id=False,
               verbose=False):
 
     """Scan for ISOTP Sockets on a bus and return findings
 
     Args:
-            sock: CANSocket object to communicate with the bus under scan
-            scan_range: hexadecimal range of CAN-Identifiers to scan.
-                        Default is 0x0 - 0x7ff
-            extended_addressing: scan with ISOTP extended addressing
-            noise_listen_time: seconds to listen for default
-                               communication on the bus
-            sniff_time: time the scan waits for isotp flow control responses
-                        after sending a first frame
-            output_format: defines the format of the returned
-                           results (text, code or sockets). Provide a string
-                           e.g. "text". Default is "socket".
-            can_interface: interface used to create the returned code/sockets
-            verbose: displays information during scan
+        sock: CANSocket object to communicate with the bus under scan
+        scan_range: hexadecimal range of CAN-Identifiers to scan.
+                    Default is 0x0 - 0x7ff
+        extended_addressing: scan with ISOTP extended addressing
+        extended_scan_range: range for ISOTP extended addressing values
+        noise_listen_time: seconds to listen for default
+                           communication on the bus
+        sniff_time: time the scan waits for isotp flow control responses
+                    after sending a first frame
+        output_format: defines the format of the returned
+                       results (text, code or sockets). Provide a string
+                       e.g. "text". Default is "socket".
+        can_interface: interface used to create the returned code/sockets
+        extended_can_id: Use Extended CAN-Frames
+        verbose: displays information during scan
 
     Scan for ISOTP Sockets in the defined range and returns found sockets
     in a specified format. The format can be:
-    text: human readable output
-    code: python code for copy&paste
-    sockets: if output format is not specified, ISOTPSockets will be
-             created and returned in a list
+
+    - text: human readable output
+    - code: python code for copy&paste
+    - sockets: if output format is not specified, ISOTPSockets will be
+      created and returned in a list
     """
 
     if verbose:
         print("Filtering background noise...")
 
     # Send dummy packet. In most cases, this triggers activity on the bus.
+
     dummy_pkt = CAN(identifier=0x123,
                     data=b'\xaa\xbb\xcc\xdd\xee\xff\xaa\xbb')
 
@@ -1864,35 +2157,48 @@
     noise_ids = list(set(pkt.identifier for pkt in background_pkts))
 
     if extended_addressing:
-        found_packets = scan_extended(sock, scan_range, noise_ids=noise_ids,
-                                      sniff_time=sniff_time, verbose=verbose)
+        found_packets = scan_extended(sock, scan_range,
+                                      extended_scan_range=extended_scan_range,
+                                      noise_ids=noise_ids,
+                                      sniff_time=sniff_time,
+                                      extended_can_id=extended_can_id,
+                                      verbose=verbose)
     else:
-        found_packets = scan(sock, scan_range, noise_ids=noise_ids,
-                             sniff_time=sniff_time, verbose=verbose)
+        found_packets = scan(sock, scan_range,
+                             noise_ids=noise_ids,
+                             sniff_time=sniff_time,
+                             extended_can_id=extended_can_id,
+                             verbose=verbose)
 
     filter_periodic_packets(found_packets, verbose)
 
     if output_format == "text":
-        return generate_text_output(found_packets)
+        return generate_text_output(found_packets, extended_addressing)
     if output_format == "code":
-        return generate_code_output(found_packets, can_interface)
-    return generate_isotp_list(found_packets, can_interface)
+        return generate_code_output(found_packets, can_interface,
+                                    extended_addressing)
+    if can_interface is None:
+        can_interface = sock
+
+    return generate_isotp_list(found_packets, can_interface,
+                               extended_addressing)
 
 
-def generate_text_output(found_packets):
+def generate_text_output(found_packets, extended_addressing=False):
     """Generate a human readable output from the result of the `scan` or
         the `scan_extended` function.
 
         Args:
                 found_packets: result of the `scan` or `scan_extended` function
+                extended_addressing: print results from a scan with ISOTP
+                                     extended addressing
     """
     if not found_packets:
         return "No packets found."
 
     text = "\nFound %s ISOTP-FlowControl Packet(s):" % len(found_packets)
     for pack in found_packets:
-        extended_id = pack > 0x7ff
-        if extended_id:
+        if extended_addressing:
             send_id = pack // 256
             send_ext = pack - (send_id * 256)
             ext_id = hex(orb(found_packets[pack][0].data[0]))
@@ -1922,7 +2228,8 @@
     return text
 
 
-def generate_code_output(found_packets, can_interface):
+def generate_code_output(found_packets, can_interface,
+                         extended_addressing=False):
     """Generate a copy&past-able output from the result of the `scan` or
         the `scan_extended` function.
 
@@ -1930,6 +2237,8 @@
                 found_packets: result of the `scan` or `scan_extended` function
                 can_interface: description string for a CAN interface to be
                                 used for the creation of the output.
+                extended_addressing: print results from a scan with ISOTP
+                                     extended addressing
     """
     result = ""
     if not found_packets:
@@ -1941,30 +2250,30 @@
              "load_contrib('isotp')\n\n" % PYTHON_CAN
 
     for pack in found_packets:
-        extended_id = pack > 0x7ff
-        if extended_id:
+        if extended_addressing:
             send_id = pack // 256
             send_ext = pack - (send_id * 256)
             ext_id = orb(found_packets[pack][0].data[0])
-            result += "ISOTPSocket(%s, sid=%s, did=%s, padding=%s, " \
-                      "extended_addr=%s, extended_rx_addr=%s, " \
+            result += "ISOTPSocket(%s, sid=0x%x, did=0x%x, padding=%s, " \
+                      "extended_addr=0x%x, extended_rx_addr=0x%x, " \
                       "basecls=ISOTP)\n" % \
-                      (can_interface, hex(send_id),
-                       hex(int(found_packets[pack][0].identifier)),
+                      (can_interface, send_id,
+                       int(found_packets[pack][0].identifier),
                        found_packets[pack][0].length == 8,
-                       hex(send_ext),
-                       hex(ext_id))
+                       send_ext,
+                       ext_id)
 
         else:
-            result += "ISOTPSocket(%s, sid=%s, did=%s, padding=%s, " \
+            result += "ISOTPSocket(%s, sid=0x%x, did=0x%x, padding=%s, " \
                       "basecls=ISOTP)\n" % \
-                      (can_interface, hex(pack),
-                       hex(int(found_packets[pack][0].identifier)),
+                      (can_interface, pack,
+                       int(found_packets[pack][0].identifier),
                        found_packets[pack][0].length == 8)
     return header + result
 
 
-def generate_isotp_list(found_packets, can_interface):
+def generate_isotp_list(found_packets, can_interface,
+                        extended_addressing=False):
     """Generate a list of ISOTPSocket objects from the result of the `scan` or
         the `scan_extended` function.
 
@@ -1972,16 +2281,17 @@
             found_packets: result of the `scan` or `scan_extended` function
             can_interface: description string for a CAN interface to be
                             used for the creation of the output.
+            extended_addressing: print results from a scan with ISOTP
+                                     extended addressing
     """
     socket_list = []
     for pack in found_packets:
-        extended_id = pack > 0x7ff
         pkt = found_packets[pack][0]
 
         dest_id = pkt.identifier
         pad = True if pkt.length == 8 else False
 
-        if extended_id:
+        if extended_addressing:
             source_id = pack >> 8
             source_ext = int(pack - (source_id * 256))
             dest_ext = orb(pkt.data[0])

scapy-2.4.3.tar.gz/scapy/contrib/lacp.py -> scapy-2.4.4.tar.gz/scapy/contrib/lacp.py Changed

@@ -21,7 +21,7 @@
 from scapy.data import ETHER_TYPES
 
 
-ETHER_TYPES['SlowProtocol'] = 0x8809
+ETHER_TYPES[0x8809] = 'SlowProtocol'
 SLOW_SUB_TYPES = {
     'Unused': 0,
     'LACP': 1,
@@ -39,6 +39,11 @@
 
 class LACP(Packet):
     name = "LACP"
+    deprecated_fields = {
+        "actor_port_numer": ("actor_port_number", "2.4.4"),
+        "partner_port_numer": ("partner_port_number", "2.4.4"),
+        "colletctor_reserved": ("collector_reserved", "2.4.4"),
+    }
     fields_desc = [
         ByteField("version", 1),
         ByteField("actor_type", 1),
@@ -47,7 +52,7 @@
         MACField("actor_system", None),
         ShortField("actor_key", 0),
         ShortField("actor_port_priority", 0),
-        ShortField("actor_port_numer", 0),
+        ShortField("actor_port_number", 0),
         ByteField("actor_state", 0),
         XStrFixedLenField("actor_reserved", "", 3),
         ByteField("partner_type", 2),
@@ -56,13 +61,13 @@
         MACField("partner_system", None),
         ShortField("partner_key", 0),
         ShortField("partner_port_priority", 0),
-        ShortField("partner_port_numer", 0),
+        ShortField("partner_port_number", 0),
         ByteField("partner_state", 0),
         XStrFixedLenField("partner_reserved", "", 3),
         ByteField("collector_type", 3),
         ByteField("collector_length", 16),
         ShortField("collector_max_delay", 0),
-        XStrFixedLenField("colletctor_reserved", "", 12),
+        XStrFixedLenField("collector_reserved", "", 12),
         ByteField("terminator_type", 0),
         ByteField("terminator_length", 0),
         XStrFixedLenField("reserved", "", 50),

scapy-2.4.3.tar.gz/scapy/contrib/lldp.py -> scapy-2.4.4.tar.gz/scapy/contrib/lldp.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-#
 # scapy.contrib.description = Link Layer Discovery Protocol (LLDP)
 # scapy.contrib.status = loads
 
@@ -28,15 +26,19 @@
             - IEEE 802.1AB 2016 - LLDP protocol, topology and MIB description
 
     :TODO:
-        - organization specific TLV e.g. ProfiNet (see LLDPDUGenericOrganisationSpecific for a starting point)  # noqa: E501
+        - | organization specific TLV e.g. ProfiNet
+          | (see LLDPDUGenericOrganisationSpecific for a starting point)
+        - Ignore everything after EndofLLDPDUTLV
 
     :NOTES:
         - you can find the layer configuration options at the end of this file
-        - default configuration enforces standard conform
-          - frame structure
-                (ChassisIDTLV/PortIDTLV/TimeToLiveTLV/.../EndofLLDPDUTLV)
-          - multiplicity of TLVs (if given by the standard)
-          - min sizes of strings used by the TLVs
+        - default configuration enforces standard conform:
+
+          * | frame structure
+            | (ChassisIDTLV/PortIDTLV/TimeToLiveTLV/...)
+          * multiplicity of TLVs (if given by the standard)
+          * min sizes of strings used by the TLVs
+
         - conf.contribs['LLDP'].strict_mode_disable() -> disable strict mode
 
 """
@@ -58,7 +60,7 @@
 LLDP_NEAREST_CUSTOMER_BRIDGE_MAC = '01:80:c2:00:00:00'
 
 LLDP_ETHER_TYPE = 0x88cc
-ETHER_TYPES['LLDP'] = LLDP_ETHER_TYPE
+ETHER_TYPES[LLDP_ETHER_TYPE] = 'LLDP'
 
 
 class LLDPInvalidFrameStructure(Scapy_Exception):
@@ -69,13 +71,6 @@
     pass
 
 
-class LLDPInvalidLastLayerException(Scapy_Exception):
-    """
-    in strict mode, last layer in frame must be of type LLDPDUEndOfLLDPDU
-    """
-    pass
-
-
 class LLDPMissingLowerLayer(Scapy_Exception):
     """
     first layer below first LLDPDU must be Ethernet or Dot1q
@@ -150,14 +145,6 @@
 
     def post_build(self, pkt, pay):
 
-        last_layer = not pay
-        if last_layer and conf.contribs['LLDP'].strict_mode() and \
-                type(self).__name__ != LLDPDUEndOfLLDPDU.__name__:
-            raise LLDPInvalidLastLayerException('Last layer must be instance '
-                                                'of LLDPDUEndOfLLDPDU - '
-                                                'got {}'.
-                                                format(type(self).__name__))
-
         under_layer = self.underlayer
 
         if under_layer is None:
@@ -195,10 +182,9 @@
         standard_frame_structure = [LLDPDUChassisID.__name__,
                                     LLDPDUPortID.__name__,
                                     LLDPDUTimeToLive.__name__,
-                                    '<...>',
-                                    LLDPDUEndOfLLDPDU.__name__]
+                                    '<...>']
 
-        if len(structure_description) < 4:
+        if len(structure_description) < 3:
             raise LLDPInvalidFrameStructure(
                 'Invalid frame structure.\ngot: {}\nexpected: '
                 '{}'.format(' '.join(structure_description),
@@ -214,12 +200,6 @@
                     '{}'.format(' '.join(structure_description),
                                 ' '.join(standard_frame_structure)))
 
-        if structure_description[-1] != standard_frame_structure[-1]:
-            raise LLDPInvalidFrameStructure(
-                'Invalid frame structure.\ngot: {}\nexpected: '
-                '{}'.format(' '.join(structure_description),
-                            ' '.join(standard_frame_structure)))
-
     @staticmethod
     def _tlv_multiplicities_check(tlv_type_count):
         """
@@ -229,7 +209,7 @@
 
         # * : 0..n, 1 : one and only one.
         standard_multiplicities = {
-            LLDPDUEndOfLLDPDU.__name__: 1,
+            LLDPDUEndOfLLDPDU.__name__: '*',
             LLDPDUChassisID.__name__: 1,
             LLDPDUPortID.__name__: 1,
             LLDPDUTimeToLive.__name__: 1,
@@ -544,14 +524,13 @@
 
 class LLDPDUManagementAddress(LLDPDU):
     """
-        ieee 802.1ab-2016 - sec. 8.5.9 / p. 32
+    ieee 802.1ab-2016 - sec. 8.5.9 / p. 32
 
-        currently only 0x00..0x1e are used by standards, no way to
-        use anything > 0xff as management address subtype is only
-        one octet wide
+    currently only 0x00..0x1e are used by standards, no way to
+    use anything > 0xff as management address subtype is only
+    one octet wide
 
-        see https://www.iana.org/assignments/
-        address-family-numbers/address-family-numbers.xhtml
+    see https://www.iana.org/assignments/address-family-numbers/address-family-numbers.xhtml  # noqa: E501
     """
     IANA_ADDRESS_FAMILY_NUMBERS = {
         0x00: 'other',
@@ -630,7 +609,8 @@
     SUBTYPE_INTERFACE_NUMBER_SYSTEM_PORT_NUMBER = 0x03
 
     '''
-        Note - calculation of _length field:
+    Note - calculation of _length field::
+
         _length = 1@_management_address_string_length +
                   1@management_address_subtype +
                   management_address.len +

scapy-2.4.4.tar.gz/scapy/contrib/loraphy2wan.py Added

@@ -0,0 +1,695 @@
+# This file is part of Scapy
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy. If not, see <http://www.gnu.org/licenses/>.
+
+# scapy.contrib.description = LoRa PHY to WAN Layer
+# scapy.contrib.status = loads
+
+
+"""
+    Copyright (C) 2020 Sebastien Dudek (@FlUxIuS @PentHertz)
+"""
+
+from __future__ import absolute_import
+
+from scapy.packet import Packet
+from scapy.fields import BitField, ByteEnumField, ByteField, \
+    ConditionalField, IntField, LEShortField, PacketListField, \
+    StrFixedLenField, X3BytesField, XByteField, XIntField, \
+    XShortField, BitFieldLenField, LEX3BytesField, XBitField, \
+    BitEnumField, XLEIntField, StrField, PacketField
+
+
+class FCtrl_DownLink(Packet):
+    name = "FCtrl_DownLink"
+    fields_desc = [BitField("ADR", 0, 1),
+                   BitField("ADRACKReq", 0, 1),
+                   BitField("ACK", 0, 1),
+                   BitField("FPending", 0, 1),
+                   BitFieldLenField("FOptsLen", 0, 4)]
+
+    # pylint: disable=R0201
+    def extract_padding(self, p):
+        return "", p
+
+
+class FCtrl_UpLink(Packet):
+    name = "FCtrl_UpLink"
+    fields_desc = [BitField("ADR", 0, 1),
+                   BitField("ADRACKReq", 0, 1),
+                   BitField("ACK", 0, 1),
+                   BitField("ClassB", 0, 1),
+                   BitFieldLenField("FOptsLen", 0, 4)]
+
+    # pylint: disable=R0201
+    def extract_padding(self, p):
+        return "", p
+
+
+class DevAddrElem(Packet):
+    name = "DevAddrElem"
+    fields_desc = [XByteField("NwkID", 0x0),
+                   LEX3BytesField("NwkAddr", b"\x00" * 3)]
+
+
+CIDs_up = {0x01: "ResetInd",
+           0x02: "LinkCheckReq",
+           0x03: "LinkADRReq",
+           0x04: "DutyCycleReq",
+           0x05: "RXParamSetupReq",
+           0x06: "DevStatusReq",
+           0x07: "NewChannelReq",
+           0x08: "RXTimingSetupReq",
+           0x09: "TxParamSetupReq",  # LoRa 1.1 specs
+           0x0A: "DlChannelReq",
+           0x0B: "RekeyInd",
+           0x0C: "ADRParamSetupReq",
+           0x0D: "DeviceTimeReq",
+           0x0E: "ForceRejoinReq",
+           0x0F: "RejoinParamSetupReq"}  # end of LoRa 1.1 specs
+
+
+CIDs_down = {0x01: "ResetConf",
+             0x02: "LinkCheckAns",
+             0x03: "LinkADRAns",
+             0x04: "DutyCycleAns",
+             0x05: "RXParamSetupAns",
+             0x06: "DevStatusAns",
+             0x07: "NewChannelAns",
+             0x08: "RXTimingSetupAns",
+             0x09: "TxParamSetupAns",  # LoRa 1.1 specs here
+             0x0A: "DlChannelAns",
+             0x0B: "RekeyConf",
+             0x0C: "ADRParamSetupAns",
+             0x0D: "DeviceTimeAns",
+             0x0F: "RejoinParamSetupAns"}  # end of LoRa 1.1 specs
+
+
+class ResetInd(Packet):
+    name = "ResetInd"
+    fields_desc = [ByteField("Dev_version", 0)]
+
+
+class ResetConf(Packet):
+    name = "ResetConf"
+    fields_desc = [ByteField("Serv_version", 0)]
+
+
+class LinkCheckReq(Packet):
+    name = "LinkCheckReq"
+
+
+class LinkCheckAns(Packet):
+    name = "LinkCheckAns"
+    fields_desc = [ByteField("Margin", 0),
+                   ByteField("GwCnt", 0)]
+
+
+class DataRate_TXPower(Packet):
+    name = "DataRate_TXPower"
+    fields_desc = [XBitField("DataRate", 0, 4),
+                   XBitField("TXPower", 0, 4)]
+
+
+class Redundancy(Packet):
+    name = "Redundancy"
+    fields_desc = [XBitField("RFU", 0, 1),
+                   XBitField("ChMaskCntl", 0, 3),
+                   XBitField("NbTrans", 0, 4)]
+
+
+class LinkADRReq(Packet):
+    name = "LinkADRReq"
+    fields_desc = [DataRate_TXPower,
+                   XShortField("ChMask", 0),
+                   Redundancy]
+
+
+class LinkADRAns_Status(Packet):
+    name = "LinkADRAns_Status"
+    fields_desc = [BitField("RFU", 0, 5),
+                   BitField("PowerACK", 0, 1),
+                   BitField("DataRate", 0, 1),
+                   BitField("ChannelMaskACK", 0, 1)]
+
+
+class LinkADRAns(Packet):
+    name = "LinkADRAns"
+    fields_desc = [PacketField("status",
+                               LinkADRAns_Status(),
+                               LinkADRAns_Status)]
+
+
+class DutyCyclePL(Packet):
+    name = "DutyCyclePL"
+    fields_desc = [BitField("MaxDCycle", 0, 4)]
+
+
+class DutyCycleReq(Packet):
+    name = "DutyCycleReq"
+    fields_desc = [DutyCyclePL]
+
+
+class DutyCycleAns(Packet):
+    name = "DutyCycleAns"
+    fields_desc = []
+
+
+class DLsettings(Packet):
+    name = "DLsettings"
+    fields_desc = [BitField("OptNeg", 0, 1),
+                   XBitField("RX1DRoffset", 0, 3),
+                   XBitField("RX2_Data_rate", 0, 4)]
+
+
+class RXParamSetupReq(Packet):
+    name = "RXParamSetupReq"
+    fields_desc = [DLsettings,
+                   X3BytesField("Frequency", 0)]
+
+
+class RXParamSetupAns_Status(Packet):
+    name = "RXParamSetupAns_Status"
+    fields_desc = [XBitField("RFU", 0, 5),
+                   BitField("RX1DRoffsetACK", 0, 1),
+                   BitField("RX2DatarateACK", 0, 1),
+                   BitField("ChannelACK", 0, 1)]
+
+
+class RXParamSetupAns(Packet):
+    name = "RXParamSetupAns"
+    fields_desc = [RXParamSetupAns_Status]
+
+
+Battery_state = {0: "End-device connected to external source",
+                 255: "Battery level unknown"}
+
+
+class DevStatusReq(Packet):
+    name = "DevStatusReq"
+    fields_desc = [ByteEnumField("Battery", 0, Battery_state),
+                   ByteField("Margin", 0)]
+
+
+class DevStatusAns_Status(Packet):
+    name = "DevStatusAns_Status"
+    fields_desc = [XBitField("RFU", 0, 2),
+                   XBitField("Margin", 0, 6)]
+
+
+class DevStatusAns(Packet):
+    name = "DevStatusAns"
+    fields_desc = [DevStatusAns_Status]
+
+
+class DrRange(Packet):
+    name = "DrRange"
+    fields_desc = [XBitField("MaxDR", 0, 4),
+                   XBitField("MinDR", 0, 4)]
+
+
+class NewChannelReq(Packet):
+    name = "NewChannelReq"
+    fields_desc = [ByteField("ChIndex", 0),
+                   X3BytesField("Freq", 0),
+                   DrRange]
+
+
+class NewChannelAns_Status(Packet):
+    name = "NewChannelAns_Status"
+    fields_desc = [XBitField("RFU", 0, 6),
+                   BitField("Dataraterangeok", 0, 1),
+                   BitField("Channelfrequencyok", 0, 1)]
+
+
+class NewChannelAns(Packet):
+    name = "NewChannelAns"
+    fields_desc = [NewChannelAns_Status]
+
+
+class RXTimingSetupReq_Settings(Packet):
+    name = "RXTimingSetupReq_Settings"
+    fields_desc = [XBitField("RFU", 0, 4),
+                   XBitField("Del", 0, 4)]
+
+
+class RXTimingSetupReq(Packet):
+    name = "RXTimingSetupReq"
+    fields_desc = [RXTimingSetupReq_Settings]
+
+
+class RXTimingSetupAns(Packet):
+    name = "RXTimingSetupAns"
+    fields_desc = []
+
+
+# Specific commands for LoRa 1.1 here
+
+MaxEIRPs = {0: "8 dbm",
+            1: "10 dbm",
+            2: "12 dbm",
+            3: "13 dbm",
+            4: "14 dbm",
+            5: "16 dbm",
+            6: "18 dbm",
+            7: "20 dbm",
+            8: "21 dbm",
+            9: "24 dbm",
+            10: "26 dbm",
+            11: "27 dbm",
+            12: "29 dbm",
+            13: "30 dbm",
+            14: "33 dbm",
+            15: "36 dbm"}
+
+
+DwellTimes = {0: "No limit",
+              1: "400 ms"}
+
+
+class EIRP_DwellTime(Packet):
+    name = "EIRP_DwellTime"
+    fields_desc = [BitField("RFU", 0b0, 2),
+                   BitEnumField("DownlinkDwellTime", 0b0, 1, DwellTimes),
+                   BitEnumField("UplinkDwellTime", 0b0, 1, DwellTimes),
+                   BitEnumField("MaxEIRP", 0b0000, 4, MaxEIRPs)]
+
+
+class TxParamSetupReq(Packet):
+    name = "TxParamSetupReq"
+    fields_desc = [EIRP_DwellTime]
+
+
+class TxParamSetupAns(Packet):
+    name = "TxParamSetupAns"
+    fields_desc = []
+
+
+class DlChannelReq(Packet):
+    name = "DlChannelReq"
+    fields_desc = [ByteField("ChIndex", 0),
+                   X3BytesField("Freq", 0)]
+
+
+class DlChannelAns(Packet):
+    name = "DlChannelAns"
+    fields_desc = [ByteField("Status", 0)]
+
+
+class DevLoraWANversion(Packet):
+    name = "DevLoraWANversion"
+    fields_desc = [BitField("RFU", 0b0000, 4),
+                   BitField("Minor", 0b0001, 4)]
+
+
+class RekeyInd(Packet):
+    name = "RekeyInd"
+    fields_desc = [PacketListField("LoRaWANversion", b"",
+                   DevLoraWANversion, length_from=lambda pkt:1)]
+
+
+class RekeyConf(Packet):
+    name = "RekeyConf"
+    fields_desc = [ByteField("ServerVersion", 0)]
+
+
+class ADRparam(Packet):
+    name = "ADRparam"
+    fields_desc = [BitField("Limit_exp", 0b0000, 4),
+                   BitField("Delay_exp", 0b0000, 4)]
+
+
+class ADRParamSetupReq(Packet):
+    name = "ADRParamSetupReq"
+    fields_desc = [ADRparam]
+
+
+class ADRParamSetupAns(Packet):
+    name = "ADRParamSetupReq"
+    fields_desc = []
+
+
+class DeviceTimeReq(Packet):
+    name = "DeviceTimeReq"
+    fields_desc = []
+
+
+class DeviceTimeAns(Packet):
+    name = "DeviceTimeAns"
+    fields_desc = [IntField("SecondsSinceEpoch", 0),
+                   ByteField("FracSecond", 0x00)]
+
+
+class ForceRejoinReq(Packet):
+    name = "ForceRejoinReq"
+    fields_desc = [BitField("RFU", 0, 2),
+                   BitField("Period", 0, 3),
+                   BitField("Max_Retries", 0, 3),
+                   BitField("RFU", 0, 1),
+                   BitField("RejoinType", 0, 3),
+                   BitField("DR", 0, 4)]
+
+
+class RejoinParamSetupReq(Packet):
+    name = "RejoinParamSetupReq"
+    fields_desc = [BitField("MaxTimeN", 0, 4),
+                   BitField("MaxCountN", 0, 4)]
+
+
+class RejoinParamSetupAns(Packet):
+    name = "RejoinParamSetupAns"
+    fields_desc = [BitField("RFU", 0, 7),
+                   BitField("TimeOK", 0, 1)]
+
+
+# End of specific 1.1 commands
+
+
+class MACCommand_up(Packet):
+    name = "MACCommand_up"
+    fields_desc = [ByteEnumField("CID", 0, CIDs_up),
+                   ConditionalField(PacketListField("Reset", b"",
+                                                    ResetInd,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x01)),
+                   ConditionalField(PacketListField("LinkCheck", b"",
+                                                    LinkCheckReq,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x02)),
+                   ConditionalField(PacketListField("LinkADR", b"",
+                                                    LinkADRReq,
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.CID == 0x03)),
+                   ConditionalField(PacketListField("DutyCycle", b"",
+                                                    DutyCycleReq,
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.CID == 0x04)),
+                   ConditionalField(PacketListField("RXParamSetup", b"",
+                                                    RXParamSetupReq,
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.CID == 0x05)),
+                   ConditionalField(PacketListField("DevStatus", b"",
+                                                    DevStatusReq,
+                                                    length_from=lambda pkt:2),
+                                    lambda pkt:(pkt.CID == 0x06)),
+                   ConditionalField(PacketListField("NewChannel", b"",
+                                                    NewChannelReq,
+                                                    length_from=lambda pkt:5),
+                                    lambda pkt:(pkt.CID == 0x07)),
+                   ConditionalField(PacketListField("RXTimingSetup", b"",
+                                                    RXTimingSetupReq,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x08)),
+                   # specific to 1.1 from here
+                   ConditionalField(PacketListField("TxParamSetup", b"",
+                                                    TxParamSetupReq,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x09)),
+                   ConditionalField(PacketListField("DlChannel", b"",
+                                                    DlChannelReq,
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.CID == 0x0A)),
+                   ConditionalField(PacketListField("Rekey", b"",
+                                                    RekeyInd,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0B)),
+                   ConditionalField(PacketListField("ADRParamSetup", b"",
+                                                    ADRParamSetupReq,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0C)),
+                   ConditionalField(PacketListField("DeviceTime", b"",
+                                                    DeviceTimeReq,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x0D)),
+                   ConditionalField(PacketListField("ForceRejoin", b"",
+                                                    ForceRejoinReq,
+                                                    length_from=lambda pkt:2),
+                                    lambda pkt:(pkt.CID == 0x0E)),
+                   ConditionalField(PacketListField("RejoinParamSetup", b"",
+                                                    RejoinParamSetupReq,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0F))]
+
+    # pylint: disable=R0201
+    def extract_padding(self, p):
+        return "", p
+
+
+class MACCommand_down(Packet):
+    name = "MACCommand_down"
+    fields_desc = [ByteEnumField("CID", 0, CIDs_up),
+                   ConditionalField(PacketListField("Reset", b"",
+                                                    ResetConf,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x01)),
+                   ConditionalField(PacketListField("LinkCheck", b"",
+                                                    LinkCheckAns,
+                                                    length_from=lambda pkt:2),
+                                    lambda pkt:(pkt.CID == 0x02)),
+                   ConditionalField(PacketListField("LinkADR", b"",
+                                                    LinkADRAns,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x03)),
+                   ConditionalField(PacketListField("DutyCycle", b"",
+                                                    DutyCycleAns,
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.CID == 0x04)),
+                   ConditionalField(PacketListField("RXParamSetup", b"",
+                                                    RXParamSetupAns,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x05)),
+                   ConditionalField(PacketListField("DevStatusAns", b"",
+                                                    RXParamSetupAns,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x06)),
+                   ConditionalField(PacketListField("NewChannel", b"",
+                                                    NewChannelAns,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x07)),
+                   ConditionalField(PacketListField("RXTimingSetup", b"",
+                                                    RXTimingSetupAns,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x08)),
+                   ConditionalField(PacketListField("TxParamSetup", b"",
+                                                    TxParamSetupAns,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x09)),
+                   ConditionalField(PacketListField("DlChannel", b"",
+                                                    DlChannelAns,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0A)),
+                   ConditionalField(PacketListField("Rekey", b"",
+                                                    RekeyConf,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0B)),
+                   ConditionalField(PacketListField("ADRParamSetup", b"",
+                                                    ADRParamSetupAns,
+                                                    length_from=lambda pkt:0),
+                                    lambda pkt:(pkt.CID == 0x0C)),
+                   ConditionalField(PacketListField("DeviceTime", b"",
+                                                    DeviceTimeAns,
+                                                    length_from=lambda pkt:5),
+                                    lambda pkt:(pkt.CID == 0x0D)),
+                   ConditionalField(PacketListField("RejoinParamSetup", b"",
+                                                    RejoinParamSetupAns,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.CID == 0x0F))]
+
+
+class FOpts(Packet):
+    name = "FOpts"
+    fields_desc = [ConditionalField(PacketListField("FOpts_up", b"",
+                                                    # UL piggy MAC Command
+                                                    MACCommand_up,
+                                                    length_from=lambda pkt:pkt.FCtrl[0].FOptsLen),  # noqa: E501
+                                    lambda pkt:(pkt.FCtrl[0].FOptsLen > 0 and
+                                                pkt.MType & 0b1 == 0 and
+                                                pkt.MType >= 0b010)),
+                   ConditionalField(PacketListField("FOpts_down", b"",
+                                                    # DL piggy MAC Command
+                                                    MACCommand_down,
+                                                    length_from=lambda pkt:pkt.FCtrl[0].FOptsLen),  # noqa: E501
+                                    lambda pkt:(pkt.FCtrl[0].FOptsLen > 0 and
+                                                pkt.MType & 0b1 == 1 and
+                                                pkt.MType <= 0b101))]
+
+
+def FOptsDownShow(pkt):
+    try:
+        if pkt.FCtrl[0].FOptsLen > 0 and pkt.MType & 0b1 == 1 and pkt.MType <= 0b101:  # noqa: E501
+            return True
+        return False
+    except Exception:
+        return False
+
+
+def FOptsUpShow(pkt):
+    try:
+        if pkt.FCtrl[0].FOptsLen > 0 and pkt.MType & 0b1 == 0 and pkt.MType >= 0b010:  # noqa: E501
+            return True
+        return False
+    except Exception:
+        return False
+
+
+class FHDR(Packet):
+    name = "FHDR"
+    fields_desc = [ConditionalField(PacketListField("DevAddr", b"", DevAddrElem,  # noqa: E501
+                                                    length_from=lambda pkt:4),
+                                    lambda pkt:(pkt.MType >= 0b010 and
+                                                pkt.MType <= 0b101)),
+                   ConditionalField(PacketListField("FCtrl", b"",
+                                                    FCtrl_DownLink,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.MType & 0b1 == 1 and
+                                                pkt.MType <= 0b101)),
+                   ConditionalField(PacketListField("FCtrl", b"",
+                                                    FCtrl_UpLink,
+                                                    length_from=lambda pkt:1),
+                                    lambda pkt:(pkt.MType & 0b1 == 0 and
+                                                pkt.MType >= 0b010)),
+                   ConditionalField(LEShortField("FCnt", 0),
+                                    lambda pkt:(pkt.MType >= 0b010 and
+                                                pkt.MType <= 0b101)),
+                   ConditionalField(PacketListField("FOpts_up", b"",
+                                                    MACCommand_up,
+                                                    length_from=lambda pkt:pkt.FCtrl[0].FOptsLen),  # noqa: E501
+                                    FOptsUpShow),
+                   ConditionalField(PacketListField("FOpts_down", b"",
+                                                    MACCommand_down,
+                                                    length_from=lambda pkt:pkt.FCtrl[0].FOptsLen),  # noqa: E501
+                                    FOptsDownShow)]
+
+
+FPorts = {0: "NwkSKey"}  # anything else is AppSKey
+
+
+JoinReqTypes = {0xFF: "Join-request",
+                0x00: "Rejoin-request type 0",
+                0x01: "Rejoin-request type 1",
+                0x02: "Rejoin-request type 2"}
+
+
+class Join_Request(Packet):
+    name = "Join_Request"
+    fields_desc = [StrFixedLenField("AppEUI", b"\x00" * 8, 8),
+                   StrFixedLenField("DevEUI", b"\00" * 8, 8),
+                   LEShortField("DevNonce", 0x0000)]
+
+
+class Join_Accept(Packet):
+    name = "Join_Accept"
+    dcflist = False
+    fields_desc = [LEX3BytesField("JoinAppNonce", 0),
+                   LEX3BytesField("NetID", 0),
+                   XLEIntField("DevAddr", 0),
+                   DLsettings,
+                   XByteField("RxDelay", 0),
+                   ConditionalField(StrFixedLenField("CFList", b"\x00" * 16, 16),  # noqa: E501
+                                    lambda pkt:(Join_Accept.dcflist is True))]
+
+    # pylint: disable=R0201
+    def extract_padding(self, p):
+        return "", p
+
+    def __init__(self, packet=""):  # CFList calculated with rest of packet len
+        if len(packet) > 18:
+            Join_Accept.dcflist = True
+        super(Join_Accept, self).__init__(packet)
+
+
+RejoinType = {0: "NetID+DevEUI",
+              1: "JoinEUI+DevEUI",
+              2: "NetID+DevEUI"}
+
+
+class RejoinReq(Packet):  # LoRa 1.1 specs
+    name = "RejoinReq"
+    fields_desc = [ByteField("Type", 0),
+                   X3BytesField("NetID", 0),
+                   StrFixedLenField("DevEUI", b"\x00" * 8),
+                   XShortField("RJcount0", 0)]
+
+
+class FRMPayload(Packet):
+    name = "FRMPayload"
+    fields_desc = [ConditionalField(StrField("DataPayload", "", remain=4),  # Downlink  # noqa: E501
+                                    lambda pkt:(pkt.MType == 0b101 or
+                                                pkt.MType == 0b011)),
+                   ConditionalField(StrField("DataPayload", "", remain=6),  # Uplink  # noqa: E501
+                                    lambda pkt:(pkt.MType == 0b100 or
+                                                pkt.MType == 0b010)),
+                   ConditionalField(PacketListField("Join_Request_Field", b"",
+                                                    Join_Request,
+                                                    length_from=lambda pkt:18),
+                                    lambda pkt:(pkt.MType == 0b000)),
+                   ConditionalField(PacketListField("Join_Accept_Field", b"",
+                                                    Join_Accept,
+                                                    count_from=lambda pkt:1),
+                                    lambda pkt:(pkt.MType == 0b001 and
+                                                LoRa.encrypted is False)),
+                   ConditionalField(StrField("Join_Accept_Encrypted", 0),
+                                    lambda pkt:(pkt.MType == 0b001 and LoRa.encrypted is True)),  # noqa: E501
+                   ConditionalField(PacketListField("ReJoin_Request_Field", b"",  # noqa: E501
+                                                    RejoinReq,
+                                                    length_from=lambda pkt:14),
+                                    lambda pkt:(pkt.MType == 0b111))]
+
+
+class MACPayload(Packet):
+    name = "MACPayload"
+    eFPort = False
+    fields_desc = [FHDR,
+                   ConditionalField(ByteEnumField("FPort", 0, FPorts),
+                                    lambda pkt:(pkt.MType >= 0b010 and
+                                                pkt.MType <= 0b101 and
+                                                pkt.FCtrl[0].FOptsLen == 0)),
+                   FRMPayload]
+
+
+MTypes = {0b000: "Join-request",
+          0b001: "Join-accept",
+          0b010: "Unconfirmed Data Up",
+          0b011: "Unconfirmed Data Down",
+          0b100: "Confirmed Data Up",
+          0b101: "Confirmed Data Down",
+          0b110: "Rejoin-request",  # Only in LoRa 1.1 specs
+          0b111: "Proprietary"}
+
+
+class MHDR(Packet):  # Same for 1.0 as for 1.1
+    name = "MHDR"
+    fields_desc = [BitEnumField("MType", 0b000, 3, MTypes),
+                   BitField("RFU", 0b000, 3),
+                   BitField("Major", 0b00, 2)]
+
+
+class PHYPayload(Packet):
+    name = "PHYPayload"
+    fields_desc = [MHDR,
+                   MACPayload,
+                   ConditionalField(XIntField("MIC", 0),
+                                    lambda pkt:(pkt.MType != 0b001 or
+                                                LoRa.encrypted is False))]
+
+
+class LoRa(Packet):  # default frame (unclear specs => taken from https://www.ncbi.nlm.nih.gov/pmc/articles/PMC5677147/)  # noqa: E501
+    name = "LoRa"
+    version = "1.1"  # default version to parse
+    encrypted = True
+    fields_desc = [XBitField("Preamble", 0, 4),
+                   XBitField("PHDR", 0, 16),
+                   XBitField("PHDR_CRC", 0, 4),
+                   PHYPayload,
+                   ConditionalField(XShortField("CRC", 0),
+                                    lambda pkt:(pkt.MType & 0b1 == 0))]

scapy-2.4.3.tar.gz/scapy/contrib/ltp.py -> scapy-2.4.4.tar.gz/scapy/contrib/ltp.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/mac_control.py -> scapy-2.4.4.tar.gz/scapy/contrib/mac_control.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/modbus.py -> scapy-2.4.4.tar.gz/scapy/contrib/modbus.py Changed

@@ -17,20 +17,20 @@
 # scapy.contrib.description = ModBus Protocol
 # scapy.contrib.status = loads
 
-# Copyright (C) 2017 Arthur Gervais, Ken LE PRADO, Sébastien Mainand, Thomas Aurel  # noqa: E501
+# Copyright (C) 2017 Arthur Gervais, Ken LE PRADO, Sébastien Mainand,
+# Thomas Aurel
 
 import struct
 
 from scapy.packet import Packet, bind_layers
 from scapy.fields import XByteField, XShortField, StrLenField, ByteEnumField, \
     BitFieldLenField, ByteField, ConditionalField, EnumField, FieldListField, \
-    ShortField, StrFixedLenField
+    ShortField, StrFixedLenField, XShortEnumField
 from scapy.layers.inet import TCP
 from scapy.utils import orb
 from scapy.config import conf
 from scapy.volatile import VolatileValue
 
-# TODO: implement serial specific function codes
 
 _modbus_exceptions = {1: "Illegal Function Code",
                       2: "Illegal Data Address",
@@ -43,44 +43,40 @@
                       11: "Gateway Target Device Failed to Respond"}
 
 
-class ModbusPDU01ReadCoilsRequest(Packet):
+class _ModbusPDUNoPayload(Packet):
+
+    def extract_padding(self, s):
+        return b"", None
+
+
+class ModbusPDU01ReadCoilsRequest(_ModbusPDUNoPayload):
     name = "Read Coils Request"
     fields_desc = [XByteField("funcCode", 0x01),
                    XShortField("startAddr", 0x0000),  # 0x0000 to 0xFFFF
                    XShortField("quantity", 0x0001)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
-class ModbusPDU01ReadCoilsResponse(Packet):
+class ModbusPDU01ReadCoilsResponse(_ModbusPDUNoPayload):
     name = "Read Coils Response"
     fields_desc = [XByteField("funcCode", 0x01),
-                   BitFieldLenField("byteCount", None, 8, count_of="coilStatus"),  # noqa: E501
-                   FieldListField("coilStatus", [0x00], ByteField("", 0x00), count_from=lambda pkt: pkt.byteCount)]  # noqa: E501
-
-    def extract_padding(self, s):
-        return b"", None
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="coilStatus"),
+                   FieldListField("coilStatus", [0x00], ByteField("", 0x00),
+                                  count_from=lambda pkt: pkt.byteCount)]
 
 
-class ModbusPDU01ReadCoilsError(Packet):
+class ModbusPDU01ReadCoilsError(_ModbusPDUNoPayload):
     name = "Read Coils Exception"
     fields_desc = [XByteField("funcCode", 0x81),
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
-class ModbusPDU02ReadDiscreteInputsRequest(Packet):
+class ModbusPDU02ReadDiscreteInputsRequest(_ModbusPDUNoPayload):
     name = "Read Discrete Inputs"
     fields_desc = [XByteField("funcCode", 0x02),
                    XShortField("startAddr", 0x0000),
                    XShortField("quantity", 0x0001)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU02ReadDiscreteInputsResponse(Packet):
     """ inputStatus: result is represented as bytes, padded with 0 to have a
@@ -89,8 +85,10 @@
     """
     name = "Read Discrete Inputs Response"
     fields_desc = [XByteField("funcCode", 0x02),
-                   BitFieldLenField("byteCount", None, 8, count_of="inputStatus"),  # noqa: E501
-                   FieldListField("inputStatus", [0x00], ByteField("", 0x00), count_from=lambda pkt: pkt.byteCount)]  # noqa: E501
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="inputStatus"),
+                   FieldListField("inputStatus", [0x00], ByteField("", 0x00),
+                                  count_from=lambda pkt: pkt.byteCount)]
 
 
 class ModbusPDU02ReadDiscreteInputsError(Packet):
@@ -99,21 +97,21 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
-class ModbusPDU03ReadHoldingRegistersRequest(Packet):
+class ModbusPDU03ReadHoldingRegistersRequest(_ModbusPDUNoPayload):
     name = "Read Holding Registers"
     fields_desc = [XByteField("funcCode", 0x03),
                    XShortField("startAddr", 0x0000),
                    XShortField("quantity", 0x0001)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU03ReadHoldingRegistersResponse(Packet):
     name = "Read Holding Registers Response"
     fields_desc = [XByteField("funcCode", 0x03),
-                   BitFieldLenField("byteCount", None, 8, count_of="registerVal", adjust=lambda pkt, x: x * 2),  # noqa: E501
-                   FieldListField("registerVal", [0x0000], ShortField("", 0x0000),  # noqa: E501
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="registerVal",
+                                    adjust=lambda pkt, x: x * 2),
+                   FieldListField("registerVal", [0x0000],
+                                  ShortField("", 0x0000),
                                   count_from=lambda pkt: pkt.byteCount)]
 
 
@@ -123,21 +121,21 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
-class ModbusPDU04ReadInputRegistersRequest(Packet):
+class ModbusPDU04ReadInputRegistersRequest(_ModbusPDUNoPayload):
     name = "Read Input Registers"
     fields_desc = [XByteField("funcCode", 0x04),
                    XShortField("startAddr", 0x0000),
                    XShortField("quantity", 0x0001)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU04ReadInputRegistersResponse(Packet):
     name = "Read Input Registers Response"
     fields_desc = [XByteField("funcCode", 0x04),
-                   BitFieldLenField("byteCount", None, 8, count_of="registerVal", adjust=lambda pkt, x: x * 2),  # noqa: E501
-                   FieldListField("registerVal", [0x0000], ShortField("", 0x0000),  # noqa: E501
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="registerVal",
+                                    adjust=lambda pkt, x: x * 2),
+                   FieldListField("registerVal", [0x0000],
+                                  ShortField("", 0x0000),
                                   count_from=lambda pkt: pkt.byteCount)]
 
 
@@ -150,15 +148,20 @@
 class ModbusPDU05WriteSingleCoilRequest(Packet):
     name = "Write Single Coil"
     fields_desc = [XByteField("funcCode", 0x05),
-                   XShortField("outputAddr", 0x0000),  # from 0x0000 to 0xFFFF
-                   XShortField("outputValue", 0x0000)]  # 0x0000 == Off, 0xFF00 == On  # noqa: E501
+                   # from 0x0000 to 0xFFFF
+                   XShortField("outputAddr", 0x0000),
+                   # 0x0000: Off, 0xFF00: On
+                   XShortField("outputValue", 0x0000)]
 
 
-class ModbusPDU05WriteSingleCoilResponse(Packet):  # The answer is the same as the request if successful  # noqa: E501
+class ModbusPDU05WriteSingleCoilResponse(Packet):
+    # The answer is the same as the request if successful
     name = "Write Single Coil"
     fields_desc = [XByteField("funcCode", 0x05),
-                   XShortField("outputAddr", 0x0000),  # from 0x0000 to 0xFFFF
-                   XShortField("outputValue", 0x0000)]  # 0x0000 == Off, 0xFF00 == On  # noqa: E501
+                   # from 0x0000 to 0xFFFF
+                   XShortField("outputAddr", 0x0000),
+                   # 0x0000 == Off, 0xFF00 == On
+                   XShortField("outputValue", 0x0000)]
 
 
 class ModbusPDU05WriteSingleCoilError(Packet):
@@ -167,15 +170,12 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
-class ModbusPDU06WriteSingleRegisterRequest(Packet):
+class ModbusPDU06WriteSingleRegisterRequest(_ModbusPDUNoPayload):
     name = "Write Single Register"
     fields_desc = [XByteField("funcCode", 0x06),
                    XShortField("registerAddr", 0x0000),
                    XShortField("registerValue", 0x0000)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU06WriteSingleRegisterResponse(Packet):
     name = "Write Single Register Response"
@@ -190,13 +190,10 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
-class ModbusPDU07ReadExceptionStatusRequest(Packet):
+class ModbusPDU07ReadExceptionStatusRequest(_ModbusPDUNoPayload):
     name = "Read Exception Status"
     fields_desc = [XByteField("funcCode", 0x07)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU07ReadExceptionStatusResponse(Packet):
     name = "Read Exception Status Response"
@@ -210,16 +207,95 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
+_diagnostics_sub_function = {
+    0x0000: "Return Query Data",
+    0x0001: "Restart Communications Option",
+    0x0002: "Return Diagnostic Register",
+    0x0003: "Change ASCII Input Delimiter",
+    0x0004: "Force Listen Only Mode",
+    0x000A: "Clear Counters and Diagnostic Register",
+    0x000B: "Return Bus Message Count",
+    0x000C: "Return Bus Communication Error Count",
+    0x000D: "Return Bus Exception Error Count",
+    0x000E: "Return Slave Message Count",
+    0x000F: "Return Slave No Response Count",
+    0x0010: "Return Slave NAK Count",
+    0x0011: "Return Slave Busy Count",
+    0x0012: "Return Bus Character Overrun Count",
+    0x0014: "Clear Overrun Counter and Flag"
+}
+
+
+class ModbusPDU08DiagnosticsRequest(_ModbusPDUNoPayload):
+    name = "Diagnostics"
+    fields_desc = [XByteField("funcCode", 0x08),
+                   XShortEnumField("subFunc", 0x0000,
+                                   _diagnostics_sub_function),
+                   FieldListField("data", [0x0000], XShortField("", 0x0000))]
+
+
+class ModbusPDU08DiagnosticsResponse(_ModbusPDUNoPayload):
+    name = "Diagnostics Response"
+    fields_desc = [XByteField("funcCode", 0x08),
+                   XShortEnumField("subFunc", 0x0000,
+                                   _diagnostics_sub_function),
+                   FieldListField("data", [0x0000], XShortField("", 0x0000))]
+
+
+class ModbusPDU08DiagnosticsError(_ModbusPDUNoPayload):
+    name = "Diagnostics Exception"
+    fields_desc = [XByteField("funcCode", 0x88),
+                   ByteEnumField("exceptionCode", 1, _modbus_exceptions)]
+
+
+class ModbusPDU0BGetCommEventCounterRequest(_ModbusPDUNoPayload):
+    name = "Get Comm Event Counter"
+    fields_desc = [XByteField("funcCode", 0x0B)]
+
+
+class ModbusPDU0BGetCommEventCounterResponse(_ModbusPDUNoPayload):
+    name = "Get Comm Event Counter Response"
+    fields_desc = [XByteField("funcCode", 0x0B),
+                   XShortField("status", 0x0000),
+                   XShortField("eventCount", 0xFFFF)]
+
+
+class ModbusPDU0BGetCommEventCounterError(_ModbusPDUNoPayload):
+    name = "Get Comm Event Counter Exception"
+    fields_desc = [XByteField("funcCode", 0x8B),
+                   ByteEnumField("exceptionCode", 1, _modbus_exceptions)]
+
+
+class ModbusPDU0CGetCommEventLogRequest(_ModbusPDUNoPayload):
+    name = "Get Comm Event Log"
+    fields_desc = [XByteField("funcCode", 0x0C)]
+
+
+class ModbusPDU0CGetCommEventLogResponse(_ModbusPDUNoPayload):
+    name = "Get Comm Event Log Response"
+    fields_desc = [XByteField("funcCode", 0x0C),
+                   ByteField("byteCount", 8),
+                   XShortField("status", 0x0000),
+                   XShortField("eventCount", 0x0108),
+                   XShortField("messageCount", 0x0121),
+                   FieldListField("event", [0x20, 0x00], XByteField("", 0x00))]
+
+
+class ModbusPDU0CGetCommEventLogError(_ModbusPDUNoPayload):
+    name = "Get Comm Event Log Exception"
+    fields_desc = [XByteField("funcCode", 0x8C),
+                   XByteField("exceptionCode", 1)]
+
+
 class ModbusPDU0FWriteMultipleCoilsRequest(Packet):
     name = "Write Multiple Coils"
     fields_desc = [XByteField("funcCode", 0x0F),
                    XShortField("startAddr", 0x0000),
                    XShortField("quantityOutput", 0x0001),
-                   BitFieldLenField("byteCount", None, 8, count_of="outputsValue"),  # noqa: E501
-                   FieldListField("outputsValue", [0x00], XByteField("", 0x00), count_from=lambda pkt: pkt.byteCount)]  # noqa: E501
-
-    def extract_padding(self, s):
-        return b"", None
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="outputsValue"),
+                   FieldListField("outputsValue", [0x00], XByteField("", 0x00),
+                                  count_from=lambda pkt: pkt.byteCount)]
 
 
 class ModbusPDU0FWriteMultipleCoilsResponse(Packet):
@@ -239,9 +315,13 @@
     name = "Write Multiple Registers"
     fields_desc = [XByteField("funcCode", 0x10),
                    XShortField("startAddr", 0x0000),
-                   BitFieldLenField("quantityRegisters", None, 16, count_of="outputsValue",),  # noqa: E501
-                   BitFieldLenField("byteCount", None, 8, count_of="outputsValue", adjust=lambda pkt, x: x * 2),  # noqa: E501
-                   FieldListField("outputsValue", [0x0000], XShortField("", 0x0000),  # noqa: E501
+                   BitFieldLenField("quantityRegisters", None, 16,
+                                    count_of="outputsValue"),
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="outputsValue",
+                                    adjust=lambda pkt, x: x * 2),
+                   FieldListField("outputsValue", [0x0000],
+                                  XShortField("", 0x0000),
                                   count_from=lambda pkt: pkt.byteCount)]
 
 
@@ -258,21 +338,22 @@
                    ByteEnumField("exceptCode", 1, _modbus_exceptions)]
 
 
-class ModbusPDU11ReportSlaveIdRequest(Packet):
+class ModbusPDU11ReportSlaveIdRequest(_ModbusPDUNoPayload):
     name = "Report Slave Id"
     fields_desc = [XByteField("funcCode", 0x11)]
 
-    def extract_padding(self, s):
-        return b"", None
-
 
 class ModbusPDU11ReportSlaveIdResponse(Packet):
     name = "Report Slave Id Response"
-    fields_desc = [XByteField("funcCode", 0x11),
-                   BitFieldLenField("byteCount", None, 8, length_of="slaveId"),
-                   ConditionalField(StrLenField("slaveId", "", length_from=lambda pkt: pkt.byteCount),  # noqa: E501
-                                    lambda pkt: pkt.byteCount > 0),
-                   ConditionalField(XByteField("runIdicatorStatus", 0x00), lambda pkt: pkt.byteCount > 0)]  # noqa: E501
+    fields_desc = [
+        XByteField("funcCode", 0x11),
+        BitFieldLenField("byteCount", None, 8, length_of="slaveId"),
+        ConditionalField(StrLenField("slaveId", "",
+                                     length_from=lambda pkt: pkt.byteCount),
+                         lambda pkt: pkt.byteCount > 0),
+        ConditionalField(XByteField("runIdicatorStatus", 0x00),
+                         lambda pkt: pkt.byteCount > 0),
+    ]
 
 
 class ModbusPDU11ReportSlaveIdError(Packet):
@@ -312,10 +393,13 @@
 
 class ModbusReadFileSubResponse(Packet):
     name = "Sub-response"
-    fields_desc = [BitFieldLenField("respLength", None, 8, count_of="recData", adjust=lambda pkt, p: p * 2 + 1),  # noqa: E501
-                   ByteField("refType", 0x06),
-                   FieldListField("recData", [0x0000], XShortField("", 0x0000),
-                                  count_from=lambda pkt: (pkt.respLength - 1) // 2)]  # noqa: E501
+    fields_desc = [
+        BitFieldLenField("respLength", None, 8, count_of="recData",
+                         adjust=lambda pkt, p: p * 2 + 1),
+        ByteField("refType", 0x06),
+        FieldListField("recData", [0x0000], XShortField("", 0x0000),
+                       count_from=lambda pkt: (pkt.respLength - 1) // 2),
+    ]
 
     def guess_payload_class(self, payload):
         return ModbusReadFileSubResponse
@@ -348,12 +432,17 @@
 # 0x15 : Write File Record
 class ModbusWriteFileSubRequest(Packet):
     name = "Sub request of Write File Record"
-    fields_desc = [ByteField("refType", 0x06),
-                   ShortField("fileNumber", 0x0001),
-                   ShortField("recordNumber", 0x0000),
-                   BitFieldLenField("recordLength", None, 16, length_of="recordData", adjust=lambda pkt, p: p // 2),  # noqa: E501
-                   FieldListField("recordData", [0x0000], ShortField("", 0x0000),  # noqa: E501
-                                  length_from=lambda pkt: pkt.recordLength * 2)]  # noqa: E501
+    fields_desc = [
+        ByteField("refType", 0x06),
+        ShortField("fileNumber", 0x0001),
+        ShortField("recordNumber", 0x0000),
+        BitFieldLenField("recordLength", None, 16,
+                         length_of="recordData",
+                         adjust=lambda pkt, p: p // 2),
+        FieldListField("recordData", [0x0000],
+                       ShortField("", 0x0000),
+                       length_from=lambda pkt: pkt.recordLength * 2),
+    ]
 
     def guess_payload_class(self, payload):
         if payload:
@@ -431,17 +520,24 @@
                    XShortField("readStartingAddr", 0x0000),
                    XShortField("readQuantityRegisters", 0x0001),
                    XShortField("writeStartingAddr", 0x0000),
-                   BitFieldLenField("writeQuantityRegisters", None, 16, count_of="writeRegistersValue"),  # noqa: E501
-                   BitFieldLenField("byteCount", None, 8, count_of="writeRegistersValue", adjust=lambda pkt, x: x * 2),  # noqa: E501
-                   FieldListField("writeRegistersValue", [0x0000], XShortField("", 0x0000),  # noqa: E501
+                   BitFieldLenField("writeQuantityRegisters", None, 16,
+                                    count_of="writeRegistersValue"),
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="writeRegistersValue",
+                                    adjust=lambda pkt, x: x * 2),
+                   FieldListField("writeRegistersValue", [0x0000],
+                                  XShortField("", 0x0000),
                                   count_from=lambda pkt: pkt.byteCount)]
 
 
 class ModbusPDU17ReadWriteMultipleRegistersResponse(Packet):
     name = "Read Write Multiple Registers Response"
     fields_desc = [XByteField("funcCode", 0x17),
-                   BitFieldLenField("byteCount", None, 8, count_of="registerVal", adjust=lambda pkt, x: x * 2),  # noqa: E501
-                   FieldListField("registerVal", [0x0000], ShortField("", 0x0000),  # noqa: E501
+                   BitFieldLenField("byteCount", None, 8,
+                                    count_of="registerVal",
+                                    adjust=lambda pkt, x: x * 2),
+                   FieldListField("registerVal", [0x0000],
+                                  ShortField("", 0x0000),
                                   count_from=lambda pkt: pkt.byteCount)]
 
 
@@ -461,9 +557,11 @@
     name = "Read FIFO Queue Response"
     fields_desc = [XByteField("funcCode", 0x18),
                    # TODO: ByteCount must includes size of FIFOCount
-                   BitFieldLenField("byteCount", None, 16, count_of="FIFOVal", adjust=lambda pkt, p: p * 2 + 2),  # noqa: E501
+                   BitFieldLenField("byteCount", None, 16, count_of="FIFOVal",
+                                    adjust=lambda pkt, p: p * 2 + 2),
                    BitFieldLenField("FIFOCount", None, 16, count_of="FIFOVal"),
-                   FieldListField("FIFOVal", [], ShortField("", 0x0000), count_from=lambda pkt: pkt.byteCount)]  # noqa: E501
+                   FieldListField("FIFOVal", [], ShortField("", 0x0000),
+                                  count_from=lambda pkt: pkt.byteCount)]
 
 
 class ModbusPDU18ReadFIFOQueueError(Packet):
@@ -504,12 +602,14 @@
                              0x04: "ProductName",
                              0x05: "ModelName",
                              0x06: "UserApplicationName"}
-_read_device_id_conformity_lvl = {0x01: "Basic Identification (stream only)",
-                                  0x02: "Regular Identification (stream only)",
-                                  0x03: "Extended Identification (stream only)",  # noqa: E501
-                                  0x81: "Basic Identification (stream and individual access)",  # noqa: E501
-                                  0x82: "Regular Identification (stream and individual access)",  # noqa: E501
-                                  0x83: "Extended Identification (stream and individual access)"}  # noqa: E501
+_read_device_id_conformity_lvl = {
+    0x01: "Basic Identification (stream only)",
+    0x02: "Regular Identification (stream only)",
+    0x03: "Extended Identification (stream only)",
+    0x81: "Basic Identification (stream and individual access)",
+    0x82: "Regular Identification (stream and individual access)",
+    0x83: "Extended Identification (stream and individual access)",
+}
 _read_device_id_more_follow = {0x00: "No",
                                0x01: "Yes"}
 
@@ -527,7 +627,8 @@
     fields_desc = [XByteField("funcCode", 0x2B),
                    XByteField("MEIType", 0x0E),
                    ByteEnumField("readCode", 4, _read_device_id_codes),
-                   ByteEnumField("conformityLevel", 0x01, _read_device_id_conformity_lvl),  # noqa: E501
+                   ByteEnumField("conformityLevel", 0x01,
+                                 _read_device_id_conformity_lvl),
                    ByteEnumField("more", 0x00, _read_device_id_more_follow),
                    ByteEnumField("nextObjId", 0x00, _read_device_id_object_id),
                    ByteField("objCount", 0x00)]
@@ -546,7 +647,6 @@
 
 
 _reserved_funccode_request = {
-    0x08: '0x08 Unknown Reserved Request',
     0x09: '0x09 Unknown Reserved Request',
     0x0A: '0x0a Unknown Reserved Request',
     0x0D: '0x0d Unknown Reserved Request',
@@ -561,7 +661,6 @@
 }
 
 _reserved_funccode_response = {
-    0x08: '0x08 Unknown Reserved Response',
     0x09: '0x09 Unknown Reserved Response',
     0x0A: '0x0a Unknown Reserved Response',
     0x0D: '0x0d Unknown Reserved Response',
@@ -576,7 +675,6 @@
 }
 
 _reserved_funccode_error = {
-    0x88: '0x88 Unknown Reserved Error',
     0x89: '0x89 Unknown Reserved Error',
     0x8A: '0x8a Unknown Reserved Error',
     0x8D: '0x8d Unknown Reserved Error',
@@ -592,41 +690,32 @@
 }
 
 
-class ModbusPDUReservedFunctionCodeRequest(Packet):
+class ModbusPDUReservedFunctionCodeRequest(_ModbusPDUNoPayload):
     name = "Reserved Function Code Request"
     fields_desc = [
         ByteEnumField("funcCode", 0x00, _reserved_funccode_request),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus Reserved Request %funcCode%")
 
 
-class ModbusPDUReservedFunctionCodeResponse(Packet):
+class ModbusPDUReservedFunctionCodeResponse(_ModbusPDUNoPayload):
     name = "Reserved Function Code Response"
     fields_desc = [
         ByteEnumField("funcCode", 0x00, _reserved_funccode_response),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus Reserved Response %funcCode%")
 
 
-class ModbusPDUReservedFunctionCodeError(Packet):
+class ModbusPDUReservedFunctionCodeError(_ModbusPDUNoPayload):
     name = "Reserved Function Code Error"
     fields_desc = [
         ByteEnumField("funcCode", 0x00, _reserved_funccode_error),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus Reserved Error %funcCode%")
 
@@ -644,7 +733,7 @@
 
     def __init__(self, name, default, enum, defEnum):
         EnumField.__init__(self, name, default, enum, "B")
-        defEnum = self.defEnum = defEnum
+        self.defEnum = defEnum
 
     def i2repr_one(self, pkt, x):
         if self not in conf.noenum and not isinstance(x, VolatileValue) \
@@ -655,7 +744,7 @@
         return repr(x)
 
 
-class ModbusPDUUserDefinedFunctionCodeRequest(Packet):
+class ModbusPDUUserDefinedFunctionCodeRequest(_ModbusPDUNoPayload):
     name = "User-Defined Function Code Request"
     fields_desc = [
         ModbusByteEnumField(
@@ -663,14 +752,11 @@
             "Unknown user-defined request function Code"),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus User-Defined Request %funcCode%")
 
 
-class ModbusPDUUserDefinedFunctionCodeResponse(Packet):
+class ModbusPDUUserDefinedFunctionCodeResponse(_ModbusPDUNoPayload):
     name = "User-Defined Function Code Response"
     fields_desc = [
         ModbusByteEnumField(
@@ -678,14 +764,11 @@
             "Unknown user-defined response function Code"),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus User-Defined Response %funcCode%")
 
 
-class ModbusPDUUserDefinedFunctionCodeError(Packet):
+class ModbusPDUUserDefinedFunctionCodeError(_ModbusPDUNoPayload):
     name = "User-Defined Function Code Error"
     fields_desc = [
         ModbusByteEnumField(
@@ -693,9 +776,6 @@
             "Unknown user-defined error function Code"),
         StrFixedLenField('payload', '', 255), ]
 
-    def extract_padding(self, s):
-        return b"", None
-
     def mysummary(self):
         return self.sprintf("Modbus User-Defined Error %funcCode%")
 
@@ -704,7 +784,8 @@
     name = "Object"
     fields_desc = [ByteEnumField("id", 0x00, _read_device_id_object_id),
                    BitFieldLenField("length", None, 8, length_of="value"),
-                   StrLenField("value", "", length_from=lambda pkt: pkt.length)]  # noqa: E501
+                   StrLenField("value", "",
+                               length_from=lambda pkt: pkt.length)]
 
     def guess_payload_class(self, payload):
         return ModbusObjectId
@@ -718,6 +799,9 @@
     0x05: ModbusPDU05WriteSingleCoilRequest,
     0x06: ModbusPDU06WriteSingleRegisterRequest,
     0x07: ModbusPDU07ReadExceptionStatusRequest,
+    0x08: ModbusPDU08DiagnosticsRequest,
+    0x0B: ModbusPDU0BGetCommEventCounterRequest,
+    0x0C: ModbusPDU0CGetCommEventLogRequest,
     0x0F: ModbusPDU0FWriteMultipleCoilsRequest,
     0x10: ModbusPDU10WriteMultipleRegistersRequest,
     0x11: ModbusPDU11ReportSlaveIdRequest,
@@ -735,6 +819,9 @@
     0x85: ModbusPDU05WriteSingleCoilError,
     0x86: ModbusPDU06WriteSingleRegisterError,
     0x87: ModbusPDU07ReadExceptionStatusError,
+    0x88: ModbusPDU08DiagnosticsError,
+    0x8B: ModbusPDU0BGetCommEventCounterError,
+    0x0C: ModbusPDU0CGetCommEventLogError,
     0x8F: ModbusPDU0FWriteMultipleCoilsError,
     0x90: ModbusPDU10WriteMultipleRegistersError,
     0x91: ModbusPDU11ReportSlaveIdError,
@@ -753,6 +840,9 @@
     0x05: ModbusPDU05WriteSingleCoilResponse,
     0x06: ModbusPDU06WriteSingleRegisterResponse,
     0x07: ModbusPDU07ReadExceptionStatusResponse,
+    0x88: ModbusPDU08DiagnosticsResponse,
+    0x8B: ModbusPDU0BGetCommEventCounterRequest,
+    0x0C: ModbusPDU0CGetCommEventLogResponse,
     0x0F: ModbusPDU0FWriteMultipleCoilsResponse,
     0x10: ModbusPDU10WriteMultipleRegistersResponse,
     0x11: ModbusPDU11ReportSlaveIdResponse,
@@ -774,10 +864,16 @@
 
 class ModbusADURequest(Packet):
     name = "ModbusADU"
-    fields_desc = [XShortField("transId", 0x0000),  # needs to be unique
-                   XShortField("protoId", 0x0000),  # needs to be zero (Modbus)
-                   ShortField("len", None),  # is calculated with payload
-                   XByteField("unitId", 0xff)]  # 0xFF (recommended as non-significant value) or 0x00  # noqa: E501
+    fields_desc = [
+        # needs to be unique
+        XShortField("transId", 0x0000),
+        # needs to be zero (Modbus)
+        XShortField("protoId", 0x0000),
+        # is calculated with payload
+        ShortField("len", None),
+        # 0xFF (recommended as non-significant value) or 0x00
+        XByteField("unitId", 0xff),
+    ]
 
     def guess_payload_class(self, payload):
         function_code = orb(payload[0])
@@ -805,10 +901,16 @@
 
 class ModbusADUResponse(Packet):
     name = "ModbusADU"
-    fields_desc = [XShortField("transId", 0x0000),  # needs to be unique
-                   XShortField("protoId", 0x0000),  # needs to be zero (Modbus)
-                   ShortField("len", None),  # is calculated with payload
-                   XByteField("unitId", 0xff)]  # 0xFF or 0x00 should be used for Modbus over TCP/IP  # noqa: E501
+    fields_desc = [
+        # needs to be unique
+        XShortField("transId", 0x0000),
+        # needs to be zero (Modbus)
+        XShortField("protoId", 0x0000),
+        # is calculated with payload
+        ShortField("len", None),
+        # 0xFF or 0x00 should be used for Modbus over TCP/IP
+        XByteField("unitId", 0xff),
+    ]
 
     def guess_payload_class(self, payload):
         function_code = orb(payload[0])

scapy-2.4.4.tar.gz/scapy/contrib/mount.py Added

@@ -0,0 +1,117 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Lucas Preston <lucas.preston@infinite.io>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = NFS Mount v3
+# scapy.contrib.status = loads
+
+from scapy.contrib.oncrpc import RPC, RPC_Call
+from scapy.packet import Packet, bind_layers
+from scapy.fields import IntField, StrLenField, IntEnumField, PacketField, \
+    ConditionalField, FieldListField
+from scapy.contrib.nfs import File_Object
+
+mountstat3 = {
+    0: 'MNT3_OK',
+    1: 'MNT3ERR_PERM',
+    2: 'MNT3ERR_NOENT',
+    5: 'MNT3ERR_IO',
+    13: 'MNT3ERR_ACCES',
+    20: 'MNT3ERR_NOTDIR',
+    22: 'MNT3ERR_INVAL',
+    63: 'MNT3ERR_NAMETOOLONG',
+    10004: 'MNT3ERR_NOTSUPP',
+    10006: 'MNT3ERR_SERVERFAULT'
+}
+
+
+class Path(Packet):
+    name = 'Path'
+    fields_desc = [
+        IntField('length', 0),
+        StrLenField('path', '', length_from=lambda pkt: pkt.length),
+        StrLenField('fill', '', length_from=lambda pkt: (4 - pkt.length) % 4)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+    def set(self, path, length=None, fill=None):
+        if length is None:
+            length = len(path)
+        if fill is None:
+            fill = b'\x00' * ((4 - len(path)) % 4)
+        self.length = length
+        self.path = path
+        self.fill = fill
+
+
+class NULL_Call(Packet):
+    name = 'MOUNT NULL Call'
+    fields_desc = []
+
+
+class NULL_Reply(Packet):
+    name = 'MOUNT NULL Reply'
+    fields_desc = []
+
+
+bind_layers(RPC, NULL_Call, mtype=0)
+bind_layers(RPC, NULL_Reply, mtype=1)
+bind_layers(RPC_Call, NULL_Call, program=100005, procedure=0, pversion=3)
+
+
+class MOUNT_Call(Packet):
+    name = 'MOUNT Call'
+    fields_desc = [
+        PacketField('path', Path(), Path)
+    ]
+
+
+class MOUNT_Reply(Packet):
+    name = 'MOUNT Reply'
+    fields_desc = [
+        IntEnumField('status', 0, mountstat3),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(IntField('flavors', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            FieldListField(
+                'flavor', None, IntField('', None),
+                count_from=lambda pkt: pkt.flavors
+            ),
+            lambda pkt: pkt.status == 0
+        )
+    ]
+
+    def get_filehandle(self):
+        if self.status == 0:
+            return self.filehandle.fh
+        return None
+
+
+bind_layers(RPC, MOUNT_Call, mtype=0)
+bind_layers(RPC, MOUNT_Reply, mtype=1)
+bind_layers(RPC_Call, MOUNT_Call, program=100005, procedure=1, pversion=3)
+
+
+class UNMOUNT_Call(Packet):
+    name = 'UNMOUNT Call'
+    fields_desc = [
+        PacketField('path', Path(), Path)
+    ]
+
+
+class UNMOUNT_Reply(Packet):
+    name = 'UNMOUNT Reply'
+    fields_desc = []
+
+
+bind_layers(RPC, UNMOUNT_Call, mtype=0)
+bind_layers(RPC, UNMOUNT_Reply, mtype=1)
+bind_layers(
+    RPC_Call, UNMOUNT_Call, program=100005, procedure=3, pversion=3
+)

scapy-2.4.3.tar.gz/scapy/contrib/mqtt.py -> scapy-2.4.4.tar.gz/scapy/contrib/mqtt.py Changed

@@ -8,11 +8,12 @@
 
 from scapy.packet import Packet, bind_layers
 from scapy.fields import FieldLenField, BitEnumField, StrLenField, \
-    ShortField, ConditionalField, ByteEnumField, ByteField, StrNullField
+    ShortField, ConditionalField, ByteEnumField, ByteField, PacketListField
 from scapy.layers.inet import TCP
 from scapy.error import Scapy_Exception
 from scapy.compat import orb, chb
 from scapy.volatile import RandNum
+from scapy.config import conf
 
 
 # CUSTOM FIELDS
@@ -58,25 +59,30 @@
 
 
 # LAYERS
-CONTROL_PACKET_TYPE = {1: 'CONNECT',
-                       2: 'CONNACK',
-                       3: 'PUBLISH',
-                       4: 'PUBACK',
-                       5: 'PUBREC',
-                       6: 'PUBREL',
-                       7: 'PUBCOMP',
-                       8: 'SUBSCRIBE',
-                       9: 'SUBACK',
-                       10: 'UNSUBSCRIBE',
-                       11: 'UNSUBACK',
-                       12: 'PINGREQ',
-                       13: 'PINGRESP',
-                       14: 'DISCONNECT'}
-
-
-QOS_LEVEL = {0: 'At most once delivery',
-             1: 'At least once delivery',
-             2: 'Exactly once delivery'}
+CONTROL_PACKET_TYPE = {
+    1: 'CONNECT',
+    2: 'CONNACK',
+    3: 'PUBLISH',
+    4: 'PUBACK',
+    5: 'PUBREC',
+    6: 'PUBREL',
+    7: 'PUBCOMP',
+    8: 'SUBSCRIBE',
+    9: 'SUBACK',
+    10: 'UNSUBSCRIBE',
+    11: 'UNSUBACK',
+    12: 'PINGREQ',
+    13: 'PINGRESP',
+    14: 'DISCONNECT',
+    15: 'AUTH'  # Added in v5.0
+}
+
+
+QOS_LEVEL = {
+    0: 'At most once delivery',
+    1: 'At least once delivery',
+    2: 'Exactly once delivery'
+}
 
 
 # source: http://stackoverflow.com/a/43722441
@@ -97,13 +103,20 @@
     ]
 
 
+PROTOCOL_LEVEL = {
+    3: 'v3.1',
+    4: 'v3.1.1',
+    5: 'v5.0'
+}
+
+
 class MQTTConnect(Packet):
     name = "MQTT connect"
     fields_desc = [
         FieldLenField("length", None, length_of="protoname"),
         StrLenField("protoname", "",
                     length_from=lambda pkt: pkt.length),
-        ByteField("protolevel", 0),
+        ByteEnumField("protolevel", 5, PROTOCOL_LEVEL),
         BitEnumField("usernameflag", 0, 1, {0: 'Disabled',
                                             1: 'Enabled'}),
         BitEnumField("passwordflag", 0, 1, {0: 'Disabled',
@@ -145,12 +158,14 @@
     ]
 
 
-RETURN_CODE = {0: 'Connection Accepted',
-               1: 'Unacceptable protocol version',
-               2: 'Identifier rejected',
-               3: 'Server unavailable',
-               4: 'Bad username/password',
-               5: 'Not authorized'}
+RETURN_CODE = {
+    0: 'Connection Accepted',
+    1: 'Unacceptable protocol version',
+    2: 'Identifier rejected',
+    3: 'Server unavailable',
+    4: 'Bad username/password',
+    5: 'Not authorized'
+}
 
 
 class MQTTConnack(Packet):
@@ -205,21 +220,35 @@
     ]
 
 
+class MQTTTopic(Packet):
+    name = "MQTT topic"
+    fields_desc = [
+        FieldLenField("length", None, length_of="topic"),
+        StrLenField("topic", "", length_from=lambda pkt:pkt.length)
+    ]
+
+    def guess_payload_class(self, payload):
+        return conf.padding_layer
+
+
+class MQTTTopicQOS(MQTTTopic):
+    fields_desc = MQTTTopic.fields_desc + [ByteEnumField("QOS", 0, QOS_LEVEL)]
+
+
 class MQTTSubscribe(Packet):
     name = "MQTT subscribe"
     fields_desc = [
         ShortField("msgid", None),
-        FieldLenField("length", None, length_of="topic"),
-        StrLenField("topic", "",
-                    length_from=lambda pkt: pkt.length),
-        ByteEnumField("QOS", 0, QOS_LEVEL),
+        PacketListField("topics", [], cls=MQTTTopicQOS)
     ]
 
 
-ALLOWED_RETURN_CODE = {0: 'Success',
-                       1: 'Success',
-                       2: 'Success',
-                       128: 'Failure'}
+ALLOWED_RETURN_CODE = {
+    0: 'Success',
+    1: 'Success',
+    2: 'Success',
+    128: 'Failure'
+}
 
 
 class MQTTSuback(Packet):
@@ -234,7 +263,7 @@
     name = "MQTT unsubscribe"
     fields_desc = [
         ShortField("msgid", None),
-        StrNullField("payload", "")
+        PacketListField("topics", [], cls=MQTTTopic)
     ]

scapy-2.4.4.tar.gz/scapy/contrib/nfs.py Added

@@ -0,0 +1,1014 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Lucas Preston <lucas.preston@infinite.io>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Network File System (NFS) v3
+# scapy.contrib.status = loads
+
+from scapy.contrib.oncrpc import RPC, RPC_Call, Object_Name
+from binascii import unhexlify
+from scapy.packet import Packet, bind_layers
+from scapy.fields import IntField, IntEnumField, FieldListField, LongField, \
+    XIntField, XLongField, ConditionalField, PacketListField, StrLenField, \
+    PacketField
+from scapy.modules.six import integer_types
+
+nfsstat3 = {
+    0: 'NFS3_OK',
+    1: 'NFS3ERR_PERM',
+    2: 'NFS3ERR_NOENT',
+    5: 'NFS3ERR_IO',
+    6: 'NFS3ERR_NXIO',
+    13: 'NFS3ERR_ACCES',
+    17: 'NFS3ERR_EXIST',
+    18: 'NFS3ERR_XDEV',
+    19: 'NFS3ERR_NODEV',
+    20: 'NFS3ERR_NOTDIR',
+    21: 'NFS3ERR_ISDIR',
+    22: 'NFS3ERR_INVAL',
+    27: 'NFS3ERR_FBIG',
+    28: 'NFS3ERR_NOSPC',
+    30: 'NFS3ERR_ROFS',
+    31: 'NFS3ERR_MLINK',
+    63: 'NFS3ERR_NAMETOOLONG',
+    66: 'NFS3ERR_NOTEMPTY',
+    69: 'NFS3ERR_DQUOT',
+    70: 'NFS3ERR_STALE',
+    71: 'NFS3ERR_REMOTE',
+    10001: 'NFS3ERR_BADHANDLE',
+    10002: 'NFS3ERR_NOT_SYNC',
+    10003: 'NFS3ERR_BAD_COOKIE',
+    10004: 'NFS3ERR_NOTSUPP',
+    10005: 'NFS3ERR_TOOSMALL',
+    10006: 'NFS3ERR_SERVERFAULT',
+    10007: 'NFS3ERR_BADTYPE',
+    10008: 'NFS3ERR_JUKEBOX'
+}
+
+ftype3 = {
+    1: 'NF3REG',
+    2: 'NF3DIR',
+    3: 'NF3BLK',
+    4: 'NF3CHR',
+    5: 'NF3LNK',
+    6: 'NF3SOCK',
+    7: 'NF3FIFO'
+}
+
+
+def loct(x):
+    if isinstance(x, integer_types):
+        return oct(x)
+    if isinstance(x, tuple):
+        return "(%s)" % ", ".join(map(loct, x))
+    if isinstance(x, list):
+        return "[%s]" % ", ".join(map(loct, x))
+    return x
+
+
+class OIntField(IntField):
+    """IntField child with octal representation"""
+    def i2repr(self, pkt, x):
+        return loct(self.i2h(pkt, x))
+
+
+class Fattr3(Packet):
+    name = 'File Attributes'
+    fields_desc = [
+        IntEnumField('type', 0, ftype3),
+        OIntField('mode', 0),
+        IntField('nlink', 0),
+        IntField('uid', 0),
+        IntField('gid', 0),
+        LongField('size', 0),
+        LongField('used', 0),
+        FieldListField(
+            'rdev', [0, 0], IntField('', None), count_from=lambda x: 2
+        ),
+        XLongField('fsid', 0),
+        XLongField('fileid', 0),
+        IntField('atime_s', 0),
+        IntField('atime_ns', 0),
+        IntField('mtime_s', 0),
+        IntField('mtime_ns', 0),
+        IntField('ctime_s', 0),
+        IntField('ctime_ns', 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class File_Object(Packet):
+    name = 'File Object'
+    fields_desc = [
+        IntField('length', 0),
+        StrLenField('fh', b'', length_from=lambda pkt: pkt.length),
+        StrLenField('fill', b'', length_from=lambda pkt: (4 - pkt.length) % 4)
+    ]
+
+    def set(self, new_filehandle, length=None, fill=None):
+        # convert filehandle to bytes if it was passed as a string
+        if new_filehandle.isalnum():
+            new_filehandle = unhexlify(new_filehandle)
+
+        if length is None:
+            length = len(new_filehandle)
+        if fill is None:
+            fill = b'\x00' * ((4 - length) % 4)
+
+        self.length = length
+        self.fh = new_filehandle
+        self.fill = fill
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class WCC_Attr(Packet):
+    name = 'File Attributes'
+    fields_desc = [
+        LongField('size', 0),
+        IntField('mtime_s', 0),
+        IntField('mtime_ns', 0),
+        IntField('ctime_s', 0),
+        IntField('ctime_ns', 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class File_From_Dir_Plus(Packet):
+    name = 'File'
+    fields_desc = [
+        LongField('fileid', 0),
+        PacketField('filename', Object_Name(), Object_Name),
+        LongField('cookie', 0),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        IntField('handle_follows', 0),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.handle_follows == 1
+        ),
+        IntField('value_follows', 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class File_From_Dir(Packet):
+    name = 'File'
+    fields_desc = [
+        LongField('fileid', 0),
+        PacketField('filename', Object_Name(), Object_Name),
+        LongField('cookie', 0),
+        IntField('value_follows', 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+attrs_enum = {0: 'DONT SET', 1: 'SET'}
+times_enum = {0: 'DONT CHANGE', 1: 'SERVER TIME', 2: 'CLIENT TIME'}
+
+
+class Sattr3(Packet):
+    name = 'Setattr3'
+    fields_desc = [
+        IntEnumField('set_mode', 0, attrs_enum),
+        ConditionalField(OIntField('mode', 0), lambda pkt: pkt.set_mode == 1),
+        IntEnumField('set_uid', 0, attrs_enum),
+        ConditionalField(IntField('uid', 0), lambda pkt: pkt.set_uid == 1),
+        IntEnumField('set_gid', 0, attrs_enum),
+        ConditionalField(IntField('gid', 0), lambda pkt: pkt.set_gid == 1),
+        IntEnumField('set_size', 0, attrs_enum),
+        ConditionalField(LongField('size', 0), lambda pkt: pkt.set_size == 1),
+        IntEnumField('set_atime', 0, times_enum),
+        ConditionalField(
+            IntField('atime_s', 0), lambda pkt: pkt.set_atime == 2
+        ),
+        ConditionalField(
+            IntField('atime_ns', 0), lambda pkt: pkt.set_atime == 2
+        ),
+        IntEnumField('set_mtime', 0, times_enum),
+        ConditionalField(
+            IntField('mtime_s', 0), lambda pkt: pkt.set_mtime == 2
+        ),
+        ConditionalField(
+            IntField('mtime_ns', 0), lambda pkt: pkt.set_mtime == 2
+        )
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class GETATTR_Call(Packet):
+    name = 'GETATTR Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object)
+    ]
+
+
+class GETATTR_Reply(Packet):
+    name = 'GETATTR Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.status == 0
+        )
+    ]
+
+    def extract_padding(self, s):
+        return '', None
+
+
+bind_layers(RPC, GETATTR_Call, mtype=0)
+bind_layers(
+    RPC_Call, GETATTR_Call, program=100003, pversion=3, procedure=1
+)
+bind_layers(RPC, GETATTR_Reply, mtype=1)
+
+
+class LOOKUP_Call(Packet):
+    name = 'LOOKUP Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('filename', Object_Name(), Object_Name)
+    ]
+
+
+class LOOKUP_Reply(Packet):
+    name = 'LOOKUP Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(IntField('af_file', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            PacketField('file_attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.status == 0 and pkt.af_file == 1
+        ),
+        IntField('af_dir', 0),
+        ConditionalField(
+            PacketField('dir_attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_dir == 1
+        )
+    ]
+
+
+bind_layers(RPC, LOOKUP_Call, mtype=0)
+bind_layers(RPC, LOOKUP_Reply, mtype=1)
+bind_layers(RPC_Call, LOOKUP_Call, program=100003, pversion=3, procedure=3)
+
+
+class NULL_Call(Packet):
+    name = 'NFS NULL Call'
+    fields_desc = []
+
+
+class NULL_Reply(Packet):
+    name = 'NFS NULL Reply'
+    fields_desc = []
+
+
+bind_layers(RPC, NULL_Call, mtype=0)
+bind_layers(RPC, NULL_Reply, mtype=1)
+bind_layers(RPC_Call, NULL_Call, program=100003, pversion=3, procedure=0)
+
+
+class FSINFO_Call(Packet):
+    name = 'FSINFO Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object)
+    ]
+
+
+class FSINFO_Reply(Packet):
+    name = 'FSINFO Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(IntField('rtmax', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('rtpref', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('rtmult', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('wtmax', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('wtpref', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('wtmult', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('dtpref', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            LongField('maxfilesize', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntField('timedelta_s', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntField('timedelta_ns', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            XIntField('properties', 0), lambda pkt: pkt.status == 0
+        ),
+    ]
+
+
+bind_layers(RPC, FSINFO_Call, mtype=0)
+bind_layers(RPC, FSINFO_Reply, mtype=1)
+bind_layers(
+    RPC_Call, FSINFO_Call, program=100003, pversion=3, procedure=19
+)
+
+
+class PATHCONF_Call(Packet):
+    name = 'PATHCONF Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object)
+    ]
+
+
+class PATHCONF_Reply(Packet):
+    name = 'PATHCONF Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(IntField('linkmax', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('name_max', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            IntEnumField('no_trunc', 0, {0: 'NO', 1: 'YES'}),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntEnumField('chown_restricted', 0, {0: 'NO', 1: 'YES'}),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntEnumField('case_insensitive', 0, {0: 'NO', 1: 'YES'}),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntEnumField('case_preserving', 0, {0: 'NO', 1: 'YES'}),
+            lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, PATHCONF_Call, mtype=0)
+bind_layers(RPC, PATHCONF_Reply, mtype=1)
+bind_layers(
+    RPC_Call, PATHCONF_Call, program=100003, pversion=3, procedure=20
+)
+
+access_specs = {
+    0x0001: 'READ',
+    0x0002: 'LOOKUP',
+    0x0004: 'MODIFY',
+    0x0008: 'EXTEND',
+    0x0010: 'DELETE',
+    0x0020: 'EXECUTE'
+}
+
+
+class ACCESS_Call(Packet):
+    name = 'ACCESS Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        IntEnumField('check_access', 1, access_specs)
+    ]
+
+
+class ACCESS_Reply(Packet):
+    name = 'ACCESS Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(
+            XIntField('access_rights', 0), lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, ACCESS_Call, mtype=0)
+bind_layers(RPC, ACCESS_Reply, mtype=1)
+bind_layers(RPC_Call, ACCESS_Call, program=100003, pversion=3, procedure=4)
+
+
+class READDIRPLUS_Call(Packet):
+    name = 'READDIRPLUS Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        LongField('cookie', 0),
+        LongField('verifier', 0),
+        IntField('dircount', 512),
+        IntField('maxcount', 4096)
+    ]
+
+
+class READDIRPLUS_Reply(Packet):
+    name = 'READDIRPLUS Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(
+            LongField('verifier', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntField('value_follows', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketListField(
+                'files', None, cls=File_From_Dir_Plus,
+                next_cls_cb=lambda pkt, lst, cur, remain:
+                File_From_Dir_Plus if pkt.value_follows == 1 and
+                (len(lst) == 0 or cur.value_follows == 1) and
+                len(remain) > 4 else None
+            ),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(IntField('eof', 0), lambda pkt: pkt.status == 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+bind_layers(RPC, READDIRPLUS_Call, mtype=0)
+bind_layers(RPC, READDIRPLUS_Reply, mtype=1)
+bind_layers(
+    RPC_Call, READDIRPLUS_Call, program=100003, pversion=3, procedure=17
+)
+
+
+class WRITE_Call(Packet):
+    name = 'WRITE Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        LongField('offset', 0),
+        IntField('count', 0),
+        IntEnumField('stable', 0, {0: 'UNSTABLE', 1: 'STABLE'}),
+        IntField('length', 0),
+        StrLenField('contents', b'', length_from=lambda pkt: pkt.length),
+        StrLenField('fill', b'', length_from=lambda pkt: (4 - pkt.length) % 4)
+    ]
+
+
+class WRITE_Reply(Packet):
+    name = 'WRITE Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        ),
+        ConditionalField(IntField('count', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            IntEnumField('committed', 0, {0: 'UNSTABLE', 1: 'STABLE'}),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            XLongField('verifier', 0), lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, WRITE_Call, mtype=0)
+bind_layers(RPC, WRITE_Reply, mtype=1)
+bind_layers(RPC_Call, WRITE_Call, program=100003, pversion=3, procedure=7)
+
+
+class COMMIT_Call(Packet):
+    name = 'COMMIT Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        LongField('offset', 0),
+        IntField('count', 0)
+    ]
+
+
+class COMMIT_Reply(Packet):
+    name = 'COMMIT Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        ),
+        ConditionalField(
+            XLongField('verifier', 0), lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, COMMIT_Call, mtype=0)
+bind_layers(RPC, COMMIT_Reply, mtype=1)
+bind_layers(
+    RPC_Call, COMMIT_Call, program=100003, pversion=3, procedure=21
+)
+
+
+class SETATTR_Call(Packet):
+    name = 'SETATTR Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('attributes', Sattr3(), Sattr3),
+        IntField('check', 0)
+    ]
+
+
+class SETATTR_Reply(Packet):
+    name = 'SETATTR Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, SETATTR_Call, mtype=0)
+bind_layers(RPC, SETATTR_Reply, mtype=1)
+bind_layers(
+    RPC_Call, SETATTR_Call, program=100003, pversion=3, procedure=2
+)
+
+
+class FSSTAT_Call(Packet):
+    name = 'FSSTAT Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object)
+    ]
+
+
+class FSSTAT_Reply(Packet):
+    name = 'FSSTAT Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(LongField('tbytes', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(LongField('fbytes', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(LongField('abytes', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(LongField('tfiles', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(LongField('ffiles', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(LongField('afiles', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('invarsec', 0), lambda pkt: pkt.status == 0)
+    ]
+
+
+bind_layers(RPC, FSSTAT_Call, mtype=0)
+bind_layers(RPC, FSSTAT_Reply, mtype=1)
+bind_layers(
+    RPC_Call, FSSTAT_Call, program=100003, pversion=3, procedure=18
+)
+
+
+class CREATE_Call(Packet):
+    name = 'CREATE Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('filename', Object_Name(), Object_Name),
+        IntEnumField('create_mode', None, {0: 'UNCHECKED',
+                                           1: 'GUARDED',
+                                           2: 'EXCLUSIVE'}),
+        ConditionalField(
+            PacketField('attributes', Sattr3(), Sattr3),
+            lambda pkt: pkt.create_mode != 2
+        ),
+        ConditionalField(
+            XLongField('verifier', 0), lambda pkt: pkt.create_mode == 2
+        )
+    ]
+
+
+class CREATE_Reply(Packet):
+    name = 'CREATE Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        ConditionalField(
+            IntField('handle_follows', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.status == 0 and pkt.handle_follows == 1
+        ),
+        ConditionalField(
+            IntField('attributes_follow', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.status == 0 and pkt.attributes_follow == 1
+        ),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('dir_attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('dir_attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, CREATE_Call, mtype=0)
+bind_layers(RPC, CREATE_Reply, mtype=1)
+bind_layers(RPC_Call, CREATE_Call, program=100003, pversion=3, procedure=8)
+
+
+class REMOVE_Call(Packet):
+    name = 'REMOVE Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('filename', Object_Name(), Object_Name)
+    ]
+
+
+class REMOVE_Reply(Packet):
+    name = 'REMOVE Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, REMOVE_Call, mtype=0)
+bind_layers(RPC, REMOVE_Reply, mtype=1)
+bind_layers(
+    RPC_Call, REMOVE_Call, program=100003, pversion=3, procedure=12
+)
+
+
+class READDIR_Call(Packet):
+    name = 'READDIR Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        LongField('cookie', 0),
+        XLongField('verifier', 0),
+        IntField('count', 0)
+    ]
+
+
+class READDIR_Reply(Packet):
+    name = 'READDIR Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(
+            XLongField('verifier', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            IntField('value_follows', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketListField(
+                'files', None, cls=File_From_Dir,
+                next_cls_cb=lambda pkt, lst, cur, remain:
+                File_From_Dir if pkt.value_follows == 1 and
+                (len(lst) == 0 or cur.value_follows == 1) and
+                len(remain) > 4 else None
+            ),
+            lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('eof', 0), lambda pkt: pkt.status == 0)
+    ]
+
+
+bind_layers(RPC, READDIR_Call, mtype=0)
+bind_layers(RPC, READDIR_Reply, mtype=1)
+bind_layers(
+    RPC_Call, READDIR_Call, program=100003, pversion=3, procedure=16
+)
+
+
+class RENAME_Call(Packet):
+    name = 'RENAME Call'
+    fields_desc = [
+        PacketField('dir_from', File_Object(), File_Object),
+        PacketField('name_from', Object_Name(), Object_Name),
+        PacketField('dir_to', File_Object(), File_Object),
+        PacketField('name_to', Object_Name(), Object_Name),
+    ]
+
+
+class RENAME_Reply(Packet):
+    name = 'RENAME Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before_f', 0),
+        ConditionalField(
+            PacketField('attributes_before_f', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before_f == 1
+        ),
+        IntField('af_after_f', 0),
+        ConditionalField(
+            PacketField('attributes_after_f', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after_f == 1
+        ),
+        IntField('af_before_t', 0),
+        ConditionalField(
+            PacketField('attributes_before_t', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before_t == 1
+        ),
+        IntField('af_after_t', 0),
+        ConditionalField(
+            PacketField('attributes_after_t', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after_t == 1
+        )
+    ]
+
+
+bind_layers(RPC, RENAME_Call, mtype=0)
+bind_layers(RPC, RENAME_Reply, mtype=1)
+bind_layers(
+    RPC_Call, RENAME_Call, program=100003, pversion=3, procedure=14
+)
+
+
+class LINK_Call(Packet):
+    name = 'LINK Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('link_dir', File_Object(), File_Object),
+        PacketField('link_name', Object_Name(), Object_Name)
+    ]
+
+
+class LINK_Reply(Packet):
+    name = 'LINK Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_file', 0),
+        ConditionalField(
+            PacketField('file_attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_file == 1
+        ),
+        IntField('af_link_before', 0),
+        ConditionalField(
+            PacketField('link_attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_link_before == 1
+        ),
+        IntField('af_link_after', 0),
+        ConditionalField(
+            PacketField('link_attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_link_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, LINK_Call, mtype=0)
+bind_layers(RPC, LINK_Reply, mtype=1)
+bind_layers(RPC_Call, LINK_Call, program=100003, pversion=3, procedure=15)
+
+
+class RMDIR_Call(Packet):
+    name = 'RMDIR Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('filename', Object_Name(), Object_Name),
+    ]
+
+
+class RMDIR_Reply(Packet):
+    name = 'RMDIR Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, RMDIR_Call, mtype=0)
+bind_layers(RPC, RMDIR_Reply, mtype=1)
+bind_layers(RPC_Call, RMDIR_Call, program=100003, pversion=3, procedure=13)
+
+
+class READLINK_Call(Packet):
+    name = 'READLINK Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object)
+    ]
+
+
+class READLINK_Reply(Packet):
+    name = 'READLINK Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(
+            PacketField('filename', Object_Name(), Object_Name),
+            lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, READLINK_Call, mtype=0)
+bind_layers(RPC, READLINK_Reply, mtype=1)
+bind_layers(
+    RPC_Call, READLINK_Call, program=100003, pversion=3, procedure=5
+)
+
+
+class READ_Call(Packet):
+    name = 'READ Call'
+    fields_desc = [
+        PacketField('filehandle', File_Object(), File_Object),
+        LongField('offset', 0),
+        IntField('count', 0)
+    ]
+
+
+class READ_Reply(Packet):
+    name = 'READ Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        IntField('attributes_follow', 0),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.attributes_follow == 1
+        ),
+        ConditionalField(IntField('count', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(IntField('eof', 0), lambda pkt: pkt.status == 0),
+        ConditionalField(
+            IntField('data_length', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            StrLenField('data', b'', length_from=lambda pkt: pkt.data_length),
+            lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            StrLenField(
+                'fill', b'', length_from=lambda pkt: (4 - pkt.data_length) % 4
+            ),
+            lambda pkt: pkt.status == 0
+        )
+    ]
+
+
+bind_layers(RPC, READ_Call, mtype=0)
+bind_layers(RPC, READ_Reply, mtype=1)
+bind_layers(RPC_Call, READ_Call, program=100003, pversion=3, procedure=6)
+
+
+class MKDIR_Call(Packet):
+    name = 'MKDIR Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('dir_name', Object_Name(), Object_Name),
+        PacketField('attributes', Sattr3(), Sattr3)
+    ]
+
+
+class MKDIR_Reply(Packet):
+    name = 'MKDIR Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        ConditionalField(
+            IntField('handle_follows', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.status == 0 and pkt.handle_follows == 1
+        ),
+        ConditionalField(
+            IntField('attributes_follow', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.status == 0 and pkt.attributes_follow == 1
+        ),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('dir_attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('dir_attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, MKDIR_Call, mtype=0)
+bind_layers(RPC, MKDIR_Reply, mtype=1)
+bind_layers(RPC_Call, MKDIR_Call, program=100003, pversion=3, procedure=9)
+
+
+class SYMLINK_Call(Packet):
+    name = 'SYMLINK Call'
+    fields_desc = [
+        PacketField('dir', File_Object(), File_Object),
+        PacketField('dir_name', Object_Name(), Object_Name),
+        PacketField('attributes', Sattr3(), Sattr3),
+        PacketField('link_name', Object_Name(), Object_Name)
+    ]
+
+
+class SYMLINK_Reply(Packet):
+    name = 'SYMLINK Reply'
+    fields_desc = [
+        IntEnumField('status', 0, nfsstat3),
+        ConditionalField(
+            IntField('handle_follows', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('filehandle', File_Object(), File_Object),
+            lambda pkt: pkt.status == 0 and pkt.handle_follows == 1
+        ),
+        ConditionalField(
+            IntField('attributes_follow', 0), lambda pkt: pkt.status == 0
+        ),
+        ConditionalField(
+            PacketField('attributes', Fattr3(), Fattr3),
+            lambda pkt: pkt.status == 0 and pkt.attributes_follow == 1
+        ),
+        IntField('af_before', 0),
+        ConditionalField(
+            PacketField('dir_attributes_before', WCC_Attr(), WCC_Attr),
+            lambda pkt: pkt.af_before == 1
+        ),
+        IntField('af_after', 0),
+        ConditionalField(
+            PacketField('dir_attributes_after', Fattr3(), Fattr3),
+            lambda pkt: pkt.af_after == 1
+        )
+    ]
+
+
+bind_layers(RPC, SYMLINK_Call, mtype=0)
+bind_layers(RPC, SYMLINK_Reply, mtype=1)
+bind_layers(
+    RPC_Call, SYMLINK_Call, program=100003, pversion=3, procedure=10
+)

scapy-2.4.4.tar.gz/scapy/contrib/nlm.py Added

@@ -0,0 +1,260 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Lucas Preston <lucas.preston@infinite.io>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Network Lock Manager (NLM) v4
+# scapy.contrib.status = loads
+
+from scapy.contrib.oncrpc import RPC, RPC_Call, Object_Name
+from scapy.packet import Packet, bind_layers
+from scapy.fields import IntField, StrLenField, LongField, PacketField, \
+    IntEnumField
+from scapy.contrib.nfs import File_Object
+
+nlm4_stats = {
+    0: 'NLM4_GRANTED',
+    1: 'NLM4_DENIED',
+    2: 'NLM4_DENIED_NOLOCKS',
+    3: 'NLM4_BLOCKED',
+    4: 'NLM4_DENIED_GRACE_PERIOD',
+    5: 'NLM4_DEADLCK',
+    6: 'NLM4_ROFS',
+    7: 'NLM4_STALE_FH',
+    8: 'NLM4_FBIG',
+    9: 'NLM4_FAILED'
+}
+
+
+class NLM4_Cookie(Packet):
+    name = 'Cookie'
+    fields_desc = [
+        IntField('length', 0),
+        StrLenField('contents', '', length_from=lambda pkt: pkt.length),
+        StrLenField('fill', b'', length_from=lambda pkt: (4 - pkt.length) % 4)
+    ]
+
+    def set(self, c, length=None, fill=None):
+        if length is None:
+            length = len(c)
+        if fill is None:
+            fill = b'\x00' * ((4 - len(c)) % 4)
+        self.length = length
+        self.contents = c
+        self.fill = fill
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class SHARE_Call(Packet):
+    name = 'SHARE Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('mode', 0),
+        IntField('access', 0),
+        IntEnumField('reclaim', 0, {0: 'NO', 1: 'YES'})
+    ]
+
+
+class SHARE_Reply(Packet):
+    name = 'SHARE Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats),
+        IntField('sequence', 0)
+    ]
+
+
+bind_layers(RPC_Call, SHARE_Call, program=100021, pversion=4, procedure=20)
+bind_layers(RPC, SHARE_Call, mtype=0)
+bind_layers(RPC, SHARE_Reply, mtype=1)
+
+
+class UNSHARE_Call(Packet):
+    name = 'UNSHARE Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('mode', 0),
+        IntField('access', 0),
+        IntEnumField('reclaim', 0, {0: 'NO', 1: 'YES'})
+    ]
+
+
+class UNSHARE_Reply(Packet):
+    name = 'UNSHARE Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats),
+        IntField('sequence', 0)
+    ]
+
+
+bind_layers(
+    RPC_Call, UNSHARE_Call, program=100021, pversion=4, procedure=21
+)
+bind_layers(RPC, UNSHARE_Call, mtype=0)
+bind_layers(RPC, UNSHARE_Reply, mtype=1)
+
+
+class LOCK_Call(Packet):
+    name = 'LOCK Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('block', 0, {0: 'NO', 1: 'YES'}),
+        IntEnumField('exclusive', 0, {0: 'NO', 1: 'YES'}),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('svid', 0),
+        LongField('l_offset', 0),
+        LongField('l_len', 0),
+        IntField('reclaim', 0),
+        IntField('state', 0)
+    ]
+
+
+class LOCK_Reply(Packet):
+    name = 'LOCK Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats)
+    ]
+
+
+bind_layers(RPC_Call, LOCK_Call, program=100021, pversion=4, procedure=2)
+bind_layers(RPC, LOCK_Call, mtype=0)
+bind_layers(RPC, LOCK_Reply, mtype=1)
+
+
+class UNLOCK_Call(Packet):
+    name = 'UNLOCK Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('svid', 0),
+        LongField('l_offset', 0),
+        LongField('l_len', 0)
+    ]
+
+
+class UNLOCK_Reply(Packet):
+    name = 'UNLOCK Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats)
+    ]
+
+
+bind_layers(RPC_Call, UNLOCK_Call, program=100021, pversion=4, procedure=4)
+bind_layers(RPC, UNLOCK_Call, mtype=0)
+bind_layers(RPC, UNLOCK_Reply, mtype=1)
+
+
+class GRANTED_MSG_Call(Packet):
+    name = 'GRANTED_MSG Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('exclusive', 0, {0: 'NO', 1: 'YES'}),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('svid', 0),
+        LongField('l_offset', 0),
+        LongField('l_len', 0)
+    ]
+
+
+class GRANTED_MSG_Reply(Packet):
+    name = 'GRANTED_MSG Reply'
+    fields_desc = []
+
+
+bind_layers(
+    RPC_Call, GRANTED_MSG_Call, program=100021, pversion=4, procedure=10
+)
+bind_layers(RPC, GRANTED_MSG_Call, mtype=0)
+bind_layers(RPC, GRANTED_MSG_Reply, mtype=1)
+
+
+class GRANTED_RES_Call(Packet):
+    name = 'GRANTED_RES Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats)
+    ]
+
+
+class GRANTED_RES_Reply(Packet):
+    name = 'GRANTED_RES Reply'
+    fields_desc = []
+
+
+bind_layers(
+    RPC_Call, GRANTED_RES_Call, program=100021, pversion=4, procedure=15
+)
+bind_layers(RPC, GRANTED_RES_Call, mtype=0)
+bind_layers(RPC, GRANTED_RES_Reply, mtype=1)
+
+
+class CANCEL_Call(Packet):
+    name = 'CANCEL Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('block', 0, {0: 'NO', 1: 'YES'}),
+        IntEnumField('exclusive', 0, {0: 'NO', 1: 'YES'}),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('svid', 0),
+        LongField('l_offset', 0),
+        LongField('l_len', 0)
+    ]
+
+
+class CANCEL_Reply(Packet):
+    name = 'CANCEL Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats)
+    ]
+
+
+bind_layers(RPC_Call, CANCEL_Call, program=100021, pversion=4, procedure=3)
+bind_layers(RPC, CANCEL_Call, mtype=0)
+bind_layers(RPC, CANCEL_Reply, mtype=1)
+
+
+class TEST_Call(Packet):
+    name = 'TEST Call'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('exclusive', 0, {0: 'NO', 1: 'YES'}),
+        PacketField('caller', Object_Name(), Object_Name),
+        PacketField('filehandle', File_Object(), File_Object),
+        PacketField('owner', Object_Name(), Object_Name),
+        IntField('svid', 0),
+        LongField('l_offset', 0),
+        LongField('l_len', 0)
+    ]
+
+
+class TEST_Reply(Packet):
+    name = 'TEST Reply'
+    fields_desc = [
+        PacketField('cookie', NLM4_Cookie(), NLM4_Cookie),
+        IntEnumField('status', 0, nlm4_stats)
+    ]
+
+
+bind_layers(RPC_Call, TEST_Call, program=100021, pversion=4, procedure=1)
+bind_layers(RPC, TEST_Call, mtype=0)
+bind_layers(RPC, TEST_Reply, mtype=1)

scapy-2.4.3.tar.gz/scapy/contrib/nsh.py -> scapy-2.4.4.tar.gz/scapy/contrib/nsh.py Changed

@@ -16,9 +16,9 @@
 # scapy.contrib.status = loads
 
 from scapy.all import bind_layers
-from scapy.fields import BitField, ByteField, ByteEnumField
-from scapy.fields import ShortField, X3BytesField, XIntField
-from scapy.fields import ConditionalField, PacketListField, BitFieldLenField
+from scapy.fields import BitField, ByteField, ByteEnumField, BitEnumField, \
+    ShortField, X3BytesField, XIntField, XStrFixedLenField, \
+    ConditionalField, PacketListField, BitFieldLenField
 from scapy.layers.inet import Ether, IP
 from scapy.layers.inet6 import IPv6
 from scapy.layers.vxlan import VXLAN
@@ -29,25 +29,19 @@
 
 #
 # NSH Support
-# https://www.ietf.org/id/draft-ietf-sfc-nsh-05.txt
+# https://www.rfc-editor.org/rfc/rfc8300.txt  January 2018
 #
 
 
-class Metadata(Packet):
-    name = 'NSH metadata'
-    fields_desc = [XIntField('value', 0)]
-
-
 class NSHTLV(Packet):
     "NSH MD-type 2 - Variable Length Context Headers"
     name = "NSHTLV"
     fields_desc = [
-        ShortField('Class', 0),
-        BitField('Critical', 0, 1),
-        BitField('Type', 0, 7),
-        BitField('Reserved', 0, 3),
-        BitField('Len', 0, 5),
-        PacketListField('Metadata', None, XIntField, count_from='Len')
+        ShortField('class', 0),
+        BitField('type', 0, 8),
+        BitField('reserved', 0, 1),
+        BitField('length', 0, 7),
+        PacketListField('metadata', None, XIntField, count_from='length')
     ]
 
 
@@ -57,41 +51,45 @@
     name = "NSH"
 
     fields_desc = [
-        BitField('Ver', 0, 2),
-        BitField('OAM', 0, 1),
-        BitField('Critical', 0, 1),
-        BitField('Reserved', 0, 6),
-        BitFieldLenField('Len', None, 6,
-                         count_of='ContextHeaders',
-                         adjust=lambda pkt, x: 6 if pkt.MDType == 1 else x + 2),  # noqa: E501
-        ByteEnumField('MDType', 1, {1: 'Fixed Length',
-                                    2: 'Variable Length'}),
-        ByteEnumField('NextProto', 3, {1: 'IPv4',
+        BitField('ver', 0, 2),
+        BitField('oam', 0, 1),
+        BitField('unused1', 0, 1),
+        BitField('ttl', 63, 6),
+        BitFieldLenField('length', None, 6,
+                         count_of='vlch',
+                         adjust=lambda pkt, x: 6 if pkt.mdtype == 1
+                         else x + 2),
+        BitField('unused2', 0, 4),
+        BitEnumField('mdtype', 1, 4, {0: 'Reserved MDType',
+                                      1: 'Fixed Length',
+                                      2: 'Variable Length',
+                                      0xF: 'Experimental MDType'}),
+        ByteEnumField('nextproto', 3, {1: 'IPv4',
                                        2: 'IPv6',
                                        3: 'Ethernet',
                                        4: 'NSH',
-                                       5: 'MPLS'}),
-        X3BytesField('NSP', 0),
-        ByteField('NSI', 1),
-        ConditionalField(XIntField('NPC', 0), lambda pkt: pkt.MDType == 1),
-        ConditionalField(XIntField('NSC', 0), lambda pkt: pkt.MDType == 1),
-        ConditionalField(XIntField('SPC', 0), lambda pkt: pkt.MDType == 1),
-        ConditionalField(XIntField('SSC', 0), lambda pkt: pkt.MDType == 1),
-        ConditionalField(PacketListField("ContextHeaders", None,
-                                         NSHTLV, count_from="Length"),
-                         lambda pkt: pkt.MDType == 2)
+                                       5: 'MPLS',
+                                       0xFE: 'Experiment 1',
+                                       0xFF: 'Experiment 2'}),
+        X3BytesField('spi', 0),
+        ByteField('si', 0xFF),
+        ConditionalField(XStrFixedLenField("context_header", "", 16),
+                         lambda pkt: pkt.mdtype == 1),
+        ConditionalField(PacketListField("vlch", None, NSHTLV,
+                                         count_from="length"),
+                         lambda pkt: pkt.mdtype == 2)
     ]
 
     def mysummary(self):
-        return self.sprintf("NSP: %NSP% - NSI: %NSI%")
+        return self.sprintf("SPI: %spi% - SI: %si%")
 
 
 bind_layers(Ether, NSH, {'type': 0x894F}, type=0x894F)
-bind_layers(VXLAN, NSH, {'flags': 0xC, 'NextProtocol': 4}, NextProtocol=4)
+bind_layers(VXLAN, NSH, {'flags': 0xC, 'nextproto': 4}, nextproto=4)
 bind_layers(GRE, NSH, {'proto': 0x894F}, proto=0x894F)
 
-bind_layers(NSH, IP, {'NextProto': 1}, NextProto=1)
-bind_layers(NSH, IPv6, {'NextProto': 2}, NextProto=2)
-bind_layers(NSH, Ether, {'NextProto': 3}, NextProto=3)
-bind_layers(NSH, NSH, {'NextProto': 4}, NextProto=4)
-bind_layers(NSH, MPLS, {'NextProto': 5}, NextProto=5)
+bind_layers(NSH, IP, nextproto=1)
+bind_layers(NSH, IPv6, nextproto=2)
+bind_layers(NSH, Ether, nextproto=3)
+bind_layers(NSH, NSH, nextproto=4)
+bind_layers(NSH, MPLS, nextproto=5)

scapy-2.4.4.tar.gz/scapy/contrib/oncrpc.py Added

@@ -0,0 +1,162 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Lucas Preston <lucas.preston@infinite.io>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = ONC-RPC v2
+# scapy.contrib.status = loads
+
+from scapy.fields import XIntField, IntField, IntEnumField, StrLenField, \
+    FieldListField, ConditionalField, PacketField
+from scapy.packet import Packet, bind_layers
+import struct
+
+
+class Object_Name(Packet):
+    name = 'Object Name'
+    fields_desc = [
+        IntField('length', 0),
+        StrLenField('_name', '', length_from=lambda pkt: pkt.length),
+        StrLenField('fill', '', length_from=lambda pkt: (4 - pkt.length) % 4)
+    ]
+
+    def set(self, name, length=None, fill=None):
+        if length is None:
+            length = len(name)
+        if fill is None:
+            fill = b'\x00' * ((4 - len(name)) % 4)
+        self.length = length
+        self._name = name
+        self.fill = fill
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class RM_Header(Packet):
+    name = 'RM Header'
+    fields_desc = [
+        XIntField('rm', None)
+    ]
+
+    def post_build(self, pkt, pay):
+        """Override of post_build to set the rm header == len(payload)"""
+        if self.rm is None:
+            new_rm = 0x80000000 + len(self.payload)
+            pkt = struct.pack('!I', new_rm)
+        return Packet.post_build(self, pkt, pay)
+
+
+class RPC(Packet):
+    name = 'RPC'
+    fields_desc = [
+        XIntField('xid', 0),
+        IntEnumField('mtype', 0, {0: 'CALL', 1: 'REPLY'}),
+    ]
+
+
+class Auth_Unix(Packet):
+    name = 'AUTH Unix'
+    fields_desc = [
+        XIntField('stamp', 0),
+        PacketField('mname', Object_Name(), Object_Name),
+        IntField('uid', 0),
+        IntField('gid', 0),
+        IntField('num_auxgids', 0),
+        FieldListField(
+            'auxgids', [], IntField('', None),
+            count_from=lambda pkt: pkt.num_auxgids
+        )
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class RPC_Call(Packet):
+    name = 'RPC Call'
+
+    fields_desc = [
+        IntField('version', 2),
+        IntField('program', 100003),
+        IntField('pversion', 3),
+        IntField('procedure', 0),
+        IntEnumField('aflavor', 1, {0: 'AUTH_NULL', 1: 'AUTH_UNIX'}),
+        IntField('alength', None),
+        ConditionalField(
+            PacketField('a_unix', Auth_Unix(), Auth_Unix),
+            lambda pkt: pkt.aflavor == 1
+        ),
+        IntEnumField('vflavor', 0, {0: 'AUTH_NULL', 1: 'AUTH_UNIX'}),
+        IntField('vlength', None),
+        ConditionalField(
+            PacketField('v_unix', Auth_Unix(), Auth_Unix),
+            lambda pkt: pkt.vflavor == 1
+        )
+    ]
+
+    def set_auth(self, **kwargs):
+        """Used to easily set the fields in an a_unix packet"""
+        if kwargs is None:
+            return
+
+        if 'mname' in kwargs:
+            self.a_unix.mname.set(kwargs['mname'])
+            del kwargs['mname']
+
+        for arg, val in kwargs.items():
+            if hasattr(self.a_unix, arg):
+                setattr(self.a_unix, arg, val)
+
+        self.alength = 0 if self.aflavor == 0 else len(self.a_unix)
+        self.vlength = 0 if self.vflavor == 0 else len(self.v_unix)
+
+    def post_build(self, pkt, pay):
+        """Override of post_build to handle length fields"""
+        if self.aflavor == 0 and self.vflavor == 0:
+            # No work required if there are no auth fields,
+            # default will be correct
+            return Packet.post_build(self, pkt, pay)
+        if self.aflavor != 0 and self.alength is None:
+            pkt = pkt[:20] \
+                + struct.pack('!I', len(self.a_unix)) \
+                + pkt[24:]
+            return Packet.post_build(self, pkt, pay)
+        if self.vflavor != 0 and self.vlength is None:
+            pkt = pkt[:28] \
+                + struct.pack('!I', len(self.v_unix)) \
+                + pkt[32:]
+        return Packet.post_build(self, pkt, pay)
+
+
+class RPC_Reply(Packet):
+    name = 'RPC Response'
+    fields_desc = [
+        IntField('reply_stat', 0),
+        IntEnumField('flavor', 0, {0: 'AUTH_NULL', 1: 'AUTH_UNIX'}),
+        ConditionalField(
+            PacketField('a_unix', Auth_Unix(), Auth_Unix),
+            lambda pkt: pkt.flavor == 1
+        ),
+        IntField('length', 0),
+        IntField('accept_stat', 0)
+    ]
+
+    def set_auth(self, **kwargs):
+        """Used to easily set the fields in an a_unix packet"""
+        if kwargs is None:
+            return
+
+        if 'mname' in kwargs:
+            self.a_unix.mname.set(kwargs['mname'])
+            del kwargs['mname']
+
+        for arg, val in kwargs.items():
+            if hasattr(self.a_unix, arg):
+                setattr(self.a_unix, arg, val)
+
+        self.length = 0 if self.flavor == 0 else len(self.a_unix)
+
+
+bind_layers(RPC, RPC_Call, mtype=0)
+bind_layers(RPC, RPC_Reply, mtype=1)

scapy-2.4.3.tar.gz/scapy/contrib/opc_da.py -> scapy-2.4.4.tar.gz/scapy/contrib/opc_da.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/openflow.py -> scapy-2.4.4.tar.gz/scapy/contrib/openflow.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/openflow3.py -> scapy-2.4.4.tar.gz/scapy/contrib/openflow3.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/ospf.py -> scapy-2.4.4.tar.gz/scapy/contrib/ospf.py Changed

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # scapy.contrib.description = Open Shortest Path First (OSPF)
 # scapy.contrib.status = loads
 
@@ -38,7 +36,7 @@
     ShortField, StrLenField, X3BytesField, XIntField, XLongField, XShortField
 from scapy.layers.inet import IP, DestIPField
 from scapy.layers.inet6 import IPv6, in6_chksum
-from scapy.utils import fletcher16_checkbytes, checksum
+from scapy.utils import fletcher16_checkbytes, checksum, inet_aton
 from scapy.compat import orb
 from scapy.config import conf
 
@@ -204,14 +202,20 @@
                  3: "summaryIP",
                  4: "summaryASBR",
                  5: "external",
-                 7: "NSSAexternal"}
+                 7: "NSSAexternal",
+                 9: "linkScopeOpaque",
+                 10: "areaScopeOpaque",
+                 11: "asScopeOpaque"}
 
 _OSPF_LSclasses = {1: "OSPF_Router_LSA",
                    2: "OSPF_Network_LSA",
                    3: "OSPF_SummaryIP_LSA",
                    4: "OSPF_SummaryASBR_LSA",
                    5: "OSPF_External_LSA",
-                   7: "OSPF_NSSA_External_LSA"}
+                   7: "OSPF_NSSA_External_LSA",
+                   9: "OSPF_Link_Scope_Opaque_LSA",
+                   10: "OSPF_Area_Scope_Opaque_LSA",
+                   11: "OSPF_AS_Scope_Opaque_LSA"}
 
 
 def ospf_lsa_checksum(lsa):
@@ -369,6 +373,38 @@
     type = 7
 
 
+class OSPF_Link_Scope_Opaque_LSA(OSPF_BaseLSA):
+    name = "OSPF Link Scope External LSA"
+    type = 9
+    fields_desc = [ShortField("age", 1),
+                   OSPFOptionsField(),
+                   ByteField("type", 9),
+                   IPField("id", "192.0.2.1"),
+                   IPField("adrouter", "198.51.100.100"),
+                   XIntField("seq", 0x80000001),
+                   XShortField("chksum", None),
+                   ShortField("len", None),
+                   StrLenField("data", "data",
+                               length_from=lambda pkt: pkt.len - 20)
+                   ]
+
+    def opaqueid(self):
+        return struct.unpack('>I', inet_aton(self.id))[0] & 0xFFFFFF
+
+    def opaquetype(self):
+        return (struct.unpack('>I', inet_aton(self.id))[0] >> 24) & 0xFF
+
+
+class OSPF_Area_Scope_Opaque_LSA(OSPF_Link_Scope_Opaque_LSA):
+    name = "OSPF Area Scope External LSA"
+    type = 10
+
+
+class OSPF_AS_Scope_Opaque_LSA(OSPF_Link_Scope_Opaque_LSA):
+    name = "OSPF AS Scope External LSA"
+    type = 11
+
+
 class OSPF_DBDesc(Packet):
     name = "OSPF Database Description"
     fields_desc = [ShortField("mtu", 1500),

scapy-2.4.4.tar.gz/scapy/contrib/pfcp.py Added

@@ -0,0 +1,2648 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2019 Travelping GmbH <info@travelping.com>
+
+# This file is part of Scapy
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy. If not, see <http://www.gnu.org/licenses/>.
+
+# 3GPP TS 29.244
+
+# scapy.contrib.description = 3GPP Packet Forwarding Control Protocol
+# scapy.contrib.status = loads
+
+import struct
+
+from scapy.compat import chb, orb
+from scapy.error import warning
+from scapy.fields import Field, BitEnumField, BitField, ByteEnumField, \
+    ShortEnumField, ByteField, IntField, LongField, \
+    ConditionalField, FieldLenField, BitFieldLenField, FieldListField, \
+    IPField, MACField, PacketListField, ShortField, \
+    StrLenField, StrField, XBitField, XByteField, XIntField, XLongField, \
+    ThreeBytesField, SignedLongField, SignedIntField, MultipleTypeField
+from scapy.layers.inet import UDP
+from scapy.layers.inet6 import IP6Field
+from scapy.data import IANA_ENTERPRISE_NUMBERS
+from scapy.packet import bind_layers, bind_bottom_up, \
+    Packet, Raw
+from scapy.volatile import RandNum, RandBin
+
+PFCPmessageType = {
+    1: "heartbeat_request",
+    2: "heartbeat_response",
+    3: "pfd_management_request",
+    4: "pfd_management_response",
+    5: "association_setup_request",
+    6: "association_setup_response",
+    7: "association_update_request",
+    8: "association_update_response",
+    9: "association_release_request",
+    10: "association_release_response",
+    11: "version_not_supported_response",
+    12: "node_report_request",
+    13: "node_report_response",
+    14: "session_set_deletion_request",
+    15: "session_set_deletion_response",
+    50: "session_establishment_request",
+    51: "session_establishment_response",
+    52: "session_modification_request",
+    53: "session_modification_response",
+    54: "session_deletion_request",
+    55: "session_deletion_response",
+    56: "session_report_request",
+    57: "session_report_response",
+}
+
+IEType = {
+    0: "Reserved",
+    1: "Create PDR",
+    2: "PDI",
+    3: "Create FAR",
+    4: "Forwarding Parameters",
+    5: "Duplicating Parameters",
+    6: "Create URR",
+    7: "Create QER",
+    8: "Created PDR",
+    9: "Update PDR",
+    10: "Update FAR",
+    11: "Update Forwarding Parameters",
+    12: "Update BAR (PFCP Session Report Response)",
+    13: "Update URR",
+    14: "Update QER",
+    15: "Remove PDR",
+    16: "Remove FAR",
+    17: "Remove URR",
+    18: "Remove QER",
+    19: "Cause",
+    20: "Source Interface",
+    21: "F-TEID",
+    22: "Network Instance",
+    23: "SDF Filter",
+    24: "Application ID",
+    25: "Gate Status",
+    26: "MBR",
+    27: "GBR",
+    28: "QER Correlation ID",
+    29: "Precedence",
+    30: "Transport Level Marking",
+    31: "Volume Threshold",
+    32: "Time Threshold",
+    33: "Monitoring Time",
+    34: "Subsequent Volume Threshold",
+    35: "Subsequent Time Threshold",
+    36: "Inactivity Detection Time",
+    37: "Reporting Triggers",
+    38: "Redirect Information",
+    39: "Report Type",
+    40: "Offending IE",
+    41: "Forwarding Policy",
+    42: "Destination Interface",
+    43: "UP Function Features",
+    44: "Apply Action",
+    45: "Downlink Data Service Information",
+    46: "Downlink Data Notification Delay",
+    47: "DL Buffering Duration",
+    48: "DL Buffering Suggested Packet Count",
+    49: "PFCPSMReq-Flags",
+    50: "PFCPSRRsp-Flags",
+    51: "Load Control Information",
+    52: "Sequence Number",
+    53: "Metric",
+    54: "Overload Control Information",
+    55: "Timer",
+    56: "PDR ID",
+    57: "F-SEID",
+    58: "Application ID's PFDs",
+    59: "PFD context",
+    60: "Node ID",
+    61: "PFD contents",
+    62: "Measurement Method",
+    63: "Usage Report Trigger",
+    64: "Measurement Period",
+    65: "FQ-CSID",
+    66: "Volume Measurement",
+    67: "Duration Measurement",
+    68: "Application Detection Information",
+    69: "Time of First Packet",
+    70: "Time of Last Packet",
+    71: "Quota Holding Time",
+    72: "Dropped DL Traffic Threshold",
+    73: "Volume Quota",
+    74: "Time Quota",
+    75: "Start Time",
+    76: "End Time",
+    77: "Query URR",
+    78: "Usage Report (Session Modification Response)",
+    79: "Usage Report (Session Deletion Response)",
+    80: "Usage Report (Session Report Request)",
+    81: "URR ID",
+    82: "Linked URR ID",
+    83: "Downlink Data Report",
+    84: "Outer Header Creation",
+    85: "Create BAR",
+    86: "Update BAR (Session Modification Request)",
+    87: "Remove BAR",
+    88: "BAR ID",
+    89: "CP Function Features",
+    90: "Usage Information",
+    91: "Application Instance ID",
+    92: "Flow Information",
+    93: "UE IP Address",
+    94: "Packet Rate",
+    95: "Outer Header Removal",
+    96: "Recovery Time Stamp",
+    97: "DL Flow Level Marking",
+    98: "Header Enrichment",
+    99: "Error Indication Report",
+    100: "Measurement Information",
+    101: "Node Report Type",
+    102: "User Plane Path Failure Report",
+    103: "Remote GTP-U Peer",
+    104: "UR-SEQN",
+    105: "Update Duplicating Parameters",
+    106: "Activate Predefined Rules",
+    107: "Deactivate Predefined Rules",
+    108: "FAR ID",
+    109: "QER ID",
+    110: "OCI Flags",
+    111: "PFCP Association Release Request",
+    112: "Graceful Release Period",
+    113: "PDN Type",
+    114: "Failed Rule ID",
+    115: "Time Quota Mechanism",
+    116: "User Plane IP Resource Information",
+    117: "User Plane Inactivity Timer",
+    118: "Aggregated URRs",
+    119: "Multiplier",
+    120: "Aggregated URR ID",
+    121: "Subsequent Volume Quota",
+    122: "Subsequent Time Quota",
+    123: "RQI",
+    124: "QFI",
+    125: "Query URR Reference",
+    126: "Additional Usage Reports Information",
+    127: "Create Traffic Endpoint",
+    128: "Created Traffic Endpoint",
+    129: "Update Traffic Endpoint",
+    130: "Remove Traffic Endpoint",
+    131: "Traffic Endpoint ID",
+    132: "Ethernet Packet Filter",
+    133: "MAC Address",
+    134: "C-TAG",
+    135: "S-TAG",
+    136: "Ethertype",
+    137: "Proxying",
+    138: "Ethernet Filter ID",
+    139: "Ethernet Filter Properties",
+    140: "Suggested Buffering Packets Count",
+    141: "User ID",
+    142: "Ethernet PDU Session Information",
+    143: "Ethernet Traffic Information",
+    144: "MAC Addresses Detected",
+    145: "MAC Addresses Removed",
+    146: "Ethernet Inactivity Timer",
+    147: "Additional Monitoring Time",
+    148: "Event Quota",
+    149: "Event Threshold",
+    150: "Subsequent Event Quota",
+    151: "Subsequent Event Threshold",
+    152: "Trace Information",
+    153: "Framed-Route",
+    154: "Framed-Routing",
+    155: "Framed-IPv6-Route",
+    156: "Event Time Stamp",
+    157: "Averaging Window",
+    158: "Paging Policy Indicator",
+    159: "APN/DNN",
+    160: "3GPP Interface Type",
+}
+
+CauseValues = {
+    0: "Reserved",
+    1: "Request accepted",
+    64: "Request rejected",
+    65: "Session context not found",
+    66: "Mandatory IE missing",
+    67: "Conditional IE missing",
+    68: "Invalid length",
+    69: "Mandatory IE incorrect",
+    70: "Invalid Forwarding Policy",
+    71: "Invalid F-TEID allocation option",
+    72: "No established Sx Association",
+    73: "Rule creation/modification Failure",
+    74: "PFCP entity in congestion",
+    75: "No resources available",
+    76: "Service not supported",
+    77: "System failure",
+}
+
+SourceInterface = {
+    0: "Access",
+    1: "Core",
+    2: "SGi-LAN/N6-LAN",
+    3: "CP-function",
+}
+
+DestinationInterface = {
+    0: "Access",
+    1: "Core",
+    2: "SGi-LAN/N6-LAN",
+    3: "CP-function",
+    4: "LI function",
+}
+
+RedirectAddressType = {
+    0: "IPv4 address",
+    1: "IPv6 address",
+    2: "URL",
+    3: "SIP URI",
+}
+
+GateStatus = {
+    0: "OPEN",
+    1: "CLOSED",
+    2: "CLOSED_RESERVED_2",
+    3: "CLOSED_RESERVED_3",
+}
+
+TimerUnit = {
+    0: '2 seconds',
+    1: '1 minute',
+    2: '10 minutes',
+    3: '1 hour',
+    4: '10 hours',
+    7: 'infinite',
+}
+
+OuterHeaderRemovalDescription = {
+    0: "GTP-U/UDP/IPv4",
+    1: "GTP-U/UDP/IPv6",
+    2: "UDP/IPv4",
+    3: "UDP/IPv6",
+    4: "IPv4",
+    5: "IPv6",
+    6: "GTP-U/UDP/IP",
+    7: "VLAN S-TAG",
+    8: "S-TAG and C-TAG",
+}
+
+NodeIdType = {
+    0: "IPv4",
+    1: "IPv6",
+    2: "FQDN",
+}
+
+FqCSIDNodeIdType = {
+    0: "IPv4",
+    1: "IPv6",
+    2: "MCCMNCId",
+}
+
+FlowDirection = {
+    0: "Unspecified",
+    1: "Downlink",  # traffic to the UE
+    2: "Uplink",    # traffic from the UE
+    3: "Bidirectional",
+    4: "Unspecified4",
+    5: "Unspecified5",
+    6: "Unspecified6",
+    7: "Unspecified7",
+}
+
+TimeUnit = {
+    0: "minute",
+    1: "6 minutes",
+    2: "hour",
+    3: "day",
+    4: "week",
+    5: "min5",  # same as 0 (minute)
+    6: "min6",  # same as 0 (minute)
+    7: "min7",  # same as 0 (minute)
+}
+
+HeaderType = {
+    0: "HTTP",
+}
+
+PDNType = {
+    0: "IPv4",
+    1: "IPv6",
+    2: "IPv4v6",
+    3: "Non-IP",
+    4: "Ethernet",
+}
+
+RuleIDType = {
+    0: "PDR",
+    1: "FAR",
+    2: "QER",
+    3: "URR",
+    4: "BAR",
+    # TODO: other values should be interpreted as '1' if received
+}
+
+BaseTimeInterval = {
+    0: "CTP",
+    1: "DTP",
+}
+
+InterfaceType = {
+    0: "S1-U",
+    1: "S5 /S8-U",
+    2: "S4-U",
+    3: "S11-U",
+    4: "S12-U",
+    5: "Gn/Gp-U",
+    6: "S2a-U",
+    7: "S2b-U",
+    8: "eNodeB GTP-U interface for DL data forwarding",
+    9: "eNodeB GTP-U interface for UL data forwarding",
+    10: "SGW/UPF GTP-U interface for DL data forwarding",
+    11: "N3 3GPP Access",
+    12: "N3 Trusted Non-3GPP Access",
+    13: "N3 Untrusted Non-3GPP Access",
+    14: "N3 for data forwarding",
+    15: "N9",
+}
+
+
+class PFCPLengthMixin(object):
+    def post_build(self, p, pay):
+        p += pay
+        if self.length is None:
+            tmp_len = len(p) - 4
+            p = p[:2] + struct.pack("!H", tmp_len) + p[4:]
+        return p
+
+
+class PFCP(PFCPLengthMixin, Packet):
+    # 3GPP TS 29.244 V15.6.0 (2019-07)
+    # without the version
+    name = "PFCP (v1) Header"
+    fields_desc = [
+        BitField("version", 1, 3),
+        XBitField("spare_b2", 0, 1),
+        XBitField("spare_b3", 0, 1),
+        XBitField("spare_b4", 0, 1),
+        BitField("MP", 0, 1),
+        BitField("S", 1, 1),
+        ByteEnumField("message_type", None, PFCPmessageType),
+        ShortField("length", None),
+        ConditionalField(XLongField("seid", 0),
+                         lambda pkt:pkt.S == 1),
+        ThreeBytesField("seq", 0),
+        ConditionalField(BitField("priority", 0, 4),
+                         lambda pkt:pkt.MP == 1),
+        ConditionalField(BitField("spare_p", 0, 4),
+                         lambda pkt:pkt.MP == 1),
+        ConditionalField(ByteField("spare_oct", 0),
+                         lambda pkt:pkt.MP == 0),
+    ]
+
+    def hashret(self):
+        return struct.pack("B", self.version) + struct.pack("I", self.seq) + \
+            self.payload.hashret()
+
+    def answers(self, other):
+        return (isinstance(other, PFCP) and
+                self.version == other.version and
+                self.seq == other.seq and
+                self.payload.answers(other.payload))
+
+
+class APNStrLenField(StrLenField):
+    # Inspired by DNSStrField
+    def m2i(self, pkt, s):
+        ret_s = b""
+        tmp_s = s
+        while tmp_s:
+            tmp_len = orb(tmp_s[0]) + 1
+            if tmp_len > len(tmp_s):
+                warning("APN prematured end of character-string (size=%i, remaining bytes=%i)" % (tmp_len, len(tmp_s)))  # noqa: E501
+            ret_s += tmp_s[1:tmp_len]
+            tmp_s = tmp_s[tmp_len:]
+            if len(tmp_s):
+                ret_s += b"."
+        s = ret_s
+        return s
+
+    def i2m(self, pkt, s):
+        s = b"".join(chb(len(x)) + x for x in s.split(b"."))
+        return s
+
+
+class ExtraDataField(StrField):
+    def __init__(self, name, default=b""):
+        StrField.__init__(self, name, default)
+
+    def addfield(self, pkt, s, val):
+        return s + self.i2m(pkt, val)
+
+    def getfield(self, pkt, s):
+        # + 4 accounts for the ietype and length fields
+        p = len(pkt.original) - len(s)
+        length = pkt.length + 4 - p
+        return s[length:], self.m2i(pkt, s[:length])
+
+    def randval(self):
+        return RandBin(RandNum(0, 2))
+
+
+class Int40Field(Field):
+    def __init__(self, name, default):
+        Field.__init__(self, name, default, "BI")
+
+    def addfield(self, pkt, s, val):
+        val = self.i2m(pkt, val)
+        return s + struct.pack("!BI", val >> 32, val & 0xffffffff)
+
+    def getfield(self, pkt, s):
+        hi, lo = struct.unpack("!BI", s[:5])
+        return s[5:], self.m2i(pkt, (hi << 32) + lo)
+
+    def randval(self):
+        return RandNum(0, 2**40 - 1)
+
+
+def IE_Dispatcher(s):
+    """Choose the correct Information Element class."""
+
+    # Get the IE type
+    ietype = (orb(s[0]) * 256) + orb(s[1])
+    if ietype & 0x8000:
+        return IE_EnterpriseSpecific(s)
+
+    cls = ietypecls.get(ietype, Raw)
+    if cls is Raw:
+        cls = IE_NotImplemented
+
+    return cls(s)
+
+
+class IE_Base(PFCPLengthMixin, Packet):
+    default_length = None
+
+    def __init__(self, *args, **kwargs):
+        self.fields_desc[0].default = self.ie_type
+        self.fields_desc[1].default = self.default_length
+        super(IE_Base, self).__init__(*args, **kwargs)
+
+    def extract_padding(self, pkt):
+        return "", pkt
+
+    fields_desc = [
+        ShortEnumField("ietype", 0, IEType),
+        ShortField("length", None)
+    ]
+
+
+class IE_Compound(IE_Base):
+    fields_desc = IE_Base.fields_desc + [
+        PacketListField("IE_list", None, IE_Dispatcher,
+                        length_from=lambda pkt: pkt.length)
+    ]
+
+
+class IE_CreatePDR(IE_Compound):
+    name = "IE Create PDR"
+    ie_type = 1
+
+
+class IE_PDI(IE_Compound):
+    name = "IE PDI"
+    ie_type = 2
+
+
+class IE_CreateFAR(IE_Compound):
+    name = "IE Create FAR"
+    ie_type = 3
+
+
+class IE_ForwardingParameters(IE_Compound):
+    name = "IE Forwarding Parameters"
+    ie_type = 4
+
+
+class IE_DuplicatingParameters(IE_Compound):
+    name = "IE Duplicating Parameters"
+    ie_type = 5
+
+
+class IE_CreateURR(IE_Compound):
+    name = "IE Create URR"
+    ie_type = 6
+
+
+class IE_CreateQER(IE_Compound):
+    name = "IE Create QER"
+    ie_type = 7
+
+
+class IE_CreatedPDR(IE_Compound):
+    name = "IE Created PDR"
+    ie_type = 8
+
+
+class IE_UpdatePDR(IE_Compound):
+    name = "IE Update PDR"
+    ie_type = 9
+
+
+class IE_UpdateFAR(IE_Compound):
+    name = "IE Update FAR"
+    ie_type = 10
+
+
+class IE_UpdateForwardingParameters(IE_Compound):
+    name = "IE Update Forwarding Parameters"
+    ie_type = 11
+
+
+class IE_UpdateBAR_SRR(IE_Compound):
+    name = "IE Update BAR (PFCP Session Report Response)"
+    ie_type = 12
+
+
+class IE_UpdateURR(IE_Compound):
+    name = "IE Update URR"
+    ie_type = 13
+
+
+class IE_UpdateQER(IE_Compound):
+    name = "IE Update QER"
+    ie_type = 14
+
+
+class IE_RemovePDR(IE_Compound):
+    name = "IE Remove PDR"
+    ie_type = 15
+
+
+class IE_RemoveFAR(IE_Compound):
+    name = "IE Remove FAR"
+    ie_type = 16
+
+
+class IE_RemoveURR(IE_Compound):
+    name = "IE Remove URR"
+    ie_type = 17
+
+
+class IE_RemoveQER(IE_Compound):
+    name = "IE Remove QER"
+    ie_type = 18
+
+
+class IE_LoadControlInformation(IE_Compound):
+    name = "IE Load Control Information"
+    ie_type = 51
+
+
+class IE_OverloadControlInformation(IE_Compound):
+    name = "IE Overload Control Information"
+    ie_type = 54
+
+
+class IE_ApplicationID_PFDs(IE_Compound):
+    name = "IE Application ID's PFDs"
+    ie_type = 58
+
+
+class IE_PFDContext(IE_Compound):
+    name = "IE PFD context"
+    ie_type = 59
+
+
+class IE_ApplicationDetectionInformation(IE_Compound):
+    name = "IE Application Detection Information"
+    ie_type = 68
+
+
+class IE_QueryURR(IE_Compound):
+    name = "IE Query URR"
+    ie_type = 77
+
+
+class IE_UsageReport_SMR(IE_Compound):
+    name = "IE Usage Report (Session Modification Response)"
+    ie_type = 78
+
+
+class IE_UsageReport_SDR(IE_Compound):
+    name = "IE Usage Report (Session Deletion Response)"
+    ie_type = 79
+
+
+class IE_UsageReport_SRR(IE_Compound):
+    name = "IE Usage Report (Session Report Request)"
+    ie_type = 80
+
+
+class IE_DownlinkDataReport(IE_Compound):
+    name = "IE Downlink Data Report"
+    ie_type = 83
+
+
+class IE_Create_BAR(IE_Compound):
+    name = "IE Create BAR"
+    ie_type = 85
+
+
+class IE_Update_BAR_SMR(IE_Compound):
+    name = "IE Update BAR (Session Modification Request)"
+    ie_type = 86
+
+
+class IE_Remove_BAR(IE_Compound):
+    name = "IE Remove BAR"
+    ie_type = 87
+
+
+class IE_ErrorIndicationReport(IE_Compound):
+    name = "IE Error Indication Report"
+    ie_type = 99
+
+
+class IE_UserPlanePathFailureReport(IE_Compound):
+    name = "IE User Plane Path Failure Report"
+    ie_type = 102
+
+
+class IE_UpdateDuplicatingParameters(IE_Compound):
+    name = "IE Update Duplicating Parameters"
+    ie_type = 105
+
+
+class IE_AggregatedURRs(IE_Compound):
+    name = "IE Aggregated URRs"
+    ie_type = 118
+
+
+class IE_CreateTrafficEndpoint(IE_Compound):
+    name = "IE Create Traffic Endpoint"
+    ie_type = 127
+
+
+class IE_CreatedTrafficEndpoint(IE_Compound):
+    name = "IE Created Traffic Endpoint"
+    ie_type = 128
+
+
+class IE_UpdateTrafficEndpoint(IE_Compound):
+    name = "IE Update Traffic Endpoint"
+    ie_type = 129
+
+
+class IE_RemoveTrafficEndpoint(IE_Compound):
+    name = "IE Remove Traffic Endpoint"
+    ie_type = 130
+
+
+class IE_EthernetPacketFilter(IE_Compound):
+    name = "IE Ethernet Packet Filter"
+    ie_type = 132
+
+
+class IE_EthernetTrafficInformation(IE_Compound):
+    name = "IE Ethernet Traffic Information"
+    ie_type = 143
+
+
+class IE_AdditionalMonitoringTime(IE_Compound):
+    name = "IE Additional Monitoring Time"
+    ie_type = 147
+
+
+class IE_Cause(IE_Base):
+    ie_type = 19
+    name = "IE Cause"
+    fields_desc = IE_Base.fields_desc + [
+        ByteEnumField("cause", None, CauseValues)
+    ]
+
+
+class IE_SourceInterface(IE_Base):
+    name = "IE Source Interface"
+    ie_type = 20
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitEnumField("interface", "Access", 4, SourceInterface),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_FTEID(IE_Base):
+    name = "IE F-TEID"
+    ie_type = 21
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitField("CHID", 0, 1),
+        BitField("CH", 0, 1),
+        BitField("V6", 0, 1),
+        BitField("V4", 0, 1),
+        ConditionalField(XIntField("TEID", 0), lambda x: x.CH == 0),
+        ConditionalField(IPField("ipv4", 0),
+                         lambda x: x.V4 == 1 and x.CH == 0),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x: x.V6 == 1 and x.CH == 0),
+        ConditionalField(ByteField("choose_id", 0),
+                         lambda x: x.CHID == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_NetworkInstance(IE_Base):
+    name = "IE Network Instance"
+    ie_type = 22
+    fields_desc = IE_Base.fields_desc + [
+        APNStrLenField("instance", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_SDF_Filter(IE_Base):
+    name = "IE SDF Filter"
+    ie_type = 23
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 3),
+        BitField("BID", 0, 1),
+        BitField("FL", 0, 1),
+        BitField("SPI", 0, 1),
+        BitField("TTC", 0, 1),
+        BitField("FD", 0, 1),
+        ByteField("spare_oct", 0),
+        ConditionalField(FieldLenField("flow_description_length", None,
+                                       length_of="flow_description"),
+                         lambda pkt: pkt.FD == 1),
+        ConditionalField(StrLenField("flow_description", "",
+                                     length_from=lambda pkt:
+                                     pkt.flow_description_length),
+                         lambda pkt: pkt.FD == 1),
+        ConditionalField(ByteField("tos_traffic_class", 0),
+                         lambda pkt: pkt.TTC == 1),
+        ConditionalField(ByteField("tos_traffic_mask", 0),
+                         lambda pkt: pkt.TTC == 1),
+        ConditionalField(IntField("security_parameter_index", 0),
+                         lambda pkt: pkt.SPI == 1),
+        ConditionalField(ThreeBytesField("flow_label", 0),
+                         lambda pkt: pkt.FL == 1),
+        ConditionalField(IntField("sdf_filter_id", 0),
+                         lambda pkt: pkt.BID == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_ApplicationId(IE_Base):
+    name = "IE Application ID"
+    ie_type = 24
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("id", "", length_from=lambda x: x.length),
+    ]
+
+
+class IE_GateStatus(IE_Base):
+    name = "IE Gate Status"
+    ie_type = 25
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitEnumField("ul", "OPEN", 2, GateStatus),
+        BitEnumField("dl", "OPEN", 2, GateStatus),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MBR(IE_Base):
+    name = "IE MBR"
+    ie_type = 26
+    fields_desc = IE_Base.fields_desc + [
+        Int40Field("ul", 0),
+        Int40Field("dl", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_GBR(IE_Base):
+    name = "IE GBR"
+    ie_type = 27
+    fields_desc = IE_Base.fields_desc + [
+        Int40Field("ul", 0),
+        Int40Field("dl", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_QERCorrelationId(IE_Base):
+    name = "IE QER Correlation ID"
+    ie_type = 28
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_Precedence(IE_Base):
+    name = "IE Precedence"
+    ie_type = 29
+    fields_desc = IE_Base.fields_desc + [
+        IntField("precedence", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TransportLevelMarking(IE_Base):
+    name = "IE Transport Level Marking"
+    ie_type = 30
+    fields_desc = IE_Base.fields_desc + [
+        XByteField("tos", 0),
+        XByteField("traffic_class", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_VolumeThreshold(IE_Base):
+    name = "IE Volume Threshold"
+    ie_type = 31
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("DLVOL", 0, 1),
+        BitField("ULVOL", 0, 1),
+        BitField("TOVOL", 0, 1),
+        ConditionalField(XLongField("total", 0), lambda x: x.TOVOL == 1),
+        ConditionalField(XLongField("uplink", 0), lambda x: x.ULVOL == 1),
+        ConditionalField(XLongField("downlink", 0), lambda x: x.DLVOL == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TimeThreshold(IE_Base):
+    name = "IE Time Threshold"
+    ie_type = 32
+    fields_desc = IE_Base.fields_desc + [
+        IntField("threshold", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MonitoringTime(IE_Base):
+    name = "IE Monitoring Time"
+    ie_type = 33
+    fields_desc = IE_Base.fields_desc + [
+        IntField("time_value", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SubsequentVolumeThreshold(IE_Base):
+    name = "IE Subsequent Volume Threshold"
+    ie_type = 34
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("DLVOL", 0, 1),
+        BitField("ULVOL", 0, 1),
+        BitField("TOVOL", 0, 1),
+        ConditionalField(XLongField("total", 0), lambda x: x.TOVOL == 1),
+        ConditionalField(XLongField("uplink", 0), lambda x: x.ULVOL == 1),
+        ConditionalField(XLongField("downlink", 0), lambda x: x.DLVOL == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SubsequentTimeThreshold(IE_Base):
+    name = "IE Subsequent Time Threshold"
+    ie_type = 35
+    fields_desc = IE_Base.fields_desc + [
+        IntField("threshold", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_InactivityDetectionTime(IE_Base):
+    name = "IE Inactivity Detection Time"
+    ie_type = 36
+    fields_desc = IE_Base.fields_desc + [
+        IntField("time_value", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_ReportingTriggers(IE_Base):
+    name = "IE Reporting Triggers"
+    ie_type = 37
+    fields_desc = IE_Base.fields_desc + [
+        BitField("linked_usage_reporting", 0, 1),
+        BitField("dropped_dl_traffic_threshold", 0, 1),
+        BitField("stop_of_traffic", 0, 1),
+        BitField("start_of_traffic", 0, 1),
+        BitField("quota_holding_time", 0, 1),
+        BitField("time_threshold", 0, 1),
+        BitField("volume_threshold", 0, 1),
+        BitField("periodic_reporting", 0, 1),
+        XBitField("spare", 0, 2),
+        BitField("event_quota", 0, 1),
+        BitField("event_threshold", 0, 1),
+        BitField("mac_addresses_reporting", 0, 1),
+        BitField("envelope_closure", 0, 1),
+        BitField("time_quota", 0, 1),
+        BitField("volume_quota", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_RedirectInformation(IE_Base):
+    name = "IE Redirect Information"
+    ie_type = 38
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitEnumField("type", "IPv4 address", 4, RedirectAddressType),
+        FieldLenField("address_length", None, length_of="address"),
+        StrLenField("address", "", length_from=lambda pkt: pkt.address_length),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_ReportType(IE_Base):
+    name = "IE Report Type"
+    ie_type = 39
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitField("UPIR", 0, 1),
+        BitField("ERIR", 0, 1),
+        BitField("USAR", 0, 1),
+        BitField("DLDR", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_OffendingIE(IE_Base):
+    name = "IE Offending IE"
+    ie_type = 40
+    fields_desc = IE_Base.fields_desc + [
+        ShortEnumField("type", None, IEType)
+    ]
+
+
+class IE_ForwardingPolicy(IE_Base):
+    name = "IE Forwarding Policy"
+    ie_type = 41
+    fields_desc = IE_Base.fields_desc + [
+        FieldLenField("policy_identifier_length", None,
+                      length_of="policy_identifier", fmt="B"),
+        StrLenField("policy_identifier", "",
+                    length_from=lambda pkt: pkt.policy_identifier_length)
+    ]
+
+
+class IE_DestinationInterface(IE_Base):
+    name = "IE Destination Interface"
+    ie_type = 42
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitEnumField("interface", "Access", 4, DestinationInterface),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UPFunctionFeatures(IE_Base):
+    name = "IE UP Function Features"
+    ie_type = 43
+    default_length = 2
+    fields_desc = IE_Base.fields_desc + [
+        ConditionalField(BitField("TREU", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("HEEU", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("PFDM", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("FTUP", None, 1), lambda x: x.length > 0),
+
+        ConditionalField(BitField("TRST", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("DLBD", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("DDND", None, 1), lambda x: x.length > 0),
+        ConditionalField(BitField("BUCP", None, 1), lambda x: x.length > 0),
+
+        ConditionalField(BitField("spare", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("PFDE", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("FRRT", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("TRACE", None, 1), lambda x: x.length > 1),
+
+        ConditionalField(BitField("QUOAC", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("UDBC", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("PDIU", None, 1), lambda x: x.length > 1),
+        ConditionalField(BitField("EMPU", None, 1), lambda x: x.length > 1),
+
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_ApplyAction(IE_Base):
+    name = "IE Apply Action"
+    ie_type = 44
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 3),
+        BitField("DUPL", 0, 1),
+        BitField("NOCP", 0, 1),
+        BitField("BUFF", 0, 1),
+        BitField("FORW", 0, 1),
+        BitField("DROP", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DownlinkDataServiceInformation(IE_Base):
+    name = "IE Downlink Data Service Information"
+    ie_type = 45
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", None, 6),
+        BitField("QFII", 0, 1),
+        BitField("PPI", 0, 1),
+        ConditionalField(
+            XBitField("spare_2", None, 2),
+            lambda x: x.PPI == 1),
+        ConditionalField(
+            XBitField("ppi_val", None, 6),
+            lambda x: x.PPI == 1),
+        ConditionalField(
+            XBitField("spare_3", None, 2),
+            lambda x: x.QFII == 1),
+        ConditionalField(
+            XBitField("qfi_val", None, 6),
+            lambda x: x.QFII == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DownlinkDataNotificationDelay(IE_Base):
+    name = "IE Downlink Data Notification Delay"
+    ie_type = 46
+    fields_desc = IE_Base.fields_desc + [
+        ByteField("delay", 0),  # in multiples of 50
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DLBufferingDuration(IE_Base):
+    name = "IE DL Buffering Duration"
+    ie_type = 47
+    fields_desc = IE_Base.fields_desc + [
+        BitEnumField("timer_unit", "2 seconds", 3, TimerUnit),
+        BitField("timer_value", 0, 5),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DLBufferingSuggestedPacketCount(IE_Base):
+    name = "IE DL Buffering Suggested Packet Count"
+    ie_type = 48
+    fields_desc = IE_Base.fields_desc + [
+        MultipleTypeField([
+            (
+                ByteField("count", 0),
+                (lambda x: x.length == 1,
+                 lambda x, val: x.length == 1 or
+                 (x.length is None and val < 256)),
+            ),
+            (
+                ShortField("count", 0),
+                (lambda x: x.length == 2,
+                 lambda x, val: x.length == 1 or
+                 (x.length is None and val >= 256))
+            ),
+        ], ByteField("count", 0))
+    ]
+
+
+class IE_PFCPSMReqFlags(IE_Base):
+    name = "IE PFCPSMReq-Flags"
+    ie_type = 49
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 5),
+        BitField("QUARR", 0, 1),
+        BitField("SNDEM", 0, 1),
+        BitField("DROBU", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PFCPSRRspFlags(IE_Base):
+    name = "IE PFCPSRRsp-Flags"
+    ie_type = 50
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 7),
+        BitField("DROBU", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SequenceNumber(IE_Base):
+    name = "IE Sequence Number"
+    ie_type = 52
+    fields_desc = IE_Base.fields_desc + [
+        IntField("number", 0),
+    ]
+
+
+class IE_Metric(IE_Base):
+    name = "IE Metric"
+    ie_type = 53
+    fields_desc = IE_Base.fields_desc + [
+        ByteField("metric", 0),
+    ]
+
+
+class IE_Timer(IE_Base):
+    name = "IE Timer"
+    ie_type = 55
+    fields_desc = IE_Base.fields_desc + [
+        BitEnumField("timer_unit", "2 seconds", 3, TimerUnit),
+        BitField("timer_value", 0, 5),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PDR_Id(IE_Base):
+    name = "IE PDR ID"
+    ie_type = 56
+    fields_desc = IE_Base.fields_desc + [
+        ShortField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_FSEID(IE_Base):
+    name = "IE F-SEID"
+    ie_type = 57
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 6),
+        BitField("v4", 0, 1),
+        BitField("v6", 0, 1),
+        XLongField("seid", 0),
+        ConditionalField(IPField("ipv4", 0),
+                         lambda x: x.v4 == 1),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x: x.v6 == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_NodeId(IE_Base):
+    name = "IE Node ID"
+    ie_type = 60
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitEnumField("id_type", "IPv4", 4, NodeIdType),
+        ConditionalField(IPField("ipv4", 0),
+                         lambda x: x.id_type == 0),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x: x.id_type == 1),
+        ConditionalField(
+            APNStrLenField("id", "", length_from=lambda x: x.length - 1),
+            lambda x: x.id_type == 2),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PFDContents(IE_Base):
+    name = "IE PFD contents"
+    ie_type = 61
+    fields_desc = IE_Base.fields_desc + [
+        BitField("ADNP", 0, 1),
+        BitField("AURL", 0, 1),
+        BitField("AFD", 0, 1),
+        BitField("DNP", 0, 1),
+        BitField("CP", 0, 1),
+        BitField("DN", 0, 1),
+        BitField("URL", 0, 1),
+        BitField("FD", 0, 1),
+        ByteField("spare_2", 0),
+        ConditionalField(FieldLenField("flow_length", None, length_of="flow"),
+                         lambda pkt: pkt.FD == 1),
+        ConditionalField(StrLenField("flow", "",
+                                     length_from=lambda pkt: pkt.flow_length),
+                         lambda pkt: pkt.FD == 1),
+        ConditionalField(FieldLenField("url_length", None, length_of="url"),
+                         lambda pkt: pkt.URL == 1),
+        ConditionalField(StrLenField("url", "",
+                                     length_from=lambda pkt: pkt.url_length),
+                         lambda pkt: pkt.URL == 1),
+        ConditionalField(FieldLenField("domain_length", None,
+                                       length_of="domain"),
+                         lambda pkt: pkt.DN == 1),
+        ConditionalField(
+            StrLenField("domain", "",
+                        length_from=lambda pkt: pkt.domain_length),
+            lambda pkt: pkt.DN == 1),
+        ConditionalField(FieldLenField("custom_length", None,
+                                       length_of="custom"),
+                         lambda pkt: pkt.CP == 1),
+        ConditionalField(
+            StrLenField("custom", "",
+                        length_from=lambda pkt: pkt.custom_length),
+            lambda pkt: pkt.CP == 1),
+        ConditionalField(FieldLenField("dnp_length", None, length_of="dnp"),
+                         lambda pkt: pkt.DNP == 1),
+        ConditionalField(StrLenField("dnp", "",
+                                     length_from=lambda pkt: pkt.dnp_length),
+                         lambda pkt: pkt.DNP == 1),
+        ConditionalField(FieldLenField("additional_flow_length", None,
+                                       length_of="additional_flow"),
+                         lambda pkt: pkt.AFD == 1),
+        ConditionalField(
+            StrLenField("additional_flow", "",
+                        length_from=lambda pkt: pkt.additional_flow_length),
+            lambda pkt: pkt.AFD == 1),
+        ConditionalField(FieldLenField("additional_url_length", None,
+                                       length_of="additional_url"),
+                         lambda pkt: pkt.AURL == 1),
+        ConditionalField(
+            StrLenField("additional_url", "",
+                        length_from=lambda pkt: pkt.additional_url_length),
+            lambda pkt: pkt.AURL == 1),
+        ConditionalField(
+            FieldLenField("additional_dn_dnp_length", None,
+                          length_of="additional_dn_dnp"),
+            lambda pkt: pkt.ADNP == 1),
+        ConditionalField(
+            StrLenField("additional_dn_dnp", "",
+                        length_from=lambda pkt: pkt.additional_dn_dnp_length),
+            lambda pkt: pkt.ADNP == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MeasurementMethod(IE_Base):
+    name = "IE Measurement Method"
+    ie_type = 62
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("EVENT", 0, 1),
+        BitField("VOLUM", 0, 1),
+        BitField("DURAT", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UsageReportTrigger(IE_Base):
+    name = "IE Usage Report Trigger"
+    ie_type = 63
+    fields_desc = IE_Base.fields_desc + [
+        BitField("IMMER", 0, 1),
+        BitField("DROTH", 0, 1),
+        BitField("STOPT", 0, 1),
+        BitField("START", 0, 1),
+        BitField("QUHTI", 0, 1),
+        BitField("TIMTH", 0, 1),
+        BitField("VOLTH", 0, 1),
+        BitField("PERIO", 0, 1),
+        BitField("EVETH", 0, 1),
+        BitField("MACAR", 0, 1),
+        BitField("ENVCL", 0, 1),
+        BitField("MONIT", 0, 1),
+        BitField("TERMR", 0, 1),
+        BitField("LIUSA", 0, 1),
+        BitField("TIMQU", 0, 1),
+        BitField("VOLQU", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MeasurementPeriod(IE_Base):
+    name = "IE Measurement Period"
+    ie_type = 64
+    fields_desc = IE_Base.fields_desc + [
+        IntField("period", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_FqCSID(IE_Base):
+    name = "IE FQ-CSID"
+    ie_type = 65
+    fields_desc = IE_Base.fields_desc + [
+        BitEnumField("node_id_type", "IPv4", 4, FqCSIDNodeIdType),
+        BitFieldLenField("num_csids", None, 4, count_of="csids"),
+        ConditionalField(IPField("ipv4", 0),
+                         lambda x: x.node_id_type == 0),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x: x.node_id_type == 1),
+        ConditionalField(
+            # FIXME: split (value = mcc * 1000 + mnc)
+            BitField("mcc_mnc", 0, 20),
+            lambda x: x.node_id_type == 2),
+        # "Least significant 12 bits is a 12 bit integer assigned by
+        # an operator to an MME, SGW-C, SGW-U, PGW-C or PGW-U."
+        ConditionalField(
+            BitField("extra_id", 0, 12),
+            lambda x: x.node_id_type == 2),
+        FieldListField("csids", None, ShortField("csid", 0),
+                       count_from=lambda x: x.num_csids),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_VolumeMeasurement(IE_Base):
+    name = "IE Volume Measurement"
+    ie_type = 66
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("DLVOL", 0, 1),
+        BitField("ULVOL", 0, 1),
+        BitField("TOVOL", 0, 1),
+        ConditionalField(XLongField("total", 0), lambda x: x.TOVOL == 1),
+        ConditionalField(XLongField("uplink", 0), lambda x: x.ULVOL == 1),
+        ConditionalField(XLongField("downlink", 0), lambda x: x.DLVOL == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DurationMeasurement(IE_Base):
+    name = "IE Duration Measurement"
+    ie_type = 67
+    fields_desc = IE_Base.fields_desc + [
+        IntField("duration", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TimeOfFirstPacket(IE_Base):
+    name = "IE Time of First Packet"
+    ie_type = 69
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TimeOfLastPacket(IE_Base):
+    name = "IE Time of Last Packet"
+    ie_type = 70
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_QuotaHoldingTime(IE_Base):
+    name = "IE Quota Holding Time"
+    ie_type = 71
+    fields_desc = IE_Base.fields_desc + [
+        IntField("time_value", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DroppedDLTrafficThreshold(IE_Base):
+    name = "IE Dropped DL Traffic Threshold"
+    ie_type = 72
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 6),
+        BitField("DLBY", 0, 1),
+        BitField("DLPA", 0, 1),
+        ConditionalField(LongField("packet_count", 0),
+                         lambda x: x.DLPA == 1),
+        ConditionalField(LongField("byte_count", 0),
+                         lambda x: x.DLBY == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_VolumeQuota(IE_Base):
+    name = "IE Volume Quota"
+    ie_type = 73
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("DLVOL", 0, 1),
+        BitField("ULVOL", 0, 1),
+        BitField("TOVOL", 0, 1),
+        ConditionalField(XLongField("total", 0), lambda x: x.TOVOL == 1),
+        ConditionalField(XLongField("uplink", 0), lambda x: x.ULVOL == 1),
+        ConditionalField(XLongField("downlink", 0), lambda x: x.DLVOL == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TimeQuota(IE_Base):
+    name = "IE Time Quota"
+    ie_type = 74
+    fields_desc = IE_Base.fields_desc + [
+        IntField("quota", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_StartTime(IE_Base):
+    name = "IE Start Time"
+    ie_type = 75
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EndTime(IE_Base):
+    name = "IE End Time"
+    ie_type = 76
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_URR_Id(IE_Base):
+    name = "IE URR ID"
+    ie_type = 81
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_LinkedURR_Id(IE_Base):
+    name = "IE Linked URR ID"
+    ie_type = 82
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_OuterHeaderCreation(IE_Base):
+    name = "IE Outer Header Creation"
+    ie_type = 84
+    fields_desc = IE_Base.fields_desc + [
+        BitField("STAG", 0, 1),
+        BitField("CTAG", 0, 1),
+        BitField("IPV6", 0, 1),
+        BitField("IPV4", 0, 1),
+        BitField("UDPIPV6", 0, 1),
+        BitField("UDPIPV4", 0, 1),
+        BitField("GTPUUDPIPV6", 0, 1),
+        BitField("GTPUUDPIPV4", 0, 1),
+        ByteField("spare", 0),
+        ConditionalField(XIntField("TEID", 0),
+                         lambda x: x.GTPUUDPIPV4 == 1 or x.GTPUUDPIPV6 == 1),
+        ConditionalField(IPField("ipv4", 0),
+                         lambda x:
+                         x.IPV4 == 1 or x.UDPIPV4 == 1 or x.GTPUUDPIPV4 == 1),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x:
+                         x.IPV6 == 1 or x.UDPIPV6 == 1 or x.GTPUUDPIPV6 == 1),
+        ConditionalField(ShortField("port", 0),
+                         lambda x: x.UDPIPV4 == 1 or x.UDPIPV6 == 1),
+        ConditionalField(ThreeBytesField("ctag", 0),
+                         lambda x: x.CTAG == 1),
+        ConditionalField(ThreeBytesField("stag", 0),
+                         lambda x: x.STAG == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_BAR_Id(IE_Base):
+    name = "IE BAR ID"
+    ie_type = 88
+    fields_desc = IE_Base.fields_desc + [
+        ByteField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_CPFunctionFeatures(IE_Base):
+    name = "IE CP Function Features"
+    ie_type = 89
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 6),
+        BitField("OVRL", 0, 1),
+        BitField("LOAD", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UsageInformation(IE_Base):
+    name = "IE Usage Information"
+    ie_type = 90
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitField("UBE", 0, 1),
+        BitField("UAE", 0, 1),
+        BitField("AFT", 0, 1),
+        BitField("BEF", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_ApplicationInstanceId(IE_Base):
+    name = "IE Application Instance ID"
+    ie_type = 91
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("id", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_FlowInformation(IE_Base):
+    name = "IE Flow Information"
+    ie_type = 92
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitEnumField("direction", "Unspecified", 3, FlowDirection),
+        FieldLenField("flow_length", None, length_of="flow"),
+        StrLenField("flow", "", length_from=lambda x: x.flow_length),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UE_IP_Address(IE_Base):
+    name = "IE UE IP Address"
+    ie_type = 93
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("SD", 0, 1),  # source or dest
+        BitField("V4", 0, 1),
+        BitField("V6", 0, 1),
+        ConditionalField(IPField("ipv4", 0), lambda x: x.V4 == 1),
+        ConditionalField(IP6Field("ipv6", 0), lambda x: x.V6 == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PacketRate(IE_Base):
+    name = "IE Packet Rate"
+    ie_type = 94
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 6),
+        BitField("DLPR", 0, 1),
+        BitField("ULPR", 0, 1),
+        ConditionalField(BitField("spare_2", 0, 5), lambda x: x.ULPR == 1),
+        ConditionalField(BitEnumField("ul_time_unit", "minute", 3, TimeUnit),
+                         lambda x: x.ULPR == 1),
+        ConditionalField(ShortField("ul_max_packet_rate", 0),
+                         lambda x: x.ULPR == 1),
+        ConditionalField(BitField("spare_3", 0, 5), lambda x: x.DLPR == 1),
+        ConditionalField(BitEnumField("dl_time_unit", "minute", 3, TimeUnit),
+                         lambda x: x.DLPR == 1),
+        ConditionalField(ShortField("dl_max_packet_rate", 0),
+                         lambda x: x.DLPR == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_OuterHeaderRemoval(IE_Base):
+    name = "IE Outer Header Removal"
+    ie_type = 95
+    fields_desc = IE_Base.fields_desc + [
+        ByteEnumField("header", None, OuterHeaderRemovalDescription),
+        ConditionalField(XBitField("spare", None, 7),
+                         lambda x: x.length is not None and x.length > 1),
+        ConditionalField(BitField("pdu_session_container", None, 1),
+                         lambda x: x.length is not None and x.length > 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_RecoveryTimeStamp(IE_Base):
+    name = "IE Recovery Time Stamp"
+    ie_type = 96
+    default_length = 4
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_DLFlowLevelMarking(IE_Base):
+    name = "IE DL Flow Level Marking"
+    ie_type = 97
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 6),
+        BitField("SCI", 0, 1),
+        BitField("TTC", 0, 1),
+        ConditionalField(ByteField("traffic_class", 0), lambda x: x.TTC),
+        ConditionalField(ByteField("traffic_class_mask", 0), lambda x: x.TTC),
+        ConditionalField(ByteField("service_class_indicator", 0),
+                         lambda x: x.SCI),
+        ConditionalField(ByteField("spare_2", 0), lambda x: x.SCI),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_HeaderEnrichment(IE_Base):
+    name = "IE Header Enrichment"
+    ie_type = 98
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 3),
+        BitEnumField("header_type", "HTTP", 5, HeaderType),
+        FieldLenField("name_length", None, fmt="B", length_of="name"),
+        StrLenField("name", "", length_from=lambda x: x.name_length),
+        FieldLenField("value_length", None, fmt="B", length_of="value"),
+        StrLenField("value", "", length_from=lambda x: x.value_length),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MeasurementInformation(IE_Base):
+    name = "IE Measurement Information"
+    ie_type = 100
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 3),
+        BitField("MNOP", 0, 1),
+        BitField("ISTM", 0, 1),
+        BitField("RADI", 0, 1),
+        BitField("INAM", 0, 1),
+        BitField("MBQE", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_NodeReportType(IE_Base):
+    name = "IE Node Report Type"
+    ie_type = 101
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 7),
+        BitField("UPFR", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_RemoteGTP_U_Peer(IE_Base):
+    name = "IE Remote GTP-U Peer"
+    ie_type = 103
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 4),
+        BitField("NI", 0, 1),
+        BitField("DI", 0, 1),
+        BitField("V4", 0, 1),
+        BitField("V6", 0, 1),
+        ConditionalField(IPField("ipv4", 0), lambda x: x.V4 == 1),
+        ConditionalField(IP6Field("ipv6", 0), lambda x: x.V6 == 1),
+        ConditionalField(ByteField("dest_interface_length", 1),
+                         lambda x: x.DI == 1),
+        ConditionalField(XBitField("spare_2", 0, 4), lambda x: x.DI == 1),
+        ConditionalField(
+            BitEnumField("dest_interface", "Access", 4, DestinationInterface),
+            lambda x: x.DI == 1),
+        ConditionalField(
+            FieldLenField("network_instance_length", 1,
+                          length_of="network_instance"),
+            lambda x: x.NI == 1),
+        ConditionalField(
+            APNStrLenField("network_instance", "",
+                           length_from=lambda x: x.network_instance_length),
+            lambda x: x.NI == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UR_SEQN(IE_Base):
+    name = "IE UR-SEQN"
+    ie_type = 104
+    fields_desc = IE_Base.fields_desc + [
+        IntField("number", 0),
+    ]
+
+
+class IE_ActivatePredefinedRules(IE_Base):
+    name = "IE Activate Predefined Rules"
+    ie_type = 106
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("name", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_DeactivatePredefinedRules(IE_Base):
+    name = "IE Deactivate Predefined Rules"
+    ie_type = 107
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("name", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_FAR_Id(IE_Base):
+    name = "IE FAR ID"
+    ie_type = 108
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_QER_Id(IE_Base):
+    name = "IE QER ID"
+    ie_type = 109
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_OCIFlags(IE_Base):
+    name = "IE OCI Flags"
+    ie_type = 110
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 7),
+        BitField("AOCI", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PFCPAssociationReleaseRequest(IE_Base):
+    name = "IE PFCP Association Release Request"
+    ie_type = 111
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 7),
+        BitField("SARR", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_GracefulReleasePeriod(IE_Base):
+    name = "IE Graceful Release Period"
+    ie_type = 112
+    fields_desc = IE_Base.fields_desc + [
+        BitEnumField("release_timer_unit", "2 seconds", 3, TimerUnit),
+        BitField("release_timer_value", 0, 5),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PDNType(IE_Base):
+    name = "IE PDN Type"
+    ie_type = 113
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitEnumField("pdn_type", "IPv4", 3, PDNType),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_FailedRuleId(IE_Base):
+    name = "IE Failed Rule ID"
+    ie_type = 114
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 3),
+        BitEnumField("type", "PDR", 5, RuleIDType),
+        ConditionalField(ShortField("pdr_id", 0),
+                         lambda x: x.type == 0),
+        ConditionalField(IntField("far_id", 0),
+                         lambda x: x.type == 1 or x.type > 4),
+        ConditionalField(IntField("qer_id", 0), lambda x: x.type == 2),
+        ConditionalField(IntField("urr_id", 0), lambda x: x.type == 3),
+        ConditionalField(ByteField("bar_id", 0),
+                         lambda x: x.type == 4),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TimeQuotaMechanism(IE_Base):
+    name = "IE Time Quota Mechanism"
+    ie_type = 115
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 6),
+        BitEnumField("base_time_interval_type", "CTP", 2, BaseTimeInterval),
+        IntField("interval", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UserPlaneIPResourceInformation(IE_Base):
+    name = "IE User Plane IP Resource Information"
+    ie_type = 116
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 1),
+        BitField("ASSOSI", 0, 1),
+        BitField("ASSONI", 0, 1),
+        BitField("TEIDRI", 0, 3),
+        BitField("V6", 0, 1),
+        BitField("V4", 0, 1),
+        ConditionalField(XByteField("teid_range", 0), lambda x: x.TEIDRI != 0),
+        ConditionalField(IPField("ipv4", 0), lambda x: x.V4 == 1),
+        ConditionalField(IP6Field("ipv6", 0),
+                         lambda x: x.V6 == 1),
+        ConditionalField(
+            APNStrLenField("network_instance", "",
+                           length_from=lambda x:
+                           x.length - 1 - (1 if x.TEIDRI != 0 else 0) -
+                           (x.V4 * 4) - (x.V6 * 16) - x.ASSOSI),
+            lambda x: x.ASSONI == 1),
+        ConditionalField(XBitField("spare", None, 4), lambda x: x.ASSOSI == 1),
+        ConditionalField(
+            BitEnumField("interface", "Access", 4, SourceInterface),
+            lambda x: x.ASSOSI == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UserPlaneInactivityTimer(IE_Base):
+    name = "IE User Plane Inactivity Timer"
+    ie_type = 117
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timer", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_Multiplier(IE_Base):
+    name = "IE Multiplier"
+    ie_type = 119
+    fields_desc = IE_Base.fields_desc + [
+        SignedLongField("digits", 0),
+        SignedIntField("exponent", 0),
+    ]
+
+
+class IE_AggregatedURR_Id(IE_Base):
+    name = "IE Aggregated URR ID"
+    ie_type = 120
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+    ]
+
+
+class IE_SubsequentVolumeQuota(IE_Base):
+    name = "IE Subsequent Volume Quota"
+    ie_type = 121
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("DLVOL", 0, 1),
+        BitField("ULVOL", 0, 1),
+        BitField("TOVOL", 0, 1),
+        ConditionalField(XLongField("total", 0), lambda x: x.TOVOL == 1),
+        ConditionalField(XLongField("uplink", 0), lambda x: x.ULVOL == 1),
+        ConditionalField(XLongField("downlink", 0), lambda x: x.DLVOL == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SubsequentTimeQuota(IE_Base):
+    name = "IE Subsequent Time Quota"
+    ie_type = 122
+    fields_desc = IE_Base.fields_desc + [
+        IntField("quota", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_RQI(IE_Base):
+    name = "IE RQI"
+    ie_type = 123
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 7),
+        BitField("RQI", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_QFI(IE_Base):
+    name = "IE QFI"
+    ie_type = 124
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", None, 2),
+        BitField("QFI", 0, 6),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_QueryURRReference(IE_Base):
+    name = "IE Query URR Reference"
+    ie_type = 125
+    fields_desc = IE_Base.fields_desc + [
+        IntField("reference", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_AdditionalUsageReportsInformation(IE_Base):
+    name = "IE Additional Usage Reports Information"
+    ie_type = 126
+    fields_desc = IE_Base.fields_desc + [
+        BitField("AURI", 0, 1),
+        BitField("reports", 0, 15),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TrafficEndpointId(IE_Base):
+    name = "IE Traffic Endpoint ID"
+    ie_type = 131
+    fields_desc = IE_Base.fields_desc + [
+        ByteField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MACAddress(IE_Base):
+    name = "IE MAC Address"
+    ie_type = 133
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitField("UDES", 0, 1),
+        BitField("USOU", 0, 1),
+        BitField("DEST", 0, 1),
+        BitField("SOUR", 0, 1),
+        ConditionalField(MACField("source_mac", 0),
+                         lambda x: x.SOUR == 1),
+        ConditionalField(MACField("destination_mac", 0),
+                         lambda x: x.DEST == 1),
+        ConditionalField(MACField("upper_source_mac", 0),
+                         lambda x: x.USOU == 1),
+        ConditionalField(MACField("upper_destination_mac", 0),
+                         lambda x: x.UDES == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_C_TAG(IE_Base):
+    name = "IE C-TAG"
+    ie_type = 134
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 5),
+        BitField("VID", 0, 1),
+        BitField("DEI", 0, 1),
+        BitField("PCP", 0, 1),
+        # TODO: fix cvid_value
+        ConditionalField(
+            BitField("cvid_value_hi", 0, 4), lambda x: x.VID == 1),
+        ConditionalField(BitField("spare_2", 0, 4), lambda x: x.VID == 0),
+        ConditionalField(BitField("dei_flag", 0, 1), lambda x: x.DEI == 1),
+        ConditionalField(BitField("spare_3", 0, 1), lambda x: x.DEI == 0),
+        ConditionalField(BitField("pcp_value", 0, 3), lambda x: x.PCP == 1),
+        ConditionalField(BitField("spare_4", 0, 3), lambda x: x.PCP == 0),
+        ConditionalField(ByteField("cvid_value_low", 0),
+                         lambda x: x.VID == 1),
+        ConditionalField(ByteField("spare_5", 0), lambda x: x.VID == 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_S_TAG(IE_Base):
+    name = "IE S-TAG"
+    ie_type = 135
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 5),
+        BitField("VID", 0, 1),
+        BitField("DEI", 0, 1),
+        BitField("PCP", 0, 1),
+        # TODO: fix svid_value
+        ConditionalField(BitField("svid_value_hi", 0, 4),
+                         lambda x: x.VID == 1),
+        ConditionalField(BitField("spare_2", 0, 4), lambda x: x.VID == 0),
+        ConditionalField(BitField("dei_flag", 0, 1), lambda x: x.DEI == 1),
+        ConditionalField(BitField("spare_3", 0, 1), lambda x: x.DEI == 0),
+        ConditionalField(BitField("pcp_value", 0, 3), lambda x: x.PCP == 1),
+        ConditionalField(BitField("spare_4", 0, 3), lambda x: x.PCP == 0),
+        ConditionalField(ByteField("svid_value_low", 0),
+                         lambda x: x.VID == 1),
+        ConditionalField(ByteField("spare_5", 0), lambda x: x.VID == 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_Ethertype(IE_Base):
+    name = "IE Ethertype"
+    ie_type = 136
+    fields_desc = IE_Base.fields_desc + [
+        ShortField("type", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_Proxying(IE_Base):
+    name = "IE Proxying"
+    ie_type = 137
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 6),
+        BitField("INS", 0, 1),
+        BitField("ARP", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EthernetFilterId(IE_Base):
+    name = "IE Ethernet Filter ID"
+    ie_type = 138
+    fields_desc = IE_Base.fields_desc + [
+        IntField("id", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EthernetFilterProperties(IE_Base):
+    name = "IE Ethernet Filter Properties"
+    ie_type = 139
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 7),
+        BitField("BIDE", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SuggestedBufferingPacketsCount(IE_Base):
+    name = "IE Suggested Buffering Packets Count"
+    ie_type = 140
+    fields_desc = IE_Base.fields_desc + [
+        ByteField("count", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_UserId(IE_Base):
+    name = "IE User ID"
+    ie_type = 141
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 4),
+        BitField("NAIF", 0, 1),
+        BitField("MSISDNF", 0, 1),
+        BitField("IMEIF", 0, 1),
+        BitField("IMSIF", 0, 1),
+        ConditionalField(
+            FieldLenField("imsi_length", None, length_of="imsi", fmt="B"),
+            lambda x: x.IMSIF == 1),
+        ConditionalField(
+            StrLenField("imsi", "", length_from=lambda x: x.imsi_length),
+            lambda x: x.IMSIF == 1),
+        ConditionalField(
+            FieldLenField("imei_length", None, length_of="imei", fmt="B"),
+            lambda x: x.IMEIF == 1),
+        ConditionalField(
+            StrLenField("imei", "", length_from=lambda x: x.imei_length),
+            lambda x: x.IMEIF == 1),
+        ConditionalField(
+            FieldLenField("msisdn_length", None, length_of="msisdn", fmt="B"),
+            lambda x: x.MSISDNF == 1),
+        ConditionalField(
+            StrLenField("msisdn", "", length_from=lambda x: x.msisdn_length),
+            lambda x: x.MSISDNF == 1),
+        ConditionalField(
+            FieldLenField("nai_length", None, length_of="nai", fmt="B"),
+            lambda x: x.NAIF == 1),
+        ConditionalField(
+            StrLenField("nai", "", length_from=lambda x: x.nai_length),
+            lambda x: x.NAIF == 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EthernetPDUSessionInformation(IE_Base):
+    name = "IE Ethernet PDU Session Information"
+    ie_type = 142
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 7),
+        BitField("ETHI", 0, 1),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MACAddressesDetected(IE_Base):
+    name = "IE MAC Addresses Detected"
+    ie_type = 144
+    fields_desc = IE_Base.fields_desc + [
+        FieldLenField("num_macs", None, count_of="macs", fmt="B"),
+        FieldListField("macs", None, MACField("mac", 0),
+                       count_from=lambda x: x.num_macs),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_MACAddressesRemoved(IE_Base):
+    name = "IE MAC Addresses Removed"
+    ie_type = 145
+    fields_desc = IE_Base.fields_desc + [
+        FieldLenField("num_macs", None, count_of="macs", fmt="B"),
+        FieldListField("macs", None, MACField("mac", 0),
+                       count_from=lambda x: x.num_macs),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EthernetInactivityTimer(IE_Base):
+    name = "IE Ethernet Inactivity Timer"
+    ie_type = 146
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timer", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EventQuota(IE_Base):
+    name = "IE Event Quota"
+    ie_type = 148
+    fields_desc = IE_Base.fields_desc + [
+        IntField("event_quota", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EventThreshold(IE_Base):
+    name = "IE Event Threshold"
+    ie_type = 149
+    fields_desc = IE_Base.fields_desc + [
+        IntField("event_threshold", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SubsequentEventQuota(IE_Base):
+    name = "IE Subsequent Event Quota"
+    ie_type = 150
+    fields_desc = IE_Base.fields_desc + [
+        IntField("subsequent_event_quota", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_SubsequentEventThreshold(IE_Base):
+    name = "IE Subsequent Event Threshold"
+    ie_type = 151
+    fields_desc = IE_Base.fields_desc + [
+        IntField("subsequent_event_threshold", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_TraceInformation(IE_Base):
+    # TODO: more detailed decoding
+    # TODO: fix IP address handling
+    name = "IE Trace Information"
+    ie_type = 152
+    fields_desc = IE_Base.fields_desc + [
+        BitField("mcc_digit_2", 0, 4),
+        BitField("mcc_digit_1", 0, 4),
+        BitField("mnc_digit_3", 0, 4),
+        BitField("mcc_digit_3", 0, 4),
+        BitField("mnc_digit_2", 0, 4),
+        BitField("mnc_digit_1", 0, 4),
+        ThreeBytesField("trace_id", 0),  # FIXME
+        FieldLenField("triggering_events_length", None,
+                      length_of="triggering_events", fmt="B"),
+        StrLenField("triggering_events", "",
+                    length_from=lambda x: x.triggering_events_length),
+        ByteField("session_trace_depth", 0),
+        FieldLenField("list_of_interfaces_length", None,
+                      length_of="list_of_interfaces", fmt="B"),
+        StrLenField("list_of_interfaces", "",
+                    length_from=lambda x: x.list_of_interfaces_length),
+        FieldLenField("ip_address_length", None,
+                      length_of="ip_address", fmt="B"),
+        StrLenField("ip_address", "",
+                    length_from=lambda x: x.ip_address_length),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_FramedRoute(IE_Base):
+    name = "IE Framed-Route"
+    ie_type = 153
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("framed_route", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_FramedRouting(IE_Base):
+    name = "IE Framed-Routing"
+    ie_type = 154
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("framed_routing", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_FramedIPv6Route(IE_Base):
+    name = "IE Framed-IPv6-Route"
+    ie_type = 155
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("framed_ipv6_route", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_EventTimeStamp(IE_Base):
+    name = "IE Event Time Stamp"
+    ie_type = 156
+    fields_desc = IE_Base.fields_desc + [
+        IntField("timestamp", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_AveragingWindow(IE_Base):
+    name = "IE Averaging Window"
+    ie_type = 157
+    fields_desc = IE_Base.fields_desc + [
+        IntField("averaging_window", 0),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_PagingPolicyIndicator(IE_Base):
+    name = "IE Paging Policy Indicator"
+    ie_type = 158
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare", 0, 5),
+        BitField("ppi", 0, 3),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_APN_DNN(IE_Base):
+    name = "IE APN/DNN"
+    ie_type = 159
+    fields_desc = IE_Base.fields_desc + [
+        APNStrLenField("apn_dnn", "", length_from=lambda x: x.length)
+    ]
+
+
+class IE_3GPP_InterfaceType(IE_Base):
+    name = "IE 3GPP Interface Type"
+    ie_type = 160
+    fields_desc = IE_Base.fields_desc + [
+        XBitField("spare_1", 0, 2),
+        BitEnumField("interface_type", "S1-U", 6, InterfaceType),
+        ExtraDataField("extra_data"),
+    ]
+
+
+class IE_EnterpriseSpecific(IE_Base):
+    name = "Enterpise Specific"
+    ie_type = None
+    fields_desc = IE_Base.fields_desc + [
+        ShortEnumField("enterprise_id", None, IANA_ENTERPRISE_NUMBERS),
+        StrLenField("data", "", length_from=lambda x: x.length - 2),
+    ]
+
+
+class IE_NotImplemented(IE_Base):
+    name = "IE not implemented"
+    ie_type = 0
+    fields_desc = IE_Base.fields_desc + [
+        StrLenField("data", "", length_from=lambda x: x.length)
+    ]
+
+
+ietypecls = {
+    1: IE_CreatePDR,
+    2: IE_PDI,
+    3: IE_CreateFAR,
+    4: IE_ForwardingParameters,
+    5: IE_DuplicatingParameters,
+    6: IE_CreateURR,
+    7: IE_CreateQER,
+    8: IE_CreatedPDR,
+    9: IE_UpdatePDR,
+    10: IE_UpdateFAR,
+    11: IE_UpdateForwardingParameters,
+    12: IE_UpdateBAR_SRR,
+    13: IE_UpdateURR,
+    14: IE_UpdateQER,
+    15: IE_RemovePDR,
+    16: IE_RemoveFAR,
+    17: IE_RemoveURR,
+    18: IE_RemoveQER,
+    19: IE_Cause,
+    20: IE_SourceInterface,
+    21: IE_FTEID,
+    22: IE_NetworkInstance,
+    23: IE_SDF_Filter,
+    24: IE_ApplicationId,
+    25: IE_GateStatus,
+    26: IE_MBR,
+    27: IE_GBR,
+    28: IE_QERCorrelationId,
+    29: IE_Precedence,
+    30: IE_TransportLevelMarking,
+    31: IE_VolumeThreshold,
+    32: IE_TimeThreshold,
+    33: IE_MonitoringTime,
+    34: IE_SubsequentVolumeThreshold,
+    35: IE_SubsequentTimeThreshold,
+    36: IE_InactivityDetectionTime,
+    37: IE_ReportingTriggers,
+    38: IE_RedirectInformation,
+    39: IE_ReportType,
+    40: IE_OffendingIE,
+    41: IE_ForwardingPolicy,
+    42: IE_DestinationInterface,
+    43: IE_UPFunctionFeatures,
+    44: IE_ApplyAction,
+    45: IE_DownlinkDataServiceInformation,
+    46: IE_DownlinkDataNotificationDelay,
+    47: IE_DLBufferingDuration,
+    48: IE_DLBufferingSuggestedPacketCount,
+    49: IE_PFCPSMReqFlags,
+    50: IE_PFCPSRRspFlags,
+    51: IE_LoadControlInformation,
+    52: IE_SequenceNumber,
+    53: IE_Metric,
+    54: IE_OverloadControlInformation,
+    55: IE_Timer,
+    56: IE_PDR_Id,
+    57: IE_FSEID,
+    58: IE_ApplicationID_PFDs,
+    59: IE_PFDContext,
+    60: IE_NodeId,
+    61: IE_PFDContents,
+    62: IE_MeasurementMethod,
+    63: IE_UsageReportTrigger,
+    64: IE_MeasurementPeriod,
+    65: IE_FqCSID,
+    66: IE_VolumeMeasurement,
+    67: IE_DurationMeasurement,
+    68: IE_ApplicationDetectionInformation,
+    69: IE_TimeOfFirstPacket,
+    70: IE_TimeOfLastPacket,
+    71: IE_QuotaHoldingTime,
+    72: IE_DroppedDLTrafficThreshold,
+    73: IE_VolumeQuota,
+    74: IE_TimeQuota,
+    75: IE_StartTime,
+    76: IE_EndTime,
+    77: IE_QueryURR,
+    78: IE_UsageReport_SMR,
+    79: IE_UsageReport_SDR,
+    80: IE_UsageReport_SRR,
+    81: IE_URR_Id,
+    82: IE_LinkedURR_Id,
+    83: IE_DownlinkDataReport,
+    84: IE_OuterHeaderCreation,
+    85: IE_Create_BAR,
+    86: IE_Update_BAR_SMR,
+    87: IE_Remove_BAR,
+    88: IE_BAR_Id,
+    89: IE_CPFunctionFeatures,
+    90: IE_UsageInformation,
+    91: IE_ApplicationInstanceId,
+    92: IE_FlowInformation,
+    93: IE_UE_IP_Address,
+    94: IE_PacketRate,
+    95: IE_OuterHeaderRemoval,
+    96: IE_RecoveryTimeStamp,
+    97: IE_DLFlowLevelMarking,
+    98: IE_HeaderEnrichment,
+    99: IE_ErrorIndicationReport,
+    100: IE_MeasurementInformation,
+    101: IE_NodeReportType,
+    102: IE_UserPlanePathFailureReport,
+    103: IE_RemoteGTP_U_Peer,
+    104: IE_UR_SEQN,
+    105: IE_UpdateDuplicatingParameters,
+    106: IE_ActivatePredefinedRules,
+    107: IE_DeactivatePredefinedRules,
+    108: IE_FAR_Id,
+    109: IE_QER_Id,
+    110: IE_OCIFlags,
+    111: IE_PFCPAssociationReleaseRequest,
+    112: IE_GracefulReleasePeriod,
+    113: IE_PDNType,
+    114: IE_FailedRuleId,
+    115: IE_TimeQuotaMechanism,
+    116: IE_UserPlaneIPResourceInformation,
+    117: IE_UserPlaneInactivityTimer,
+    118: IE_AggregatedURRs,
+    119: IE_Multiplier,
+    120: IE_AggregatedURR_Id,
+    121: IE_SubsequentVolumeQuota,
+    122: IE_SubsequentTimeQuota,
+    123: IE_RQI,
+    124: IE_QFI,
+    125: IE_QueryURRReference,
+    126: IE_AdditionalUsageReportsInformation,
+    127: IE_CreateTrafficEndpoint,
+    128: IE_CreatedTrafficEndpoint,
+    129: IE_UpdateTrafficEndpoint,
+    130: IE_RemoveTrafficEndpoint,
+    131: IE_TrafficEndpointId,
+    132: IE_EthernetPacketFilter,
+    133: IE_MACAddress,
+    134: IE_C_TAG,
+    135: IE_S_TAG,
+    136: IE_Ethertype,
+    137: IE_Proxying,
+    138: IE_EthernetFilterId,
+    139: IE_EthernetFilterProperties,
+    140: IE_SuggestedBufferingPacketsCount,
+    141: IE_UserId,
+    142: IE_EthernetPDUSessionInformation,
+    143: IE_EthernetTrafficInformation,
+    144: IE_MACAddressesDetected,
+    145: IE_MACAddressesRemoved,
+    146: IE_EthernetInactivityTimer,
+    147: IE_AdditionalMonitoringTime,
+    148: IE_EventQuota,
+    149: IE_EventThreshold,
+    150: IE_SubsequentEventQuota,
+    151: IE_SubsequentEventThreshold,
+    152: IE_TraceInformation,
+    153: IE_FramedRoute,
+    154: IE_FramedRouting,
+    155: IE_FramedIPv6Route,
+    156: IE_EventTimeStamp,
+    157: IE_AveragingWindow,
+    158: IE_PagingPolicyIndicator,
+    159: IE_APN_DNN,
+    160: IE_3GPP_InterfaceType,
+}
+
+
+#
+# PFCP Messages
+# 3GPP TS 29.244 V15.6.0 (2019-07)
+#
+
+# class PFCPMessage(Packet):
+#     fields_desc = [PacketListField("IE_list", None, IE_Dispatcher)]
+
+
+class PFCPHeartbeatRequest(Packet):
+    name = "PFCP Heartbeat Request"
+    fields_desc = [
+        PacketListField("IE_list", [IE_RecoveryTimeStamp()], IE_Dispatcher)
+    ]
+
+
+class PFCPHeartbeatResponse(Packet):
+    name = "PFCP Heartbeat Response"
+    fields_desc = [
+        PacketListField("IE_list", [IE_RecoveryTimeStamp()], IE_Dispatcher)
+    ]
+
+    def answers(self, other):
+        return isinstance(other, PFCPHeartbeatRequest)
+
+
+class PFCPPFDManagementRequest(Packet):
+    name = "PFCP PFD Management Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPPFDManagementResponse(Packet):
+    name = "PFCP PFD Management Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPPFDManagementRequest)
+
+
+class PFCPAssociationSetupRequest(Packet):
+    name = "PFCP Association Setup Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPAssociationSetupResponse(Packet):
+    name = "PFCP Association Setup Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPAssociationSetupRequest)
+
+
+class PFCPAssociationUpdateRequest(Packet):
+    name = "PFCP Association Update Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPAssociationUpdateResponse(Packet):
+    name = "PFCP Association Update Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPAssociationUpdateRequest)
+
+
+class PFCPAssociationReleaseRequest(Packet):
+    name = "PFCP Association Release Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPAssociationReleaseResponse(Packet):
+    name = "PFCP Association Release Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPAssociationReleaseRequest)
+
+
+class PFCPVersionNotSupportedResponse(Packet):
+    name = "PFCP Version Not Supported Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+    # TODO: answers()
+
+
+class PFCPNodeReportRequest(Packet):
+    name = "PFCP Node Report Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPNodeReportResponse(Packet):
+    name = "PFCP Node Report Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPNodeReportRequest)
+
+
+class PFCPSessionSetDeletionRequest(Packet):
+    name = "PFCP Session Set Deletion Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPSessionSetDeletionResponse(Packet):
+    name = "PFCP Session Set Deletion Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPSessionSetDeletionRequest)
+
+
+class PFCPSessionEstablishmentRequest(Packet):
+    name = "PFCP Session Establishment Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPSessionEstablishmentResponse(Packet):
+    name = "PFCP Session Establishment Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPSessionEstablishmentRequest)
+
+
+class PFCPSessionModificationRequest(Packet):
+    name = "PFCP Session Modification Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPSessionModificationResponse(Packet):
+    name = "PFCP Session Modification Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPSessionModificationRequest)
+
+
+class PFCPSessionDeletionRequest(Packet):
+    name = "PFCP Session Deletion Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPSessionDeletionResponse(Packet):
+    name = "PFCP Session Deletion Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPSessionDeletionRequest)
+
+
+class PFCPSessionReportRequest(Packet):
+    name = "PFCP Session Report Request"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+
+class PFCPSessionReportResponse(Packet):
+    name = "PFCP Session Report Response"
+    fields_desc = [PacketListField("IE_list", [], IE_Dispatcher)]
+
+    def answers(self, other):
+        return isinstance(other, PFCPSessionReportRequest)
+
+
+bind_bottom_up(UDP, PFCP, dport=8805)
+bind_bottom_up(UDP, PFCP, sport=8805)
+bind_layers(UDP, PFCP, dport=8805, sport=8805)
+bind_layers(PFCP, PFCPHeartbeatRequest, message_type=1)
+bind_layers(PFCP, PFCPHeartbeatResponse, message_type=2)
+bind_layers(PFCP, PFCPPFDManagementRequest, message_type=3)
+bind_layers(PFCP, PFCPPFDManagementResponse, message_type=4)
+bind_layers(PFCP, PFCPAssociationSetupRequest, message_type=5)
+bind_layers(PFCP, PFCPAssociationSetupResponse, message_type=6)
+bind_layers(PFCP, PFCPAssociationUpdateRequest, message_type=7)
+bind_layers(PFCP, PFCPAssociationUpdateResponse, message_type=8)
+bind_layers(PFCP, PFCPAssociationReleaseRequest, message_type=9)
+bind_layers(PFCP, PFCPAssociationReleaseResponse, message_type=10)
+bind_layers(PFCP, PFCPVersionNotSupportedResponse, message_type=11)
+bind_layers(PFCP, PFCPNodeReportRequest, message_type=12)
+bind_layers(PFCP, PFCPNodeReportResponse, message_type=13)
+bind_layers(PFCP, PFCPSessionSetDeletionRequest, message_type=14)
+bind_layers(PFCP, PFCPSessionSetDeletionResponse, message_type=15)
+bind_layers(PFCP, PFCPSessionEstablishmentRequest, message_type=50)
+bind_layers(PFCP, PFCPSessionEstablishmentResponse, message_type=51)
+bind_layers(PFCP, PFCPSessionModificationRequest, message_type=52)
+bind_layers(PFCP, PFCPSessionModificationResponse, message_type=53)
+bind_layers(PFCP, PFCPSessionDeletionRequest, message_type=54)
+bind_layers(PFCP, PFCPSessionDeletionResponse, message_type=55)
+bind_layers(PFCP, PFCPSessionReportRequest, message_type=56)
+bind_layers(PFCP, PFCPSessionReportResponse, message_type=57)
+
+# FIXME: the following fails with pfcplib-generated pcaps:
+# bind_layers(PFCP, PFCPSessionEstablishmentRequest, message_type=50, S=1)
+# bind_layers(PFCP, PFCPSessionEstablishmentResponse, message_type=51, S=1)
+# bind_layers(PFCP, PFCPSessionModificationRequest, message_type=52, S=1)
+# bind_layers(PFCP, PFCPSessionModificationResponse, message_type=53, S=1)
+# bind_layers(PFCP, PFCPSessionDeletionRequest, message_type=54, S=1)
+# bind_layers(PFCP, PFCPSessionDeletionResponse, message_type=55, S=1)
+# bind_layers(PFCP, PFCPSessionReportRequest, message_type=56, S=1)
+# bind_layers(PFCP, PFCPSessionReportResponse, message_type=57, S=1)
+
+# TODO: limit possible child IEs based on IE type
+
+IE_UE_IP_Address(SD=0, V4=0, V6=0, spare=0)

scapy-2.4.3.tar.gz/scapy/contrib/pnio_dcp.py -> scapy-2.4.4.tar.gz/scapy/contrib/pnio_dcp.py Changed

@@ -477,19 +477,23 @@
     Profinet DCP Packet
 
     Requests are handled via ConditionalField because here only 1 Block is used
-        qevery time
-    Ŕesoinse can contain 1..n Blocks, for that you have to use one ProfinetDCP
-        Layer with one or multiple DCP*Block Layers
+    every time.
+
+    Response can contain 1..n Blocks, for that you have to use one ProfinetDCP
+    Layer with one or multiple DCP*Block Layers::
+
         ProfinetDCP / DCPNameOfStationBlock / DCPDeviceIDBlock ...
 
-    Example for a DCP Identify All Request:
+    Example for a DCP Identify All Request::
+
         Ether(dst="01:0e:cf:00:00:00") /
         ProfinetIO(frameID=DCP_IDENTIFY_REQUEST_FRAME_ID) /
         ProfinetDCP(service_id=DCP_SERVICE_ID_IDENTIFY,
             service_type=DCP_REQUEST, option=255, sub_option=255,
             dcp_data_length=4)
 
-    Example for a DCP Identify Response:
+    Example for a DCP Identify Response::
+
         Ether(dst=dst_mac) /
         ProfinetIO(frameID=DCP_IDENTIFY_RESPONSE_FRAME_ID) /
         ProfinetDCP(
@@ -497,7 +501,8 @@
             service_type=DCP_RESPONSE) /
         DCPNameOfStationBlock(name_of_station="device1")
 
-    Example for a DCP Set Request:
+    Example for a DCP Set Request::
+
         Ether(dst=mac) /
         ProfinetIO(frameID=DCP_GET_SET_FRAME_ID) /
         ProfinetDCP(service_id=DCP_SERVICE_ID_SET, service_type=DCP_REQUEST,

scapy-2.4.4.tar.gz/scapy/contrib/portmap.py Added

@@ -0,0 +1,86 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Lucas Preston <lucas.preston@infinite.io>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = Portmapper v2
+# scapy.contrib.status = loads
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import IntField, PacketListField
+from scapy.contrib.oncrpc import RPC, RPC_Call
+
+
+class GETPORT_Call(Packet):
+    name = 'GETPORT Call'
+    fields_desc = [
+        IntField('prog', 0),
+        IntField('vers', 0),
+        IntField('prot', 0),
+        IntField('port', 0)
+    ]
+
+
+class GETPORT_Reply(Packet):
+    name = 'GETPORT Reply'
+    fields_desc = [
+        IntField('port', 0)
+    ]
+
+
+bind_layers(RPC, GETPORT_Call, mtype=0)
+bind_layers(RPC, GETPORT_Reply, mtype=1)
+bind_layers(
+    RPC_Call, GETPORT_Call, program=100000, pversion=2, procedure=3
+)
+
+
+class NULL_Call(Packet):
+    name = 'PORTMAP NULL Call'
+    fields_desc = []
+
+
+class NULL_Reply(Packet):
+    name = 'PORTMAP NULL Reply'
+    fields_desc = []
+
+
+bind_layers(RPC, NULL_Call, mtype=0)
+bind_layers(RPC, NULL_Reply, mtype=1)
+bind_layers(RPC_Call, NULL_Call, program=100000, pversion=2, procedure=0)
+
+
+class Map_Entry(Packet):
+    name = 'PORTMAP Map Entry'
+    fields_desc = [
+        IntField('prog', 0),
+        IntField('vers', 0),
+        IntField('prot', 0),
+        IntField('port', 0),
+        IntField('value_follows', 0)
+    ]
+
+    def extract_padding(self, s):
+        return '', s
+
+
+class DUMP_Call(Packet):
+    name = 'PORTMAP DUMP Call'
+    fields_desc = []
+
+
+class DUMP_Reply(Packet):
+    name = 'PORTMAP DUMP Reply'
+    fields_desc = [
+        IntField('value_follows', 0),
+        PacketListField('mappings', [], cls=Map_Entry,
+                        next_cls_cb=lambda pkt, lst, cur, remain:
+                        Map_Entry if pkt.value_follows == 1 and
+                        (len(lst) == 0 or cur.value_follows == 1) and
+                        len(remain) > 4 else None)
+    ]
+
+
+bind_layers(RPC, DUMP_Call, mtype=0)
+bind_layers(RPC, DUMP_Reply, mtype=1)
+bind_layers(RPC_Call, DUMP_Call, program=100000, pversion=2, procedure=4)

scapy-2.4.3.tar.gz/scapy/contrib/ripng.py -> scapy-2.4.4.tar.gz/scapy/contrib/ripng.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/roce.py Added

@@ -0,0 +1,204 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Haggai Eran <haggai.eran@gmail.com>
+# This program is published under a GPLv2 license
+
+# scapy.contrib.description = RoCE v2
+# scapy.contrib.status = loads
+
+"""
+RoCE: RDMA over Converged Ethernet
+"""
+
+from scapy.packet import Packet, bind_layers, Raw
+from scapy.fields import ByteEnumField, XShortField, \
+    XLongField, BitField, FCSField
+from scapy.layers.inet import IP, UDP
+from scapy.compat import raw
+from scapy.error import warning
+from zlib import crc32
+import struct
+
+_transports = {
+    'RC': 0x00,
+    'UC': 0x20,
+    'RD': 0x40,
+    'UD': 0x60,
+}
+
+_ops = {
+    'SEND_FIRST': 0x00,
+    'SEND_MIDDLE': 0x01,
+    'SEND_LAST': 0x02,
+    'SEND_LAST_WITH_IMMEDIATE': 0x03,
+    'SEND_ONLY': 0x04,
+    'SEND_ONLY_WITH_IMMEDIATE': 0x05,
+    'RDMA_WRITE_FIRST': 0x06,
+    'RDMA_WRITE_MIDDLE': 0x07,
+    'RDMA_WRITE_LAST': 0x08,
+    'RDMA_WRITE_LAST_WITH_IMMEDIATE': 0x09,
+    'RDMA_WRITE_ONLY': 0x0a,
+    'RDMA_WRITE_ONLY_WITH_IMMEDIATE': 0x0b,
+    'RDMA_READ_REQUEST': 0x0c,
+    'RDMA_READ_RESPONSE_FIRST': 0x0d,
+    'RDMA_READ_RESPONSE_MIDDLE': 0x0e,
+    'RDMA_READ_RESPONSE_LAST': 0x0f,
+    'RDMA_READ_RESPONSE_ONLY': 0x10,
+    'ACKNOWLEDGE': 0x11,
+    'ATOMIC_ACKNOWLEDGE': 0x12,
+    'COMPARE_SWAP': 0x13,
+    'FETCH_ADD': 0x14,
+}
+
+
+CNP_OPCODE = 0x81
+
+
+def opcode(transport, op):
+    return (_transports[transport] + _ops[op], '{}_{}'.format(transport, op))
+
+
+_bth_opcodes = dict([
+    opcode('RC', 'SEND_FIRST'),
+    opcode('RC', 'SEND_MIDDLE'),
+    opcode('RC', 'SEND_LAST'),
+    opcode('RC', 'SEND_LAST_WITH_IMMEDIATE'),
+    opcode('RC', 'SEND_ONLY'),
+    opcode('RC', 'SEND_ONLY_WITH_IMMEDIATE'),
+    opcode('RC', 'RDMA_WRITE_FIRST'),
+    opcode('RC', 'RDMA_WRITE_MIDDLE'),
+    opcode('RC', 'RDMA_WRITE_LAST'),
+    opcode('RC', 'RDMA_WRITE_LAST_WITH_IMMEDIATE'),
+    opcode('RC', 'RDMA_WRITE_ONLY'),
+    opcode('RC', 'RDMA_WRITE_ONLY_WITH_IMMEDIATE'),
+    opcode('RC', 'RDMA_READ_REQUEST'),
+    opcode('RC', 'RDMA_READ_RESPONSE_FIRST'),
+    opcode('RC', 'RDMA_READ_RESPONSE_MIDDLE'),
+    opcode('RC', 'RDMA_READ_RESPONSE_LAST'),
+    opcode('RC', 'RDMA_READ_RESPONSE_ONLY'),
+    opcode('RC', 'ACKNOWLEDGE'),
+    opcode('RC', 'ATOMIC_ACKNOWLEDGE'),
+    opcode('RC', 'COMPARE_SWAP'),
+    opcode('RC', 'FETCH_ADD'),
+
+    opcode('UC', 'SEND_FIRST'),
+    opcode('UC', 'SEND_MIDDLE'),
+    opcode('UC', 'SEND_LAST'),
+    opcode('UC', 'SEND_LAST_WITH_IMMEDIATE'),
+    opcode('UC', 'SEND_ONLY'),
+    opcode('UC', 'SEND_ONLY_WITH_IMMEDIATE'),
+    opcode('UC', 'RDMA_WRITE_FIRST'),
+    opcode('UC', 'RDMA_WRITE_MIDDLE'),
+    opcode('UC', 'RDMA_WRITE_LAST'),
+    opcode('UC', 'RDMA_WRITE_LAST_WITH_IMMEDIATE'),
+    opcode('UC', 'RDMA_WRITE_ONLY'),
+    opcode('UC', 'RDMA_WRITE_ONLY_WITH_IMMEDIATE'),
+
+    opcode('RD', 'SEND_FIRST'),
+    opcode('RD', 'SEND_MIDDLE'),
+    opcode('RD', 'SEND_LAST'),
+    opcode('RD', 'SEND_LAST_WITH_IMMEDIATE'),
+    opcode('RD', 'SEND_ONLY'),
+    opcode('RD', 'SEND_ONLY_WITH_IMMEDIATE'),
+    opcode('RD', 'RDMA_WRITE_FIRST'),
+    opcode('RD', 'RDMA_WRITE_MIDDLE'),
+    opcode('RD', 'RDMA_WRITE_LAST'),
+    opcode('RD', 'RDMA_WRITE_LAST_WITH_IMMEDIATE'),
+    opcode('RD', 'RDMA_WRITE_ONLY'),
+    opcode('RD', 'RDMA_WRITE_ONLY_WITH_IMMEDIATE'),
+    opcode('RD', 'RDMA_READ_REQUEST'),
+    opcode('RD', 'RDMA_READ_RESPONSE_FIRST'),
+    opcode('RD', 'RDMA_READ_RESPONSE_MIDDLE'),
+    opcode('RD', 'RDMA_READ_RESPONSE_LAST'),
+    opcode('RD', 'RDMA_READ_RESPONSE_ONLY'),
+    opcode('RD', 'ACKNOWLEDGE'),
+    opcode('RD', 'ATOMIC_ACKNOWLEDGE'),
+    opcode('RD', 'COMPARE_SWAP'),
+    opcode('RD', 'FETCH_ADD'),
+
+    opcode('UD', 'SEND_ONLY'),
+    opcode('UD', 'SEND_ONLY_WITH_IMMEDIATE'),
+
+    (CNP_OPCODE, 'CNP'),
+])
+
+
+class BTH(Packet):
+    name = "BTH"
+    fields_desc = [
+        ByteEnumField("opcode", 0, _bth_opcodes),
+        BitField("solicited", 0, 1),
+        BitField("migreq", 0, 1),
+        BitField("padcount", 0, 2),
+        BitField("version", 0, 4),
+        XShortField("pkey", 0xffff),
+        BitField("fecn", 0, 1),
+        BitField("becn", 0, 1),
+        BitField("resv6", 0, 6),
+        BitField("dqpn", 0, 24),
+        BitField("ackreq", 0, 1),
+        BitField("resv7", 0, 7),
+        BitField("psn", 0, 24),
+
+        FCSField("icrc", None, fmt="!I")]
+
+    @staticmethod
+    def pack_icrc(icrc):
+        return struct.pack("!I", icrc & 0xffffffff)[::-1]
+
+    def compute_icrc(self, p):
+        udp = self.underlayer
+        if udp is None or not isinstance(udp, UDP):
+            warning("Expecting UDP underlayer to compute checksum. Got %s.",
+                    udp and udp.name)
+            return self.pack_icrc(0)
+        ip = udp.underlayer
+        if isinstance(ip, IP):
+            # pseudo-LRH / IP / UDP / BTH / payload
+            pshdr = Raw(b'\xff' * 8) / ip.copy()
+            pshdr.chksum = 0xffff
+            pshdr.ttl = 0xff
+            pshdr.tos = 0xff
+            pshdr[UDP].chksum = 0xffff
+            pshdr[BTH].fecn = 1
+            pshdr[BTH].becn = 1
+            pshdr[BTH].resv6 = 0xff
+            bth = pshdr[BTH].self_build()
+            payload = raw(pshdr[BTH].payload)
+            # add ICRC placeholder just to get the right IP.totlen and
+            # UDP.length
+            icrc_placeholder = b'\xff\xff\xff\xff'
+            pshdr[UDP].payload = Raw(bth + payload + icrc_placeholder)
+            icrc = crc32(raw(pshdr)[:-4]) & 0xffffffff
+            return self.pack_icrc(icrc)
+        else:
+            # TODO support IPv6
+            warning("The underlayer protocol %s is not supported.",
+                    ip and ip.name)
+            return self.pack_icrc(0)
+
+    # RoCE packets end with ICRC - a 32-bit CRC of the packet payload and
+    # pseudo-header. Add the ICRC header if it is missing and calculate its
+    # value.
+    def post_build(self, p, pay):
+        p += pay
+        if self.icrc is None:
+            p = p[:-4] + self.compute_icrc(p)
+        return p
+
+
+class CNPPadding(Packet):
+    name = "CNPPadding"
+    fields_desc = [
+        XLongField("reserved1", 0),
+        XLongField("reserved2", 0),
+    ]
+
+
+def cnp(dqpn):
+    return BTH(opcode=CNP_OPCODE, becn=1, dqpn=dqpn) / CNPPadding()
+
+
+bind_layers(BTH, CNPPadding, opcode=CNP_OPCODE)
+
+bind_layers(UDP, BTH, dport=4791)

scapy-2.4.4.tar.gz/scapy/contrib/rpl.py Added

@@ -0,0 +1,323 @@
+# This file is part of Scapy.
+# See http://www.secdev.org/projects/scapy for more information.
+#
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2020 Rahul Jadhav <nyrahul@gmail.com>
+
+# RFC 6550
+# scapy.contrib.description = Routing Protocol for LLNs (RPL)
+# scapy.contrib.status = loads
+
+"""
+RPL
+===
+
+RFC 6550 - Routing Protocol for Low-Power and Lossy Networks (RPL)
+draft-ietf-roll-efficient-npdao-17 - Efficient Route Invalidation
+
++----------------------------------------------------------------------+
+| RPL Options : Pad1 PadN TIO RIO PIO Tgt TgtDesc DODAGConfig DAGMC ...|
++----------------------------------------------------------------------+
+| RPL Msgs : DIS DIO DAO DAOACK DCO DCOACK                             |
++----------------------------------------------------------------------+
+| ICMPv6 : type 155 RPL                                                |
++----------------------------------------------------------------------+
+
+"""
+
+
+from scapy.packet import Packet, bind_layers
+from scapy.fields import ByteEnumField, ByteField, IP6Field, ShortField, \
+    BitField, BitEnumField, FieldLenField, StrLenField, IntField, \
+    ConditionalField
+from scapy.layers.inet6 import ICMPv6RPL, icmp6ndraprefs, _IP6PrefixField
+
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#mop
+RPLMOP = {0: "No Downward routes",
+          1: "Non-Storing",
+          2: "Storing with no multicast support",
+          3: "Storing with multicast support",
+          4: "P2P Route Discovery"}
+
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#control-message-options
+RPLOPTSSTR = {0: "Pad1",
+              1: "PadN",
+              2: "DAG Metric Container",
+              3: "Routing Information",
+              4: "DODAG Configuration",
+              5: "RPL Target",
+              6: "Transit Information",
+              7: "Solicited Information",
+              8: "Prefix Information Option",
+              9: "Target Descriptor",
+              10: "P2P Route Discovery"}
+
+
+class _RPLGuessOption(Packet):
+    name = "Dummy RPL Option class"
+
+
+class RPLOptRIO(_RPLGuessOption):
+    """
+    Control Option: Routing Information Option (RIO)
+    """
+    name = "Routing Information"
+    fields_desc = [ByteEnumField("otype", 3, RPLOPTSSTR),
+                   FieldLenField("len", None, length_of="prefix", fmt="B",
+                                 adjust=lambda pkt, x: x + 6),
+                   ByteField("plen", None),
+                   BitField("res1", 0, 3),
+                   BitEnumField("prf", 0, 2, icmp6ndraprefs),
+                   BitField("res2", 0, 3),
+                   IntField("rtlifetime", 0xffffffff),
+                   _IP6PrefixField("prefix", None)]
+
+
+class RPLOptDODAGConfig(_RPLGuessOption):
+    """
+    Control Option: DODAG Configuration
+    """
+    name = "DODAG Configuration"
+    fields_desc = [ByteEnumField("otype", 4, RPLOPTSSTR),
+                   ByteField("len", 14),
+                   BitField("flags", 0, 4),
+                   BitField("A", 0, 1),
+                   BitField("PCS", 0, 3),
+                   ByteField("DIOIntDoubl", 20),
+                   ByteField("DIOIntMin", 3),
+                   ByteField("DIORedun", 10),
+                   ShortField("MaxRankIncrease", 0),
+                   ShortField("MinRankIncrease", 256),
+                   ShortField("OCP", 1),
+                   ByteField("reserved", 0),
+                   ByteField("DefLifetime", 0xff),
+                   ShortField("LifetimeUnit", 0xffff)]
+
+
+class RPLOptTgt(_RPLGuessOption):
+    """
+    Control Option: RPL Target
+    """
+    name = "RPL Target"
+    fields_desc = [ByteEnumField("otype", 5, RPLOPTSSTR),
+                   FieldLenField("len", None, length_of="prefix", fmt="B",
+                                 adjust=lambda pkt, x: x + 2),
+                   ByteField("flags", 0),
+                   ByteField("plen", 0),
+                   _IP6PrefixField("prefix", None)]
+
+
+class RPLOptTIO(_RPLGuessOption):
+    """
+    Control Option: Transit Information Option (TIO)
+    """
+    name = "Transit Information"
+    fields_desc = [ByteEnumField("otype", 6, RPLOPTSSTR),
+                   FieldLenField("len", None, length_of="parentaddr", fmt="B",
+                                 adjust=lambda pkt, x: x + 4),
+                   BitField("E", 0, 1),
+                   BitField("flags", 0, 7),
+                   ByteField("pathcontrol", 0),
+                   ByteField("pathseq", 0),
+                   ByteField("pathlifetime", 0xff),
+                   _IP6PrefixField("parentaddr", None)]
+
+
+class RPLOptSolInfo(_RPLGuessOption):
+    """
+    Control Option: Solicited Information
+    """
+    name = "Solicited Information"
+    fields_desc = [ByteEnumField("otype", 7, RPLOPTSSTR),
+                   ByteField("len", 19),
+                   ByteField("RPLInstanceID", 0),
+                   BitField("V", 0, 1),
+                   BitField("I", 0, 1),
+                   BitField("D", 0, 1),
+                   BitField("flags", 0, 5),
+                   IP6Field("dodagid", "::1"),
+                   ByteField("ver", 0)]
+
+
+class RPLOptPIO(_RPLGuessOption):
+    """
+    Control Option: Prefix Information Option (PIO)
+    """
+    name = "Prefix Information"
+    fields_desc = [ByteEnumField("otype", 8, RPLOPTSSTR),
+                   ByteField("len", 30),
+                   ByteField("plen", 64),
+                   BitField("L", 0, 1),
+                   BitField("A", 0, 1),
+                   BitField("R", 0, 1),
+                   BitField("reserved1", 0, 5),
+                   IntField("validlifetime", 0xffffffff),
+                   IntField("preflifetime", 0xffffffff),
+                   IntField("reserved2", 0),
+                   IP6Field("prefix", "::1")]
+
+
+class RPLOptTgtDesc(_RPLGuessOption):
+    """
+    Control Option: RPL Target Descriptor
+    """
+    name = "RPL Target Descriptor"
+    fields_desc = [ByteEnumField("otype", 9, RPLOPTSSTR),
+                   ByteField("len", 4),
+                   IntField("descriptor", 0)]
+
+
+class RPLOptPad1(_RPLGuessOption):
+    """
+    Control Option: Pad 1 byte
+    """
+    name = "Pad1"
+    fields_desc = [ByteEnumField("otype", 0x00, RPLOPTSSTR)]
+
+
+class RPLOptPadN(_RPLGuessOption):
+    """
+    Control Option: Pad N bytes
+    """
+    name = "PadN"
+    fields_desc = [ByteEnumField("otype", 0x01, RPLOPTSSTR),
+                   FieldLenField("optlen", None, length_of="optdata", fmt="B"),
+                   StrLenField("optdata", "",
+                               length_from=lambda pkt: pkt.optlen)]
+
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#control-message-options
+RPLOPTS = {0: RPLOptPad1,
+           1: RPLOptPadN,
+           # 2: RPLOptDAGMC, defined in rpl_metrics.py
+           3: RPLOptRIO,
+           4: RPLOptDODAGConfig,
+           5: RPLOptTgt,
+           6: RPLOptTIO,
+           7: RPLOptSolInfo,
+           8: RPLOptPIO,
+           9: RPLOptTgtDesc}
+
+
+# RPL Control Message Handling
+
+
+class _RPLGuessMsgType(Packet):
+    name = "Dummy RPL Message class"
+
+    def guess_payload_class(self, payload):
+        if isinstance(payload, str):
+            otype = ord(payload[0])
+        else:
+            otype = payload[0]
+        return RPLOPTS.get(otype)
+
+
+class RPLDIS(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: DODAG Information Solicitation (DIS)
+    """
+    name = "DODAG Information Solicitation"
+    fields_desc = [ByteField("flags", 0),
+                   ByteField("reserved", 0)]
+
+
+class RPLDIO(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: DODAG Information Object (DIO)
+    """
+    name = "DODAG Information Object"
+    fields_desc = [ByteField("RPLInstanceID", 50),
+                   ByteField("ver", 0),
+                   ShortField("rank", 1),
+                   BitField("G", 1, 1),
+                   BitField("unused1", 0, 1),
+                   BitEnumField("mop", 1, 3, RPLMOP),
+                   BitField("prf", 0, 3),
+                   ByteField("dtsn", 240),
+                   ByteField("flags", 0),
+                   ByteField("reserved", 0),
+                   IP6Field("dodagid", "::1")]
+
+
+class RPLDAO(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: Destination Advertisement Object (DAO)
+    """
+    name = "Destination Advertisement Object"
+    fields_desc = [ByteField("RPLInstanceID", 50),
+                   BitField("K", 0, 1),
+                   BitField("D", 0, 1),
+                   BitField("flags", 0, 6),
+                   ByteField("reserved", 0),
+                   ByteField("daoseq", 1),
+                   ConditionalField(IP6Field("dodagid", None),
+                                    lambda pkt: pkt.D == 1)]
+
+
+class RPLDAOACK(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: Destination Advertisement Object Acknowledgement (DAOACK)
+    """
+    name = "Destination Advertisement Object Acknowledgement"
+    fields_desc = [ByteField("RPLInstanceID", 50),
+                   BitField("D", 0, 1),
+                   BitField("reserved", 0, 7),
+                   ByteField("daoseq", 1),
+                   ByteField("status", 0),
+                   ConditionalField(IP6Field("dodagid", None),
+                                    lambda pkt: pkt.D == 1)]
+
+
+# https://datatracker.ietf.org/doc/draft-ietf-roll-efficient-npdao/
+class RPLDCO(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: Destination Cleanup Object (DCO)
+    """
+    name = "Destination Cleanup Object"
+    fields_desc = [ByteField("RPLInstanceID", 50),
+                   BitField("K", 0, 1),
+                   BitField("D", 0, 1),
+                   BitField("flags", 0, 6),
+                   ByteField("status", 0),
+                   ByteField("dcoseq", 1),
+                   ConditionalField(IP6Field("dodagid", None),
+                                    lambda pkt: pkt.D == 1)]
+
+
+# https://datatracker.ietf.org/doc/draft-ietf-roll-efficient-npdao/
+class RPLDCOACK(_RPLGuessMsgType, _RPLGuessOption):
+    """
+    Control Message: Destination Cleanup Object Acknowledgement (DCOACK)
+    """
+    name = "Destination Cleanup Object Acknowledgement"
+    fields_desc = [ByteField("RPLInstanceID", 50),
+                   BitField("D", 0, 1),
+                   BitField("flags", 0, 7),
+                   ByteField("dcoseq", 1),
+                   ByteField("status", 0),
+                   ConditionalField(IP6Field("dodagid", None),
+                                    lambda pkt: pkt.D == 1)]
+
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#control-codes
+bind_layers(ICMPv6RPL, RPLDIS, code=0)
+bind_layers(ICMPv6RPL, RPLDIO, code=1)
+bind_layers(ICMPv6RPL, RPLDAO, code=2)
+bind_layers(ICMPv6RPL, RPLDAOACK, code=3)
+bind_layers(ICMPv6RPL, RPLDCO, code=7)
+bind_layers(ICMPv6RPL, RPLDCOACK, code=8)

scapy-2.4.4.tar.gz/scapy/contrib/rpl_metrics.py Added

@@ -0,0 +1,291 @@
+# This file is part of Scapy.
+# See http://www.secdev.org/projects/scapy for more information.
+#
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2020 Rahul Jadhav <nyrahul@gmail.com>
+
+# RFC 6551
+# scapy.contrib.description = Routing Metrics used for Path Calc in LLNs
+# scapy.contrib.status = loads
+
+"""
+RFC 6551 - Routing Metrics Used for Path Calculation in LLNs
+
++----------------------------+
+| Metrics & Constraint Types |
++----------------------------+
+| DAGMC Option               |
++----------------------------+
+| RPL-DIO                    |
++----------------------------+
+"""
+
+import struct
+from scapy.compat import orb
+from scapy.packet import Packet
+from scapy.fields import ByteEnumField, ByteField, ShortField, BitField, \
+    BitEnumField, FieldLenField, StrLenField, IntField
+from scapy.layers.inet6 import _PhantomAutoPadField, _OptionsField
+from scapy.contrib.rpl import RPLOPTSSTR, RPLOPTS
+
+
+class _DAGMetricContainer(Packet):
+    name = 'Dummy DAG Metric container'
+
+    def post_build(self, pkt, pay):
+        pkt += pay
+        tmp_len = self.len
+        if self.len is None:
+            tmp_len = len(pkt) - 2
+        pkt = pkt[:1] + struct.pack("B", tmp_len) + pkt[2:]
+        return pkt
+
+
+DAGMC_OBJTYPE = {1: "Node State and Attributes",
+                 2: "Node Energy",
+                 3: "Hop Count",
+                 4: "Link Throughput",
+                 5: "Link Latency",
+                 6: "Link Quality Level",
+                 7: "Link ETX",
+                 8: "Link Color"}
+
+
+class DAGMCObjUnknown(Packet):
+    """
+    Dummy unknown metric/constraint
+    """
+    name = 'Unknown DAGMC Object Option'
+    fields_desc = [ByteEnumField("otype", 3, DAGMC_OBJTYPE),
+                   FieldLenField("olen", None, length_of="odata", fmt="B"),
+                   StrLenField("odata", "",
+                               length_from=lambda pkt: pkt.olen)]
+
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *_, **kargs):
+        """
+        Dispatch hook for DAGMC sub-fields
+        """
+        if _pkt:
+            opt_type = orb(_pkt[0])  # Option type
+            if opt_type in DAGMC_CLS:
+                return DAGMC_CLS[opt_type]
+        return cls
+
+
+AGG_RTMETRIC = {0: "additive",
+                1: "maximum",
+                2: "minimum",
+                3: "multiplicative"}  # RFC 6551
+
+
+class DAGMCObj(Packet):
+    """
+    Set the length field in DAG Metric Constraint Control Option
+    """
+    name = 'Dummy DAG MC Object'
+
+    def post_build(self, pkt, pay):
+        pkt += pay
+        tmp_len = self.len
+        if self.len is None:
+            tmp_len = len(pkt) - 4
+        pkt = pkt[:3] + struct.pack("B", tmp_len) + pkt[4:]
+        return pkt
+
+
+class RPLDAGMCNSA(DAGMCObj):
+    """
+    DAG Metric: Node State and Attributes
+    """
+    name = "Node State and Attributes"
+    fields_desc = [ByteEnumField("otype", 1, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # NSA Object Body Format
+                   ByteField("res", 0),
+                   BitField("flags", 0, 6),
+                   BitField("A", 0, 1),
+                   BitField("O", 0, 1)]
+
+
+class RPLDAGMCNodeEnergy(DAGMCObj):
+    """
+    DAG Metric: Node Energy
+    """
+    name = "Node Energy"
+    fields_desc = [ByteEnumField("otype", 2, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # NE Sub-Object Format
+                   BitField("flags", 0, 4),
+                   BitField("I", 0, 1),
+                   BitField("T", 0, 2),
+                   BitField("E", 0, 1),
+                   ByteField("E_E", 0)]
+
+
+class RPLDAGMCHopCount(DAGMCObj):
+    """
+    DAG Metric: Hop Count
+    """
+    name = "Hop Count"
+    fields_desc = [ByteEnumField("otype", 3, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # Sub-Object Format
+                   BitField("res", 0, 4),
+                   BitField("flags", 0, 4),
+                   ByteField("HopCount", 1)]
+
+
+class RPLDAGMCLinkThroughput(DAGMCObj):
+    """
+    DAG Metric: Link Throughput
+    """
+    name = "Link Throughput"
+    fields_desc = [ByteEnumField("otype", 4, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # Sub-Object Format
+                   IntField("Throughput", 1)]
+
+
+class RPLDAGMCLinkLatency(DAGMCObj):
+    """
+    DAG Metric: Link Latency
+    """
+    name = "Link Latency"
+    fields_desc = [ByteEnumField("otype", 5, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # NE Sub-Object Format
+                   IntField("Latency", 1)]
+
+
+class RPLDAGMCLinkQualityLevel(DAGMCObj):
+    """
+    DAG Metric: Link Quality Level (LQL)
+    """
+    name = "Link Quality Level"
+    fields_desc = [ByteEnumField("otype", 6, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # Sub-Object Format
+                   ByteField("res", 0),
+                   BitField("val", 0, 3),
+                   BitField("counter", 0, 5)]
+
+
+class RPLDAGMCLinkETX(DAGMCObj):
+    """
+    DAG Metric: Link ETX
+    """
+    name = "Link ETX"
+    fields_desc = [ByteEnumField("otype", 7, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # Sub-Object Format
+                   ShortField("ETX", 1)]
+
+
+# Note: Wireshark shows warning decoding LinkColor.
+# This seems to be wireshark issue!
+class RPLDAGMCLinkColor(DAGMCObj):
+    """
+    DAG Metric: Link Color
+    """
+    name = "Link Color"
+    fields_desc = [ByteEnumField("otype", 8, DAGMC_OBJTYPE),
+                   BitField("resflags", 0, 5),
+                   BitField("P", 0, 1),
+                   BitField("C", 0, 1),
+                   BitField("O", 0, 1),
+                   BitField("R", 0, 1),
+                   BitEnumField("A", 0, 3, AGG_RTMETRIC),
+                   BitField("prec", 0, 4),
+                   ByteField("len", None),
+                   # Sub-Object Format
+                   ByteField("res", 0),
+                   BitField("color", 1, 10),
+                   BitField("counter", 1, 6)]
+
+
+DAGMC_CLS = {1: RPLDAGMCNSA,
+             2: RPLDAGMCNodeEnergy,
+             3: RPLDAGMCHopCount,
+             4: RPLDAGMCLinkThroughput,
+             5: RPLDAGMCLinkLatency,
+             6: RPLDAGMCLinkQualityLevel,
+             7: RPLDAGMCLinkETX,
+             8: RPLDAGMCLinkColor}
+
+
+class RPLOptDAGMC(_DAGMetricContainer):
+    """
+    Control Option: DAG Metric Container
+    """
+    name = "DAG Metric Container"
+    fields_desc = [ByteEnumField("otype", 2, RPLOPTSSTR),
+                   ByteField("len", None),
+                   _PhantomAutoPadField("autopad", 0),
+                   _OptionsField("options", [], DAGMCObjUnknown, 8,
+                                 length_from=lambda pkt: 8 * pkt.len)]
+
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#control-message-options
+RPLOPTS.update({2: RPLOptDAGMC})

scapy-2.4.3.tar.gz/scapy/contrib/scada/__init__.py -> scapy-2.4.4.tar.gz/scapy/contrib/scada/__init__.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/scada/iec104/__init__.py -> scapy-2.4.4.tar.gz/scapy/contrib/scada/iec104/__init__.py Changed

@@ -1,10 +1,3 @@
-"""contains the IEC 60870-5-104 package."""
-
-from scapy.contrib.scada.iec104.iec104_fields import *  # noqa F403,F401
-from scapy.contrib.scada.iec104.iec104_information_elements import *  # noqa F403,F401
-from scapy.contrib.scada.iec104.iec104_information_objects import *  # noqa F403,F401
-from scapy.contrib.scada.iec104.iec104 import *  # noqa F403,F401
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Thomas Tannhaeuser <hecke@naberius.de>
@@ -13,5 +6,633 @@
 # scapy.contrib.description = IEC-60870-5-104 APCI / APDU layer definitions
 # scapy.contrib.status = loads
 
+"""
+    IEC 60870-5-104
+    ~~~~~~~~~~~~~~~
+
+    :description:
+
+        This module provides the IEC 60870-5-104 (common short name: iec104)
+        layer, the information objects and related information element
+        definitions.
+
+        normative references:
+            - IEC 60870-5-4:1994 (atomic base types / data format)
+            - IEC 60870-5-101:2003 (information elements (sec. 7.2.6) and
+              ASDU definition (sec. 7.3))
+            - IEC 60870-5-104:2006 (information element TSC (sec. 8.8, p. 44))
+
+    :TODO:
+        - add allowed direction to IO attributes
+          (but this could be derived from the name easily <--> )
+        - information elements / objects need more testing
+          (e.g. on live traffic w comparison against tshark)
+
+    :NOTES:
+        - bit and octet numbering is used as in the related standards
+          (they usually start with index one instead of zero)
+        - some of the information objects are only valid for IEC 60870-5-101 -
+          so usually they should never appear on the network as iec101 uses
+          serial connections. I added them if decoding of those messages is
+          needed cause one goes to implement a iec101<-->iec104 gateway or
+          hits such a gateway that acts not standard conform (e.g. by
+          forwarding 101 messages to a 104 network)
+"""
+
+from scapy.contrib.scada.iec104.iec104_fields import *  # noqa F403,F401
+from scapy.contrib.scada.iec104.iec104_information_elements import *  # noqa F403,F401
+from scapy.contrib.scada.iec104.iec104_information_objects import *  # noqa F403,F401
+
+from scapy.compat import orb
+from scapy.config import conf
+from scapy.error import warning, Scapy_Exception
+from scapy.fields import ByteField, BitField, ByteEnumField, PacketListField, \
+    BitEnumField, XByteField, FieldLenField, LEShortField, BitFieldLenField
+from scapy.layers.inet import TCP
+from scapy.packet import Raw, Packet, bind_layers
+
+IEC_104_IANA_PORT = 2404
+
+# direction - from the central station to the substation
+IEC104_CONTROL_DIRECTION = 0
+IEC104_CENTRAL_2_SUB_DIR = IEC104_CONTROL_DIRECTION
+
+# direction - from the substation to the central station
+IEC104_MONITOR_DIRECTION = 1
+IEC104_SUB_2_CENTRAL_DIR = IEC104_MONITOR_DIRECTION
+
+IEC104_DIRECTIONS = {
+    IEC104_MONITOR_DIRECTION: 'monitor direction (sub -> central)',
+    IEC104_CONTROL_DIRECTION: 'control direction (central -> sub)',
+}
+
+# COT - cause of transmission
+IEC104_COT_UNDEFINED = 0
+IEC104_COT_CYC = 1
+IEC104_COT_BACK = 2
+IEC104_COT_SPONT = 3
+IEC104_COT_INIT = 4
+IEC104_COT_REQ = 5
+IEC104_COT_ACT = 6
+IEC104_COT_ACTCON = 7
+IEC104_COT_DEACT = 8
+IEC104_COT_DEACTCON = 9
+IEC104_COT_ACTTERM = 10
+IEC104_COT_RETREM = 11
+IEC104_COT_RETLOC = 12
+IEC104_COT_FILE = 13
+IEC104_COT_RESERVED_14 = 14
+IEC104_COT_RESERVED_15 = 15
+IEC104_COT_RESERVED_16 = 16
+IEC104_COT_RESERVED_17 = 17
+IEC104_COT_RESERVED_18 = 18
+IEC104_COT_RESERVED_19 = 19
+IEC104_COT_INROGEN = 20
+IEC104_COT_INRO1 = 21
+IEC104_COT_INRO2 = 22
+IEC104_COT_INRO3 = 23
+IEC104_COT_INRO4 = 24
+IEC104_COT_INRO5 = 25
+IEC104_COT_INRO6 = 26
+IEC104_COT_INRO7 = 27
+IEC104_COT_INRO8 = 28
+IEC104_COT_INRO9 = 29
+IEC104_COT_INRO10 = 30
+IEC104_COT_INRO11 = 31
+IEC104_COT_INRO12 = 32
+IEC104_COT_INRO13 = 33
+IEC104_COT_INRO14 = 34
+IEC104_COT_INRO15 = 35
+IEC104_COT_INRO16 = 36
+IEC104_COT_REQCOGEN = 37
+IEC104_COT_REQCO1 = 38
+IEC104_COT_REQCO2 = 39
+IEC104_COT_REQCO3 = 40
+IEC104_COT_REQCO4 = 41
+IEC104_COT_RESERVED_42 = 42
+IEC104_COT_RESERVED_43 = 43
+IEC104_COT_UNKNOWN_TYPE_CODE = 44
+IEC104_COT_UNKNOWN_TRANSMIT_REASON = 45
+IEC104_COT_UNKNOWN_COMMON_ADDRESS_OF_ASDU = 46
+IEC104_COT_UNKNOWN_ADDRESS_OF_INFORMATION_OBJECT = 47
+IEC104_COT_PRIVATE_48 = 48
+IEC104_COT_PRIVATE_49 = 49
+IEC104_COT_PRIVATE_50 = 50
+IEC104_COT_PRIVATE_51 = 51
+IEC104_COT_PRIVATE_52 = 52
+IEC104_COT_PRIVATE_53 = 53
+IEC104_COT_PRIVATE_54 = 54
+IEC104_COT_PRIVATE_55 = 55
+IEC104_COT_PRIVATE_56 = 56
+IEC104_COT_PRIVATE_57 = 57
+IEC104_COT_PRIVATE_58 = 58
+IEC104_COT_PRIVATE_59 = 59
+IEC104_COT_PRIVATE_60 = 60
+IEC104_COT_PRIVATE_61 = 61
+IEC104_COT_PRIVATE_62 = 62
+IEC104_COT_PRIVATE_63 = 63
+
+CAUSE_OF_TRANSMISSIONS = {
+    IEC104_COT_UNDEFINED: 'undefined',
+    IEC104_COT_CYC: 'cyclic (per/cyc)',
+    IEC104_COT_BACK: 'background (back)',
+    IEC104_COT_SPONT: 'spontaneous (spont)',
+    IEC104_COT_INIT: 'initialized (init)',
+    IEC104_COT_REQ: 'request (req)',
+    IEC104_COT_ACT: 'activation (act)',
+    IEC104_COT_ACTCON: 'activation confirmed (actcon)',
+    IEC104_COT_DEACT: 'activation canceled (deact)',
+    IEC104_COT_DEACTCON: 'activation cancellation confirmed (deactcon)',
+    IEC104_COT_ACTTERM: 'activation finished (actterm)',
+    IEC104_COT_RETREM: 'feedback caused by remote command (retrem)',
+    IEC104_COT_RETLOC: 'feedback caused by local command (retloc)',
+    IEC104_COT_FILE: 'file transfer (file)',
+    IEC104_COT_RESERVED_14: 'reserved_14',
+    IEC104_COT_RESERVED_15: 'reserved_15',
+    IEC104_COT_RESERVED_16: 'reserved_16',
+    IEC104_COT_RESERVED_17: 'reserved_17',
+    IEC104_COT_RESERVED_18: 'reserved_18',
+    IEC104_COT_RESERVED_19: 'reserved_19',
+    IEC104_COT_INROGEN: 'queried by station (inrogen)',
+    IEC104_COT_INRO1: 'queried by query to group 1 (inro1)',
+    IEC104_COT_INRO2: 'queried by query to group 2 (inro2)',
+    IEC104_COT_INRO3: 'queried by query to group 3 (inro3)',
+    IEC104_COT_INRO4: 'queried by query to group 4 (inro4)',
+    IEC104_COT_INRO5: 'queried by query to group 5 (inro5)',
+    IEC104_COT_INRO6: 'queried by query to group 6 (inro6)',
+    IEC104_COT_INRO7: 'queried by query to group 7 (inro7)',
+    IEC104_COT_INRO8: 'queried by query to group 8 (inro8)',
+    IEC104_COT_INRO9: 'queried by query to group 9 (inro9)',
+    IEC104_COT_INRO10: 'queried by query to group 10 (inro10)',
+    IEC104_COT_INRO11: 'queried by query to group 11 (inro11)',
+    IEC104_COT_INRO12: 'queried by query to group 12 (inro12)',
+    IEC104_COT_INRO13: 'queried by query to group 13 (inro13)',
+    IEC104_COT_INRO14: 'queried by query to group 14 (inro14)',
+    IEC104_COT_INRO15: 'queried by query to group 15 (inro15)',
+    IEC104_COT_INRO16: 'queried by query to group 16 (inro16)',
+    IEC104_COT_REQCOGEN: 'queried by counter general interrogation (reqcogen)',
+    IEC104_COT_REQCO1: 'queried by query to counter group 1 (reqco1)',
+    IEC104_COT_REQCO2: 'queried by query to counter group 2 (reqco2)',
+    IEC104_COT_REQCO3: 'queried by query to counter group 3 (reqco3)',
+    IEC104_COT_REQCO4: 'queried by query to counter group 4 (reqco4)',
+    IEC104_COT_RESERVED_42: 'reserved_42',
+    IEC104_COT_RESERVED_43: 'reserved_43',
+    IEC104_COT_UNKNOWN_TYPE_CODE: 'unknown type code',
+    IEC104_COT_UNKNOWN_TRANSMIT_REASON: 'unknown transmit reason',
+    IEC104_COT_UNKNOWN_COMMON_ADDRESS_OF_ASDU:
+        'unknown common address of ASDU',
+    IEC104_COT_UNKNOWN_ADDRESS_OF_INFORMATION_OBJECT:
+        'unknown address of information object',
+    IEC104_COT_PRIVATE_48: 'private_48',
+    IEC104_COT_PRIVATE_49: 'private_49',
+    IEC104_COT_PRIVATE_50: 'private_50',
+    IEC104_COT_PRIVATE_51: 'private_51',
+    IEC104_COT_PRIVATE_52: 'private_52',
+    IEC104_COT_PRIVATE_53: 'private_53',
+    IEC104_COT_PRIVATE_54: 'private_54',
+    IEC104_COT_PRIVATE_55: 'private_55',
+    IEC104_COT_PRIVATE_56: 'private_56',
+    IEC104_COT_PRIVATE_57: 'private_57',
+    IEC104_COT_PRIVATE_58: 'private_58',
+    IEC104_COT_PRIVATE_59: 'private_59',
+    IEC104_COT_PRIVATE_60: 'private_60',
+    IEC104_COT_PRIVATE_61: 'private_61',
+    IEC104_COT_PRIVATE_62: 'private_62',
+    IEC104_COT_PRIVATE_63: 'private_63'
+}
+
+IEC104_APDU_TYPE_UNKNOWN = 0x00
+IEC104_APDU_TYPE_I_SEQ_IOA = 0x01
+IEC104_APDU_TYPE_I_SINGLE_IOA = 0x02
+IEC104_APDU_TYPE_U = 0x03
+IEC104_APDU_TYPE_S = 0x04
+
+
+def _iec104_apci_type_from_packet(data):
+    """
+    the type of the message is encoded in octet 1..4
+
+                 oct 1, bit 1   2       oct 3, bit 1
+    I Message               0  1|0                 0
+    S Message               1   0                  0
+    U Message               1   1                  0
+
+
+    see EN 60870-5-104:2006, sec. 5 (p. 13, fig. 6,7,8)
+    """
+
+    oct_1 = orb(data[2])
+    oct_3 = orb(data[4])
+
+    oct_1_bit_1 = bool(oct_1 & 1)
+    oct_1_bit_2 = bool(oct_1 & 2)
+    oct_3_bit_1 = bool(oct_3 & 1)
+
+    if oct_1_bit_1 is False and oct_3_bit_1 is False:
+        if len(data) < 8:
+            return IEC104_APDU_TYPE_UNKNOWN
+
+        is_seq_ioa = ((orb(data[7]) & 0x80) == 0x80)
+
+        if is_seq_ioa:
+            return IEC104_APDU_TYPE_I_SEQ_IOA
+        else:
+            return IEC104_APDU_TYPE_I_SINGLE_IOA
+
+    if oct_1_bit_1 and oct_1_bit_2 is False and oct_3_bit_1 is False:
+        return IEC104_APDU_TYPE_S
+
+    if oct_1_bit_1 and oct_1_bit_2 and oct_3_bit_1 is False:
+        return IEC104_APDU_TYPE_U
+
+    return IEC104_APDU_TYPE_UNKNOWN
+
+
+class IEC104_APDU(Packet):
+    """
+    basic Application Protocol Data Unit definition used by S/U/I messages
+    """
+
+    def guess_payload_class(self, payload):
+
+        payload_len = len(payload)
+
+        if payload_len < 6:
+            return self.default_payload_class(payload)
+
+        if orb(payload[0]) != 0x68:
+            self.default_payload_class(payload)
+
+        # the length field contains the number of bytes starting from the
+        # first control octet
+        apdu_length = 2 + orb(payload[1])
+
+        if payload_len < apdu_length:
+            warning(
+                'invalid len of APDU. given len: {} available len: {}'.format(
+                    apdu_length, payload_len))
+            return self.default_payload_class(payload)
+
+        apdu_type = _iec104_apci_type_from_packet(payload)
+
+        return IEC104_APDU_CLASSES.get(apdu_type,
+                                       self.default_payload_class(payload))
+
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *args, **kargs):
+        """
+        detect type of the message by checking packet data
+        :param _pkt: raw bytes of the packet layer data to be checked
+        :param args: unused
+        :param kargs: unused
+        :return: class of the detected message type
+        """
+
+        if _iec104_is_i_apdu_seq_ioa(_pkt):
+            return IEC104_I_Message_SeqIOA
+
+        if _iec104_is_i_apdu_single_ioa(_pkt):
+            return IEC104_I_Message_SingleIOA
+
+        if _iec104_is_u_apdu(_pkt):
+            return IEC104_U_Message
+
+        if _iec104_is_s_apdu(_pkt):
+            return IEC104_S_Message
+
+        return Raw
+
+
+class IEC104_S_Message(IEC104_APDU):
+    """
+    message used for ack of received I-messages
+    """
+    name = 'IEC-104 S APDU'
+
+    fields_desc = [
+
+        XByteField('start', 0x68),
+        ByteField("apdu_length", 4),
+
+        ByteField('octet_1', 0x01),
+        ByteField('octet_2', 0),
+        IEC104SequenceNumber('rx_seq_num', 0),
+    ]
+
+
+class IEC104_U_Message(IEC104_APDU):
+    """
+    message used for connection tx control (start/stop)  and monitoring (test)
+    """
+    name = 'IEC-104 U APDU'
+
+    fields_desc = [
+
+        XByteField('start', 0x68),
+        ByteField("apdu_length", 4),
+
+        BitField('testfr_con', 0, 1),
+        BitField('testfr_act', 0, 1),
+        BitField('stopdt_con', 0, 1),
+        BitField('stopdt_act', 0, 1),
+        BitField('startdt_con', 0, 1),
+        BitField('startdt_act', 0, 1),
+        BitField('octet_1_1_2', 3, 2),
+
+        ByteField('octet_2', 0),
+        ByteField('octet_3', 0),
+        ByteField('octet_4', 0)
+    ]
+
+
+def _i_msg_io_dispatcher_sequence(pkt, next_layer_data):
+    """
+    get the type id and return the matching ASDU instance
+    """
+    next_layer_class_type = IEC104_IO_CLASSES.get(pkt.type_id, conf.raw_layer)
+
+    return next_layer_class_type(next_layer_data)
+
+
+def _i_msg_io_dispatcher_single(pkt, next_layer_data):
+    """
+    get the type id and return the matching ASDU instance
+    (information object address + regular ASDU information object fields)
+    """
+    next_layer_class_type = IEC104_IO_WITH_IOA_CLASSES.get(pkt.type_id,
+                                                           conf.raw_layer)
+
+    return next_layer_class_type(next_layer_data)
+
+
+class IEC104ASDUPacketListField(PacketListField):
+    """
+    used to add a list of information objects to an I-message
+    """
+    def m2i(self, pkt, m):
+        """
+        add calling layer instance to the cls()-signature
+        :param pkt: calling layer instance
+        :param m: raw data forming the next layer
+        :return: instance of the class representing the next layer
+        """
+        return self.cls(pkt, m)
+
+
+class IEC104_I_Message_StructureException(Scapy_Exception):
+    """
+    Exception raised if payload is not of type Information Object
+    """
+    pass
+
+
+class IEC104_I_Message(IEC104_APDU):
+    """
+    message used for transmitting data (APDU - Application Protocol Data Unit)
+
+    APDU: MAGIC + APCI + ASDU
+    MAGIC: 0x68
+    APCI : Control Information (rx/tx seq/ack numbers)
+    ASDU : Application Service Data Unit - information object related data
+
+    see EN 60870-5-104:2006, sec. 5 (p. 12)
+    """
+    name = 'IEC-104 I APDU'
+
+    IEC_104_MAGIC = 0x68  # dec -> 104
+
+    SQ_FLAG_SINGLE = 0
+    SQ_FLAG_SEQUENCE = 1
+
+    SQ_FLAGS = {
+        SQ_FLAG_SINGLE: 'single',
+        SQ_FLAG_SEQUENCE: 'sequence'
+    }
+
+    TEST_DISABLED = 0
+    TEST_ENABLED = 1
+
+    TEST_FLAGS = {
+        TEST_DISABLED: 'disabled',
+        TEST_ENABLED: 'enabled'
+    }
+
+    ACK_POSITIVE = 0
+    ACK_NEGATIVE = 1
+
+    ACK_FLAGS = {
+        ACK_POSITIVE: 'positive',
+        ACK_NEGATIVE: 'negative'
+    }
+
+    fields_desc = []
+
+    def __init__(self, _pkt=b"", post_transform=None, _internal=0,
+                 _underlayer=None, **fields):
+
+        super(IEC104_I_Message, self).__init__(_pkt=_pkt,
+                                               post_transform=post_transform,
+                                               _internal=_internal,
+                                               _underlayer=_underlayer,
+                                               **fields)
+
+        if 'io' in fields and fields['io']:
+            self._information_object_update(fields['io'])
+
+    def _information_object_update(self, io_instances):
+        """
+        set the type_id in the ASDU header based on the given information
+        object (io) and check for valid structure
+        :param io_instances: information object
+        """
+
+        if not isinstance(io_instances, list):
+            io_instances = [io_instances]
+
+        first_io = io_instances[0]
+        first_io_class = first_io.__class__
+
+        if not issubclass(first_io_class, IEC104_IO_Packet):
+            raise IEC104_I_Message_StructureException(
+                'information object payload must be a subclass of '
+                'IEC104_IO_Packet')
+
+        self.type_id = first_io.iec104_io_type_id()
+
+        # ensure all io elements within the ASDU share the same class type
+        for io_inst in io_instances[1:]:
+            if io_inst.__class__ != first_io_class:
+                raise IEC104_I_Message_StructureException(
+                    'each information object within the ASDU must be of '
+                    'the same class type (first io: {}, '
+                    'current io: {})'.format(first_io_class._name,
+                                             io_inst._name))
+
+
+class IEC104_I_Message_SeqIOA(IEC104_I_Message):
+    """
+    all information objects share a base information object address field
+
+    sq = 1, see EN 60870-5-101:2003, sec. 7.2.2.1 (p. 33)
+    """
+    name = 'IEC-104 I APDU (Seq IOA)'
+
+    fields_desc = [
+        # APCI
+        XByteField('start', IEC104_I_Message.IEC_104_MAGIC),
+        FieldLenField("apdu_length", None, fmt="!B", length_of='io',
+                      adjust=lambda pkt, x: x + 13),
+
+        IEC104SequenceNumber('tx_seq_num', 0),
+        IEC104SequenceNumber('rx_seq_num', 0),
+
+        # ASDU
+        ByteEnumField('type_id', 0, IEC104_IO_NAMES),
+
+        BitEnumField('sq', IEC104_I_Message.SQ_FLAG_SEQUENCE, 1,
+                     IEC104_I_Message.SQ_FLAGS),
+        BitFieldLenField('num_io', None, 7, count_of='io'),
+
+        BitEnumField('test', 0, 1, IEC104_I_Message.TEST_FLAGS),
+        BitEnumField('ack', 0, 1, IEC104_I_Message.ACK_FLAGS),
+        BitEnumField('cot', 0, 6, CAUSE_OF_TRANSMISSIONS),
+
+        ByteField('origin_address', 0),
+
+        LEShortField('common_asdu_address', 0),
+
+        LEThreeBytesField('information_object_address', 0),
+
+        IEC104ASDUPacketListField('io',
+                                  conf.raw_layer(),
+                                  _i_msg_io_dispatcher_sequence,
+                                  length_from=lambda pkt: pkt.apdu_length - 13)
+    ]
+
+    def post_dissect(self, s):
+        if self.type_id == IEC104_IO_ID_C_RD_NA_1:
+
+            # IEC104_IO_ID_C_RD_NA_1 has no payload. we will add the layer
+            # manually to the stack right now. we do this num_io times
+            # as - even if it makes no sense - someone could decide
+            # to add more than one read commands in a sequence...
+            setattr(self, 'io', [IEC104_IO_C_RD_NA_1()] * self.num_io)
+
+        return s
+
+
+class IEC104_I_Message_SingleIOA(IEC104_I_Message):
+    """
+    every information object contains an individual information object
+    address field
+
+    sq = 0, see EN 60870-5-101:2003, sec. 7.2.2.1 (p. 33)
+    """
+    name = 'IEC-104 I APDU (single IOA)'
+
+    fields_desc = [
+        # APCI
+        XByteField('start', IEC104_I_Message.IEC_104_MAGIC),
+        FieldLenField("apdu_length", None, fmt="!B", length_of='io',
+                      adjust=lambda pkt, x: x + 10),
+
+        IEC104SequenceNumber('tx_seq_num', 0),
+        IEC104SequenceNumber('rx_seq_num', 0),
+
+        # ASDU
+        ByteEnumField('type_id', 0, IEC104_IO_NAMES),
+
+        BitEnumField('sq', IEC104_I_Message.SQ_FLAG_SINGLE, 1,
+                     IEC104_I_Message.SQ_FLAGS),
+        BitFieldLenField('num_io', None, 7, count_of='io'),
+
+        BitEnumField('test', 0, 1, IEC104_I_Message.TEST_FLAGS),
+        BitEnumField('ack', 0, 1, IEC104_I_Message.ACK_FLAGS),
+        BitEnumField('cot', 0, 6, CAUSE_OF_TRANSMISSIONS),
+
+        ByteField('origin_address', 0),
+
+        LEShortField('common_asdu_address', 0),
+
+        IEC104ASDUPacketListField('io',
+                                  conf.raw_layer(),
+                                  _i_msg_io_dispatcher_single,
+                                  length_from=lambda pkt: pkt.apdu_length - 10)
+    ]
+
+
+IEC104_APDU_CLASSES = {
+    IEC104_APDU_TYPE_UNKNOWN: conf.raw_layer,
+    IEC104_APDU_TYPE_I_SEQ_IOA: IEC104_I_Message_SeqIOA,
+    IEC104_APDU_TYPE_I_SINGLE_IOA: IEC104_I_Message_SingleIOA,
+    IEC104_APDU_TYPE_U: IEC104_U_Message,
+    IEC104_APDU_TYPE_S: IEC104_S_Message
+}
+
+
+def _iec104_is_i_apdu_seq_ioa(payload):
+    len_payload = len(payload)
+    if len_payload < 6:
+        return False
+
+    if orb(payload[0]) != 0x68 or (
+            orb(payload[1]) + 2) > len_payload or len_payload < 8:
+        return False
+
+    return IEC104_APDU_TYPE_I_SEQ_IOA == _iec104_apci_type_from_packet(payload)
+
+
+def _iec104_is_i_apdu_single_ioa(payload):
+    len_payload = len(payload)
+    if len_payload < 6:
+        return False
+
+    if orb(payload[0]) != 0x68 or (
+            orb(payload[1]) + 2) > len_payload or len_payload < 8:
+        return False
+
+    return IEC104_APDU_TYPE_I_SINGLE_IOA == _iec104_apci_type_from_packet(
+        payload)
+
+
+def _iec104_is_u_apdu(payload):
+    if len(payload) < 6:
+        return False
+
+    if orb(payload[0]) != 0x68 or orb(payload[1]) != 4:
+        return False
+
+    return IEC104_APDU_TYPE_U == _iec104_apci_type_from_packet(payload)
+
+
+def _iec104_is_s_apdu(payload):
+    if len(payload) < 6:
+        return False
+
+    if orb(payload[0]) != 0x68 or orb(payload[1]) != 4:
+        return False
+
+    return IEC104_APDU_TYPE_S == _iec104_apci_type_from_packet(payload)
+
+
+def iec104_decode(payload):
+    """
+    can be used to dissect payload of a TCP connection
+    :param payload: the application layer data (IEC104-APDU(s))
+    :return: iec104 (I/U/S) message instance, conf.raw_layer() if unknown
+    """
+
+    if _iec104_is_i_apdu_seq_ioa(payload):
+        return IEC104_I_Message_SeqIOA(payload)
+    elif _iec104_is_i_apdu_single_ioa(payload):
+        return IEC104_I_Message_SingleIOA(payload)
+    elif _iec104_is_s_apdu(payload):
+        return IEC104_S_Message(payload)
+    elif _iec104_is_u_apdu(payload):
+        return IEC104_U_Message(payload)
+    else:
+        return conf.raw_layer(payload)
+
 
-# Package of contrib SCADA IEC-60870-5-104 specific modules
+bind_layers(TCP, IEC104_APDU, sport=IEC_104_IANA_PORT)
+bind_layers(TCP, IEC104_APDU, dport=IEC_104_IANA_PORT)

scapy-2.4.3.tar.gz/scapy/contrib/scada/iec104/iec104_fields.py -> scapy-2.4.4.tar.gz/scapy/contrib/scada/iec104/iec104_fields.py Changed

@@ -3,12 +3,11 @@
 # Copyright (C) Thomas Tannhaeuser <hecke@naberius.de>
 # This program is published under a GPLv2 license
 
-# scapy.contrib.description = IEC-60870-5-104 layer specific fields
-# scapy.contrib.status = loads
+# scapy.contrib.status = skip
 
 """
     field type definitions used by iec 60870-5-104 layer (iec104)
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :description:
 
@@ -89,11 +88,11 @@
     (see EN 60870-5-104:2006, p. 13):
 
       bit ->7   6   5   4   3   2   1   0
-          +---+---+---+---+---+---+---+---+
-          |   |   |   |   |   |   |LSB| 0 |  byte 0
-          +---+---+---+---+---+---+---+---+
-          |MSB|   |   |   |   |   |   |   |  byte 1
-          +---+---+---+---+---+---+---+---+
+          +---+---+---+---+---+---+---+---+---------+
+          |   |   |   |   |   |   |LSB| 0 | =byte 0 |
+          +---+---+---+---+---+---+---+---+---------+
+          |MSB|   |   |   |   |   |   |   | =byte 1 |
+          +---+---+---+---+---+---+---+---+---------+
 
     """

scapy-2.4.3.tar.gz/scapy/contrib/scada/iec104/iec104_information_elements.py -> scapy-2.4.4.tar.gz/scapy/contrib/scada/iec104/iec104_information_elements.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/scada/iec104/iec104_information_objects.py -> scapy-2.4.4.tar.gz/scapy/contrib/scada/iec104/iec104_information_objects.py Changed

scapy-2.4.4.tar.gz/scapy/contrib/scada/pcom.py Added

@@ -0,0 +1,241 @@
+# coding: utf8
+
+# This file is part of Scapy
+# Scapy is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+#
+# Scapy is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Scapy. If not, see <http://www.gnu.org/licenses/>.
+
+# scapy.contrib.description = PCOM Protocol
+# scapy.contrib.status = loads
+
+# Copyright (C) 2019 Luis Rosa <lmrosa@dei.uc.pt>
+#
+# PCOM is a protocol to communicate with Unitronics PLCs either by serial
+# or TCP. Two modes are available, ASCII and Binary.
+#
+# See https://unitronicsplc.com/Download/SoftwareUtilities/Unitronics%20PCOM%20Protocol.pdf # noqa
+
+import struct
+
+from scapy.packet import Packet, bind_layers
+from scapy.layers.inet import TCP
+from scapy.fields import XShortField, ByteEnumField, XByteField, \
+    StrFixedLenField, StrLenField, LEShortField, \
+    LEFieldLenField, LEX3BytesField, XLEShortField
+from scapy.volatile import RandShort
+from scapy.compat import bytes_encode, orb
+
+_protocol_modes = {0x65: "ascii", 0x66: "binary"}
+
+_ascii_command_codes = {
+    "ID": "Send Identification Command",
+    "CCR": "Send Start Command",
+    "CCS": "Send Stop Command",
+    "CCE": "Send Reset Command",
+    "CCI": "Send Init Command",
+    "CC": "Reply of Admin Commands (CC*)",
+    "UG": "Get UnitID",
+    "US": "Set UnitID",
+    "RC": "Get RTC",
+    "SC": "Set RTC",
+    "RE": "Read Inputs",
+    "RA": "Read Outputs",
+    "GS": "Read System Bits",
+    "GF": "Read System Integers",
+    "RNH": "Read System Longs",
+    "RNJ": "Read System Double Words",
+    "RB": "Read Memory Bits",
+    "RW": "Read Memory Integers",
+    "RNL": "Read Memory Longs",
+    "RND": "Read Memory Double Words",
+    "RN": "Read Longs / Double Words",
+    "SA": "Write Outputs",
+    "SS": "Write System Bits",
+    "SF": "Write System Integers",
+    "SNH": "Write System Longs",
+    "SNJ": "Write System Double Words",
+    "SB": "Write Memory Bits",
+    "SW": "Write Memory Integers",
+    "SNL": "Write Memory Longs",
+    "SND": "Write Memory Double Words",
+    "SN": "Write Longs / Double Words"
+}
+
+_binary_command_codes = {
+    0x0c: "Get PLC Name Request",
+    0x8c: "Get PLC Name Reply",
+    0x4d: "Read Operands Request",
+    0xcd: "Read Operands Reply",
+    0x04: "Read Data Table Request",
+    0x84: "Read Data Table Reply",
+    0x44: "Write Data Table Request",
+    0xc4: "Write Data Table Reply"
+}
+
+
+class PCOM(Packet):
+    fields_desc = [
+        XShortField("transId", RandShort()),
+        ByteEnumField("mode", 0x65, _protocol_modes),
+        XByteField("reserved", 0x00),
+        LEShortField("len", None)
+    ]
+
+    def post_build(self, pkt, pay):
+        if self.len is None and pay:
+            pkt = pkt[:4] + struct.pack("H", len(pay))
+        return pkt + pay
+
+
+class PCOMRequest(PCOM):
+    name = "PCOM/TCP Request"
+
+
+class PCOMResponse(PCOM):
+    name = "PCOM/TCP Response"
+
+
+class PCOMAscii(Packet):
+    @staticmethod
+    def pcom_ascii_checksum(command):
+        n = 0
+        command = bytes_encode(command)
+        for _, c in enumerate(command):
+            n += orb(c)
+        return list(map(ord, hex(n % 256)[2:].zfill(2).upper()))
+
+
+class PCOMAsciiCommandField(StrLenField):
+    def i2repr(self, pkt, x):
+        s = super(PCOMAsciiCommandField, self).i2repr(pkt, x)
+        code = s[1:4]  # check for 3 chars known codes
+        if code in _ascii_command_codes:
+            return _ascii_command_codes[code] + " " + s
+        code = s[1:3]  # check for 2 chars known codes
+        if code in _ascii_command_codes:
+            return _ascii_command_codes[code] + " " + s
+        return s
+
+
+class PCOMAsciiRequest(PCOMAscii):
+    name = "PCOM/ASCII Request"
+    fields_desc = [
+        StrFixedLenField("stx", "/", 1),
+        StrFixedLenField("unitId", "00", 2),
+        PCOMAsciiCommandField(
+            "command", '', length_from=lambda pkt: pkt.underlayer.len - 6),
+        XShortField("chksum", None),
+        XByteField("etx", 0x0d)
+    ]
+
+    def post_build(self, pkt, pay):
+        if self.chksum is None:
+            chksum = PCOMAscii.pcom_ascii_checksum(pkt[1:-3])
+            pkt = pkt[:-3] + struct.pack("2B", chksum[0], chksum[1]) + pkt[-1:]
+        return pkt + pay
+
+
+class PCOMAsciiResponse(PCOMAscii):
+    name = "PCOM/ASCII Response"
+    fields_desc = [
+        StrFixedLenField("stx", "/A", 2),
+        StrFixedLenField("unitId", "00", 2),
+        PCOMAsciiCommandField(
+            "command", '', length_from=lambda pkt: pkt.underlayer.len - 7),
+        XShortField("chksum", None),
+        XByteField("etx", 0x0d)
+    ]
+
+    def post_build(self, pkt, pay):
+        if self.chksum is None:
+            chksum = PCOMAscii.pcom_ascii_checksum(pkt[2:-3])
+            pkt = pkt[:-3] + struct.pack("2B", chksum[0], chksum[1]) + pkt[-1:]
+        return pkt + pay
+
+
+class PCOMBinary(Packet):
+    @staticmethod
+    def pcom_binary_checksum(command):
+        n = 0
+        command = bytes_encode(command)
+        for _, c in enumerate(command):
+            c = c if isinstance(c, int) else ord(c)  # python 2 fallback
+            n += c
+        if n == 0:
+            return [0x00, 0x00]
+        else:
+            two_complement = hex(0x10000 - (n % 0x10000))[2:].zfill(4)
+            return [int(two_complement[:2], 16), int(two_complement[2:], 16)]
+
+    def post_build(self, pkt, pay):
+        if self.headerChksum is None:
+            chksum = PCOMBinaryRequest.pcom_binary_checksum(pkt[:21])
+            pkt = pkt[:22] + struct.pack("2B", chksum[1], chksum[0]) + pkt[24:]
+        if self.footerChksum is None:
+            chksum = PCOMBinaryRequest.pcom_binary_checksum(pkt[24:-3])
+            pkt = pkt[:-3] + struct.pack("2B", chksum[1], chksum[0]) + pkt[-1:]
+        return pkt + pay
+
+
+class PCOMBinaryCommandField(XByteField):
+    def i2repr(self, pkt, x):
+        s = super(PCOMBinaryCommandField, self).i2repr(pkt, x)
+        if x in _binary_command_codes:
+            return _binary_command_codes[x] + " - " + s
+        else:
+            return s
+
+
+class PCOMBinaryRequest(PCOMBinary):
+    name = "PCOM/Binary Request"
+    fields_desc = [
+        StrFixedLenField("stx", "/_OPLC", 6),
+        XByteField("id", 0x0),
+        XByteField("reserved1", 0xfe),
+        XByteField("reserved2", 0x1),
+        LEX3BytesField("reserved3", 0x0),
+        PCOMBinaryCommandField("command", None),
+        XByteField("reserved4", 0x0),
+        StrFixedLenField("commandSpecific", '', 6),
+        LEFieldLenField("len", 0, length_of="data"),
+        XLEShortField("headerChksum", None),
+        StrLenField("data", '', length_from=lambda pkt: pkt.len),
+        XLEShortField("footerChksum", None),
+        XByteField("etx", 0x5c)
+    ]
+
+
+class PCOMBinaryResponse(PCOMBinary):
+    name = "PCOM/Binary Response"
+    fields_desc = [
+        StrFixedLenField("stx", "/_OPLC", 6),
+        XByteField("reserved1", 0xfe),
+        XByteField("id", 0x0),
+        XByteField("reserved2", 0x1),
+        LEX3BytesField("reserved3", 0x0),
+        PCOMBinaryCommandField("command", None),
+        XByteField("reserved4", 0x0),
+        StrFixedLenField("commandSpecific", '', 6),
+        LEFieldLenField("len", 0, length_of="data"),
+        XLEShortField("headerChksum", None),
+        StrLenField("data", '', length_from=lambda pkt: pkt.len),
+        XLEShortField("footerChksum", None),
+        XByteField("etx", 0x5c)
+    ]
+
+
+bind_layers(TCP, PCOMRequest, dport=20256)
+bind_layers(TCP, PCOMResponse, sport=20256)
+bind_layers(PCOMRequest, PCOMAsciiRequest, mode=0x65)
+bind_layers(PCOMRequest, PCOMBinaryRequest, mode=0x66)
+bind_layers(PCOMResponse, PCOMAsciiResponse, mode=0x65)
+bind_layers(PCOMResponse, PCOMBinaryResponse, mode=0x66)

scapy-2.4.3.tar.gz/scapy/contrib/sdnv.py -> scapy-2.4.4.tar.gz/scapy/contrib/sdnv.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/send.py -> scapy-2.4.4.tar.gz/scapy/contrib/send.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/skinny.py -> scapy-2.4.4.tar.gz/scapy/contrib/skinny.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/tzsp.py -> scapy-2.4.4.tar.gz/scapy/contrib/tzsp.py Changed

scapy-2.4.3.tar.gz/scapy/contrib/vtp.py -> scapy-2.4.4.tar.gz/scapy/contrib/vtp.py Changed

@@ -15,7 +15,7 @@
 # scapy.contrib.description = VLAN Trunking Protocol (VTP)
 # scapy.contrib.status = loads
 
-"""
+r"""
     VTP Scapy Extension
     ~~~~~~~~~~~~~~~~~~~~~
 
@@ -34,24 +34,28 @@
         MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
         GNU General Public License for more details.
 
-    :TODO
+    :TODO:
 
         - Join messages
         - RE MD5 hash calculation
-        - Have a closer look at 8 byte padding in summary adv.
+        - Have a closer look at 8 byte padding in summary adv:
+
             "debug sw-vlan vtp packets" says the TLV length is invalid,
-            when I change the values
-            b'\x00\x00\x00\x01\x06\x01\x00\x02'
-                * \x00\x00 ?
-                * \x00\x01 tlvtype?
-                * \x06 length?
-                * \x00\x02 value?
+            when I change the values:
+
+            ``b'\x00\x00\x00\x01\x06\x01\x00\x02'``
+
+            * \x00\x00 ?
+            * \x00\x01 tlvtype?
+            * \x06 length?
+            * \x00\x02 value?
+
         - h2i function for VTPTimeStampField
 
     :References:
 
-        - Understanding VLAN Trunk Protocol (VTP)
-        http://www.cisco.com/en/US/tech/tk389/tk689/technologies_tech_note09186a0080094c52.shtml
+        - | Understanding VLAN Trunk Protocol (VTP)
+          | http://www.cisco.com/en/US/tech/tk389/tk689/technologies_tech_note09186a0080094c52.shtml  # noqa: E501
 """
 
 from scapy.packet import Packet, bind_layers
@@ -59,6 +63,7 @@
     FieldLenField, IPField, PacketListField, ShortField, SignedIntField, \
     StrFixedLenField, StrLenField, XIntField
 from scapy.layers.l2 import SNAP
+from scapy.compat import chb
 from scapy.config import conf
 
 _VTP_VLAN_TYPE = {
@@ -98,25 +103,30 @@
 class VTPVlanInfo(Packet):
     name = "VTP VLAN Info"
     fields_desc = [
-        ByteField("len", None),  # FIXME: compute length
+        ByteField("len", None),
         ByteEnumField("status", 0, {0: "active", 1: "suspended"}),
         ByteEnumField("type", 1, _VTP_VLAN_TYPE),
         FieldLenField("vlannamelen", None, "vlanname", "B"),
         ShortField("vlanid", 1),
         ShortField("mtu", 1500),
         XIntField("dot10index", None),
-        StrLenField("vlanname", "default", length_from=lambda pkt: 4 * ((pkt.vlannamelen + 3) / 4)),  # noqa: E501
-        ConditionalField(PacketListField("tlvlist", [], VTPVlanInfoTlv,
-                                         length_from=lambda pkt:pkt.len - 12 - (4 * ((pkt.vlannamelen + 3) / 4))),  # noqa: E501
-                         lambda pkt:pkt.type not in [1, 2])
+        StrLenField("vlanname", "default",
+                    length_from=lambda pkt: 4 * ((pkt.vlannamelen + 3) // 4)),
+        ConditionalField(
+            PacketListField(
+                "tlvlist", [], VTPVlanInfoTlv,
+                length_from=lambda pkt: pkt.len - 12 - (4 * ((pkt.vlannamelen + 3) // 4))  # noqa: E501
+            ),
+            lambda pkt:pkt.type not in [1, 2]
+        )
     ]
 
     def post_build(self, p, pay):
-        vlannamelen = 4 * ((len(self.vlanname) + 3) / 4)
+        vlannamelen = 4 * ((len(self.vlanname) + 3) // 4)
 
         if self.len is None:
             tmp_len = vlannamelen + 12
-            p = chr(tmp_len & 0xff) + p[1:]
+            p = chb(tmp_len & 0xff) + p[1:]
 
         # Pad vlan name with zeros if vlannamelen > len(vlanname)
         tmp_len = vlannamelen - len(self.vlanname)
@@ -180,7 +190,7 @@
     def post_build(self, p, pay):
         if self.domnamelen is None:
             domnamelen = len(self.domname.strip(b"\x00"))
-            p = p[:3] + chr(domnamelen & 0xff) + p[4:]
+            p = p[:3] + chb(domnamelen & 0xff) + p[4:]
 
         p += pay

scapy-2.4.3.tar.gz/scapy/dadict.py -> scapy-2.4.4.tar.gz/scapy/dadict.py Changed

@@ -19,6 +19,10 @@
 
 
 def fixname(x):
+    """
+    Modifies a string to make sure it can be used as an attribute name.
+    """
+    x = plain_str(x)
     if x and str(x[0]) in "0123456789":
         x = "n_" + x
     return x.translate(
@@ -34,89 +38,81 @@
     pass
 
 
-class DADict:
-    def __init__(self, _name="DADict", **kargs):
-        self._name = _name
-        self.update(kargs)
-
-    def fixname(self, val):
-        return fixname(plain_str(val))
+class DADict(object):
+    """
+    Direct Access Dictionary
 
-    def __contains__(self, val):
-        return val in self.__dict__
+    This acts like a dict, but it provides a direct attribute access
+    to its keys through its values. This is used to store protocols,
+    manuf...
 
-    def __getitem__(self, attr):
-        return getattr(self, attr)
+    For instance, scapy fields will use a DADict as an enum::
 
-    def __setitem__(self, attr, val):
-        return setattr(self, self.fixname(attr), val)
+        ETHER_TYPES[2048] -> IPv4
 
-    def __iter__(self):
-        return (value for key, value in six.iteritems(self.__dict__)
-                if key and key[0] != '_')
+    Whereas humans can access::
 
-    def _show(self):
-        for k in self.__dict__:
-            if k and k[0] != "_":
-                print("%10s = %r" % (k, getattr(self, k)))
-
-    def __repr__(self):
-        return "<%s - %s elements>" % (self._name, len(self.__dict__))
-
-    def _branch(self, br, uniq=0):
-        if uniq and br._name in self:
-            raise DADict_Exception("DADict: [%s] already branched in [%s]" % (br._name, self._name))  # noqa: E501
-        self[br._name] = br
+        ETHER_TYPES.IPv4 -> 2048
+    """
+    def __init__(self, _name="DADict", **kargs):
+        self._name = _name
+        self.update(kargs)
 
-    def _my_find(self, *args, **kargs):
-        if args and self._name not in args:
-            return False
-        return all(k in self and self[k] == v for k, v in six.iteritems(kargs))
+    def ident(self, v):
+        """
+        Return value that is used as key for the direct access
+        """
+        return fixname(v)
 
     def update(self, *args, **kwargs):
         for k, v in six.iteritems(dict(*args, **kwargs)):
             self[k] = v
 
-    def _find(self, *args, **kargs):
-        return self._recurs_find((), *args, **kargs)
-
-    def _recurs_find(self, path, *args, **kargs):
-        if self in path:
-            return None
-        if self._my_find(*args, **kargs):
-            return self
-        for o in self:
-            if isinstance(o, DADict):
-                p = o._recurs_find(path + (self,), *args, **kargs)
-                if p is not None:
-                    return p
-        return None
-
-    def _find_all(self, *args, **kargs):
-        return self._recurs_find_all((), *args, **kargs)
-
-    def _recurs_find_all(self, path, *args, **kargs):
-        r = []
-        if self in path:
-            return r
-        if self._my_find(*args, **kargs):
-            r.append(self)
-        for o in self:
-            if isinstance(o, DADict):
-                p = o._recurs_find_all(path + (self,), *args, **kargs)
-                r += p
-        return r
+    def iterkeys(self):
+        for x in six.iterkeys(self.__dict__):
+            if not isinstance(x, str) or x[0] != "_":
+                yield x
 
     def keys(self):
         return list(self.iterkeys())
 
-    def iterkeys(self):
-        return (x for x in self.__dict__ if x and x[0] != "_")
+    def __iter__(self):
+        return self.iterkeys()
+
+    def itervalues(self):
+        return six.itervalues(self.__dict__)
+
+    def values(self):
+        return list(self.itervalues())
+
+    def _show(self):
+        for k in self.iterkeys():
+            print("%10s = %r" % (k, self[k]))
+
+    def __repr__(self):
+        return "<%s - %s elements>" % (self._name, len(self))
+
+    def __getitem__(self, attr):
+        return self.__dict__[attr]
+
+    def __setitem__(self, attr, val):
+        self.__dict__[attr] = val
 
     def __len__(self):
         return len(self.__dict__)
 
     def __nonzero__(self):
         # Always has at least its name
-        return len(self.__dict__) > 1
+        return len(self) > 1
     __bool__ = __nonzero__
+
+    def __getattr__(self, attr):
+        try:
+            return object.__getattribute__(self, attr)
+        except AttributeError:
+            for k, v in six.iteritems(self.__dict__):
+                if self.ident(v) == attr:
+                    return k
+
+    def __dir__(self):
+        return [self.ident(x) for x in self.itervalues()]

scapy-2.4.3.tar.gz/scapy/data.py -> scapy-2.4.4.tar.gz/scapy/data.py Changed

@@ -10,9 +10,10 @@
 import calendar
 import os
 import re
+import warnings
 
 
-from scapy.dadict import DADict
+from scapy.dadict import DADict, fixname
 from scapy.consts import FREEBSD, NETBSD, OPENBSD, WINDOWS
 from scapy.error import log_loading
 from scapy.compat import plain_str
@@ -26,6 +27,12 @@
 ETHER_ANY = b"\x00" * 6
 ETHER_BROADCAST = b"\xff" * 6
 
+# From bits/socket.h
+SOL_PACKET = 263
+# From asm/socket.h
+SO_ATTACH_FILTER = 26
+SO_TIMESTAMPNS = 35  # SO_TIMESTAMPNS_OLD: not 2038 safe
+
 ETH_P_ALL = 3
 ETH_P_IP = 0x800
 ETH_P_ARP = 0x806
@@ -73,6 +80,7 @@
 DLT_SYMANTEC_FIREWALL = 99
 DLT_C_HDLC = 104
 DLT_IEEE802_11 = 105
+DLT_FRELAY = 107
 if OPENBSD:
     DLT_LOOP = 12
     DLT_ENC = 13
@@ -80,26 +88,35 @@
     DLT_LOOP = 108
     DLT_ENC = 109
 DLT_LINUX_SLL = 113
+DLT_LTALK = 114
 DLT_PFLOG = 117
 DLT_PRISM_HEADER = 119
 DLT_AIRONET_HEADER = 120
+DLT_IP_OVER_FC = 122
 DLT_IEEE802_11_RADIO = 127
+DLT_ARCNET_LINUX = 129
 DLT_LINUX_IRDA = 144
 DLT_IEEE802_11_RADIO_AVS = 163
+DLT_LINUX_LAPD = 177
 DLT_BLUETOOTH_HCI_H4 = 187
 DLT_USB_LINUX = 189
+DLT_PPI = 192
 DLT_IEEE802_15_4_WITHFCS = 195
 DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 201
+DLT_AX25_KISS = 202
 DLT_PPP_WITH_DIR = 204
-DLT_PPI = 192
+DLT_FC_2 = 224
 DLT_CAN_SOCKETCAN = 227
 DLT_IPV4 = 228
 DLT_IPV6 = 229
 DLT_IEEE802_15_4_NOFCS = 230
 DLT_USBPCAP = 249
+DLT_NETLINK = 253
 DLT_USB_DARWIN = 266
 DLT_BLUETOOTH_LE_LL = 251
 DLT_BLUETOOTH_LE_LL_WITH_PHDR = 256
+DLT_VSOCK = 271
+DLT_ETHERNET_MPACKET = 274
 
 # From net/ipv6.h on Linux (+ Additions)
 IPV6_ADDR_UNICAST = 0x01
@@ -115,6 +132,89 @@
 IPV6_ADDR_6TO4 = 0x0100   # Added to have more specific info (should be 0x0101 ?)  # noqa: E501
 IPV6_ADDR_UNSPECIFIED = 0x10000
 
+# from if_arp.h
+ARPHRD_ETHER = 1
+ARPHRD_EETHER = 2
+ARPHRD_AX25 = 3
+ARPHRD_PRONET = 4
+ARPHRD_CHAOS = 5
+ARPHRD_IEEE802 = 6
+ARPHRD_ARCNET = 7
+ARPHRD_DLCI = 15
+ARPHRD_ATM = 19
+ARPHRD_METRICOM = 23
+ARPHRD_SLIP = 256
+ARPHRD_CSLIP = 257
+ARPHRD_SLIP6 = 258
+ARPHRD_CSLIP6 = 259
+ARPHRD_ADAPT = 264
+ARPHRD_CAN = 280
+ARPHRD_PPP = 512
+ARPHRD_CISCO = 513
+ARPHRD_RAWHDLC = 518
+ARPHRD_TUNNEL = 768
+ARPHRD_FRAD = 770
+ARPHRD_LOOPBACK = 772
+ARPHRD_LOCALTLK = 773
+ARPHRD_FDDI = 774
+ARPHRD_SIT = 776
+ARPHRD_FCPP = 784
+ARPHRD_FCAL = 785
+ARPHRD_FCPL = 786
+ARPHRD_FCFABRIC = 787
+ARPHRD_IRDA = 783
+ARPHRD_IEEE802_TR = 800
+ARPHRD_IEEE80211 = 801
+ARPHRD_IEEE80211_PRISM = 802
+ARPHRD_IEEE80211_RADIOTAP = 803
+ARPHRD_IEEE802154 = 804
+ARPHRD_NETLINK = 824
+ARPHRD_VSOCKMON = 826  # from pcap/pcap-linux.c
+ARPHRD_LAPD = 8445  # from pcap/pcap-linux.c
+ARPHRD_NONE = 0xFFFE
+
+ARPHRD_TO_DLT = {  # netlink -> datalink
+    ARPHRD_ETHER: DLT_EN10MB,
+    ARPHRD_METRICOM: DLT_EN10MB,
+    ARPHRD_LOOPBACK: DLT_EN10MB,
+    ARPHRD_EETHER: DLT_EN3MB,
+    ARPHRD_AX25: DLT_AX25_KISS,
+    ARPHRD_PRONET: DLT_PRONET,
+    ARPHRD_CHAOS: DLT_CHAOS,
+    ARPHRD_CAN: DLT_LINUX_SLL,
+    ARPHRD_IEEE802_TR: DLT_IEEE802,
+    ARPHRD_IEEE802: DLT_IEEE802,
+    ARPHRD_ARCNET: DLT_ARCNET_LINUX,
+    ARPHRD_FDDI: DLT_FDDI,
+    ARPHRD_ATM: -1,
+    ARPHRD_IEEE80211: DLT_IEEE802_11,
+    ARPHRD_IEEE80211_PRISM: DLT_PRISM_HEADER,
+    ARPHRD_IEEE80211_RADIOTAP: DLT_IEEE802_11_RADIO,
+    ARPHRD_PPP: DLT_RAW,
+    ARPHRD_CISCO: DLT_C_HDLC,
+    ARPHRD_SIT: DLT_RAW,
+    ARPHRD_CSLIP: DLT_RAW,
+    ARPHRD_SLIP6: DLT_RAW,
+    ARPHRD_CSLIP6: DLT_RAW,
+    ARPHRD_ADAPT: DLT_RAW,
+    ARPHRD_SLIP: DLT_RAW,
+    ARPHRD_RAWHDLC: DLT_RAW,
+    ARPHRD_DLCI: DLT_RAW,
+    ARPHRD_FRAD: DLT_FRELAY,
+    ARPHRD_LOCALTLK: DLT_LTALK,
+    18: DLT_IP_OVER_FC,
+    ARPHRD_FCPP: DLT_FC_2,
+    ARPHRD_FCAL: DLT_FC_2,
+    ARPHRD_FCPL: DLT_FC_2,
+    ARPHRD_FCFABRIC: DLT_FC_2,
+    ARPHRD_IRDA: DLT_LINUX_IRDA,
+    ARPHRD_LAPD: DLT_LINUX_LAPD,
+    ARPHRD_NONE: DLT_RAW,
+    ARPHRD_IEEE802154: DLT_IEEE802_15_4_NOFCS,
+    ARPHRD_NETLINK: DLT_NETLINK,
+    ARPHRD_VSOCKMON: DLT_VSOCK,
+}
+
 # Constants for PPI header types.
 PPI_DOT11COMMON = 2
 PPI_DOT11NMAC = 3
@@ -154,10 +254,29 @@
 MTU = 0xffff  # a.k.a give me all you have
 
 
-def load_protocols(filename, _fallback=None, _integer_base=10):
+# In fact, IANA enterprise-numbers file available at
+# http://www.iana.org/assignments/enterprise-numbers
+# is simply huge (more than 2Mo and 600Ko in bz2). I'll
+# add only most common vendors, and encountered values.
+# -- arno
+IANA_ENTERPRISE_NUMBERS = {
+    9: "ciscoSystems",
+    35: "Nortel Networks",
+    43: "3Com",
+    311: "Microsoft",
+    2636: "Juniper Networks, Inc.",
+    4526: "Netgear",
+    5771: "Cisco Systems, Inc.",
+    5842: "Cisco Systems",
+    11129: "Google, Inc",
+    16885: "Nortel Networks",
+}
+
+
+def load_protocols(filename, _fallback=None, _integer_base=10, _cls=DADict):
     """"Parse /etc/protocols and return values as a dictionary."""
     spaces = re.compile(b"[ \t]+|\n")
-    dct = DADict(_name=filename)
+    dct = _cls(_name=filename)
 
     def _process_data(fdesc):
         for line in fdesc:
@@ -171,7 +290,7 @@
                 lt = tuple(re.split(spaces, line))
                 if len(lt) < 2 or not lt[0]:
                     continue
-                dct[lt[0]] = int(lt[1], _integer_base)
+                dct[int(lt[1], _integer_base)] = fixname(lt[0])
             except Exception as e:
                 log_loading.info(
                     "Couldn't parse file [%s]: line [%r] (%s)",
@@ -192,11 +311,36 @@
     return dct
 
 
+class EtherDA(DADict):
+    # Backward compatibility: accept
+    # ETHER_TYPES["MY_GREAT_TYPE"] = 12
+    def __setitem__(self, attr, val):
+        if isinstance(attr, str):
+            attr, val = val, attr
+            warnings.warn(
+                "ETHER_TYPES now uses the integer value as key !",
+                DeprecationWarning
+            )
+        super(EtherDA, self).__setitem__(attr, val)
+
+    def __getitem__(self, attr):
+        if isinstance(attr, str):
+            warnings.warn(
+                "Please use 'ETHER_TYPES.%s'" % attr,
+                DeprecationWarning
+            )
+            return super(EtherDA, self).__getattr__(attr)
+        return super(EtherDA, self).__getitem__(attr)
+
+
 def load_ethertypes(filename):
     """"Parse /etc/ethertypes and return values as a dictionary.
     If unavailable, use the copy bundled with Scapy."""
-    from scapy.modules.ethertypes import DATA
-    return load_protocols(filename, _fallback=DATA, _integer_base=16)
+    from scapy.libs.ethertypes import DATA
+    return load_protocols(filename or "Scapy's backup ETHER_TYPES",
+                          _fallback=DATA,
+                          _integer_base=16,
+                          _cls=EtherDA)
 
 
 def load_services(filename):
@@ -216,10 +360,21 @@
                     lt = tuple(re.split(spaces, line))
                     if len(lt) < 2 or not lt[0]:
                         continue
+                    dtct = None
                     if lt[1].endswith(b"/tcp"):
-                        tdct[lt[0]] = int(lt[1].split(b'/')[0])
+                        dtct = tdct
                     elif lt[1].endswith(b"/udp"):
-                        udct[lt[0]] = int(lt[1].split(b'/')[0])
+                        dtct = udct
+                    else:
+                        continue
+                    port = lt[1].split(b'/')[0]
+                    name = fixname(lt[0])
+                    if b"-" in port:
+                        sport, eport = port.split(b"-")
+                        for i in range(int(sport), int(eport) + 1):
+                            dtct[i] = name
+                    else:
+                        dtct[int(port)] = name
                 except Exception as e:
                     log_loading.warning(
                         "Couldn't parse file [%s]: line [%r] (%s)",
@@ -233,11 +388,8 @@
 
 
 class ManufDA(DADict):
-    def fixname(self, val):
-        return plain_str(val)
-
-    def __dir__(self):
-        return ["lookup", "reverse_lookup"]
+    def ident(self, v):
+        return fixname(v[0] if isinstance(v, tuple) else v)
 
     def _get_manuf_couple(self, mac):
         oui = ":".join(mac.split(":")[:3]).upper()
@@ -261,11 +413,12 @@
         return self[oui]
 
     def reverse_lookup(self, name, case_sensitive=False):
-        """Find all MACs registered to a OUI
-        params:
-         - name: the OUI name
-         - case_sensitive: default to False
-        returns: a dict of mac:tuples (Name, Extended Name)
+        """
+        Find all MACs registered to a OUI
+
+        :param name: the OUI name
+        :param case_sensitive: default to False
+        :returns: a dict of mac:tuples (Name, Extended Name)
         """
         if case_sensitive:
             filtr = lambda x, l: any(x == z for z in l)
@@ -275,11 +428,23 @@
         return {k: v for k, v in six.iteritems(self.__dict__)
                 if filtr(name, v)}
 
+    def __dir__(self):
+        return [
+            "_get_manuf",
+            "_get_short_manuf",
+            "_resolve_MAC",
+            "loopkup",
+            "reverse_lookup",
+        ] + super(ManufDA, self).__dir__()
+
 
 def load_manuf(filename):
-    """Load manuf file from Wireshark.
-    param:
-     - filename: the file to load the manuf file from"""
+    """
+    Loads manuf file from Wireshark.
+
+    :param filename: the file to load the manuf file from
+    :returns: a ManufDA filled object
+    """
     manufdb = ManufDA(_name=filename)
     with open(filename, "rb") as fdesc:
         for line in fdesc:
@@ -288,9 +453,10 @@
                 if not line or line.startswith(b"#"):
                     continue
                 parts = line.split(None, 2)
-                oui, shrt = parts[:2]
-                lng = parts[2].lstrip(b"#").strip() if len(parts) > 2 else ""
+                ouib, shrt = parts[:2]
+                lng = parts[2].lstrip(b"#").strip() if len(parts) > 2 else b""
                 lng = lng or shrt
+                oui = plain_str(ouib)
                 manufdb[oui] = plain_str(shrt), plain_str(lng)
             except Exception:
                 log_loading.warning("Couldn't parse one line from [%s] [%r]",

scapy-2.4.3.tar.gz/scapy/error.py -> scapy-2.4.4.tar.gz/scapy/error.py Changed

scapy-2.4.3.tar.gz/scapy/extlib.py -> scapy-2.4.4.tar.gz/scapy/extlib.py Changed

scapy-2.4.3.tar.gz/scapy/fields.py -> scapy-2.4.4.tar.gz/scapy/fields.py Changed

@@ -38,6 +38,7 @@
 from scapy.error import warning
 import scapy.modules.six as six
 from scapy.modules.six.moves import range
+from scapy.modules.six import integer_types
 
 
 """
@@ -73,10 +74,19 @@
 ############
 
 class Field(six.with_metaclass(Field_metaclass, object)):
-    """For more information on how this work, please refer to
-       http://www.secdev.org/projects/scapy/files/scapydoc.pdf
-       chapter ``Adding a New Field''"""
-    __slots__ = ["name", "fmt", "default", "sz", "owners"]
+    """
+    For more information on how this work, please refer to
+    http://www.secdev.org/projects/scapy/files/scapydoc.pdf
+    chapter ``Adding a New Field``
+    """
+    __slots__ = [
+        "name",
+        "fmt",
+        "default",
+        "sz",
+        "owners",
+        "struct"
+    ]
     islist = 0
     ismutable = False
     holds_packets = 0
@@ -87,6 +97,7 @@
             self.fmt = fmt
         else:
             self.fmt = "!" + fmt
+        self.struct = struct.Struct(self.fmt)
         self.default = self.any2i(None, default)
         self.sz = struct.calcsize(self.fmt)
         self.owners = []
@@ -137,7 +148,7 @@
         Copy the network representation of field `val` (belonging to layer
         `pkt`) to the raw string packet `s`, and return the new string packet.
         """
-        return s + struct.pack(self.fmt, self.i2m(pkt, val))
+        return s + self.struct.pack(self.i2m(pkt, val))
 
     def getfield(self, pkt, s):
         """Extract an internal value from a string
@@ -149,7 +160,7 @@
         first the raw packet string after having removed the extracted field,
         second the extracted field itself in internal representation.
         """
-        return s[self.sz:], self.m2i(pkt, struct.unpack(self.fmt, s[:self.sz])[0])  # noqa: E501
+        return s[self.sz:], self.m2i(pkt, self.struct.unpack(s[:self.sz])[0])
 
     def do_copy(self, x):
         if hasattr(x, "copy"):
@@ -165,7 +176,7 @@
         return "<Field (%s).%s>" % (",".join(x.__name__ for x in self.owners), self.name)  # noqa: E501
 
     def copy(self):
-        return copy.deepcopy(self)
+        return copy.copy(self)
 
     def randval(self):
         """Return a volatile object whose value is both random and suitable for this field"""  # noqa: E501
@@ -195,12 +206,15 @@
     def __getattr__(self, attr):
         return getattr(self.fld, attr)
 
-    def __hash__(self):
-        return hash(self.fld)
-
     def __eq__(self, other):
         return self.fld == other
 
+    def __ne__(self, other):
+        # Python 2.7 compat
+        return not self == other
+
+    __hash__ = None
+
 
 class ActionField(object):
     __slots__ = ["_fld", "_action_method", "_privdata"]
@@ -392,7 +406,7 @@
     def __init__(self, fld, align, padwith=None):
         self._fld = fld
         self._align = align
-        self._padwith = padwith or b""
+        self._padwith = padwith or b"\x00"
 
     def padlen(self, flen):
         return -flen % self._align
@@ -416,7 +430,7 @@
 
     def getfield(self, pkt, s):
         # We need to get the length that has already been dissected
-        padlen = self.padlen(pkt._tmp_dissect_pos)
+        padlen = self.padlen(len(pkt.original) - len(s))
         remain, val = self._fld.getfield(pkt, s[padlen:])
         return remain, val
 
@@ -488,7 +502,12 @@
     def i2m(self, pkt, x):
         if x is None:
             return b"\0\0\0\0\0\0"
-        return mac2str(x)
+        try:
+            x = mac2str(x)
+        except (struct.error, OverflowError):
+            x = bytes_encode(x)
+
+        return x
 
     def m2i(self, pkt, x):
         return str2mac(x)
@@ -726,6 +745,46 @@
         return XByteField.i2repr(self, pkt, x)
 
 
+class NBytesField(ByteField, Field):
+    def __init__(self, name, default, sz):
+        Field.__init__(self, name, default, "<" + "B" * sz)
+
+    def i2m(self, pkt, x):
+        x2m = list()
+        for _ in range(self.sz):
+            x2m.append(x % 256)
+            x //= 256
+        return x2m[::-1]
+
+    def m2i(self, pkt, x):
+        if isinstance(x, int):
+            return x
+        # x can be a tuple when coming from struct.unpack  (from getfield)
+        if isinstance(x, (list, tuple)):
+            return sum(d * (256 ** i) for i, d in enumerate(x))
+
+    def i2repr(self, pkt, x):
+        if isinstance(x, integer_types):
+            return '%i' % x
+        return super(NBytesField, self).i2repr(pkt, x)
+
+    def addfield(self, pkt, s, val):
+        return s + self.struct.pack(*self.i2m(pkt, val))
+
+    def getfield(self, pkt, s):
+        return s[self.sz:], self.m2i(pkt, self.struct.unpack(s[:self.sz]))
+
+
+class XNBytesField(NBytesField):
+    def i2repr(self, pkt, x):
+        if isinstance(x, integer_types):
+            return '0x%x' % x
+        # x can be a tuple when coming from struct.unpack (from getfield)
+        if isinstance(x, (list, tuple)):
+            return "0x" + "".join("%02x" % b for b in x)
+        return super(XNBytesField, self).i2repr(pkt, x)
+
+
 class SignedByteField(Field):
     def __init__(self, name, default):
         Field.__init__(self, name, default, "b")
@@ -741,30 +800,37 @@
 
 class YesNoByteField(ByteField):
     """
-    byte based flag field that shows representation of its number based on a given association  # noqa: E501
+    A byte based flag field that shows representation of its number
+    based on a given association
 
-    in its default configuration the following representation is generated:
+    In its default configuration the following representation is generated:
         x == 0 : 'no'
         x != 0 : 'yes'
 
-    in more sophisticated use-cases (e.g. yes/no/invalid) one can use the config attribute to configure  # noqa: E501
-    key-value, key-range and key-value-set associations that will be used to generate the values representation.  # noqa: E501
+    In more sophisticated use-cases (e.g. yes/no/invalid) one can use the
+    config attribute to configure.
+    Key-value, key-range and key-value-set associations that will be used to
+    generate the values representation.
 
-    a range is given by a tuple (<first-val>, <last-value>) including the last value. a single-value tuple  # noqa: E501
-    is treated as scalar.
+    - A range is given by a tuple (<first-val>, <last-value>) including the
+      last value.
+    - A single-value tuple is treated as scalar.
+    - A list defines a set of (probably non consecutive) values that should be
+      associated to a given key.
 
-    a list defines a set of (probably non consecutive) values that should be associated to a given key.  # noqa: E501
+    All values not associated with a key will be shown as number of type
+    unsigned byte.
 
-    all values not associated with a key will be shown as number of type unsigned byte.  # noqa: E501
+    **For instance**::
 
-    config = {
-                'no' : 0,
-                'foo' : (1,22),
-                'yes' : 23,
-                'bar' : [24,25, 42, 48, 87, 253]
-             }
+        config = {
+            'no' : 0,
+            'foo' : (1,22),
+            'yes' : 23,
+            'bar' : [24,25, 42, 48, 87, 253]
+        }
 
-    generates the following representations:
+    Generates the following representations::
 
         x == 0 : 'no'
         x == 15: 'foo'
@@ -772,14 +838,15 @@
         x == 42: 'bar'
         x == 43: 43
 
-    using the config attribute one could also revert the stock-yes-no-behavior:
+    Another example, using the config attribute one could also revert
+    the stock-yes-no-behavior::
 
-    config = {
+        config = {
                 'yes' : 0,
                 'no' : (1,255)
-             }
+        }
 
-    will generate the following value representation:
+    Will generate the following value representation::
 
         x == 0 : 'yes'
         x != 0 : 'no'
@@ -857,6 +924,11 @@
         Field.__init__(self, name, default, "<H")
 
 
+class LESignedShortField(Field):
+    def __init__(self, name, default):
+        Field.__init__(self, name, default, "<h")
+
+
 class XShortField(ShortField):
     def i2repr(self, pkt, x):
         return lhex(self.i2h(pkt, x))
@@ -902,11 +974,21 @@
         Field.__init__(self, name, default, "Q")
 
 
+class SignedLongField(Field):
+    def __init__(self, name, default):
+        Field.__init__(self, name, default, "q")
+
+
 class LELongField(LongField):
     def __init__(self, name, default):
         Field.__init__(self, name, default, "<Q")
 
 
+class LESignedLongField(Field):
+    def __init__(self, name, default):
+        Field.__init__(self, name, default, "<q")
+
+
 class XLongField(LongField):
     def i2repr(self, pkt, x):
         return lhex(self.i2h(pkt, x))
@@ -968,6 +1050,22 @@
         return RandBin(RandNum(0, 1200))
 
 
+class StrFieldUtf16(StrField):
+    def h2i(self, pkt, x):
+        return plain_str(x).encode('utf-16')[2:]
+
+    def any2i(self, pkt, x):
+        if isinstance(x, six.text_type):
+            return self.h2i(pkt, x)
+        return super(StrFieldUtf16, self).any2i(pkt, x)
+
+    def i2repr(self, pkt, x):
+        return x
+
+    def i2h(self, pkt, x):
+        return bytes_encode(x).decode('utf-16')
+
+
 class PacketField(StrField):
     __slots__ = ["cls"]
     holds_packets = 1
@@ -1017,68 +1115,113 @@
 
 
 class PacketListField(PacketField):
-    """ PacketListField represents a series of Packet instances that might occur right in the middle of another Packet  # noqa: E501
-    field list.
-    This field type may also be used to indicate that a series of Packet instances have a sibling semantic instead of  # noqa: E501
-    a parent/child relationship (i.e. a stack of layers).
+    """PacketListField represents a series of Packet instances that might
+    occur right in the middle of another Packet field list.
+    This field type may also be used to indicate that a series of Packet
+    instances have a sibling semantic instead of a parent/child relationship
+    (i.e. a stack of layers).
     """
     __slots__ = ["count_from", "length_from", "next_cls_cb"]
     islist = 1
 
     def __init__(self, name, default, cls=None, count_from=None, length_from=None, next_cls_cb=None):  # noqa: E501
-        """ The number of Packet instances that are dissected by this field can be parametrized using one of three  # noqa: E501
-        different mechanisms/parameters:
-            * count_from: a callback that returns the number of Packet instances to dissect. The callback prototype is:  # noqa: E501
-            count_from(pkt:Packet) -> int
-            * length_from: a callback that returns the number of bytes that must be dissected by this field. The  # noqa: E501
-            callback prototype is:
-            length_from(pkt:Packet) -> int
-            * next_cls_cb: a callback that enables a Scapy developer to dynamically discover if another Packet instance  # noqa: E501
-            should be dissected or not. See below for this callback prototype.
-
-        The bytes that are not consumed during the dissection of this field are passed to the next field of the current  # noqa: E501
-        packet.
-
-        For the serialization of such a field, the list of Packets that are contained in a PacketListField can be  # noqa: E501
-        heterogeneous and is unrestricted.
-
-        The type of the Packet instances that are dissected with this field is specified or discovered using one of the  # noqa: E501
-        following mechanism:
-            * the cls parameter may contain a callable that returns an instance of the dissected Packet. This  # noqa: E501
-                may either be a reference of a Packet subclass (e.g. DNSRROPT in layers/dns.py) to generate an  # noqa: E501
-                homogeneous PacketListField or a function deciding the type of the Packet instance  # noqa: E501
-                (e.g. _CDPGuessAddrRecord in contrib/cdp.py)
-            * the cls parameter may contain a class object with a defined "dispatch_hook" classmethod. That  # noqa: E501
-                method must return a Packet instance. The dispatch_hook callmethod must implement the following prototype:  # noqa: E501
-                dispatch_hook(cls, _pkt:Optional[Packet], *args, **kargs) -> Packet_metaclass  # noqa: E501
-                The _pkt parameter may contain a reference to the packet instance containing the PacketListField that is  # noqa: E501
-                being dissected.
-            * the next_cls_cb parameter may contain a callable whose prototype is:  # noqa: E501
-                cbk(pkt:Packet, lst:List[Packet], cur:Optional[Packet], remain:str) -> Optional[Packet_metaclass]  # noqa: E501
-                The pkt argument contains a reference to the Packet instance containing the PacketListField that is  # noqa: E501
-                being dissected. The lst argument is the list of all Packet instances that were previously parsed during  # noqa: E501
-                the current PacketListField dissection, save for the very last Packet instance. The cur argument  # noqa: E501
-                contains a reference to that very last parsed Packet instance. The remain argument contains the bytes  # noqa: E501
-                that may still be consumed by the current PacketListField dissection operation. This callback returns  # noqa: E501
-                either the type of the next Packet to dissect or None to indicate that no more Packet are to be  # noqa: E501
+        """
+        The number of Packet instances that are dissected by this field can
+        be parametrized using one of three different mechanisms/parameters:
+
+            * count_from: a callback that returns the number of Packet
+              instances to dissect. The callback prototype is::
+
+                count_from(pkt:Packet) -> int
+
+            * length_from: a callback that returns the number of bytes that
+              must be dissected by this field. The callback prototype is::
+
+                length_from(pkt:Packet) -> int
+
+            * next_cls_cb: a callback that enables a Scapy developer to
+              dynamically discover if another Packet instance should be
+              dissected or not. See below for this callback prototype.
+
+        The bytes that are not consumed during the dissection of this field
+        are passed to the next field of the current packet.
+
+        For the serialization of such a field, the list of Packets that are
+        contained in a PacketListField can be heterogeneous and is
+        unrestricted.
+
+        The type of the Packet instances that are dissected with this field is
+        specified or discovered using one of the following mechanism:
+
+            * the cls parameter may contain a callable that returns an
+              instance of the dissected Packet. This may either be a
+              reference of a Packet subclass (e.g. DNSRROPT in layers/dns.py)
+              to generate an homogeneous PacketListField or a function
+              deciding the type of the Packet instance
+              (e.g. _CDPGuessAddrRecord in contrib/cdp.py)
+
+            * the cls parameter may contain a class object with a defined
+              ``dispatch_hook`` classmethod. That method must return a Packet
+              instance. The ``dispatch_hook`` callmethod must implement the
+                following prototype::
+
+                dispatch_hook(cls,
+                              _pkt:Optional[Packet],
+                              *args, **kargs
+                ) -> Packet_metaclass
+
+                The _pkt parameter may contain a reference to the packet
+                instance containing the PacketListField that is being
                 dissected.
-                These four arguments allows a variety of dynamic discovery of the number of Packet to dissect and of the  # noqa: E501
-                type of each one of these Packets, including: type determination based on current Packet instances or  # noqa: E501
-                its underlayers, continuation based on the previously parsed Packet instances within that  # noqa: E501
-                PacketListField, continuation based on a look-ahead on the bytes to be dissected...  # noqa: E501
-
-        The cls and next_cls_cb parameters are semantically exclusive, although one could specify both. If both are  # noqa: E501
-        specified, cls is silently ignored. The same is true for count_from and next_cls_cb.  # noqa: E501
-        length_from and next_cls_cb are compatible and the dissection will end, whichever of the two stop conditions  # noqa: E501
-        comes first.
-
-        @param name: the name of the field
-        @param default: the default value of this field; generally an empty Python list  # noqa: E501
-        @param cls: either a callable returning a Packet instance or a class object defining a dispatch_hook class  # noqa: E501
-            method
-        @param count_from: a callback returning the number of Packet instances to dissect  # noqa: E501
-        @param length_from: a callback returning the number of bytes to dissect
-        @param next_cls_cb: a callback returning either None or the type of the next Packet to dissect.  # noqa: E501
+
+            * the ``next_cls_cb`` parameter may contain a callable whose
+              prototype is::
+
+                cbk(pkt:Packet,
+                    lst:List[Packet],
+                    cur:Optional[Packet],
+                    remain:str
+                ) -> Optional[Packet_metaclass]
+
+              The pkt argument contains a reference to the Packet instance
+              containing the PacketListField that is being dissected.
+              The lst argument is the list of all Packet instances that were
+              previously parsed during the current ``PacketListField``
+              dissection, saved for the very last Packet instance.
+              The cur argument contains a reference to that very last parsed
+              ``Packet`` instance. The remain argument contains the bytes
+              that may still be consumed by the current PacketListField
+              dissection operation.
+
+              This callback returns either the type of the next Packet to
+              dissect or None to indicate that no more Packet are to be
+              dissected.
+
+              These four arguments allows a variety of dynamic discovery of
+              the number of Packet to dissect and of the type of each one of
+              these Packets, including: type determination based on current
+              Packet instances or its underlayers, continuation based on the
+              previously parsed Packet instances within that PacketListField,
+              continuation based on a look-ahead on the bytes to be
+              dissected...
+
+        The cls and next_cls_cb parameters are semantically exclusive,
+        although one could specify both. If both are specified, cls is
+        silently ignored. The same is true for count_from and next_cls_cb.
+
+        length_from and next_cls_cb are compatible and the dissection will
+        end, whichever of the two stop conditions comes first.
+
+        :param name: the name of the field
+        :param default: the default value of this field; generally an empty
+            Python list
+        @param cls: either a callable returning a Packet instance or a class
+            object defining a ``dispatch_hook`` class method
+        :param count_from: a callback returning the number of Packet
+            instances to dissect.
+        :param length_from: a callback returning the number of bytes to dissect
+        :param next_cls_cb: a callback returning either None or the type of
+            the next Packet to dissect.
         """
         if default is None:
             default = []  # Create a new list for each instance
@@ -1283,8 +1426,16 @@
     def h2i(self, pkt, x):
         return plain_str(x).encode('utf-16')[2:]
 
+    def any2i(self, pkt, x):
+        if isinstance(x, six.text_type):
+            return self.h2i(pkt, x)
+        return super(StrLenFieldUtf16, self).any2i(pkt, x)
+
+    def i2repr(self, pkt, x):
+        return x
+
     def i2h(self, pkt, x):
-        return x.decode('utf-16')
+        return bytes_encode(x).decode('utf-16')
 
 
 class BoundStrLenField(StrLenField):
@@ -1392,7 +1543,7 @@
     def getfield(self, pkt, s):
         len_str = s.find(b"\x00")
         if len_str < 0:
-            # XXX \x00 not found
+            # \x00 not found: return empty
             return b"", s
         return s[len_str + 1:], self.m2i(pkt, s[:len_str])
 
@@ -1421,6 +1572,9 @@
 
 
 class LenField(Field):
+    """
+    If None, will be filled with the size of the payload
+    """
     __slots__ = ["adjust"]
 
     def __init__(self, name, default, fmt="H", adjust=lambda x: x):
@@ -1442,21 +1596,65 @@
 
 
 class BitField(Field):
-    __slots__ = ["rev", "size"]
+    """
+    Field to handle bits.
+
+    :param name: name of the field
+    :param default: default value
+    :param size: size (in bits). If negative, Low endian
+    :param tot_size: size of the total group of bits (in bytes) the bitfield
+                     is in. If negative, Low endian.
+    :param end_tot_size: same but for the BitField ending a group.
+
+    Example - normal usage::
+
+         0                   1                   2                   3
+         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |             A             |               B               | C |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+                                 Fig. TestPacket
 
-    def __init__(self, name, default, size):
+        class TestPacket(Packet):
+            fields_desc = [
+                BitField("a", 0, 14),
+                BitField("b", 0, 16),
+                BitField("c", 0, 2),
+            ]
+
+    Example - Low endian stored as 16 bits on the network::
+
+        x x x x x x x x x x x x x x x x
+        a [b] [   c   ] [      a      ]
+
+        Will first get reversed during dissecion:
+
+        x x x x x x x x x x x x x x x x
+        [      a        ] [b] [   c   ]
+
+        class TestPacket(Packet):
+            fields_desc = [
+                BitField("a", 0, 9, tot_size=-16),
+                BitField("b", 0, 2),
+                BitField("c", 0, 5, end_tot_size=-16)
+            ]
+
+    """
+    __slots__ = ["rev", "size", "tot_size", "end_tot_size"]
+
+    def __init__(self, name, default, size,
+                 tot_size=0, end_tot_size=0):
         Field.__init__(self, name, default)
-        self.rev = size < 0
+        self.rev = size < 0 or tot_size < 0 or end_tot_size < 0
         self.size = abs(size)
-
-    def reverse(self, val):
-        if self.size == 16:
-            # Replaces socket.ntohs (but work on both little/big endian)
-            val = struct.unpack('>H', struct.pack('<H', int(val)))[0]
-        elif self.size == 32:
-            # Same here but for socket.ntohl
-            val = struct.unpack('>I', struct.pack('<I', int(val)))[0]
-        return val
+        if not tot_size:
+            tot_size = self.size // 8
+        self.tot_size = abs(tot_size)
+        if not end_tot_size:
+            end_tot_size = self.size // 8
+        self.end_tot_size = abs(end_tot_size)
+        self.sz = self.size / 8.
 
     def addfield(self, pkt, s, val):
         val = self.i2m(pkt, val)
@@ -1465,8 +1663,6 @@
         else:
             bitsdone = 0
             v = 0
-        if self.rev:
-            val = self.reverse(val)
         v <<= self.size
         v |= val & ((1 << self.size) - 1)
         bitsdone += self.size
@@ -1477,6 +1673,9 @@
         if bitsdone:
             return s, bitsdone, v
         else:
+            # Apply LE if necessary
+            if self.rev and self.end_tot_size > 1:
+                s = s[:-self.end_tot_size] + s[-self.end_tot_size:][::-1]
             return s
 
     def getfield(self, pkt, s):
@@ -1484,6 +1683,10 @@
             s, bn = s
         else:
             bn = 0
+            # Apply LE if necessary
+            if self.rev and self.tot_size > 1:
+                s = s[:self.tot_size][::-1] + s[self.tot_size:]
+
         # we don't want to process all the string
         nb_bytes = (self.size + bn - 1) // 8 + 1
         w = s[:nb_bytes]
@@ -1501,9 +1704,6 @@
         # remove low order bits
         b = b >> (nb_bytes * 8 - self.size - bn)
 
-        if self.rev:
-            b = self.reverse(b)
-
         bn += self.size
         s = s[bn // 8:]
         bn = bn % 8
@@ -1574,8 +1774,8 @@
                 keys = enum.keys()
             else:
                 keys = list(enum)
-            if any(isinstance(x, str) for x in keys):
-                i2s, s2i = s2i, i2s
+                if any(isinstance(x, str) for x in keys):
+                    i2s, s2i = s2i, i2s
             for k in keys:
                 i2s[k] = enum[k]
                 s2i[enum[k]] = k
@@ -1653,6 +1853,7 @@
         _EnumField.__init__(self, name, default, enum)
         self.rev = size < 0
         self.size = abs(size)
+        self.sz = self.size / 8.
 
     def any2i(self, pkt, x):
         return _EnumField.any2i(self, pkt, x)
@@ -1747,6 +1948,8 @@
 
     def i2repr_one(self, pkt, x):
         v = self.depends_on(pkt)
+        if isinstance(v, VolatileValue):
+            return repr(v)
         if v in self.i2s_multi:
             return self.i2s_multi[v].get(x, x)
         return x
@@ -1763,6 +1966,7 @@
         _MultiEnumField.__init__(self, name, default, enum, depends_on)
         self.rev = size < 0
         self.size = abs(size)
+        self.sz = self.size / 8.
 
     def any2i(self, pkt, x):
         return _MultiEnumField.any2i(self, pkt, x)
@@ -1948,27 +2152,54 @@
 
    Make sure all your flags have a label
 
-   Example:
+   Example (list):
        >>> from scapy.packet import Packet
        >>> class FlagsTest(Packet):
                fields_desc = [FlagsField("flags", 0, 8, ["f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7"])]  # noqa: E501
        >>> FlagsTest(flags=9).show2()
        ###[ FlagsTest ]###
          flags     = f0+f3
-       >>> FlagsTest(flags=0).show2().strip()
+
+    Example (str):
+       >>> from scapy.packet import Packet
+       >>> class TCPTest(Packet):
+               fields_desc = [
+                   BitField("reserved", 0, 7),
+                   FlagsField("flags", 0x2, 9, "FSRPAUECN")
+               ]
+       >>> TCPTest(flags=3).show2()
        ###[ FlagsTest ]###
-         flags     =
+         reserved  = 0
+         flags     = FS
+
+    Example (dict):
+       >>> from scapy.packet import Packet
+       >>> class FlagsTest2(Packet):
+               fields_desc = [
+                   FlagsField("flags", 0x2, 16, {
+                       1: "1",  # 1st bit
+                       8: "2"   # 8th bit
+                   })
+               ]
 
    :param name: field's name
    :param default: default value for the field
-   :param size: number of bits in the field
-   :param names: (list or dict) label for each flag, Least Significant Bit tag's name is written first  # noqa: E501
+   :param size: number of bits in the field (in bits)
+   :param names: (list or str or dict) label for each flag
+       If it's a str or a list, the least Significant Bit tag's name
+       is written first.
    """
     ismutable = True
-    __slots__ = ["multi", "names"]
+    __slots__ = ["names"]
 
     def __init__(self, name, default, size, names):
-        self.multi = isinstance(names, list)
+        # Convert the dict to a list
+        if isinstance(names, dict):
+            tmp = ["bit_%d" % i for i in range(size)]
+            for i, v in six.viewitems(names):
+                tmp[i] = v
+            names = tmp
+        # Store the names as str or list
         self.names = names
         BitField.__init__(self, name, default, size)
 
@@ -2243,7 +2474,50 @@
         return "%s sec" % x
 
 
-class ScalingField(Field):
+class _ScalingField(object):
+    def __init__(self, name, default, scaling=1, unit="",
+                 offset=0, ndigits=3, fmt="B"):
+        self.scaling = scaling
+        self.unit = unit
+        self.offset = offset
+        self.ndigits = ndigits
+        Field.__init__(self, name, default, fmt)
+
+    def i2m(self, pkt, x):
+        if x is None:
+            x = 0
+        x = (x - self.offset) / self.scaling
+        if isinstance(x, float) and self.fmt[-1] != "f":
+            x = int(round(x))
+        return x
+
+    def m2i(self, pkt, x):
+        x = x * self.scaling + self.offset
+        if isinstance(x, float) and self.fmt[-1] != "f":
+            x = round(x, self.ndigits)
+        return x
+
+    def any2i(self, pkt, x):
+        if isinstance(x, (str, bytes)):
+            x = struct.unpack(self.fmt, bytes_encode(x))[0]
+            x = self.m2i(pkt, x)
+        return x
+
+    def i2repr(self, pkt, x):
+        return "%s %s" % (self.i2h(pkt, x), self.unit)
+
+    def randval(self):
+        value = super(_ScalingField, self).randval()
+        if value is not None:
+            min_val = round(value.min * self.scaling + self.offset,
+                            self.ndigits)
+            max_val = round(value.max * self.scaling + self.offset,
+                            self.ndigits)
+
+            return RandFloat(min(min_val, max_val), max(min_val, max_val))
+
+
+class ScalingField(_ScalingField, Field):
     """ Handle physical values which are scaled and/or offset for communication
 
        Example:
@@ -2283,48 +2557,15 @@
        :param ndigits: number of fractional digits for the internal conversion
        :param fmt: struct.pack format used to parse and serialize the internal value from and to machine representation # noqa: E501
        """
-    __slots__ = ["scaling", "unit", "offset", "ndigits"]
-
-    def __init__(self, name, default, scaling=1, unit="",
-                 offset=0, ndigits=3, fmt="B"):
-        self.scaling = scaling
-        self.unit = unit
-        self.offset = offset
-        self.ndigits = ndigits
-        Field.__init__(self, name, default, fmt)
-
-    def i2m(self, pkt, x):
-        if x is None:
-            x = 0
-        x = (x - self.offset) / self.scaling
-        if isinstance(x, float) and self.fmt[-1] != "f":
-            x = int(round(x))
-        return x
-
-    def m2i(self, pkt, x):
-        x = x * self.scaling + self.offset
-        if isinstance(x, float) and self.fmt[-1] != "f":
-            x = round(x, self.ndigits)
-        return x
-
-    def any2i(self, pkt, x):
-        if isinstance(x, str) or isinstance(x, bytes):
-            x = struct.unpack(self.fmt, bytes_encode(x))[0]
-            x = self.m2i(pkt, x)
-        return x
-
-    def i2repr(self, pkt, x):
-        return "%s %s" % (self.i2h(pkt, x), self.unit)
 
-    def randval(self):
-        value = super(ScalingField, self).randval()
-        if value is not None:
-            min_val = round(value.min * self.scaling + self.offset,
-                            self.ndigits)
-            max_val = round(value.max * self.scaling + self.offset,
-                            self.ndigits)
 
-            return RandFloat(min(min_val, max_val), max(min_val, max_val))
+class BitScalingField(_ScalingField, BitField):
+    """
+    A ScalingField that is a BitField
+    """
+    def __init__(self, name, default, size, *args, **kwargs):
+        _ScalingField.__init__(self, name, default, *args, **kwargs)
+        BitField.__init__(self, name, default, size)
 
 
 class UUIDField(Field):
@@ -2333,7 +2574,7 @@
     The internal storage format of this field is ``uuid.UUID`` from the Python
     standard library.
 
-    There are three formats (``uuid_fmt``) for this field type::
+    There are three formats (``uuid_fmt``) for this field type:
 
     * ``FORMAT_BE`` (default): the UUID is six fields in big-endian byte order,
       per RFC 4122.
@@ -2341,20 +2582,20 @@
       This format is used by DHCPv6 (RFC 6355) and most network protocols.
 
     * ``FORMAT_LE``: the UUID is six fields, with ``time_low``, ``time_mid``
-      and ``time_high_version`` in little-endian byte order. This _doesn't_
+      and ``time_high_version`` in little-endian byte order. This *doesn't*
       change the arrangement of the fields from RFC 4122.
 
       This format is used by Microsoft's COM/OLE libraries.
 
     * ``FORMAT_REV``: the UUID is a single 128-bit integer in little-endian
-      byte order. This _changes the arrangement_ of the fields.
+      byte order. This *changes the arrangement* of the fields.
 
       This format is used by Bluetooth Low Energy.
 
     Note: You should use the constants here.
 
     The "human encoding" of this field supports a number of different input
-    formats, and wraps Python's ``uuid.UUID`` library appropriately::
+    formats, and wraps Python's ``uuid.UUID`` library appropriately:
 
     * Given a bytearray, bytes or str of 16 bytes, this class decodes UUIDs in
       wire format.
@@ -2456,14 +2697,14 @@
 class BitExtendedField(Field):
     """
     Bit Extended Field
-    ------------------
 
     This type of field has a variable number of bytes. Each byte is defined
     as follows:
     - 7 bits of data
-    - 1 bit an an extension bit
-        * 0 means it is last byte of the field ("stopping bit")
-        * 1 means there is another byte after this one ("forwarding bit")
+    - 1 bit an an extension bit:
+
+      + 0 means it is last byte of the field ("stopping bit")
+      + 1 means there is another byte after this one ("forwarding bit")
 
     To get the actual data, it is necessary to hop the binary data byte per
     byte and to check the extension bit until 0

scapy-2.4.3.tar.gz/scapy/layers/all.py -> scapy-2.4.4.tar.gz/scapy/layers/all.py Changed

scapy-2.4.3.tar.gz/scapy/layers/bluetooth.py -> scapy-2.4.4.tar.gz/scapy/layers/bluetooth.py Changed

@@ -13,7 +13,7 @@
 import functools
 import socket
 import struct
-from select import select
+import select
 from ctypes import sizeof
 
 from scapy.config import conf
@@ -97,60 +97,97 @@
 }
 
 _bluetooth_error_codes = {
-    0x00: "success",
-    0x01: "unknown command",
-    0x02: "no connection",
-    0x03: "hardware failure",
-    0x04: "page timeout",
-    0x05: "authentication failure",
-    0x06: "pin or key missing",
-    0x07: "memory full",
-    0x08: "connection timeout",
-    0x09: "max number of connections",
-    0x0a: "max number of sco connections",
-    0x0b: "acl connection exists",
-    0x0c: "command disallowed",
-    0x0d: "rejected limited resources",
-    0x0e: "rejected security",
-    0x0f: "rejected personal",
-    0x10: "host timeout",
-    0x11: "unsupported feature",
-    0x12: "invalid parameters",
-    0x13: "oe user ended connection",
-    0x14: "oe low resources",
-    0x15: "oe power off",
-    0x16: "connection terminated",
-    0x17: "repeated attempts",
-    0x18: "pairing not allowed",
-    0x19: "unknown lmp pdu",
-    0x1a: "unsupported remote feature",
-    0x1b: "sco offset rejected",
-    0x1c: "sco interval rejected",
-    0x1d: "air mode rejected",
-    0x1e: "invalid lmp parameters",
-    0x1f: "unspecified error",
-    0x20: "unsupported lmp parameter value",
-    0x21: "role change not allowed",
-    0x22: "lmp response timeout",
-    0x23: "lmp error transaction collision",
-    0x24: "lmp pdu not allowed",
-    0x25: "encryption mode not accepted",
-    0x26: "unit link key used",
-    0x27: "qos not supported",
-    0x28: "instant passed",
-    0x29: "pairing not supported",
-    0x2a: "transaction collision",
-    0x2c: "qos unacceptable parameter",
-    0x2d: "qos rejected",
-    0x2e: "classification not supported",
-    0x2f: "insufficient security",
-    0x30: "parameter out of range",
-    0x32: "role switch pending",
-    0x34: "slot violation",
-    0x35: "role switch failed",
-    0x36: "eir too large",
-    0x37: "simple pairing not supported",
-    0x38: "host busy pairing"
+    0x00: "Success",
+    0x01: "Unknown HCI Command",
+    0x02: "Unknown Connection Identifier",
+    0x03: "Hardware Failure",
+    0x04: "Page Timeout",
+    0x05: "Authentication Failure",
+    0x06: "PIN or Key Missing",
+    0x07: "Memory Capacity Exceeded",
+    0x08: "Connection Timeout",
+    0x09: "Connection Limit Exceeded",
+    0x0A: "Synchronous Connection Limit To A Device Exceeded",
+    0x0B: "Connection Already Exists",
+    0x0C: "Command Disallowed",
+    0x0D: "Connection Rejected due to Limited Resources",
+    0x0E: "Connection Rejected Due To Security Reasons",
+    0x0F: "Connection Rejected due to Unacceptable BD_ADDR",
+    0x10: "Connection Accept Timeout Exceeded",
+    0x11: "Unsupported Feature or Parameter Value",
+    0x12: "Invalid HCI Command Parameters",
+    0x13: "Remote User Terminated Connection",
+    0x14: "Remote Device Terminated Connection due to Low Resources",
+    0x15: "Remote Device Terminated Connection due to Power Off",
+    0x16: "Connection Terminated By Local Host",
+    0x17: "Repeated Attempts",
+    0x18: "Pairing Not Allowed",
+    0x19: "Unknown LMP PDU",
+    0x1A: "Unsupported Remote Feature / Unsupported LMP Feature",
+    0x1B: "SCO Offset Rejected",
+    0x1C: "SCO Interval Rejected",
+    0x1D: "SCO Air Mode Rejected",
+    0x1E: "Invalid LMP Parameters / Invalid LL Parameters",
+    0x1F: "Unspecified Error",
+    0x20: "Unsupported LMP Parameter Value / Unsupported LL Parameter Value",
+    0x21: "Role Change Not Allowed",
+    0x22: "LMP Response Timeout / LL Response Timeout",
+    0x23: "LMP Error Transaction Collision / LL Procedure Collision",
+    0x24: "LMP PDU Not Allowed",
+    0x25: "Encryption Mode Not Acceptable",
+    0x26: "Link Key cannot be Changed",
+    0x27: "Requested QoS Not Supported",
+    0x28: "Instant Passed",
+    0x29: "Pairing With Unit Key Not Supported",
+    0x2A: "Different Transaction Collision",
+    0x2B: "Reserved for future use",
+    0x2C: "QoS Unacceptable Parameter",
+    0x2D: "QoS Rejected",
+    0x2E: "Channel Classification Not Supported",
+    0x2F: "Insufficient Security",
+    0x30: "Parameter Out Of Mandatory Range",
+    0x31: "Reserved for future use",
+    0x32: "Role Switch Pending",
+    0x33: "Reserved for future use",
+    0x34: "Reserved Slot Violation",
+    0x35: "Role Switch Failed",
+    0x36: "Extended Inquiry Response Too Large",
+    0x37: "Secure Simple Pairing Not Supported By Host",
+    0x38: "Host Busy - Pairing",
+    0x39: "Connection Rejected due to No Suitable Channel Found",
+    0x3A: "Controller Busy",
+    0x3B: "Unacceptable Connection Parameters",
+    0x3C: "Advertising Timeout",
+    0x3D: "Connection Terminated due to MIC Failure",
+    0x3E: "Connection Failed to be Established / Synchronization Timeout",
+    0x3F: "MAC Connection Failed",
+    0x40: "Coarse Clock Adjustment Rejected but Will Try to Adjust Using Clock"
+          " Dragging",
+    0x41: "Type0 Submap Not Defined",
+    0x42: "Unknown Advertising Identifier",
+    0x43: "Limit Reached",
+    0x44: "Operation Cancelled by Host",
+    0x45: "Packet Too Long"
+}
+
+_att_error_codes = {
+    0x01: "invalid handle",
+    0x02: "read not permitted",
+    0x03: "write not permitted",
+    0x04: "invalid pdu",
+    0x05: "insufficient auth",
+    0x06: "unsupported req",
+    0x07: "invalid offset",
+    0x08: "insuficient author",
+    0x09: "prepare queue full",
+    0x0a: "attr not found",
+    0x0b: "attr not long",
+    0x0c: "insufficient key size",
+    0x0d: "invalid value size",
+    0x0e: "unlikely",
+    0x0f: "insufficiet encrypt",
+    0x10: "unsupported gpr type",
+    0x11: "insufficient resources",
 }
 
 
@@ -164,27 +201,16 @@
 
 class HCI_ACL_Hdr(Packet):
     name = "HCI ACL header"
-    # NOTE: the 2-bytes entity formed by the 2 flags + handle must be LE
-    # This means that we must reverse those two bytes manually (we don't have
-    # a field that can reverse a group of fields)
-    fields_desc = [BitField("BC", 0, 2),       # ]
-                   BitField("PB", 0, 2),       # ]=> 2 bytes
-                   BitField("handle", 0, 12),  # ]
+    fields_desc = [BitField("BC", 0, 2, tot_size=-2),
+                   BitField("PB", 0, 2),
+                   BitField("handle", 0, 12, end_tot_size=-2),
                    LEShortField("len", None), ]
 
-    def pre_dissect(self, s):
-        return s[:2][::-1] + s[2:]  # Reverse the 2 first bytes
-
-    def post_dissect(self, s):
-        self.raw_packet_cache = None  # Reset packet to allow post_build
-        return s
-
     def post_build(self, p, pay):
         p += pay
         if self.len is None:
             p = p[:2] + struct.pack("<H", len(pay)) + p[4:]
-        # Reverse, opposite of pre_dissect
-        return p[:2][::-1] + p[2:]  # Reverse (again) the 2 first bytes
+        return p
 
 
 class L2CAP_Hdr(Packet):
@@ -344,7 +370,7 @@
     name = "Error Response"
     fields_desc = [XByteField("request", 0),
                    LEShortField("handle", 0),
-                   XByteField("ecode", 0), ]
+                   ByteEnumField("ecode", 0, _att_error_codes), ]
 
 
 class ATT_Exchange_MTU_Request(Packet):
@@ -623,6 +649,17 @@
     fields_desc = [StrFixedLenField("csrk", b'\x00' * 16, 16), ]
 
 
+class SM_Public_Key(Packet):
+    name = "Public Key"
+    fields_desc = [StrFixedLenField("key_x", b'\x00' * 32, 32),
+                   StrFixedLenField("key_y", b'\x00' * 32, 32), ]
+
+
+class SM_DHKey_Check(Packet):
+    name = "DHKey Check"
+    fields_desc = [StrFixedLenField("dhkey_check", b'\x00' * 16, 16), ]
+
+
 class EIR_Hdr(Packet):
     name = "EIR Header"
     fields_desc = [
@@ -788,7 +825,7 @@
 
         For an example of this method in use, see ``scapy.contrib.altbeacon``.
 
-        :param Type[Packet] payload_cls:
+        :param Type[scapy.packet.Packet] payload_cls:
             A reference to a Packet subclass to register as a payload.
         :param Callable[[bytes], bool] magic_check:
             (optional) callable to use to if a payload should be associated
@@ -1303,6 +1340,8 @@
 bind_layers(SM_Hdr, SM_Identity_Information, sm_command=8)
 bind_layers(SM_Hdr, SM_Identity_Address_Information, sm_command=9)
 bind_layers(SM_Hdr, SM_Signing_Information, sm_command=0x0a)
+bind_layers(SM_Hdr, SM_Public_Key, sm_command=0x0c)
+bind_layers(SM_Hdr, SM_DHKey_Check, sm_command=0x0d)
 
 
 ###########
@@ -1329,8 +1368,8 @@
 
         Users of this helper must implement this method.
 
-        :returns: List of HCI_Hdr with payloads that describe this beacon type
-        :rtype: list[HCI_Hdr]
+        :return: List of HCI_Hdr with payloads that describe this beacon type
+        :rtype: list[scapy.bluetooth.HCI_Hdr]
         """
         raise NotImplementedError("build_eir")
 
@@ -1338,7 +1377,7 @@
         """
         Builds a HCI_LE_Meta_Advertising_Report containing this frame.
 
-        :rtype: HCI_LE_Meta_Advertising_Report
+        :rtype: scapy.bluetooth.HCI_LE_Meta_Advertising_Report
         """
 
         return HCI_LE_Meta_Advertising_Report(
@@ -1352,7 +1391,7 @@
 
         This includes the :class:`HCI_Hdr` and :class:`HCI_Command_Hdr` layers.
 
-        :rtype: HCI_Hdr
+        :rtype: scapy.bluetooth.HCI_Hdr
         """
 
         return HCI_Hdr() / HCI_Command_Hdr() / HCI_Cmd_LE_Set_Advertising_Data(
@@ -1485,7 +1524,7 @@
         return HCI_Hdr(self.ins.recv(x))
 
     def readable(self, timeout=0):
-        (ins, outs, foo) = select([self.ins], [], [], timeout)
+        (ins, outs, foo) = select.select([self.ins], [], [], timeout)
         return len(ins) > 0
 
     def flush(self):

scapy-2.4.3.tar.gz/scapy/layers/can.py -> scapy-2.4.4.tar.gz/scapy/layers/can.py Changed

@@ -18,7 +18,7 @@
 from scapy.compat import orb
 from scapy.data import DLT_CAN_SOCKETCAN, MTU
 from scapy.fields import FieldLenField, FlagsField, StrLenField, \
-    ThreeBytesField, XBitField, ScalingField
+    ThreeBytesField, XBitField, ScalingField, ConditionalField, LenField
 from scapy.volatile import RandFloat, RandBinFloat
 from scapy.packet import Packet, bind_layers
 from scapy.layers.l2 import CookedLinux
@@ -28,7 +28,7 @@
 __all__ = ["CAN", "SignalPacket", "SignalField", "LESignedSignalField",
            "LEUnsignedSignalField", "LEFloatSignalField", "BEFloatSignalField",
            "BESignedSignalField", "BEUnsignedSignalField", "rdcandump",
-           "CandumpReader"]
+           "CandumpReader", "SignalHeader"]
 
 # Mimics the Wireshark CAN dissector parameter 'Byte-swap the CAN ID/flags field'  # noqa: E501
 #   set to True when working with PF_CAN sockets
@@ -279,7 +279,10 @@
 
 class SignalPacket(Packet):
     def pre_dissect(self, s):
-        if not all(isinstance(f, SignalField) for f in self.fields_desc):
+        if not all(isinstance(f, SignalField) or
+                   (isinstance(f, ConditionalField) and
+                    isinstance(f.fld, SignalField))
+                   for f in self.fields_desc):
             raise Scapy_Exception("Use only SignalFields in a SignalPacket")
         return s
 
@@ -296,6 +299,20 @@
         return s[self.wirelen:]
 
 
+class SignalHeader(CAN):
+    fields_desc = [
+        FlagsField('flags', 0, 3, ['error',
+                                   'remote_transmission_request',
+                                   'extended']),
+        XBitField('identifier', 0, 29),
+        LenField('length', None, fmt='B'),
+        ThreeBytesField('reserved', 0)
+    ]
+
+    def extract_padding(self, s):
+        return s, None
+
+
 def rdcandump(filename, count=-1, interface=None):
     """Read a candump log file and return a packet list
 
@@ -310,7 +327,6 @@
 class CandumpReader:
     """A stateful candump reader. Each packet is returned as a CAN packet"""
 
-    read_allowed_exceptions = ()  # emulate SuperSocket
     nonblocking_socket = True
 
     def __init__(self, filename, interface=None):
@@ -331,6 +347,9 @@
         if isinstance(filename, six.string_types):
             try:
                 fdesc = gzip.open(filename, "rb")
+                # try read to cause exception
+                fdesc.read(1)
+                fdesc.seek(0)
             except IOError:
                 fdesc = open(filename, "rb")
         else:

scapy-2.4.3.tar.gz/scapy/layers/dhcp.py -> scapy-2.4.4.tar.gz/scapy/layers/dhcp.py Changed

@@ -112,7 +112,7 @@
 DHCPOptions = {
     0: "pad",
     1: IPField("subnet_mask", "0.0.0.0"),
-    2: "time_zone",
+    2: IntField("time_zone", 500),
     3: IPField("router", "0.0.0.0"),
     4: IPField("time_server", "0.0.0.0"),
     5: IPField("IEN_name_server", "0.0.0.0"),
@@ -132,9 +132,9 @@
     19: ByteField("ip-forwarding", 0),
     20: ByteField("non-local-source-routing", 0),
     21: IPField("policy-filter", "0.0.0.0"),
-    22: "max_dgram_reass_size",
-    23: "default_ttl",
-    24: "pmtu_timeout",
+    22: ShortField("max_dgram_reass_size", 300),
+    23: ByteField("default_ttl", 50),
+    24: IntField("pmtu_timeout", 1000),
     25: ShortField("path-mtu-plateau-table", 1000),
     26: ShortField("interface-mtu", 50),
     27: ByteField("all-subnets-local", 0),
@@ -145,12 +145,12 @@
     32: IPField("router-solicitation-address", "0.0.0.0"),
     33: IPField("static-routes", "0.0.0.0"),
     34: ByteField("trailer-encapsulation", 0),
-    35: "arp_cache_timeout",
-    36: "ether_or_dot3",
-    37: "tcp_ttl",
-    38: "tcp_keepalive_interval",
-    39: "tcp_keepalive_garbage",
-    40: "NIS_domain",
+    35: IntField("arp_cache_timeout", 1000),
+    36: ByteField("ieee802-3-encapsulation", 0),
+    37: ByteField("tcp_ttl", 100),
+    38: IntField("tcp_keepalive_interval", 1000),
+    39: ByteField("tcp_keepalive_garbage", 0),
+    40: StrField("NIS_domain", "www.example.com"),
     41: IPField("NIS_server", "0.0.0.0"),
     42: IPField("NTP_server", "0.0.0.0"),
     43: "vendor_specific",
@@ -170,8 +170,8 @@
     57: ShortField("max_dhcp_size", 1500),
     58: IntField("renewal_time", 21600),
     59: IntField("rebinding_time", 37800),
-    60: "vendor_class_id",
-    61: "client_id",
+    60: StrField("vendor_class_id", "id"),
+    61: StrField("client_id", ""),
     62: "nwip-domain-name",
     64: "NISplus_domain",
     65: IPField("NISplus_server", "0.0.0.0"),
@@ -184,12 +184,45 @@
     73: IPField("Finger_server", "0.0.0.0"),
     74: IPField("IRC_server", "0.0.0.0"),
     75: IPField("StreetTalk_server", "0.0.0.0"),
-    76: "StreetTalk_Dir_Assistance",
+    76: IPField("StreetTalk_Dir_Assistance", "0.0.0.0"),
+    78: "slp_service_agent",
+    79: "slp_service_scope",
     81: "client_FQDN",
-    82: "relay_agent_Information",
+    82: "relay_agent_information",
+    85: IPField("nds-server", "0.0.0.0"),
+    86: StrField("nds-tree-name", ""),
+    87: StrField("nds-context", ""),
+    88: "bcms-controller-namesi",
+    89: IPField("bcms-controller-address", "0.0.0.0"),
     91: IntField("client-last-transaction-time", 1000),
     92: IPField("associated-ip", "0.0.0.0"),
+    93: "pxe_client_architecture",
+    94: "pxe_client_network_interface",
+    97: "pxe_client_machine_identifier",
+    98: StrField("uap-servers", ""),
+    100: StrField("pcode", ""),
+    101: StrField("tcode", ""),
+    112: IPField("netinfo-server-address", "0.0.0.0"),
+    113: StrField("netinfo-server-tag", ""),
+    114: StrField("default-url", ""),
+    116: ByteField("auto-config", 0),
+    117: ShortField("name-service-search", 0,),
     118: IPField("subnet-selection", "0.0.0.0"),
+    124: "vendor_class",
+    125: "vendor_specific_information",
+    136: IPField("pana-agent", "0.0.0.0"),
+    137: "v4-lost",
+    138: IPField("capwap-ac-v4", "0.0.0.0"),
+    141: "sip_ua_service_domains",
+    146: "rdnss-selection",
+    159: "v4-portparams",
+    160: StrField("v4-captive-portal", ""),
+    208: "pxelinux_magic",
+    209: "pxelinux_configuration_file",
+    210: "pxelinux_path_prefix",
+    211: "pxelinux_reboot_time",
+    212: "option-6rd",
+    213: "v4-access-domain",
     255: "end"
 }

scapy-2.4.3.tar.gz/scapy/layers/dhcp6.py -> scapy-2.4.4.tar.gz/scapy/layers/dhcp6.py Changed

@@ -7,7 +7,7 @@
 #                     Arnaud Ebalard <arnaud.ebalard@eads.net>
 
 """
-DHCPv6: Dynamic Host Configuration Protocol for IPv6. [RFC 3315]
+DHCPv6: Dynamic Host Configuration Protocol for IPv6. [RFC 3315,8415]
 """
 
 from __future__ import print_function
@@ -19,13 +19,15 @@
 from scapy.arch import get_if_raw_hwaddr, in6_getifaddr
 from scapy.config import conf
 from scapy.data import EPOCH, ETHER_ANY
-from scapy.compat import raw, orb, chb
+from scapy.compat import raw, orb
 from scapy.error import warning
 from scapy.fields import BitField, ByteEnumField, ByteField, FieldLenField, \
     FlagsField, IntEnumField, IntField, MACField, PacketField, \
     PacketListField, ShortEnumField, ShortField, StrField, StrFixedLenField, \
     StrLenField, UTCTimeField, X3BytesField, XIntField, XShortEnumField, \
     PacketLenField, UUIDField, FieldListField
+from scapy.data import IANA_ENTERPRISE_NUMBERS
+from scapy.layers.dns import DNSStrField
 from scapy.layers.inet import UDP
 from scapy.layers.inet6 import DomainNameListField, IP6Field, IP6ListField, \
     IPv6
@@ -183,7 +185,7 @@
                      }
 
 
-# sect 5.3 RFC 3315 : DHCP6 Messages types
+# sect 7.3 RFC 8415 : DHCP6 Messages types
 dhcp6types = {1: "SOLICIT",
                  2: "ADVERTISE",
                  3: "REQUEST",
@@ -268,26 +270,10 @@
                    _LLAddrField("lladdr", ETHER_ANY)]
 
 
-# In fact, IANA enterprise-numbers file available at
-# http://www.iana.org/assignments/enterprise-numbers
-# is simply huge (more than 2Mo and 600Ko in bz2). I'll
-# add only most common vendors, and encountered values.
-# -- arno
-iana_enterprise_num = {9: "ciscoSystems",
-                          35: "Nortel Networks",
-                          43: "3Com",
-                       311: "Microsoft",
-                       2636: "Juniper Networks, Inc.",
-                       4526: "Netgear",
-                       5771: "Cisco Systems, Inc.",
-                       5842: "Cisco Systems",
-                       16885: "Nortel Networks"}
-
-
 class DUID_EN(Packet):  # sect 9.3 RFC 3315
     name = "DUID - Assigned by Vendor Based on Enterprise Number"
     fields_desc = [ShortEnumField("type", 2, duidtypes),
-                   IntEnumField("enterprisenum", 311, iana_enterprise_num),
+                   IntEnumField("enterprisenum", 311, IANA_ENTERPRISE_NUMBERS),
                    StrField("id", "")]
 
 
@@ -315,28 +301,38 @@
 
 
 class _DHCP6OptGuessPayload(Packet):
-    @classmethod
+    @staticmethod
     def _just_guess_payload_class(cls, payload):
         # try to guess what option is in the payload
-        cls = conf.raw_layer
-        if len(payload) > 2:
-            opt = struct.unpack("!H", payload[:2])[0]
-            cls = get_cls(dhcp6opts_by_code.get(opt, "DHCP6OptUnknown"),
-                          DHCP6OptUnknown)
-        return cls
+        if len(payload) <= 2:
+            return conf.raw_layer
+        opt = struct.unpack("!H", payload[:2])[0]
+        clsname = dhcp6opts_by_code.get(opt, None)
+        if clsname is None:
+            return cls
+        return get_cls(clsname, cls)
 
     def guess_payload_class(self, payload):
         # this method is used in case of all derived classes
         # from _DHCP6OptGuessPayload in this file
-        cls = _DHCP6OptGuessPayload._just_guess_payload_class(payload)
-        return cls
-
+        return _DHCP6OptGuessPayload._just_guess_payload_class(
+            DHCP6OptUnknown,
+            payload
+        )
+
+
+class _DHCP6OptGuessPayloadElt(_DHCP6OptGuessPayload):
+    """
+    Same than _DHCP6OptGuessPayload but made for lists
+    in case of list of different suboptions
+    e.g. in ianaopts in DHCP6OptIA_NA
+    """
     @classmethod
     def dispatch_hook(cls, payload=None, *args, **kargs):
-        # this classmethod is used in case of list of different suboptions
-        # e.g. in ianaopts in DHCP6OptIA_NA
-        cls_ = cls._just_guess_payload_class(payload)
-        return cls_
+        return cls._just_guess_payload_class(conf.raw_layer, payload)
+
+    def extract_padding(self, s):
+        return b"", s
 
 
 class DHCP6OptUnknown(_DHCP6OptGuessPayload):  # A generic DHCPv6 Option
@@ -369,7 +365,7 @@
         return s[tmp_len:], self.m2i(pkt, s[:tmp_len])
 
 
-class DHCP6OptClientId(_DHCP6OptGuessPayload):     # RFC sect 22.2
+class DHCP6OptClientId(_DHCP6OptGuessPayload):     # RFC 8415 sect 21.2
     name = "DHCP6 Client Identifier Option"
     fields_desc = [ShortEnumField("optcode", 1, dhcp6opts),
                    FieldLenField("optlen", None, length_of="duid", fmt="!H"),
@@ -377,31 +373,34 @@
                               length_from=lambda pkt: pkt.optlen)]
 
 
-class DHCP6OptServerId(DHCP6OptClientId):     # RFC sect 22.3
+class DHCP6OptServerId(DHCP6OptClientId):     # RFC 8415 sect 21.3
     name = "DHCP6 Server Identifier Option"
     optcode = 2
 
 # Should be encapsulated in the option field of IA_NA or IA_TA options
 # Can only appear at that location.
-# TODO : last field IAaddr-options is not defined in the reference document
 
 
-class DHCP6OptIAAddress(_DHCP6OptGuessPayload):    # RFC sect 22.6
+class DHCP6OptIAAddress(_DHCP6OptGuessPayload):    # RFC 8415 sect 21.6
     name = "DHCP6 IA Address Option (IA_TA or IA_NA suboption)"
     fields_desc = [ShortEnumField("optcode", 5, dhcp6opts),
                    FieldLenField("optlen", None, length_of="iaaddropts",
                                  fmt="!H", adjust=lambda pkt, x: x + 24),
                    IP6Field("addr", "::"),
-                   IntField("preflft", 0),
-                   IntField("validlft", 0),
-                   StrLenField("iaaddropts", "",
-                               length_from=lambda pkt: pkt.optlen - 24)]
+                   IntEnumField("preflft", 0, {0xffffffff: "infinity"}),
+                   IntEnumField("validlft", 0, {0xffffffff: "infinity"}),
+                   # last field IAaddr-options is not defined in the
+                   # reference document. We copy what wireshark does: read
+                   # more dhcp6 options and excpect failures
+                   PacketListField("iaaddropts", [],
+                                   _DHCP6OptGuessPayloadElt,
+                                   length_from=lambda pkt: pkt.optlen - 24)]
 
     def guess_payload_class(self, payload):
         return conf.padding_layer
 
 
-class DHCP6OptIA_NA(_DHCP6OptGuessPayload):         # RFC sect 22.4
+class DHCP6OptIA_NA(_DHCP6OptGuessPayload):         # RFC 8415 sect 21.4
     name = "DHCP6 Identity Association for Non-temporary Addresses Option"
     fields_desc = [ShortEnumField("optcode", 3, dhcp6opts),
                    FieldLenField("optlen", None, length_of="ianaopts",
@@ -409,17 +408,17 @@
                    XIntField("iaid", None),
                    IntField("T1", None),
                    IntField("T2", None),
-                   PacketListField("ianaopts", [], _DHCP6OptGuessPayload,
+                   PacketListField("ianaopts", [], _DHCP6OptGuessPayloadElt,
                                    length_from=lambda pkt: pkt.optlen - 12)]
 
 
-class DHCP6OptIA_TA(_DHCP6OptGuessPayload):         # RFC sect 22.5
+class DHCP6OptIA_TA(_DHCP6OptGuessPayload):         # RFC 8415 sect 21.5
     name = "DHCP6 Identity Association for Temporary Addresses Option"
     fields_desc = [ShortEnumField("optcode", 4, dhcp6opts),
                    FieldLenField("optlen", None, length_of="iataopts",
                                  fmt="!H", adjust=lambda pkt, x: x + 4),
                    XIntField("iaid", None),
-                   PacketListField("iataopts", [], _DHCP6OptGuessPayload,
+                   PacketListField("iataopts", [], _DHCP6OptGuessPayloadElt,
                                    length_from=lambda pkt: pkt.optlen - 4)]
 
 
@@ -465,7 +464,7 @@
 # Confirm or Information-request
 
 
-class DHCP6OptOptReq(_DHCP6OptGuessPayload):       # RFC sect 22.7
+class DHCP6OptOptReq(_DHCP6OptGuessPayload):       # RFC 8415 sect 21.7
     name = "DHCP6 Option Request Option"
     fields_desc = [ShortEnumField("optcode", 6, dhcp6opts),
                    FieldLenField("optlen", None, length_of="reqopts", fmt="!H"),  # noqa: E501
@@ -477,7 +476,7 @@
 
 # emise par un serveur pour affecter le choix fait par le client. Dans
 # les messages Advertise, a priori
-class DHCP6OptPref(_DHCP6OptGuessPayload):       # RFC sect 22.8
+class DHCP6OptPref(_DHCP6OptGuessPayload):       # RFC 8415 sect 21.8
     name = "DHCP6 Preference Option"
     fields_desc = [ShortEnumField("optcode", 7, dhcp6opts),
                    ShortField("optlen", 1),
@@ -493,7 +492,7 @@
         return "%.2f sec" % (self.i2h(pkt, x) / 100.)
 
 
-class DHCP6OptElapsedTime(_DHCP6OptGuessPayload):  # RFC sect 22.9
+class DHCP6OptElapsedTime(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.9
     name = "DHCP6 Elapsed Time Option"
     fields_desc = [ShortEnumField("optcode", 8, dhcp6opts),
                    ShortField("optlen", 2),
@@ -534,17 +533,31 @@
 #
 #       Value   Data as defined by field.
 
-
-# TODO : Decoding only at the moment
-class DHCP6OptAuth(_DHCP6OptGuessPayload):    # RFC sect 22.11
+# https://www.iana.org/assignments/auth-namespaces
+_dhcp6_auth_proto = {
+    0: "configuration token",
+    1: "delayed authentication",
+    2: "delayed authentication (obsolete)",
+    3: "reconfigure key",
+}
+_dhcp6_auth_alg = {
+    0: "configuration token",
+    1: "HMAC-MD5",
+}
+_dhcp6_auth_rdm = {
+    0: "use of a monotonically increasing value"
+}
+
+
+class DHCP6OptAuth(_DHCP6OptGuessPayload):    # RFC 8415 sect 21.11
     name = "DHCP6 Option - Authentication"
     fields_desc = [ShortEnumField("optcode", 11, dhcp6opts),
                    FieldLenField("optlen", None, length_of="authinfo",
-                                 adjust=lambda pkt, x: x + 11),
-                   ByteField("proto", 3),  # TODO : XXX
-                   ByteField("alg", 1),  # TODO : XXX
-                   ByteField("rdm", 0),  # TODO : XXX
-                   StrFixedLenField("replay", "A" * 8, 8),  # TODO: XXX
+                                 fmt="!H", adjust=lambda pkt, x: x + 11),
+                   ByteEnumField("proto", 3, _dhcp6_auth_proto),
+                   ByteEnumField("alg", 1, _dhcp6_auth_alg),
+                   ByteEnumField("rdm", 0, _dhcp6_auth_rdm),
+                   StrFixedLenField("replay", b"\x00" * 8, 8),
                    StrLenField("authinfo", "",
                                length_from=lambda pkt: pkt.optlen - 11)]
 
@@ -561,7 +574,7 @@
         return inet_pton(socket.AF_INET6, self.i2h(pkt, x))
 
 
-class DHCP6OptServerUnicast(_DHCP6OptGuessPayload):  # RFC sect 22.12
+class DHCP6OptServerUnicast(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.12
     name = "DHCP6 Server Unicast Option"
     fields_desc = [ShortEnumField("optcode", 12, dhcp6opts),
                    ShortField("optlen", 16),
@@ -570,7 +583,7 @@
 
 #    DHCPv6 Status Code Option                                      #
 
-dhcp6statuscodes = {0: "Success",      # sect 24.4
+dhcp6statuscodes = {0: "Success",      # RFC 8415 sect 21.13
                     1: "UnspecFail",
                     2: "NoAddrsAvail",
                     3: "NoBinding",
@@ -579,7 +592,7 @@
                     6: "NoPrefixAvail"}  # From RFC3633
 
 
-class DHCP6OptStatusCode(_DHCP6OptGuessPayload):  # RFC sect 22.13
+class DHCP6OptStatusCode(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.13
     name = "DHCP6 Status Code Option"
     fields_desc = [ShortEnumField("optcode", 13, dhcp6opts),
                    FieldLenField("optlen", None, length_of="statusmsg",
@@ -591,7 +604,7 @@
 
 #    DHCPv6 Rapid Commit Option                                     #
 
-class DHCP6OptRapidCommit(_DHCP6OptGuessPayload):   # RFC sect 22.14
+class DHCP6OptRapidCommit(_DHCP6OptGuessPayload):   # RFC 8415 sect 21.14
     name = "DHCP6 Rapid Commit Option"
     fields_desc = [ShortEnumField("optcode", 14, dhcp6opts),
                    ShortField("optlen", 0)]
@@ -631,7 +644,7 @@
         return conf.padding_layer
 
 
-class DHCP6OptUserClass(_DHCP6OptGuessPayload):  # RFC sect 22.15
+class DHCP6OptUserClass(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.15
     name = "DHCP6 User Class Option"
     fields_desc = [ShortEnumField("optcode", 15, dhcp6opts),
                    FieldLenField("optlen", None, fmt="!H",
@@ -650,12 +663,13 @@
     name = "vendor class data"
 
 
-class DHCP6OptVendorClass(_DHCP6OptGuessPayload):  # RFC sect 22.16
+class DHCP6OptVendorClass(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.16
     name = "DHCP6 Vendor Class Option"
     fields_desc = [ShortEnumField("optcode", 16, dhcp6opts),
                    FieldLenField("optlen", None, length_of="vcdata", fmt="!H",
                                  adjust=lambda pkt, x: x + 4),
-                   IntEnumField("enterprisenum", None, iana_enterprise_num),
+                   IntEnumField("enterprisenum", None,
+                                IANA_ENTERPRISE_NUMBERS),
                    _VendorClassDataField("vcdata", [], VENDOR_CLASS_DATA,
                                          length_from=lambda pkt: pkt.optlen - 4)]  # noqa: E501
 
@@ -675,12 +689,13 @@
 # The third one that will be used for nothing interesting
 
 
-class DHCP6OptVendorSpecificInfo(_DHCP6OptGuessPayload):  # RFC sect 22.17
+class DHCP6OptVendorSpecificInfo(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.17
     name = "DHCP6 Vendor-specific Information Option"
     fields_desc = [ShortEnumField("optcode", 17, dhcp6opts),
                    FieldLenField("optlen", None, length_of="vso", fmt="!H",
                                  adjust=lambda pkt, x: x + 4),
-                   IntEnumField("enterprisenum", None, iana_enterprise_num),
+                   IntEnumField("enterprisenum", None,
+                                IANA_ENTERPRISE_NUMBERS),
                    _VendorClassDataField("vso", [], VENDOR_SPECIFIC_OPTION,
                                          length_from=lambda pkt: pkt.optlen - 4)]  # noqa: E501
 
@@ -690,7 +705,7 @@
 # masses critique.
 
 
-class DHCP6OptIfaceId(_DHCP6OptGuessPayload):  # RFC sect 22.18
+class DHCP6OptIfaceId(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.18
     name = "DHCP6 Interface-Id Option"
     fields_desc = [ShortEnumField("optcode", 18, dhcp6opts),
                    FieldLenField("optlen", None, fmt="!H",
@@ -704,7 +719,7 @@
 # A server includes a Reconfigure Message option in a Reconfigure
 # message to indicate to the client whether the client responds with a
 # renew message or an Information-request message.
-class DHCP6OptReconfMsg(_DHCP6OptGuessPayload):       # RFC sect 22.19
+class DHCP6OptReconfMsg(_DHCP6OptGuessPayload):       # RFC 8415 sect 21.19
     name = "DHCP6 Reconfigure Message Option"
     fields_desc = [ShortEnumField("optcode", 19, dhcp6opts),
                    ShortField("optlen", 1),
@@ -721,7 +736,7 @@
 # absence of this option, means unwillingness to accept reconfigure
 # messages, or instruction not to accept Reconfigure messages, for the
 # client and server messages, respectively.
-class DHCP6OptReconfAccept(_DHCP6OptGuessPayload):   # RFC sect 22.20
+class DHCP6OptReconfAccept(_DHCP6OptGuessPayload):   # RFC 8415 sect 21.20
     name = "DHCP6 Reconfigure Accept Option"
     fields_desc = [ShortEnumField("optcode", 20, dhcp6opts),
                    ShortField("optlen", 0)]
@@ -758,24 +773,25 @@
                    DomainNameListField("dnsdomains", [],
                                        length_from=lambda pkt: pkt.optlen)]
 
-# TODO: Implement iaprefopts correctly when provided with more
-#       information about it.
-
 
-class DHCP6OptIAPrefix(_DHCP6OptGuessPayload):  # RFC3633
-    name = "DHCP6 Option - IA_PD Prefix option"
+class DHCP6OptIAPrefix(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.22
+    name = "DHCP6 Option - IA Prefix option"
     fields_desc = [ShortEnumField("optcode", 26, dhcp6opts),
                    FieldLenField("optlen", None, length_of="iaprefopts",
                                  adjust=lambda pkt, x: x + 25),
-                   IntField("preflft", 0),
-                   IntField("validlft", 0),
+                   IntEnumField("preflft", 0, {0xffffffff: "infinity"}),
+                   IntEnumField("validlft", 0, {0xffffffff: "infinity"}),
                    ByteField("plen", 48),  # TODO: Challenge that default value
+                                           # See RFC 8168
                    IP6Field("prefix", "2001:db8::"),  # At least, global and won't hurt  # noqa: E501
-                   StrLenField("iaprefopts", "",
-                               length_from=lambda pkt: pkt.optlen - 25)]
+                   # We copy what wireshark does: read more dhcp6 options and
+                   # expect failures
+                   PacketListField("iaprefopts", [],
+                                   _DHCP6OptGuessPayloadElt,
+                                   length_from=lambda pkt: pkt.optlen - 25)]
 
 
-class DHCP6OptIA_PD(_DHCP6OptGuessPayload):  # RFC3633
+class DHCP6OptIA_PD(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.21
     name = "DHCP6 Option - Identity Association for Prefix Delegation"
     fields_desc = [ShortEnumField("optcode", 25, dhcp6opts),
                    FieldLenField("optlen", None, length_of="iapdopt",
@@ -783,7 +799,7 @@
                    XIntField("iaid", None),
                    IntField("T1", None),
                    IntField("T2", None),
-                   PacketListField("iapdopt", [], _DHCP6OptGuessPayload,
+                   PacketListField("iapdopt", [], _DHCP6OptGuessPayloadElt,
                                    length_from=lambda pkt: pkt.optlen - 12)]
 
 
@@ -803,42 +819,20 @@
                                 length_from=lambda pkt: pkt.optlen)]
 
 
-class DomainNameField(StrLenField):
-    def getfield(self, pkt, s):
-        tmp_len = self.length_from(pkt)
-        return s[tmp_len:], self.m2i(pkt, s[:tmp_len])
-
-    def i2len(self, pkt, x):
-        return len(self.i2m(pkt, x))
-
-    def m2i(self, pkt, x):
-        cur = []
-        while x:
-            tmp_len = orb(x[0])
-            cur.append(x[1:1 + tmp_len])
-            x = x[tmp_len + 1:]
-        return b".".join(cur)
-
-    def i2m(self, pkt, x):
-        if not x:
-            return b""
-        return b"".join(chb(len(z)) + z for z in x.split(b'.'))
-
-
 class DHCP6OptNISDomain(_DHCP6OptGuessPayload):  # RFC3898
     name = "DHCP6 Option - NIS Domain Name"
     fields_desc = [ShortEnumField("optcode", 29, dhcp6opts),
                    FieldLenField("optlen", None, length_of="nisdomain"),
-                   DomainNameField("nisdomain", "",
-                                   length_from=lambda pkt: pkt.optlen)]
+                   DNSStrField("nisdomain", "",
+                               length_from=lambda pkt: pkt.optlen)]
 
 
 class DHCP6OptNISPDomain(_DHCP6OptGuessPayload):  # RFC3898
     name = "DHCP6 Option - NIS+ Domain Name"
     fields_desc = [ShortEnumField("optcode", 30, dhcp6opts),
                    FieldLenField("optlen", None, length_of="nispdomain"),
-                   DomainNameField("nispdomain", "",
-                                   length_from=lambda pkt: pkt.optlen)]
+                   DNSStrField("nispdomain", "",
+                               length_from=lambda pkt: pkt.optlen)]
 
 
 class DHCP6OptSNTPServers(_DHCP6OptGuessPayload):  # RFC4075
@@ -875,15 +869,30 @@
                    IP6ListField("bcmcsservers", [],
                                 length_from=lambda pkt: pkt.optlen)]
 
-# TODO : Does Nothing at the moment
+
+_dhcp6_geoconf_what = {
+    0: "DHCP server",
+    1: "closest network element",
+    2: "client"
+}
 
 
-class DHCP6OptGeoConf(_DHCP6OptGuessPayload):  # RFC-ietf-geopriv-dhcp-civil-09.txt  # noqa: E501
-    name = ""
+class DHCP6OptGeoConfElement(Packet):
+    fields_desc = [ByteField("CAtype", 0),
+                   FieldLenField("CAlength", None, length_of="CAvalue"),
+                   StrLenField("CAvalue", "",
+                               length_from=lambda pkt: pkt.CAlength)]
+
+
+class DHCP6OptGeoConf(_DHCP6OptGuessPayload):  # RFC 4776
+    name = "DHCP6 Option - Civic Location"
     fields_desc = [ShortEnumField("optcode", 36, dhcp6opts),
-                   FieldLenField("optlen", None, length_of="optdata"),
-                   StrLenField("optdata", "",
-                               length_from=lambda pkt: pkt.optlen)]
+                   FieldLenField("optlen", None, length_of="ca_elts",
+                                 adjust=lambda x: x + 3),
+                   ByteEnumField("what", 2, _dhcp6_geoconf_what),
+                   StrFixedLenField("country_code", "FR", 2),
+                   PacketListField("ca_elts", [], DHCP6OptGeoConfElement,
+                                   length_from=lambda pkt: pkt.optlen - 3)]
 
 # TODO: see if we encounter opaque values from vendor devices
 
@@ -893,23 +902,21 @@
     fields_desc = [ShortEnumField("optcode", 37, dhcp6opts),
                    FieldLenField("optlen", None, length_of="remoteid",
                                  adjust=lambda pkt, x: x + 4),
-                   IntEnumField("enterprisenum", None, iana_enterprise_num),
+                   IntEnumField("enterprisenum", None,
+                                IANA_ENTERPRISE_NUMBERS),
                    StrLenField("remoteid", "",
                                length_from=lambda pkt: pkt.optlen - 4)]
 
-# TODO : 'subscriberid' default value should be at least 1 byte long
-
 
 class DHCP6OptSubscriberID(_DHCP6OptGuessPayload):  # RFC4580
     name = "DHCP6 Option - Subscriber ID"
     fields_desc = [ShortEnumField("optcode", 38, dhcp6opts),
                    FieldLenField("optlen", None, length_of="subscriberid"),
+                   # subscriberid default value should be at least 1 byte long
+                   # but we don't really care
                    StrLenField("subscriberid", "",
                                length_from=lambda pkt: pkt.optlen)]
 
-# TODO :  "The data in the Domain Name field MUST be encoded
-#          as described in Section 8 of [5]"
-
 
 class DHCP6OptClientFQDN(_DHCP6OptGuessPayload):  # RFC4704
     name = "DHCP6 Option - Client FQDN"
@@ -918,8 +925,8 @@
                                  adjust=lambda pkt, x: x + 1),
                    BitField("res", 0, 5),
                    FlagsField("flags", 0, 3, "SON"),
-                   DomainNameField("fqdn", "",
-                                   length_from=lambda pkt: pkt.optlen - 1)]
+                   DNSStrField("fqdn", "",
+                               length_from=lambda pkt: pkt.optlen - 1)]
 
 
 class DHCP6OptPanaAuthAgent(_DHCP6OptGuessPayload):  # RFC5192
@@ -1003,7 +1010,8 @@
     fields_desc = [ShortEnumField("optcode", 66, dhcp6opts),
                    FieldLenField("optlen", None, length_of="relaysupplied",
                                  fmt="!H"),
-                   PacketListField("relaysupplied", [], _DHCP6OptGuessPayload,
+                   PacketListField("relaysupplied", [],
+                                   _DHCP6OptGuessPayloadElt,
                                    length_from=lambda pkt: pkt.optlen)]
 
 
@@ -1079,7 +1087,7 @@
 # Relayed message is seen as a payload.
 
 
-class DHCP6OptRelayMsg(_DHCP6OptGuessPayload):  # RFC sect 22.10
+class DHCP6OptRelayMsg(_DHCP6OptGuessPayload):  # RFC 8415 sect 21.10
     name = "DHCP6 Relay Message Option"
     fields_desc = [ShortEnumField("optcode", 9, dhcp6opts),
                    FieldLenField("optlen", None, fmt="!H",
@@ -1375,7 +1383,7 @@
     def usage(self):
         msg = """
 DHCPv6_am.parse_options( dns="2001:500::1035", domain="localdomain, local",
-        duid=None, iface=conf.iface6, advpref=255, sntpservers=None,
+        duid=None, iface=conf.iface, advpref=255, sntpservers=None,
         sipdomains=None, sipservers=None,
         nisdomain=None, nisservers=None,
         nispdomain=None, nispservers=None,
@@ -1389,7 +1397,7 @@
             answering machine.
 
    iface : the interface to listen/reply on if you do not want to use
-           conf.iface6.
+           conf.iface.
 
    advpref : Value in [0,255] given to Advertise preference field.
              By default, 255 is used. Be aware that this specific
@@ -1458,7 +1466,7 @@
                 return -1
 
         if iface is None:
-            iface = conf.iface6
+            iface = conf.iface
 
         self.debug = debug
 
@@ -1525,6 +1533,7 @@
 
         ####
         # Find the source address we will use
+        self.src_addr = None
         try:
             addr = next(x for x in in6_getifaddr() if x[2] == iface and in6_islladdr(x[0]))  # noqa: E501
         except (StopIteration, RuntimeError):
@@ -1633,7 +1642,7 @@
                 msg += ", ".join(addrs) + n
                 print(msg)
 
-            # See sect 18.1.7
+            # See RFC 3315 sect 18.1.7
 
             # Sent by a client to warn us she has determined
             # one or more addresses assigned to her is already
@@ -1822,7 +1831,7 @@
             pass
 
         elif msgtype == 8:  # RELEASE
-            # See section 18.1.6
+            # See RFC 3315 section 18.1.6
 
             # Message is sent to the server to indicate that
             # she will no longer use the addresses that was assigned
@@ -1837,7 +1846,7 @@
             pass
 
         elif msgtype == 9:  # DECLINE
-            # See section 18.1.7
+            # See RFC 3315 section 18.1.7
             pass
 
         elif msgtype == 11:  # INFO-REQUEST

scapy-2.4.3.tar.gz/scapy/layers/dns.py -> scapy-2.4.4.tar.gz/scapy/layers/dns.py Changed

@@ -417,7 +417,6 @@
                 other.qr == 0)
 
     def mysummary(self):
-        type = ["Qry", "Ans"][self.qr]
         name = ""
         if self.qr:
             type = "Ans"
@@ -438,6 +437,28 @@
         """Return the compressed DNS packet (using `dns_compress()`"""
         return dns_compress(self)
 
+    def pre_dissect(self, s):
+        """
+        Check that a valid DNS over TCP message can be decoded
+        """
+        if isinstance(self.underlayer, TCP):
+
+            # Compute the length of the DNS packet
+            if len(s) >= 2:
+                dns_len = struct.unpack("!H", s[:2])[0]
+            else:
+                message = "Malformed DNS message: too small!"
+                warning(message)
+                raise Scapy_Exception(message)
+
+            # Check if the length is valid
+            if dns_len < 14 or len(s) < dns_len:
+                message = "Malformed DNS message: invalid length!"
+                warning(message)
+                raise Scapy_Exception(message)
+
+        return s
+
 
 # https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4
 dnstypes = {

scapy-2.4.3.tar.gz/scapy/layers/dot11.py -> scapy-2.4.4.tar.gz/scapy/layers/dot11.py Changed

@@ -17,10 +17,13 @@
 
 """
 Wireless LAN according to IEEE 802.11.
+
+This file contains bindings for 802.11 layers and some usual linklayers:
+  - PRISM
+  - RadioTap
 """
 
 from __future__ import print_function
-import math
 import re
 import struct
 from zlib import crc32
@@ -30,19 +33,44 @@
     DLT_IEEE802_11_RADIO
 from scapy.compat import raw, plain_str, orb, chb
 from scapy.packet import Packet, bind_layers, bind_top_down, NoPayload
-from scapy.fields import ByteField, LEShortField, BitField, LEShortEnumField, \
-    ByteEnumField, X3BytesField, FlagsField, LELongField, StrField, \
-    StrLenField, IntField, XByteField, LEIntField, StrFixedLenField, \
-    LESignedIntField, ReversePadField, ConditionalField, PacketListField, \
-    ShortField, BitEnumField, FieldLenField, LEFieldLenField, \
-    FieldListField, XStrFixedLenField, PacketField, FCSField
+from scapy.fields import (
+    BitEnumField,
+    BitField,
+    BitMultiEnumField,
+    ByteEnumField,
+    ByteField,
+    ConditionalField,
+    FCSField,
+    FieldLenField,
+    FieldListField,
+    FlagsField,
+    IntField,
+    LEFieldLenField,
+    LEIntField,
+    LELongField,
+    LEShortEnumField,
+    LEShortField,
+    LESignedIntField,
+    MultipleTypeField,
+    PacketField,
+    PacketListField,
+    ReversePadField,
+    ScalingField,
+    ShortField,
+    StrField,
+    StrFixedLenField,
+    StrLenField,
+    X3BytesField,
+    XByteField,
+    XStrFixedLenField,
+)
 from scapy.ansmachine import AnsweringMachine
 from scapy.plist import PacketList
 from scapy.layers.l2 import Ether, LLC, MACField
 from scapy.layers.inet import IP, TCP
 from scapy.error import warning, log_loading
 from scapy.sendrecv import sniff, sendp
-from scapy.utils import issubtype
+from scapy.utils import str2mac
 
 
 if conf.crypto_valid:
@@ -53,8 +81,11 @@
     log_loading.info("Can't import python-cryptography v1.7+. Disabled WEP decryption/encryption. (Dot11)")  # noqa: E501
 
 
-# Layers
+#########
+# Prism #
+#########
 
+# http://www.martin.cc/linux/prism
 
 class PrismHeader(Packet):
     """ iwpriv wlan0 monitor 3 """
@@ -110,31 +141,14 @@
         else:
             return self.payload.answers(other)
 
+############
+# RadioTap #
+############
 
-# RadioTap
-
-class _RadiotapReversePadField(ReversePadField):
-    def __init__(self, fld):
-        self._fld = fld
-        self._padwith = b"\x00"
-        # Quote from https://www.radiotap.org/:
-        # ""Radiotap requires that all fields in the radiotap header are aligned to natural boundaries.  # noqa: E501
-        # For radiotap, that means all 8-, 16-, 32-, and 64-bit fields must begin on 8-, 16-, 32-, and 64-bit boundaries, respectively.""  # noqa: E501
-        if isinstance(self._fld, BitField):
-            self._align = int(math.ceil(self.i2len(None, None)))
-        else:
-            self._align = struct.calcsize(self._fld.fmt)
-
-
-class _dbmField(ByteField):
-    def i2m(self, pkt, x):
-        return super(ByteField, self).i2m(pkt, x + 256)
+# https://www.radiotap.org/
 
-    def m2i(self, pkt, x):
-        return super(ByteField, self).m2i(pkt, x) - 256
-
-    def i2repr(self, pkt, x):
-        return "%sdBm" % x
+# Note: Radiotap alignment is crazy. See the doc:
+# https://www.radiotap.org/#alignment-in-radiotap
 
 
 def _next_radiotap_extpm(pkt, lst, cur, s):
@@ -246,7 +260,7 @@
 
 
 class RadioTap(Packet):
-    name = "RadioTap dummy"
+    name = "RadioTap"
     deprecated_fields = {
         "Channel": ("ChannelFrequency", "2.4.3"),
         "ChannelFlags2": ("ChannelPlusFlags", "2.4.3"),
@@ -259,76 +273,75 @@
         FlagsField('present', None, -32, _rt_present),  # noqa: E501
         # Extended presence mask
         ConditionalField(PacketListField("Ext", [], next_cls_cb=_next_radiotap_extpm), lambda pkt: pkt.present and pkt.present.Ext),  # noqa: E501
-        # RadioTap fields - each starts with a _RadiotapReversePadField
+        # RadioTap fields - each starts with a ReversePadField
         # to handle padding
 
         # TSFT
         ConditionalField(
-            _RadiotapReversePadField(
-                LELongField("mac_timestamp", 0)
+            ReversePadField(
+                LELongField("mac_timestamp", 0),
+                8
             ),
             lambda pkt: pkt.present and pkt.present.TSFT),
         # Flags
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("Flags", None, -8, _rt_flags)
-            ),
+            FlagsField("Flags", None, -8, _rt_flags),
             lambda pkt: pkt.present and pkt.present.Flags),
         # Rate
         ConditionalField(
-            _RadiotapReversePadField(
-                ByteField("Rate", 0)
-             ),
+            ScalingField("Rate", 0, scaling=0.5,
+                         unit="Mbps", fmt="B"),
             lambda pkt: pkt.present and pkt.present.Rate),
         # Channel
         ConditionalField(
-            _RadiotapReversePadField(
-                LEShortField("ChannelFrequency", 0)
-             ),
+            ReversePadField(
+                LEShortField("ChannelFrequency", 0),
+                2
+            ),
             lambda pkt: pkt.present and pkt.present.Channel),
         ConditionalField(
             FlagsField("ChannelFlags", None, -16, _rt_channelflags),
             lambda pkt: pkt.present and pkt.present.Channel),
         # dBm_AntSignal
         ConditionalField(
-            _RadiotapReversePadField(
-                _dbmField("dBm_AntSignal", -256)
-             ),
+            ScalingField("dBm_AntSignal", 0, offset=-256,
+                         unit="dBm", fmt="B"),
             lambda pkt: pkt.present and pkt.present.dBm_AntSignal),
         # dBm_AntNoise
         ConditionalField(
-            _RadiotapReversePadField(
-                _dbmField("dBm_AntNoise", -256)
-             ),
+            ScalingField("dBm_AntNoise", 0, offset=-256,
+                         unit="dBm", fmt="B"),
             lambda pkt: pkt.present and pkt.present.dBm_AntNoise),
         # Lock_Quality
         ConditionalField(
-            _RadiotapReversePadField(
+            ReversePadField(
                 LEShortField("Lock_Quality", 0),
-             ),
+                2
+            ),
             lambda pkt: pkt.present and pkt.present.Lock_Quality),
         # Antenna
         ConditionalField(
-            _RadiotapReversePadField(
-                ByteField("Antenna", 0)
-             ),
+            ByteField("Antenna", 0),
             lambda pkt: pkt.present and pkt.present.Antenna),
         # RX Flags
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("RXFlags", None, -16, _rt_rxflags)
-             ),
-             lambda pkt: pkt.present and pkt.present.RXFlags),
+            ReversePadField(
+                FlagsField("RXFlags", None, -16, _rt_rxflags),
+                2
+            ),
+            lambda pkt: pkt.present and pkt.present.RXFlags),
         # TX Flags
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("TXFlags", None, -16, _rt_txflags)
-             ),
-             lambda pkt: pkt.present and pkt.present.TXFlags),
+            ReversePadField(
+                FlagsField("TXFlags", None, -16, _rt_txflags),
+                2
+            ),
+            lambda pkt: pkt.present and pkt.present.TXFlags),
         # ChannelPlus
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("ChannelPlusFlags", None, -32, _rt_channelflags2)
+            ReversePadField(
+                FlagsField("ChannelPlusFlags", None, -32, _rt_channelflags2),
+                4
             ),
             lambda pkt: pkt.present and pkt.present.ChannelPlus),
         ConditionalField(
@@ -339,9 +352,10 @@
             lambda pkt: pkt.present and pkt.present.ChannelPlus),
         # MCS
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("knownMCS", None, -8, _rt_knownmcs)
-             ),
+            ReversePadField(
+                FlagsField("knownMCS", None, -8, _rt_knownmcs),
+                4
+            ),
             lambda pkt: pkt.present and pkt.present.MCS),
         ConditionalField(
             BitField("Ness_LSB", 0, 1),
@@ -366,17 +380,19 @@
             lambda pkt: pkt.present and pkt.present.MCS),
         # A_MPDU
         ConditionalField(
-            _RadiotapReversePadField(
-                LEIntField("A_MPDU_ref", 0)
-             ),
+            ReversePadField(
+                LEIntField("A_MPDU_ref", 0),
+                4
+            ),
             lambda pkt: pkt.present and pkt.present.A_MPDU),
         ConditionalField(
             FlagsField("A_MPDU_flags", None, -32, _rt_a_mpdu_flags),
             lambda pkt: pkt.present and pkt.present.A_MPDU),
         # VHT
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("KnownVHT", None, -16, _rt_knownvht)
+            ReversePadField(
+                FlagsField("KnownVHT", None, -16, _rt_knownvht),
+                2
             ),
             lambda pkt: pkt.present and pkt.present.VHT),
         ConditionalField(
@@ -396,8 +412,9 @@
             lambda pkt: pkt.present and pkt.present.VHT),
         # timestamp
         ConditionalField(
-            _RadiotapReversePadField(
-                LELongField("timestamp", 0)
+            ReversePadField(
+                LELongField("timestamp", 0),
+                8
             ),
             lambda pkt: pkt.present and pkt.present.timestamp),
         ConditionalField(
@@ -411,8 +428,9 @@
             lambda pkt: pkt.present and pkt.present.timestamp),
         # HE - XXX not complete
         ConditionalField(
-            _RadiotapReversePadField(
-                ShortField("he_data1", 0)
+            ReversePadField(
+                ShortField("he_data1", 0),
+                2
             ),
             lambda pkt: pkt.present and pkt.present.HE),
         ConditionalField(
@@ -432,8 +450,9 @@
             lambda pkt: pkt.present and pkt.present.HE),
         # HE_MU
         ConditionalField(
-            _RadiotapReversePadField(
-                LEShortField("hemu_flags1", 0)
+            ReversePadField(
+                LEShortField("hemu_flags1", 0),
+                2
             ),
             lambda pkt: pkt.present and pkt.present.HE_MU),
         ConditionalField(
@@ -449,8 +468,9 @@
             lambda pkt: pkt.present and pkt.present.HE_MU),
         # HE_MU_other_user
         ConditionalField(
-            _RadiotapReversePadField(
-                LEShortField("hemuou_per_user_1", 0x7fff)
+            ReversePadField(
+                LEShortField("hemuou_per_user_1", 0x7fff),
+                2
             ),
             lambda pkt: pkt.present and pkt.present.HE_MU_other_user),
         ConditionalField(
@@ -465,8 +485,9 @@
             lambda pkt: pkt.present and pkt.present.HE_MU_other_user),
         # L_SIG
         ConditionalField(
-            _RadiotapReversePadField(
-                FlagsField("lsig_data1", 0, -16, ["rate", "length"])
+            ReversePadField(
+                FlagsField("lsig_data1", 0, -16, ["rate", "length"]),
+                2
             ),
             lambda pkt: pkt.present and pkt.present.L_SIG),
         ConditionalField(
@@ -476,10 +497,7 @@
             BitField("lsig_rate", 0, 4),
             lambda pkt: pkt.present and pkt.present.L_SIG),
         # Remaining
-        StrLenField('notdecoded', "",
-                    length_from=lambda pkt: max(
-                        pkt.len - pkt._tmp_dissect_pos, 0
-                    ))
+        StrLenField('notdecoded', "", length_from=lambda pkt: 0)
     ]
 
     def guess_payload_class(self, payload):
@@ -487,35 +505,171 @@
             return Dot11FCS
         return Dot11
 
+    def post_dissect(self, s):
+        length = max(self.len - len(self.original) + len(s), 0)
+        self.notdecoded = s[:length]
+        return s[length:]
+
     def post_build(self, p, pay):
         if self.len is None:
             p = p[:2] + struct.pack("!H", len(p))[::-1] + p[4:]
         return p + pay
 
 
+##########
+# 802.11 #
+##########
+
+# Note:
+# 802.11-2016 includes the spec for
+# 802.11abdghijekrywnpzvus,ae,aa,ad,ac,af
+
+# 802.11-2016 9.2
+
+# 802.11-2016 9.2.4.1.3
+_dot11_subtypes = {
+    0: {  # Management
+        0: "Association Request",
+        1: "Association Response",
+        2: "Reassociation Request",
+        3: "Reassociation Response",
+        4: "Probe Request",
+        5: "Probe Response",
+        6: "Timing Advertisement",
+        8: "Beacon",
+        9: "ATIM",
+        10: "Disassociation",
+        11: "Authentication",
+        12: "Deauthentification",
+        13: "Action",
+        14: "Action No Ack",
+    },
+    1: {  # Control
+        4: "Beamforming Report Poll",
+        5: "VHT NDP Announcement",
+        6: "Control Frame Extension",
+        7: "Control Wrapper",
+        8: "Block Ack Request",
+        9: "Block Ack",
+        10: "PS-Poll",
+        11: "RTS",
+        12: "CTS",
+        13: "Ack",
+        14: "CF-End",
+        15: "CF-End+CF-Ack",
+    },
+    2: {  # Data
+        0: "Data",
+        1: "Data+CF-Ack",
+        2: "Data+CF-Poll",
+        3: "Data+CF-Ack+CF-Poll",
+        4: "Null (no data)",
+        5: "CF-Ack (no data)",
+        6: "CF-Poll (no data)",
+        7: "CF-Ack+CF-Poll (no data)",
+        8: "QoS Data",
+        9: "QoS Data+CF-Ack",
+        10: "QoS Data+CF-Poll",
+        11: "QoS Data+CF-Ack+CF-Poll",
+        12: "QoS Null (no data)",
+        14: "QoS CF-Poll (no data)",
+        15: "QoS CF-Ack+CF-Poll (no data)"
+    },
+    3: {  # Extension
+        0: "DMG Beacon"
+    }
+}
+
+_dot11_cfe = {
+    2: "Poll",
+    3: "SPR",
+    4: "Grant",
+    5: "DMG CTS",
+    6: "DMG DTS",
+    7: "Grant Ack",
+    8: "SSW",
+    9: "SSW-Feedback",
+    10: "SSW-Ack",
+}
+
+
+_dot11_addr_meaning = [
+    [  # Management: 802.11-2016 9.3.3.2
+        "RA=DA", "TA=SA", "BSSID/STA", None,
+    ],
+    [  # Control
+        "RA", "TA", None, None
+    ],
+    [  # Data: 802.11-2016 9.3.2.1: Table 9-26
+        [["RA=DA", "RA=DA"], ["RA=BSSID", "RA"]],
+        [["TA=SA", "TA=BSSID"], ["TA=SA", "TA"]],
+        [["BSSID", "SA"], ["DA", "DA"]],
+        [[None, None], ["SA", "BSSID"]],
+    ],
+    [  # Extension
+        "BSSID", None, None, None
+    ],
+]
+
+
+class _Dot11MacField(MACField):
+    """
+    A MACField that displays the address type depending on the
+    802.11 flags
+    """
+    __slots__ = ["index"]
+
+    def __init__(self, name, default, index):
+        self.index = index
+        super(_Dot11MacField, self).__init__(name, default)
+
+    def i2repr(self, pkt, val):
+        s = super(_Dot11MacField, self).i2repr(pkt, val)
+        meaning = pkt.address_meaning(self.index)
+        if meaning:
+            return "%s (%s)" % (s, meaning)
+        return s
+
+
+# 802.11-2016 9.2.4.1.1
 class Dot11(Packet):
     name = "802.11"
     fields_desc = [
-        BitField("subtype", 0, 4),
+        BitMultiEnumField("subtype", 0, 4, _dot11_subtypes,
+                          lambda pkt: pkt.type),
         BitEnumField("type", 0, 2, ["Management", "Control", "Data",
-                                    "Reserved"]),
+                                    "Extension"]),
         BitField("proto", 0, 2),
-        FlagsField("FCfield", 0, 8, ["to-DS", "from-DS", "MF", "retry",
-                                     "pw-mgt", "MD", "protected", "order"]),
+        ConditionalField(
+            BitEnumField("cfe", 0, 4, _dot11_cfe),
+            lambda pkt: (pkt.type, pkt.subtype) == (1, 6)
+        ),
+        MultipleTypeField(
+            [
+                (
+                    FlagsField("FCfield", 0, 4,
+                               ["pw-mgt", "MD", "protected", "order"]),
+                    lambda pkt: (pkt.type, pkt.subtype) == (1, 6)
+                )
+            ],
+            FlagsField("FCfield", 0, 8,
+                       ["to-DS", "from-DS", "MF", "retry",
+                        "pw-mgt", "MD", "protected", "order"])
+        ),
         ShortField("ID", 0),
-        MACField("addr1", ETHER_ANY),
+        _Dot11MacField("addr1", ETHER_ANY, 1),
         ConditionalField(
-            MACField("addr2", ETHER_ANY),
+            _Dot11MacField("addr2", ETHER_ANY, 2),
             lambda pkt: (pkt.type != 1 or
                          pkt.subtype in [0x8, 0x9, 0xa, 0xb, 0xe, 0xf]),
         ),
         ConditionalField(
-            MACField("addr3", ETHER_ANY),
+            _Dot11MacField("addr3", ETHER_ANY, 3),
             lambda pkt: pkt.type in [0, 2],
         ),
         ConditionalField(LEShortField("SC", 0), lambda pkt: pkt.type != 1),
         ConditionalField(
-            MACField("addr4", ETHER_ANY),
+            _Dot11MacField("addr4", ETHER_ANY, 4),
             lambda pkt: (pkt.type == 2 and
                          pkt.FCfield & 3 == 3),  # from-DS+to-DS
         )
@@ -526,7 +680,8 @@
         return self.sprintf("802.11 %%%s.type%% %%%s.subtype%% %%%s.addr2%% > %%%s.addr1%%" % ((self.__class__.__name__,) * 4))  # noqa: E501
 
     def guess_payload_class(self, payload):
-        if self.type == 0x02 and (0x08 <= self.subtype <= 0xF and self.subtype != 0xD):  # noqa: E501
+        if self.type == 0x02 and (
+                0x08 <= self.subtype <= 0xF and self.subtype != 0xD):
             return Dot11QoS
         elif self.FCfield.protected:
             # When a frame is handled by encryption, the Protected Frame bit
@@ -553,6 +708,31 @@
                 return 0
         return 0
 
+    def address_meaning(self, index):
+        """
+        Return the meaning of the address[index] considering the context
+        """
+        if index not in [1, 2, 3, 4]:
+            raise ValueError("Wrong index: should be [1, 2, 3, 4]")
+        index = index - 1
+        if self.type == 0:  # Management
+            return _dot11_addr_meaning[0][index]
+        elif self.type == 1:  # Control
+            return _dot11_addr_meaning[1][index]
+        elif self.type == 2:  # Data
+            meaning = _dot11_addr_meaning[2][index][
+                self.FCfield.to_DS
+            ][self.FCfield.from_DS]
+            if meaning and index in [2, 3]:  # Address 3-4
+                if isinstance(self.payload, Dot11QoS):
+                    # MSDU and Short A-MSDU
+                    if self.payload.A_MSDU_Present:
+                        meaning = "BSSID"
+            return meaning
+        elif self.type == 3:  # Extension
+            return _dot11_addr_meaning[3][index]
+        return None
+
     def unwep(self, key=None, warn=1):
         if self.FCfield & 0x40 == 0:
             if warn:
@@ -580,17 +760,17 @@
     def post_build(self, p, pay):
         p += pay
         if self.fcs is None:
-            p = p[:-4] + self.compute_fcs(p)
+            p = p[:-4] + self.compute_fcs(p[:-4])
         return p
 
 
 class Dot11QoS(Packet):
     name = "802.11 QoS"
-    fields_desc = [BitField("Reserved", None, 1),
-                   BitField("Ack_Policy", None, 2),
-                   BitField("EOSP", None, 1),
-                   BitField("TID", None, 4),
-                   ByteField("TXOP", None)]
+    fields_desc = [BitField("A_MSDU_Present", 0, 1),
+                   BitField("Ack_Policy", 0, 2),
+                   BitField("EOSP", 0, 1),
+                   BitField("TID", 0, 4),
+                   ByteField("TXOP", 0)]
 
     def guess_payload_class(self, payload):
         if isinstance(self.underlayer, Dot11):
@@ -616,25 +796,22 @@
                16: "timeout", 17: "AP-full", 18: "rate-unsupported"}
 
 
-class _Dot11NetStats(Packet):
-    fields_desc = [LELongField("timestamp", 0),
-                   LEShortField("beacon_interval", 0x0064),
-                   FlagsField("cap", 0, 16, capability_list)]
-
+class _Dot11EltUtils(Packet):
+    """
+    Contains utils for classes that have Dot11Elt as payloads
+    """
     def network_stats(self):
         """Return a dictionary containing a summary of the Dot11
         elements fields
         """
         summary = {}
         crypto = set()
-        akmsuite_types = {
-            0x00: "Reserved",
-            0x01: "802.1X",
-            0x02: "PSK"
-        }
         p = self.payload
         while isinstance(p, Dot11Elt):
-            if p.ID == 0:
+            # Avoid overriding already-set SSID values because it is not part
+            # of the standard and it protects from parsing bugs,
+            # see https://github.com/secdev/scapy/issues/2683
+            if p.ID == 0 and "ssid" not in summary:
                 summary["ssid"] = plain_str(p.info)
             elif p.ID == 3:
                 summary["channel"] = ord(p.info)
@@ -650,73 +827,144 @@
                     p.country_string[-1:]
                 )
             elif isinstance(p, Dot11EltRates):
-                summary["rates"] = p.rates
+                rates = [(x & 0x7f) / 2. for x in p.rates]
+                if "rates" in summary:
+                    summary["rates"].extend(rates)
+                else:
+                    summary["rates"] = rates
             elif isinstance(p, Dot11EltRSN):
+                wpa_version = "WPA2"
+                # WPA3-only:
+                # - AP shall at least enable AKM suite selector 00-0F-AC:8
+                # - AP shall not enable AKM suite selector 00-0F-AC:2 and
+                #   00-0F-AC:6
+                # - AP shall set MFPC and MFPR to 1
+                # - AP shall not enable WEP and TKIP
+                # WPA3-transition:
+                # - AP shall at least enable AKM suite selector 00-0F-AC:2
+                #   and 00-0F-AC:8
+                # - AP shall set MFPC to 1 and MFPR to 0
+                if any(x.suite == 8 for x in p.akm_suites) and \
+                        all(x.suite not in [2, 6] for x in p.akm_suites) and \
+                        p.mfp_capable and p.mfp_required and \
+                        all(x.cipher not in [1, 2, 5]
+                            for x in p.pairwise_cipher_suites):
+                    # WPA3 only mode
+                    wpa_version = "WPA3"
+                elif any(x.suite == 8 for x in p.akm_suites) and \
+                        any(x.suite == 2 for x in p.akm_suites) and \
+                        p.mfp_capable and not p.mfp_required:
+                    # WPA3 transition mode
+                    wpa_version = "WPA3-transition"
+                # Append suite
                 if p.akm_suites:
-                    auth = akmsuite_types.get(p.akm_suites[0].suite)
-                    crypto.add("WPA2/%s" % auth)
+                    auth = p.akm_suites[0].sprintf("%suite%")
+                    crypto.add(wpa_version + "/%s" % auth)
                 else:
-                    crypto.add("WPA2")
+                    crypto.add(wpa_version)
             elif p.ID == 221:
-                if isinstance(p, Dot11EltMicrosoftWPA) or \
-                        p.info.startswith(b'\x00P\xf2\x01\x01\x00'):
+                if isinstance(p, Dot11EltMicrosoftWPA):
                     if p.akm_suites:
-                        auth = akmsuite_types.get(p.akm_suites[0].suite)
+                        auth = p.akm_suites[0].sprintf("%suite%")
                         crypto.add("WPA/%s" % auth)
                     else:
                         crypto.add("WPA")
             p = p.payload
-        if not crypto:
+        if not crypto and hasattr(self, "cap"):
             if self.cap.privacy:
                 crypto.add("WEP")
             else:
                 crypto.add("OPN")
-        summary["crypto"] = crypto
+        if crypto:
+            summary["crypto"] = crypto
         return summary
 
 
-class Dot11Beacon(_Dot11NetStats):
-    name = "802.11 Beacon"
+#############
+# 802.11 IE #
+#############
 
+# 802.11-2016 - 9.4.2
 
 _dot11_info_elts_ids = {
     0: "SSID",
-    1: "Rates",
+    1: "Supported Rates",
     2: "FHset",
-    3: "DSset",
-    4: "CFset",
+    3: "DSSS Set",
+    4: "CF Set",
     5: "TIM",
-    6: "IBSSset",
+    6: "IBSS Set",
     7: "Country",
     10: "Request",
-    16: "challenge",
-    33: "PowerCapability",
-    36: "Channels",
-    42: "ERPinfo",
-    45: "HTCapabilities",
-    46: "QoSCapability",
-    47: "ERPinfo",
-    48: "RSNinfo",
-    50: "ESRates",
-    52: "PowerConstraint",
-    61: "HTinfo",
-    68: "reserved",
+    11: "BSS Load",
+    12: "EDCA Set",
+    13: "TSPEC",
+    14: "TCLAS",
+    15: "Schedule",
+    16: "Challenge text",
+    32: "Power Constraint",
+    33: "Power Capability",
+    36: "Supported Channels",
+    42: "ERP",
+    45: "HT Capabilities",
+    46: "QoS Capability",
+    48: "RSN",
+    50: "Extended Supported Rates",
+    52: "Neighbor Report",
+    61: "HT Operation",
     107: "Interworking",
-    127: "ExtendendCapatibilities",
-    191: "VHTCapabilities",
-    221: "vendor"
+    127: "Extendend Capabilities",
+    191: "VHT Capabilities",
+    221: "Vendor Specific"
+}
+
+# Backward compatibility
+_dot11_elt_deprecated_names = {
+    "Rates": 1,
+    "DSset": 3,
+    "CFset": 4,
+    "IBSSset": 6,
+    "challenge": 16,
+    "PowerCapability": 33,
+    "Channels": 36,
+    "ERPinfo": 42,
+    "HTinfo": 45,
+    "RSNinfo": 48,
+    "ESRates": 50,
+    "ExtendendCapatibilities": 127,
+    "VHTCapabilities": 191,
+    "Vendor": 221,
 }
 
+_dot11_info_elts_ids_rev = {v: k for k, v in _dot11_info_elts_ids.items()}
+_dot11_info_elts_ids_rev.update(_dot11_elt_deprecated_names)
+_dot11_id_enum = (
+    lambda x: _dot11_info_elts_ids.get(x, x),
+    lambda x: _dot11_info_elts_ids_rev.get(x, x)
+)
+
 
 class Dot11Elt(Packet):
+    """
+    A Generic 802.11 Element
+    """
     __slots__ = ["info"]
     name = "802.11 Information Element"
-    fields_desc = [ByteEnumField("ID", 0, _dot11_info_elts_ids),
+    fields_desc = [ByteEnumField("ID", 0, _dot11_id_enum),
                    FieldLenField("len", None, "info", "B"),
                    StrLenField("info", "", length_from=lambda x: x.len,
                                max_length=255)]
     show_indent = 0
 
+    def __setattr__(self, attr, val):
+        if attr == "info":
+            # Will be caught by __slots__: we need an extra call
+            try:
+                self.setfieldval(attr, val)
+            except AttributeError:
+                pass
+        super(Dot11Elt, self).__setattr__(attr, val)
+
     def mysummary(self):
         if self.ID == 0:
             ssid = repr(self.info)
@@ -729,44 +977,22 @@
     registered_ies = {}
 
     @classmethod
-    def register_variant(cls):
-        cls.registered_ies[cls.ID.default] = cls
+    def register_variant(cls, id=None):
+        id = id or cls.ID.default
+        if id not in cls.registered_ies:
+            cls.registered_ies[id] = cls
 
     @classmethod
     def dispatch_hook(cls, _pkt=None, *args, **kargs):
         if _pkt:
-            _id = orb(_pkt[0])
-            if _id == 221:
-                oui_a = orb(_pkt[2])
-                oui_b = orb(_pkt[3])
-                oui_c = orb(_pkt[4])
-                if oui_a == 0x00 and oui_b == 0x50 and oui_c == 0xf2:
-                    # MS OUI
-                    type_ = orb(_pkt[5])
-                    if type_ == 0x01:
-                        # MS WPA IE
-                        return Dot11EltMicrosoftWPA
-                    else:
-                        return Dot11EltVendorSpecific
-                else:
-                    return Dot11EltVendorSpecific
-            else:
-                return cls.registered_ies.get(_id, cls)
+            _id = ord(_pkt[:1])
+            idcls = cls.registered_ies.get(_id, cls)
+            if idcls.dispatch_hook != cls.dispatch_hook:
+                # Vendor has its own dispatch_hook
+                return idcls.dispatch_hook(_pkt=_pkt, *args, **kargs)
+            cls = idcls
         return cls
 
-    def haslayer(self, cls):
-        if cls == "Dot11Elt":
-            if isinstance(self, Dot11Elt):
-                return True
-        elif issubtype(cls, Dot11Elt):
-            if isinstance(self, cls):
-                return True
-        return super(Dot11Elt, self).haslayer(cls)
-
-    def getlayer(self, cls, nb=1, _track=None, _subclass=True, **flt):
-        return super(Dot11Elt, self).getlayer(cls, nb=nb, _track=_track,
-                                              _subclass=True, **flt)
-
     def pre_dissect(self, s):
         # Backward compatibility: add info to all elements
         # This allows to introduce new Dot11Elt classes without breaking
@@ -783,17 +1009,59 @@
         return p + pay
 
 
+class _OUIField(X3BytesField):
+    def i2repr(self, pkt, val):
+        by_val = struct.pack("!I", val or 0)[1:]
+        oui = str2mac(by_val + b"\0" * 3)[:8]
+        if conf.manufdb:
+            fancy = conf.manufdb._get_manuf(oui)
+            if fancy != oui:
+                return "%s (%s)" % (fancy, oui)
+        return oui
+
+
+class Dot11EltDSSSet(Dot11Elt):
+    name = "802.11 DSSS Parameter Set"
+    match_subclass = True
+    fields_desc = [
+        ByteEnumField("ID", 3, _dot11_id_enum),
+        ByteField("len", 1),
+        ByteField("channel", 0),
+    ]
+
+
+class Dot11EltERP(Dot11Elt):
+    name = "802.11 ERP"
+    match_subclass = True
+    fields_desc = [
+        ByteEnumField("ID", 42, _dot11_id_enum),
+        ByteField("len", 1),
+        BitField("NonERP_Present", 0, 1),
+        BitField("Use_Protection", 0, 1),
+        BitField("Barker_Preamble_Mode", 0, 1),
+        BitField("res", 0, 5),
+    ]
+
+
 class RSNCipherSuite(Packet):
     name = "Cipher suite"
     fields_desc = [
-        X3BytesField("oui", 0x000fac),
+        _OUIField("oui", 0x000fac),
         ByteEnumField("cipher", 0x04, {
             0x00: "Use group cipher suite",
             0x01: "WEP-40",
             0x02: "TKIP",
-            0x03: "Reserved",
-            0x04: "CCMP",
-            0x05: "WEP-104"
+            0x03: "OCB",
+            0x04: "CCMP-128",
+            0x05: "WEP-104",
+            0x06: "BIP-CMAC-128",
+            0x07: "Group addressed traffic not allowed",
+            0x08: "GCMP-128",
+            0x09: "GCMP-256",
+            0x0A: "CCMP-256",
+            0x0B: "BIP-GMAC-128",
+            0x0C: "BIP-GMAC-256",
+            0x0D: "BIP-CMAC-256"
         })
     ]
 
@@ -804,11 +1072,27 @@
 class AKMSuite(Packet):
     name = "AKM suite"
     fields_desc = [
-        X3BytesField("oui", 0x000fac),
+        _OUIField("oui", 0x000fac),
         ByteEnumField("suite", 0x01, {
             0x00: "Reserved",
-            0x01: "IEEE 802.1X / PMKSA caching",
-            0x02: "PSK"
+            0x01: "802.1X",
+            0x02: "PSK",
+            0x03: "FT-802.1X",
+            0x04: "FT-PSK",
+            0x05: "WPA-SHA256",
+            0x06: "PSK-SHA256",
+            0x07: "TDLS",
+            0x08: "SAE",
+            0x09: "FT-SAE",
+            0x0A: "AP-PEER-KEY",
+            0x0B: "WPA-SHA256-SUITE-B",
+            0x0C: "WPA-SHA384-SUITE-B",
+            0x0D: "FT-802.1X-SHA384",
+            0x0E: "FILS-SHA256",
+            0x0F: "FILS-SHA384",
+            0x10: "FT-FILS-SHA256",
+            0x11: "FT-FILS-SHA384",
+            0x12: "OWE"
         })
     ]
 
@@ -819,7 +1103,7 @@
 class PMKIDListPacket(Packet):
     name = "PMKIDs"
     fields_desc = [
-        LEFieldLenField("nb_pmkids", 0, count_of="pmk_id_list"),
+        LEFieldLenField("nb_pmkids", None, count_of="pmkid_list"),
         FieldListField(
             "pmkid_list",
             None,
@@ -834,14 +1118,15 @@
 
 class Dot11EltRSN(Dot11Elt):
     name = "802.11 RSN information"
+    match_subclass = True
     fields_desc = [
-        ByteField("ID", 48),
+        ByteEnumField("ID", 48, _dot11_id_enum),
         ByteField("len", None),
         LEShortField("version", 1),
         PacketField("group_cipher_suite", RSNCipherSuite(), RSNCipherSuite),
         LEFieldLenField(
             "nb_pairwise_cipher_suites",
-            1,
+            None,
             count_of="pairwise_cipher_suites"
         ),
         PacketListField(
@@ -852,7 +1137,7 @@
         ),
         LEFieldLenField(
             "nb_akm_suites",
-            1,
+            None,
             count_of="akm_suites"
         ),
         PacketListField(
@@ -872,8 +1157,17 @@
             PacketField("pmkids", None, PMKIDListPacket),
             lambda pkt: (
                 0 if pkt.len is None else
-                pkt.len - (12 + (pkt.nb_pairwise_cipher_suites * 4) +
-                                (pkt.nb_akm_suites * 4)) >= 18)
+                pkt.len - (
+                    12 +
+                    (pkt.nb_pairwise_cipher_suites or 0) * 4 +
+                    (pkt.nb_akm_suites or 0) * 4
+                ) >= 2
+            )
+        ),
+        ConditionalField(
+            PacketField("group_management_cipher_suite",
+                        RSNCipherSuite(cipher=0x6), RSNCipherSuite),
+            lambda pkt: pkt.mfp_capable == 1
         )
     ]
 
@@ -892,8 +1186,9 @@
 
 class Dot11EltCountry(Dot11Elt):
     name = "802.11 Country"
+    match_subclass = True
     fields_desc = [
-        ByteField("ID", 7),
+        ByteEnumField("ID", 7, _dot11_id_enum),
         ByteField("len", None),
         StrFixedLenField("country_string", b"\0\0\0", length=3),
         PacketListField(
@@ -906,68 +1201,175 @@
         ),
         ConditionalField(
             ByteField("pad", 0),
-            lambda pkt: (pkt.len + 1) % 2
+            lambda pkt: (len(pkt.descriptors) + 1) % 2
         )
     ]
 
 
-class Dot11EltMicrosoftWPA(Dot11Elt):
-    name = "802.11 Microsoft WPA"
-    fields_desc = [
-        ByteField("ID", 221),
-        ByteField("len", None),
-        X3BytesField("oui", 0x0050f2),
-        XByteField("type", 0x01),
-        LEShortField("version", 1),
-        PacketField("group_cipher_suite", RSNCipherSuite(), RSNCipherSuite),
-        LEFieldLenField(
-            "nb_pairwise_cipher_suites",
-            1,
-            count_of="pairwise_cipher_suites"
-        ),
-        PacketListField(
-            "pairwise_cipher_suites",
-            RSNCipherSuite(),
-            RSNCipherSuite,
-            count_from=lambda p: p.nb_pairwise_cipher_suites
-        ),
-        LEFieldLenField(
-            "nb_akm_suites",
-            1,
-            count_of="akm_suites"
-        ),
-        PacketListField(
-            "akm_suites",
-            AKMSuite(),
-            AKMSuite,
-            count_from=lambda p: p.nb_akm_suites
-        )
-    ]
+class _RateField(ByteField):
+    def i2repr(self, pkt, val):
+        if val is None:
+            return ""
+        s = str((val & 0x7f) / 2.)
+        if val & 0x80:
+            s += "(B)"
+        return s + " Mbps"
 
 
 class Dot11EltRates(Dot11Elt):
     name = "802.11 Rates"
+    match_subclass = True
     fields_desc = [
-        ByteField("ID", 1),
+        ByteEnumField("ID", 1, _dot11_id_enum),
         ByteField("len", None),
         FieldListField(
             "rates",
-            [],
-            XByteField("", 0),
-            count_from=lambda p: p.len
+            [0x82],
+            _RateField("", 0),
+            length_from=lambda p: p.len
         )
     ]
 
 
+Dot11EltRates.register_variant(50)  # Extended rates
+
+
+class Dot11EltHTCapabilities(Dot11Elt):
+    name = "802.11 HT Capabilities"
+    match_subclass = True
+    fields_desc = [
+        ByteEnumField("ID", 45, _dot11_id_enum),
+        ByteField("len", None),
+        # HT Capabilities Info: 2B
+        BitField("L_SIG_TXOP_Protection", 0, 1, tot_size=-2),
+        BitField("Forty_Mhz_Intolerant", 0, 1),
+        BitField("PSMP", 0, 1),
+        BitField("DSSS_CCK", 0, 1),
+        BitEnumField("Max_A_MSDU", 0, 1, {0: "3839 o", 1: "7935 o"}),
+        BitField("Delayed_BlockAck", 0, 1),
+        BitField("Rx_STBC", 0, 2),
+        BitField("Tx_STBC", 0, 1),
+        BitField("Short_GI_40Mhz", 0, 1),
+        BitField("Short_GI_20Mhz", 0, 1),
+        BitField("Green_Field", 0, 1),
+        BitEnumField("SM_Power_Save", 0, 2,
+                     {0: "static SM", 1: "dynamic SM", 3: "disabled"}),
+        BitEnumField("Supported_Channel_Width", 0, 1,
+                     {0: "20Mhz", 1: "20Mhz+40Mhz"}),
+        BitField("LDPC_Coding_Capability", 0, 1, end_tot_size=-2),
+        # A-MPDU Parameters: 1B
+        BitField("res", 0, 3, tot_size=-1),
+        BitField("Min_MPDCU_Start_Spacing", 8, 3),
+        BitField("Max_A_MPDU_Length_Exponent", 3, 2, end_tot_size=-1),
+        # Supported MCS set: 16B
+        BitField("res", 0, 27, tot_size=-16),
+        BitField("TX_Unequal_Modulation", 0, 1),
+        BitField("TX_Max_Spatial_Streams", 0, 2),
+        BitField("TX_RX_MCS_Set_Not_Equal", 0, 1),
+        BitField("TX_MCS_Set_Defined", 0, 1),
+        BitField("res", 0, 6),
+        BitField("RX_Highest_Supported_Data_Rate", 0, 10),
+        BitField("res", 0, 3),
+        BitField("RX_MSC_Bitmask", 0, 77, end_tot_size=-16),
+        # HT Extended capabilities: 2B
+        BitField("res", 0, 4, tot_size=-2),
+        BitField("RD_Responder", 0, 1),
+        BitField("HTC_HT_Support", 0, 1),
+        BitField("MCS_Feedback", 0, 2),
+        BitField("res", 0, 5),
+        BitField("PCO_Transition_Time", 0, 2),
+        BitField("PCO", 0, 1, end_tot_size=-2),
+        # TX Beamforming Capabilities TxBF: 4B
+        BitField("res", 0, 3, tot_size=-4),
+        BitField("Channel_Estimation_Capability", 0, 2),
+        BitField("CSI_max_n_Rows_Beamformer_Supported", 0, 2),
+        BitField("Compressed_Steering_n_Beamformer_Antennas_Supported", 0, 2),
+        BitField("Noncompressed_Steering_n_Beamformer_Antennas_Supported",
+                 0, 2),
+        BitField("CSI_n_Beamformer_Antennas_Supported", 0, 2),
+        BitField("Minimal_Grouping", 0, 2),
+        BitField("Explicit_Compressed_Beamforming_Feedback", 0, 2),
+        BitField("Explicit_Noncompressed_Beamforming_Feedback", 0, 2),
+        BitField("Explicit_Transmit_Beamforming_CSI_Feedback", 0, 2),
+        BitField("Explicit_Compressed_Steering", 0, 1),
+        BitField("Explicit_Noncompressed_Steering", 0, 1),
+        BitField("Explicit_CSI_Transmit_Beamforming", 0, 1),
+        BitField("Calibration", 0, 2),
+        BitField("Implicit_Trasmit_Beamforming", 0, 1),
+        BitField("Transmit_NDP", 0, 1),
+        BitField("Receive_NDP", 0, 1),
+        BitField("Transmit_Staggered_Sounding", 0, 1),
+        BitField("Receive_Staggered_Sounding", 0, 1),
+        BitField("Implicit_Transmit_Beamforming_Receiving", 0, 1,
+                 end_tot_size=-4),
+        # ASEL Capabilities: 1B
+        FlagsField("ASEL", 0, 8, [
+            "res"
+            "Transmit_Sounding_PPDUs",
+            "Receive_ASEL",
+            "Antenna_Indices_Feedback",
+            "Explicit_CSI_Feedback",
+            "Explicit_CSI_Feedback_Based_Transmit_ASEL",
+            "Antenna_Selection",
+        ])
+    ]
+
+
 class Dot11EltVendorSpecific(Dot11Elt):
     name = "802.11 Vendor Specific"
+    match_subclass = True
     fields_desc = [
-        ByteField("ID", 221),
+        ByteEnumField("ID", 221, _dot11_id_enum),
         ByteField("len", None),
-        X3BytesField("oui", 0x000000),
+        _OUIField("oui", 0x000000),
         StrLenField("info", "", length_from=lambda x: x.len - 3)
     ]
 
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *args, **kargs):
+        if _pkt:
+            oui = struct.unpack("!I", b"\x00" + _pkt[2:5])[0]
+            if oui == 0x0050f2:  # Microsoft
+                type_ = orb(_pkt[5])
+                if type_ == 0x01:
+                    # MS WPA IE
+                    return Dot11EltMicrosoftWPA
+                elif type_ == 0x02:
+                    # MS WME IE TODO
+                    # return Dot11EltMicrosoftWME
+                    pass
+                elif type_ == 0x04:
+                    # MS WPS IE TODO
+                    # return Dot11EltWPS
+                    pass
+                return Dot11EltVendorSpecific
+        return cls
+
+
+class Dot11EltMicrosoftWPA(Dot11EltVendorSpecific):
+    name = "802.11 Microsoft WPA"
+    match_subclass = True
+    ID = 221
+    oui = 0x0050f2
+    # It appears many WPA implementations ignore the fact
+    # that this IE should only have a single cipher and auth suite
+    fields_desc = Dot11EltVendorSpecific.fields_desc[:3] + [
+        XByteField("type", 0x01)
+    ] + Dot11EltRSN.fields_desc[2:8]
+
+
+######################
+# 802.11 Frame types #
+######################
+
+# 802.11-2016 9.3
+
+class Dot11Beacon(_Dot11EltUtils):
+    name = "802.11 Beacon"
+    fields_desc = [LELongField("timestamp", 0),
+                   LEShortField("beacon_interval", 0x0064),
+                   FlagsField("cap", 0, 16, capability_list)]
+
 
 class Dot11ATIM(Packet):
     name = "802.11 ATIM"
@@ -978,20 +1380,20 @@
     fields_desc = [LEShortEnumField("reason", 1, reason_code)]
 
 
-class Dot11AssoReq(Packet):
+class Dot11AssoReq(_Dot11EltUtils):
     name = "802.11 Association Request"
     fields_desc = [FlagsField("cap", 0, 16, capability_list),
                    LEShortField("listen_interval", 0x00c8)]
 
 
-class Dot11AssoResp(Packet):
+class Dot11AssoResp(_Dot11EltUtils):
     name = "802.11 Association Response"
     fields_desc = [FlagsField("cap", 0, 16, capability_list),
                    LEShortField("status", 0),
                    LEShortField("AID", 0)]
 
 
-class Dot11ReassoReq(Packet):
+class Dot11ReassoReq(_Dot11EltUtils):
     name = "802.11 Reassociation Request"
     fields_desc = [FlagsField("cap", 0, 16, capability_list),
                    LEShortField("listen_interval", 0x00c8),
@@ -1002,15 +1404,18 @@
     name = "802.11 Reassociation Response"
 
 
-class Dot11ProbeReq(Packet):
+class Dot11ProbeReq(_Dot11EltUtils):
     name = "802.11 Probe Request"
 
 
-class Dot11ProbeResp(_Dot11NetStats):
+class Dot11ProbeResp(_Dot11EltUtils):
     name = "802.11 Probe Response"
+    fields_desc = [LELongField("timestamp", 0),
+                   LEShortField("beacon_interval", 0x0064),
+                   FlagsField("cap", 0, 16, capability_list)]
 
 
-class Dot11Auth(Packet):
+class Dot11Auth(_Dot11EltUtils):
     name = "802.11 Authentication"
     fields_desc = [LEShortEnumField("algo", 0, ["open", "sharedkey"]),
                    LEShortField("seqnum", 0),
@@ -1027,6 +1432,16 @@
     fields_desc = [LEShortEnumField("reason", 1, reason_code)]
 
 
+class Dot11Ack(Packet):
+    name = "802.11 Ack packet"
+
+
+###################
+# 802.11 Security #
+###################
+
+# 802.11-2016 12
+
 class Dot11Encrypted(Packet):
     name = "802.11 Encrypted (unknown algorithm)"
     fields_desc = [StrField("data", None)]
@@ -1051,6 +1466,8 @@
         return conf.raw_layer
 
 
+# 802.11-2016 12.3.2
+
 class Dot11WEP(Dot11Encrypted):
     name = "802.11 WEP packet"
     fields_desc = [StrFixedLenField("iv", b"\0\0\0", 3),
@@ -1102,10 +1519,10 @@
             p = self.encrypt(p, raw(pay))
         return p
 
-# Dot11TKIP & Dot11CCMP
-
 # we can't dissect ICV / MIC here: they are encrypted
 
+# 802.11-2016 12.5.2.2
+
 
 class Dot11TKIP(Dot11Encrypted):
     name = "802.11 TKIP packet"
@@ -1126,9 +1543,11 @@
         StrField("data", None),
     ]
 
+# 802.11-2016 12.5.3.2
+
 
 class Dot11CCMP(Dot11Encrypted):
-    name = "802.11 TKIP packet"
+    name = "802.11 CCMP packet"
     fields_desc = [
         # iv - 8 bytes
         ByteField("PN0", 0),
@@ -1146,11 +1565,13 @@
     ]
 
 
-class Dot11Ack(Packet):
-    name = "802.11 Ack packet"
+############
+# Bindings #
+############
 
 
 bind_top_down(RadioTap, Dot11FCS, present=2, Flags=16)
+bind_top_down(Dot11, Dot11QoS, type=2, subtype=0xc)
 
 bind_layers(PrismHeader, Dot11,)
 bind_layers(Dot11, LLC, type=2)
@@ -1187,6 +1608,10 @@
 conf.l2types.register(DLT_IEEE802_11_RADIO, RadioTap)
 conf.l2types.register_num2layer(803, RadioTap)
 
+####################
+# Other WiFi utils #
+####################
+
 
 class WiFi_am(AnsweringMachine):
     """Before using this, initialize "iffrom" and "ifto" interfaces:

scapy-2.4.3.tar.gz/scapy/layers/dot15d4.py -> scapy-2.4.4.tar.gz/scapy/layers/dot15d4.py Changed

scapy-2.4.3.tar.gz/scapy/layers/eap.py -> scapy-2.4.4.tar.gz/scapy/layers/eap.py Changed

@@ -18,7 +18,6 @@
     PacketField, PacketListField, ConditionalField, PadField
 from scapy.packet import Packet, Padding, bind_layers
 from scapy.layers.l2 import SourceMACField, Ether, CookedLinux, GRE, SNAP
-from scapy.utils import issubtype
 from scapy.config import conf
 from scapy.compat import orb, chb
 
@@ -199,13 +198,11 @@
         ConditionalField(ByteEnumField("type", 0, eap_types),
                          lambda pkt:pkt.code not in [
                              EAP.SUCCESS, EAP.FAILURE]),
-        ConditionalField(FieldListField(
-                            "desired_auth_types",
-                            [],
-                            ByteEnumField("auth_type", 0, eap_types),
-                            length_from=lambda pkt: pkt.len - 4
-                         ),
-                         lambda pkt:pkt.code == EAP.RESPONSE and pkt.type == 3),  # noqa: E501
+        ConditionalField(
+            FieldListField("desired_auth_types", [],
+                           ByteEnumField("auth_type", 0, eap_types),
+                           length_from=lambda pkt: pkt.len - 4),
+            lambda pkt:pkt.code == EAP.RESPONSE and pkt.type == 3),
         ConditionalField(
             StrLenField("identity", '', length_from=lambda pkt: pkt.len - 5),
             lambda pkt: pkt.code == EAP.RESPONSE and hasattr(pkt, 'type') and pkt.type == 1),  # noqa: E501
@@ -243,19 +240,6 @@
                 return cls.registered_methods.get(t, cls)
         return cls
 
-    def haslayer(self, cls):
-        if cls == "EAP":
-            if isinstance(self, EAP):
-                return True
-        elif issubtype(cls, EAP):
-            if isinstance(self, cls):
-                return True
-        return super(EAP, self).haslayer(cls)
-
-    def getlayer(self, cls, nb=1, _track=None, _subclass=True, **flt):
-        return super(EAP, self).getlayer(cls, nb=nb, _track=_track,
-                                         _subclass=True, **flt)
-
     def answers(self, other):
         if isinstance(other, EAP):
             if self.code == self.REQUEST:
@@ -295,6 +279,7 @@
     """
 
     name = "EAP-MD5"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),
@@ -313,6 +298,7 @@
     """
 
     name = "EAP-TLS"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),
@@ -335,6 +321,7 @@
     """
 
     name = "EAP-TTLS"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),
@@ -357,6 +344,7 @@
     """
 
     name = "PEAP"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),
@@ -380,6 +368,7 @@
     """
 
     name = "EAP-FAST"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),
@@ -403,6 +392,7 @@
     """
 
     name = "Cisco LEAP"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("code", 1, eap_codes),
         ByteField("id", 0),

scapy-2.4.3.tar.gz/scapy/layers/http.py -> scapy-2.4.4.tar.gz/scapy/layers/http.py Changed

@@ -9,21 +9,31 @@
 """
 HTTP 1.0 layer.
 
-Load using:
->>> load_layer("http")
+Load using::
+
+    from scapy.layers.http import *
+
+Or (console only)::
+
+    >>> load_layer("http")
+
 Note that this layer ISN'T loaded by default, as quite experimental for now.
 
 To follow HTTP packets streams = group packets together to get the
-whole request/answer, use `TCPSession` as:
->>> sniff(session=TCPSession)  # Live on-the-flow session
->>> sniff(offline="./http_chunk.pcap", session=TCPSession)  # pcap
+whole request/answer, use ``TCPSession`` as:
 
-This will decode HTTP packets using `Content_Length` or chunks,
+    >>> sniff(session=TCPSession)  # Live on-the-flow session
+    >>> sniff(offline="./http_chunk.pcap", session=TCPSession)  # pcap
+
+This will decode HTTP packets using ``Content_Length`` or chunks,
 and will also decompress the packets when needed.
 Note: on failure, decompression will be ignored.
 
 You can turn auto-decompression/auto-compression off with:
->>> conf.contribs["http"]["auto_compression"] = True
+
+    >>> conf.contribs["http"]["auto_compression"] = False
+
+(Defaults to True)
 """
 
 # This file is a modified version of the former scapy_http plugin.
@@ -33,13 +43,14 @@
 
 import os
 import re
+import struct
 import subprocess
 
 from scapy.compat import plain_str, bytes_encode, \
     gzip_compress, gzip_decompress
 from scapy.config import conf
 from scapy.consts import WINDOWS
-from scapy.error import warning
+from scapy.error import warning, log_loading
 from scapy.fields import StrField
 from scapy.packet import Packet, bind_layers, bind_bottom_up, Raw
 from scapy.utils import get_temp_file, ContextManagerSubprocess
@@ -48,6 +59,12 @@
 
 from scapy.modules import six
 
+try:
+    import brotli
+    _is_brotli_available = True
+except ImportError:
+    _is_brotli_available = False
+
 if "http" not in conf.contribs:
     conf.contribs["http"] = {}
     conf.contribs["http"]["auto_compression"] = True
@@ -293,6 +310,14 @@
             elif "compress" in encodings:
                 import lzw
                 s = lzw.decompress(s)
+            elif "br" in encodings:
+                if _is_brotli_available:
+                    s = brotli.decompress(s)
+                else:
+                    log_loading.info(
+                        "Can't import brotli. brotli decompression "
+                        "will be ignored !"
+                    )
         except Exception:
             # Cannot decompress - probably incomplete data
             pass
@@ -311,6 +336,14 @@
         elif "compress" in encodings:
             import lzw
             pay = lzw.compress(pay)
+        elif "br" in encodings:
+            if _is_brotli_available:
+                pay = brotli.compress(pay)
+            else:
+                log_loading.info(
+                    "Can't import brotli. brotli compression will "
+                    "be ignored !"
+                )
         return pkt + pay
 
     def self_build(self, field_pos_list=None):
@@ -364,6 +397,14 @@
             p = f.addfield(self, p, b'\r\n')
         return p
 
+    def guess_payload_class(self, payload):
+        """Detect potential payloads
+        """
+        if self.Connection and b"Upgrade" in self.Connection:
+            from scapy.contrib.http2 import H2Frame
+            return H2Frame
+        return super(_HTTPContent, self).guess_payload_class(payload)
+
 
 class _HTTPHeaderField(StrField):
     """Modified StrField to handle HTTP Header names"""
@@ -486,9 +527,26 @@
 
     @classmethod
     def dispatch_hook(cls, _pkt=None, *args, **kargs):
-        if _pkt and False:
-            # XXX TODO
-            from scapy.contrib.contrib.http2 import H2Frame
+        if _pkt and len(_pkt) >= 9:
+            from scapy.contrib.http2 import _HTTP2_types, H2Frame
+            # To detect a valid HTTP2, we check that the type is correct
+            # that the Reserved bit is set and length makes sense.
+            while _pkt:
+                if len(_pkt) < 9:
+                    # Invalid total length
+                    return cls
+                if ord(_pkt[3:4]) not in _HTTP2_types:
+                    # Invalid type
+                    return cls
+                length = struct.unpack("!I", b"\0" + _pkt[:3])[0] + 9
+                if length > len(_pkt):
+                    # Invalid length
+                    return cls
+                sid = struct.unpack("!I", _pkt[5:9])[0]
+                if sid >> 31 != 0:
+                    # Invalid Reserved bit
+                    return cls
+                _pkt = _pkt[length:]
             return H2Frame
         return cls
 
@@ -521,8 +579,22 @@
                 # It's not Content-Length based. It could be chunked
                 encodings = http_packet[HTTP].payload._get_encodings()
                 chunked = ("chunked" in encodings)
+                is_response = isinstance(http_packet.payload, HTTPResponse)
                 if chunked:
+                    detect_end = lambda dat: dat.endswith(b"0\r\n\r\n")
+                # HTTP Requests that do not have any content,
+                # end with a double CRLF
+                elif isinstance(http_packet.payload, HTTPRequest):
                     detect_end = lambda dat: dat.endswith(b"\r\n\r\n")
+                    # In case we are handling a HTTP Request,
+                    # we want to continue assessing the data,
+                    # to handle requests with a body (POST)
+                    metadata["detect_unknown"] = True
+                elif is_response and http_packet.Status_Code == b"101":
+                    # If it's an upgrade response, it may also hold a
+                    # different protocol data.
+                    # make sure all headers are present
+                    detect_end = lambda dat: dat.find(b"\r\n\r\n")
                 else:
                     # If neither Content-Length nor chunked is specified,
                     # it means it's the TCP packet that contains the data,
@@ -564,7 +636,9 @@
 
 
 def http_request(host, path="/", port=80, timeout=3,
-                 display=False, verbose=None, **headers):
+                 display=False, verbose=0,
+                 iptables=False, iface=None,
+                 **headers):
     """Util to perform an HTTP request, using the TCP_client.
 
     :param host: the host to connect to
@@ -572,7 +646,10 @@
     :param port: the port (default 80)
     :param timeout: timeout before None is returned
     :param display: display the resullt in the default browser (default False)
-    :param **headers: any additional headers passed to the request
+    :param iface: interface to use. default: conf.iface
+    :param iptables: temporarily prevents the kernel from
+      answering with a TCP RESET message.
+    :param headers: any additional headers passed to the request
 
     :returns: the HTTPResponse packet
     """
@@ -586,14 +663,24 @@
     }
     http_headers.update(headers)
     req = HTTP() / HTTPRequest(**http_headers)
-    tcp_client = TCP_client.tcplink(HTTP, host, 80)
+    tcp_client = TCP_client.tcplink(HTTP, host, port, debug=verbose,
+                                    iface=iface)
     ans = None
+    if iptables:
+        ip = tcp_client.atmt.dst
+        iptables_rule = "iptables -%c INPUT -s %s -p tcp --sport 80 -j DROP"
+        assert(os.system(iptables_rule % ('A', ip)) == 0)
     try:
         ans = tcp_client.sr1(req, timeout=timeout, verbose=verbose)
     finally:
         tcp_client.close()
+        if iptables:
+            assert(os.system(iptables_rule % ('D', ip)) == 0)
     if ans:
         if display:
+            if Raw not in ans:
+                warning("No HTTP content returned. Cannot display")
+                return ans
             # Write file
             file = get_temp_file(autoext=".html")
             with open(file, "wb") as fd:
@@ -602,11 +689,9 @@
             if WINDOWS:
                 os.startfile(file)
             else:
-                with ContextManagerSubprocess("http_request()",
-                                              conf.prog.universal_open):
+                with ContextManagerSubprocess(conf.prog.universal_open):
                     subprocess.Popen([conf.prog.universal_open, file])
-        else:
-            return ans
+        return ans
 
 
 # Bindings

scapy-2.4.3.tar.gz/scapy/layers/inet.py -> scapy-2.4.4.tar.gz/scapy/layers/inet.py Changed

@@ -13,8 +13,8 @@
 import struct
 import re
 import random
+import select
 import socket
-from select import select
 from collections import defaultdict
 
 from scapy.utils import checksum, do_graph, incremental_label, \
@@ -216,6 +216,28 @@
                    IPField("originator_ip", "0.0.0.0")]
 
 
+class IPOption_Timestamp(IPOption):
+    name = "IP Option Timestamp"
+    optclass = 2
+    option = 4
+    fields_desc = [_IPOption_HDR,
+                   ByteField("length", None),
+                   ByteField("pointer", 9),
+                   BitField("oflw", 0, 4),
+                   BitEnumField("flg", 1, 4,
+                                {0: "timestamp_only",
+                                 1: "timestamp_and_ip_addr",
+                                 3: "prespecified_ip_addr"}),
+                   ConditionalField(IPField("internet_address", "0.0.0.0"),
+                                    lambda pkt: pkt.flg != 0),
+                   IntField('timestamp', 0)]
+
+    def post_build(self, p, pay):
+        if self.length is None:
+            p = p[:1] + struct.pack("!B", len(p)) + p[2:]
+        return p + pay
+
+
 class IPOption_Address_Extension(IPOption):
     name = "IP Option Address Extension"
     copy_flag = 1
@@ -334,7 +356,6 @@
             onum = orb(x[0])
             if onum == 0:
                 opt.append(("EOL", None))
-                x = x[1:]
                 break
             if onum == 1:
                 opt.append(("NOP", None))
@@ -425,7 +446,7 @@
         if isinstance(val, str):
             hmsms = self.re_hmsm.match(val)
             if hmsms:
-                h, _, m, _, s, _, ms = hmsms = hmsms.groups()
+                h, _, m, _, s, _, ms = hmsms.groups()
                 ms = int(((ms or "") + "000")[:3])
                 val = ((int(h) * 60 + int(m or 0)) * 60 + int(s or 0)) * 1000 + ms  # noqa: E501
             else:
@@ -552,7 +573,8 @@
 
     def fragment(self, fragsize=1480):
         """Fragment IP datagrams"""
-        fragsize = (fragsize + 7) // 8 * 8
+        lastfragsz = fragsize
+        fragsize -= fragsize % 8
         lst = []
         fnb = 0
         fl = self
@@ -562,7 +584,11 @@
 
         for p in fl:
             s = raw(p[fnb].payload)
-            nb = (len(s) + fragsize - 1) // fragsize
+            if len(s) <= lastfragsz:
+                lst.append(p)
+                continue
+
+            nb = (len(s) - lastfragsz + fragsize - 1) // fragsize + 1
             for i in range(nb):
                 q = p.copy()
                 del(q[fnb].payload)
@@ -570,8 +596,11 @@
                 del(q[fnb].len)
                 if i != nb - 1:
                     q[fnb].flags |= 1
+                    fragend = (i + 1) * fragsize
+                else:
+                    fragend = i * fragsize + lastfragsz
                 q[fnb].frag += i * fragsize // 8
-                r = conf.raw_layer(load=s[i * fragsize:(i + 1) * fragsize])
+                r = conf.raw_layer(load=s[i * fragsize:fragend])
                 r.overload_fields = p[fnb].payload.overload_fields.copy()
                 q.add_payload(r)
                 lst.append(q)
@@ -625,8 +654,10 @@
         p += pay
         dataofs = self.dataofs
         if dataofs is None:
-            dataofs = 5 + ((len(self.get_field("options").i2m(self, self.options)) + 3) // 4)  # noqa: E501
-            p = p[:12] + chb((dataofs << 4) | orb(p[12]) & 0x0f) + p[13:]
+            opt_len = len(self.get_field("options").i2m(self, self.options))
+            dataofs = 5 + ((opt_len + 3) // 4)
+            dataofs = (dataofs << 4) | orb(p[12]) & 0x0f
+            p = p[:12] + chb(dataofs & 0xff) + p[13:]
         if self.chksum is None:
             if isinstance(self.underlayer, IP):
                 ck = in4_chksum(socket.IPPROTO_TCP, self.underlayer, p)
@@ -978,11 +1009,12 @@
 @conf.commands.register
 def fragment(pkt, fragsize=1480):
     """Fragment a big IP datagram"""
-    fragsize = (fragsize + 7) // 8 * 8
+    lastfragsz = fragsize
+    fragsize -= fragsize % 8
     lst = []
     for p in pkt:
         s = raw(p[IP].payload)
-        nb = (len(s) + fragsize - 1) // fragsize
+        nb = (len(s) - lastfragsz + fragsize - 1) // fragsize + 1
         for i in range(nb):
             q = p.copy()
             del(q[IP].payload)
@@ -990,8 +1022,11 @@
             del(q[IP].len)
             if i != nb - 1:
                 q[IP].flags |= 1
+                fragend = (i + 1) * fragsize
+            else:
+                fragend = i * fragsize + lastfragsz
             q[IP].frag += i * fragsize // 8
-            r = conf.raw_layer(load=s[i * fragsize:(i + 1) * fragsize])
+            r = conf.raw_layer(load=s[i * fragsize:fragend])
             r.overload_fields = p[IP].payload.overload_fields.copy()
             q.add_payload(r)
             lst.append(q)
@@ -1023,7 +1058,7 @@
     p = lst[0]
     lastp = lst[-1]
     if p.frag > 0 or lastp.flags.MF:  # first or last fragment missing
-        missfrag.append(lst)
+        missfrag.extend(lst)
         return
     p = p.copy()
     if conf.padding_layer in p:
@@ -1038,7 +1073,7 @@
         if clen != q.frag << 3:  # Wrong fragmentation offset
             if clen > q.frag << 3:
                 warning("Fragment overlap (%i > %i) %r || %r ||  %r" % (clen, q.frag << 3, p, txt, q))  # noqa: E501
-            missfrag.append(lst)
+            missfrag.extend(lst)
             break
         if q[IP].len is None or q[IP].ihl is None:
             clen += len(q[IP].payload)
@@ -1171,7 +1206,7 @@
                  "nloc"]
 
     def __init__(self, res=None, name="Traceroute", stats=None):
-        PacketList.__init__(self, res, name, stats)
+        SndRcvList.__init__(self, res, name, stats)
         self.graphdef = None
         self.graphASres = None
         self.padding = 0
@@ -1197,9 +1232,9 @@
                 m = min(x for x, y in six.iteritems(k) if y[1])
             except ValueError:
                 continue
-            for l in list(k):  # use list(): k is modified in the loop
-                if l > m:
-                    del k[l]
+            for li in list(k):  # use list(): k is modified in the loop
+                if li > m:
+                    del k[li]
         return trace
 
     def trace3D(self, join=True):
@@ -1295,7 +1330,6 @@
             )
         )
         vpython.scene.exit = True
-        start = vpython.box()
         rings = {}
         tr3d = {}
         for i in trace:
@@ -1682,9 +1716,10 @@
 def traceroute_map(ips, **kargs):
     """Util function to call traceroute on multiple targets, then
     show the different paths on a map.
-    params:
-     - ips: a list of IPs on which traceroute will be called
-     - optional: kwargs, passed to traceroute"""
+
+    :param ips: a list of IPs on which traceroute will be called
+    :param kargs: (optional) kwargs, passed to traceroute
+    """
     kargs.setdefault("verbose", 0)
     return traceroute(ips)[0].world_trace()
 
@@ -1702,6 +1737,9 @@
         >>> a = TCP_client.tcplink(HTTP, "www.google.com", 80)
         >>> a.send(HTTPRequest())
         >>> a.recv()
+
+    :param ip: the ip to connect to
+    :param port:
     """
     def parse_args(self, ip, port, *args, **kargs):
         from scapy.sessions import TCPSession
@@ -1713,7 +1751,7 @@
         self.src = self.l4.src
         self.sack = self.l4[TCP].ack
         self.rel_seq = None
-        self.rcvbuf = TCPSession(self._transmit_packet, False)
+        self.rcvbuf = TCPSession(prn=self._transmit_packet, store=False)
         bpf = "host %s  and host %s and port %i and port %i" % (self.src,
                                                                 self.dst,
                                                                 self.sport,
@@ -1722,7 +1760,7 @@
 
     def _transmit_packet(self, pkt):
         """Transmits a packet from TCPSession to the SuperSocket"""
-        self.oi.tcp.send(pkt[TCP].payload)
+        self.oi.tcp.send(raw(pkt[TCP].payload))
 
     def master_filter(self, pkt):
         return (IP in pkt and
@@ -1886,7 +1924,7 @@
             try:
                 if not intr:
                     s.send(pkt)
-                sin, sout, serr = select([s], [], [], timeout)
+                sin = select.select([s], [], [], timeout)[0]
                 if not sin:
                     continue
                 ans = s.recv(1600)
@@ -1899,7 +1937,7 @@
                 if ans.payload.payload.dst != target:
                     continue
                 if ans.src != target:
-                    print("leak from", ans.src, end=' ')
+                    print("leak from", ans.src)
                 if not ans.haslayer(conf.padding_layer):
                     continue
                 leak = ans.getlayer(conf.padding_layer).load

scapy-2.4.3.tar.gz/scapy/layers/inet6.py -> scapy-2.4.4.tar.gz/scapy/layers/inet6.py Changed

@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 #############################################################################
 #                                                                           #
 #  inet6.py --- IPv6 support for Scapy                                      #
@@ -38,7 +37,6 @@
 from scapy.base_classes import Gen
 from scapy.compat import chb, orb, raw, plain_str, bytes_encode
 from scapy.config import conf
-import scapy.consts
 from scapy.data import DLT_IPV6, DLT_RAW, DLT_RAW_ALT, ETHER_ANY, ETH_P_IPV6, \
     MTU
 from scapy.error import warning
@@ -72,7 +70,7 @@
 
 if conf.route6 is None:
     # unused import, only to initialize conf.route6
-    import scapy.route6
+    import scapy.route6  # noqa: F401
 
 ##########################
 #  Neighbor cache stuff  #
@@ -127,7 +125,7 @@
 
     iff, a, nh = conf.route6.route(ip6)
 
-    if iff == scapy.consts.LOOPBACK_INTERFACE:
+    if iff == conf.loopback_name:
         return "ff:ff:ff:ff:ff:ff"
 
     if nh != '::':
@@ -179,8 +177,8 @@
              17: "UDP",
              43: "IPv6ExtHdrRouting",
              44: "IPv6ExtHdrFragment",
-             # 50: "IPv6ExtHrESP",
-             # 51: "IPv6ExtHdrAH",
+             50: "ESP",
+             51: "AH",
              58: "ICMPv6Unknown",
              59: "Raw",
              60: "IPv6ExtHdrDestOpt"}
@@ -271,7 +269,7 @@
 class IPv6(_IPv6GuessPayload, Packet, IPTools):
     name = "IPv6"
     fields_desc = [BitField("version", 6, 4),
-                   BitField("tc", 0, 8),  # TODO: IPv6, ByteField ?
+                   BitField("tc", 0, 8),
                    BitField("fl", 0, 20),
                    ShortField("plen", None),
                    ByteEnumField("nh", 59, ipv6nh),
@@ -383,7 +381,7 @@
 
         if conf.checkIPsrc and conf.checkIPaddr and not in6_ismaddr(sd):
             sd = inet_pton(socket.AF_INET6, sd)
-            ss = inet_pton(socket.AF_INET6, self.src)
+            ss = inet_pton(socket.AF_INET6, ss)
             return strxor(sd, ss) + struct.pack("B", nh) + self.payload.hashret()  # noqa: E501
         else:
             return struct.pack("B", nh) + self.payload.hashret()
@@ -564,15 +562,10 @@
     """
     As Specified in RFC 2460 - 8.1 Upper-Layer Checksums
 
-    Performs IPv6 Upper Layer checksum computation. Provided parameters are:
-    - 'nh' : value of upper layer protocol
-    - 'u'  : upper layer instance (TCP, UDP, ICMPv6*, ). Instance must be
-             provided with all under layers (IPv6 and all extension headers,
-             for example)
-    - 'p'  : the payload of the upper layer provided as a string
+    Performs IPv6 Upper Layer checksum computation.
 
-    Functions operate by filling a pseudo header class instance (PseudoIPv6)
-    with
+    This function operates by filling a pseudo header class instance
+    (PseudoIPv6) with:
     - Next Header value
     - the address of _final_ destination (if some Routing Header with non
     segleft field is present in underlayer classes, last address is used.)
@@ -581,6 +574,12 @@
     in HAO option if some Destination Option header found in underlayer
     includes this option).
     - the length is the length of provided payload string ('p')
+
+    :param nh: value of upper layer protocol
+    :param u: upper layer instance (TCP, UDP, ICMPv6*, ). Instance must be
+        provided with all under layers (IPv6 and all extension headers,
+        for example)
+    :param p: the payload of the upper layer provided as a string
     """
 
     ph6 = PseudoIPv6()
@@ -859,7 +858,7 @@
                                  adjust=lambda pkt, x: (x + 2 + 7) // 8 - 1),
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], HBHOptUnknown, 2,
-                                         length_from=lambda pkt: (8 * (pkt.len + 1)) - 2)]  # noqa: E501
+                                 length_from=lambda pkt: (8 * (pkt.len + 1)) - 2)]  # noqa: E501
     overload_fields = {IPv6: {"nh": 0}}
 
 
@@ -872,7 +871,7 @@
                                  adjust=lambda pkt, x: (x + 2 + 7) // 8 - 1),
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], HBHOptUnknown, 2,
-                                         length_from=lambda pkt: (8 * (pkt.len + 1)) - 2)]  # noqa: E501
+                                 length_from=lambda pkt: (8 * (pkt.len + 1)) - 2)]  # noqa: E501
     overload_fields = {IPv6: {"nh": 60}}
 
 
@@ -1023,6 +1022,12 @@
                    IntField("id", None)]
     overload_fields = {IPv6: {"nh": 44}}
 
+    def guess_payload_class(self, p):
+        if self.offset > 0:
+            return Raw
+        else:
+            return super(IPv6ExtHdrFragment, self).guess_payload_class(p)
+
 
 def defragment6(packets):
     """
@@ -1041,7 +1046,6 @@
     lst = [x for x in lst if x[IPv6ExtHdrFragment].id == id]
     if len(lst) != llen:
         warning("defragment6: some fragmented packets have been removed from list")  # noqa: E501
-    llen = len(lst)
 
     # reorder fragments
     res = []
@@ -1067,7 +1071,7 @@
         fragmentable += raw(q.payload)
 
     # Regenerate the unfragmentable part.
-    q = res[0]
+    q = res[0].copy()
     nh = q[IPv6ExtHdrFragment].nh
     q[IPv6ExtHdrFragment].underlayer.nh = nh
     q[IPv6ExtHdrFragment].underlayer.plen = len(fragmentable)
@@ -1075,26 +1079,40 @@
     q /= conf.raw_layer(load=fragmentable)
     del(q.plen)
 
-    return IPv6(raw(q))
+    if q[IPv6].underlayer:
+        q[IPv6] = IPv6(raw(q[IPv6]))
+    else:
+        q = IPv6(raw(q))
+    return q
 
 
 def fragment6(pkt, fragSize):
     """
-    Performs fragmentation of an IPv6 packet. Provided packet ('pkt') must
-    already contain an IPv6ExtHdrFragment() class. 'fragSize' argument is the
-    expected maximum size of fragments (MTU). The list of packets is returned.
-
-    If packet does not contain an IPv6ExtHdrFragment class, it is returned in
-    result list.
+    Performs fragmentation of an IPv6 packet. 'fragSize' argument is the
+    expected maximum size of fragment data (MTU). The list of packets is
+    returned.
+
+    If packet does not contain an IPv6ExtHdrFragment class, it is added to
+    first IPv6 layer found. If no IPv6 layer exists packet is returned in
+    result list unmodified.
     """
 
     pkt = pkt.copy()
 
     if IPv6ExtHdrFragment not in pkt:
-        # TODO : automatically add a fragment before upper Layer
-        #        at the moment, we do nothing and return initial packet
-        #        as single element of a list
-        return [pkt]
+        if IPv6 not in pkt:
+            return [pkt]
+
+        layer3 = pkt[IPv6]
+        data = layer3.payload
+        frag = IPv6ExtHdrFragment(nh=layer3.nh)
+
+        layer3.remove_payload()
+        del(layer3.nh)
+        del(layer3.plen)
+
+        frag.add_payload(data)
+        layer3.add_payload(frag)
 
     # If the payload is bigger than 65535, a Jumbo payload must be used, as
     # an IPv6 packet can't be bigger than 65535 bytes.
@@ -1168,48 +1186,6 @@
     return res
 
 
-#                               AH Header                                   #
-
-# class _AHFieldLenField(FieldLenField):
-#     def getfield(self, pkt, s):
-#         l = getattr(pkt, self.fld)
-#         l = (l*8)-self.shift
-#         i = self.m2i(pkt, s[:l])
-#         return s[l:],i
-
-# class _AHICVStrLenField(StrLenField):
-#     def i2len(self, pkt, x):
-
-
-# class IPv6ExtHdrAH(_IPv6ExtHdr):
-#     name = "IPv6 Extension Header - AH"
-#     fields_desc = [ ByteEnumField("nh", 59, ipv6nh),
-#                     _AHFieldLenField("len", None, "icv"),
-#                     ShortField("res", 0),
-#                     IntField("spi", 0),
-#                     IntField("sn", 0),
-#                     _AHICVStrLenField("icv", None, "len", shift=2) ]
-#     overload_fields = {IPv6: { "nh": 51 }}
-
-#     def post_build(self, pkt, pay):
-#         if self.len is None:
-#             pkt = pkt[0]+struct.pack("!B", 2*len(self.addresses))+pkt[2:]
-#         if self.segleft is None:
-#             pkt = pkt[:3]+struct.pack("!B", len(self.addresses))+pkt[4:]
-#         return _IPv6ExtHdr.post_build(self, pkt, pay)
-
-
-#                               ESP Header                                  #
-
-# class IPv6ExtHdrESP(_IPv6extHdr):
-#     name = "IPv6 Extension Header - ESP"
-#     fields_desc = [ IntField("spi", 0),
-#                     IntField("sn", 0),
-#                     # there is things to extract from IKE work
-#                     ]
-#     overloads_fields = {IPv6: { "nh": 50 }}
-
-
 #############################################################################
 #############################################################################
 #                             ICMPv6* Classes                               #
@@ -1246,6 +1222,8 @@
                  151: "ICMPv6MRD_Advertisement",
                  152: "ICMPv6MRD_Solicitation",
                  153: "ICMPv6MRD_Termination",
+                 # 154: Do Me - FMIPv6 Messages - RFC 5568
+                 155: "ICMPv6RPL",  # RFC 6550
                  }
 
 icmp6typesminhdrlen = {1: 8,
@@ -1273,7 +1251,8 @@
                        147: 8,
                        151: 8,
                        152: 4,
-                       153: 4
+                       153: 4,
+                       155: 4
                        }
 
 icmp6types = {1: "Destination unreachable",
@@ -1307,6 +1286,7 @@
               151: "Multicast Router Advertisement",
               152: "Multicast Router Solicitation",
               153: "Multicast Router Termination",
+              155: "RPL Control Message",
               200: "Private Experimentation",
               201: "Private Experimentation"}
 
@@ -1720,7 +1700,7 @@
     name = "ICMPv6 Neighbor Discovery Option - Prefix Information"
     fields_desc = [ByteField("type", 3),
                    ByteField("len", 4),
-                   ByteField("prefixlen", None),
+                   ByteField("prefixlen", 64),
                    BitField("L", 1, 1),
                    BitField("A", 1, 1),
                    BitField("R", 0, 1),
@@ -2646,6 +2626,32 @@
 
 #############################################################################
 #############################################################################
+#     Routing Protocol for Low Power and Lossy Networks RPL (RFC 6550)      #
+#############################################################################
+#############################################################################
+
+# https://www.iana.org/assignments/rpl/rpl.xhtml#control-codes
+rplcodes = {0: "DIS",
+            1: "DIO",
+            2: "DAO",
+            3: "DAO-ACK",
+            # 4: "P2P-DRO",
+            # 5: "P2P-DRO-ACK",
+            # 6: "Measurement",
+            7: "DCO",
+            8: "DCO-ACK"}
+
+
+class ICMPv6RPL(_ICMPv6):   # RFC 6550
+    name = 'RPL'
+    fields_desc = [ByteEnumField("type", 155, icmp6types),
+                   ByteEnumField("code", 0, rplcodes),
+                   XShortField("cksum", None)]
+    overload_fields = {IPv6: {"nh": 58, "dst": "ff02::1a"}}
+
+
+#############################################################################
+#############################################################################
 #               Mobile IPv6 (RFC 3775) and Nemo (RFC 3963)                  #
 #############################################################################
 #############################################################################
@@ -3049,7 +3055,7 @@
                    ShortField("res2", None),
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], MIP6OptUnknown, 8,
-                                   length_from=lambda pkt: 8 * pkt.len)]
+                                 length_from=lambda pkt: 8 * pkt.len)]
     overload_fields = {IPv6: {"nh": 135}}
 
     def hashret(self):
@@ -3070,7 +3076,7 @@
                    StrFixedLenField("cookie", b"\x00" * 8, 8),
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], MIP6OptUnknown, 16,
-                                 length_from=lambda pkt: 8 * (pkt.len - 1))]  # noqa: E501
+                                 length_from=lambda pkt: 8 * (pkt.len - 1))]
     overload_fields = {IPv6: {"nh": 135}}
 
     def hashret(self):
@@ -3097,7 +3103,7 @@
                    StrFixedLenField("token", b"\x00" * 8, 8),
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], MIP6OptUnknown, 24,
-                                   length_from=lambda pkt: 8 * (pkt.len - 2))]  # noqa: E501
+                                 length_from=lambda pkt: 8 * (pkt.len - 2))]
     overload_fields = {IPv6: {"nh": 135}}
 
     def hashret(self):
@@ -3142,7 +3148,7 @@
                    LifetimeField("mhtime", 3),  # unit == 4 seconds
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], MIP6OptUnknown, 12,
-                                   length_from=lambda pkt: 8 * pkt.len - 4)]  # noqa: E501
+                                 length_from=lambda pkt: 8 * pkt.len - 4)]
     overload_fields = {IPv6: {"nh": 135}}
 
     def hashret(self):  # Hack: see comment in MIP6MH_BRR.hashret()
@@ -3168,7 +3174,7 @@
                    XShortField("mhtime", 0),  # unit == 4 seconds
                    _PhantomAutoPadField("autopad", 1),  # autopad activated by default  # noqa: E501
                    _OptionsField("options", [], MIP6OptUnknown, 12,
-                                   length_from=lambda pkt: 8 * pkt.len - 4)]  # noqa: E501
+                                 length_from=lambda pkt: 8 * pkt.len - 4)]
     overload_fields = {IPv6: {"nh": 135}}
 
     def hashret(self):  # Hack: see comment in MIP6MH_BRR.hashret()
@@ -3201,7 +3207,7 @@
                    ByteField("reserved", 0),
                    IP6Field("ha", "::"),
                    _OptionsField("options", [], MIP6OptUnknown, 24,
-                                  length_from=lambda pkt: 8 * (pkt.len - 2))]  # noqa: E501
+                                 length_from=lambda pkt: 8 * (pkt.len - 2))]
     overload_fields = {IPv6: {"nh": 135}}
 
 
@@ -3281,9 +3287,9 @@
                 m = min(x for x, y in six.iteritems(k) if y[1])
             except ValueError:
                 continue
-            for l in list(k):  # use list(): k is modified in the loop
-                if l > m:
-                    del k[l]
+            for li in list(k):  # use list(): k is modified in the loop
+                if li > m:
+                    del k[li]
 
         return trace

scapy-2.4.3.tar.gz/scapy/layers/ipsec.py -> scapy-2.4.4.tar.gz/scapy/layers/ipsec.py Changed

@@ -12,7 +12,7 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        #
 #  General Public License for more details.                                 #
 #############################################################################
-"""
+r"""
 IPsec layer
 ===========
 
@@ -177,7 +177,8 @@
 else:
     log_loading.info("Can't import python-cryptography v1.7+. "
                      "Disabled IPsec encryption/authentication.")
-    InvalidTag = default_backend = None
+    default_backend = None
+    InvalidTag = Exception
     Cipher = algorithms = modes = None
 
 ###############################################################################
@@ -201,21 +202,21 @@
     def __init__(self, name, cipher, mode, block_size=None, iv_size=None,
                  key_size=None, icv_size=None, salt_size=None, format_mode_iv=None):  # noqa: E501
         """
-        @param name: the name of this encryption algorithm
-        @param cipher: a Cipher module
-        @param mode: the mode used with the cipher module
-        @param block_size: the length a block for this algo. Defaults to the
+        :param name: the name of this encryption algorithm
+        :param cipher: a Cipher module
+        :param mode: the mode used with the cipher module
+        :param block_size: the length a block for this algo. Defaults to the
                            `block_size` of the cipher.
-        @param iv_size: the length of the initialization vector of this algo.
+        :param iv_size: the length of the initialization vector of this algo.
                         Defaults to the `block_size` of the cipher.
-        @param key_size: an integer or list/tuple of integers. If specified,
+        :param key_size: an integer or list/tuple of integers. If specified,
                          force the secret keys length to one of the values.
                          Defaults to the `key_size` of the cipher.
-        @param icv_size: the length of the Integrity Check Value of this algo.
+        :param icv_size: the length of the Integrity Check Value of this algo.
                          Used by Combined Mode Algorithms e.g. GCM
-        @param salt_size: the length of the salt to use as the IV prefix.
+        :param salt_size: the length of the salt to use as the IV prefix.
                           Usually used by Counter modes e.g. CTR
-        @param format_mode_iv: function to format the Initialization Vector
+        :param format_mode_iv: function to format the Initialization Vector
                                e.g. handle the salt value
                                Default is the random buffer from `generate_iv`
         """
@@ -263,7 +264,7 @@
         """
         Check that the key length is valid.
 
-        @param key:    a byte string
+        :param key:    a byte string
         """
         if self.key_size and not (len(key) == self.key_size or len(key) in self.key_size):  # noqa: E501
             raise TypeError('invalid key size %s, must be %s' %
@@ -280,14 +281,14 @@
     @crypto_validator
     def new_cipher(self, key, mode_iv, digest=None):
         """
-        @param key:     the secret key, a byte string
-        @param mode_iv: the initialization vector or nonce, a byte string.
+        :param key:     the secret key, a byte string
+        :param mode_iv: the initialization vector or nonce, a byte string.
                         Formatted by `format_mode_iv`.
-        @param digest:  also known as tag or icv. A byte string containing the
+        :param digest:  also known as tag or icv. A byte string containing the
                         digest of the encrypted data. Only use this during
                         decryption!
 
-        @return:    an initialized cipher object for this algo
+        :returns:    an initialized cipher object for this algo
         """
         if self.is_aead and digest is not None:
             # With AEAD, the mode needs the digest during decryption.
@@ -311,9 +312,9 @@
         Also, make sure that the total ESP packet length is a multiple of 4
         bytes.
 
-        @param esp:    an unencrypted _ESPPlain packet
+        :param esp:    an unencrypted _ESPPlain packet
 
-        @return:    an unencrypted _ESPPlain packet with valid padding
+        :returns:    an unencrypted _ESPPlain packet with valid padding
         """
         # 2 extra bytes for padlen and nh
         data_len = len(esp.data) + 2
@@ -342,14 +343,14 @@
         """
         Encrypt an ESP packet
 
-        @param sa:   the SecurityAssociation associated with the ESP packet.
-        @param esp:  an unencrypted _ESPPlain packet with valid padding
-        @param key:  the secret key used for encryption
-        @esn_en:     extended sequence number enable which allows to use 64-bit
+        :param sa:   the SecurityAssociation associated with the ESP packet.
+        :param esp:  an unencrypted _ESPPlain packet with valid padding
+        :param key:  the secret key used for encryption
+        :esn_en:     extended sequence number enable which allows to use 64-bit
                      sequence number instead of 32-bit when using an AEAD
                      algorithm
-        @esn:        extended sequence number (32 MSB)
-        @return:    a valid ESP packet encrypted with this algorithm
+        :esn:        extended sequence number (32 MSB)
+        :return:    a valid ESP packet encrypted with this algorithm
         """
         data = esp.data_for_encryption()
 
@@ -375,16 +376,17 @@
         """
         Decrypt an ESP packet
 
-        @param sa:         the SecurityAssociation associated with the ESP packet.  # noqa: E501
-        @param esp:        an encrypted ESP packet
-        @param key:        the secret key used for encryption
-        @param icv_size:   the length of the icv used for integrity check
-        @esn_en:           extended sequence number enable which allows to use 64-bit
-                           sequence number instead of 32-bit when using an AEAD algorithm
-        @esn:              extended sequence number (32 MSB)
-        @return:    a valid ESP packet encrypted with this algorithm
-        @raise IPSecIntegrityError: if the integrity check fails with an AEAD
-                                    algorithm
+        :param sa: the SecurityAssociation associated with the ESP packet.
+        :param esp: an encrypted ESP packet
+        :param key: the secret key used for encryption
+        :param icv_size: the length of the icv used for integrity check
+        :param esn_en: extended sequence number enable which allows to use
+                       64-bit sequence number instead of 32-bit when using an
+                       AEAD algorithm
+        :param esn: extended sequence number (32 MSB)
+        :returns: a valid ESP packet encrypted with this algorithm
+        :raise scapy.layers.ipsec.IPSecIntegrityError: if the integrity check
+            fails with an AEAD algorithm
         """
         if icv_size is None:
             icv_size = self.icv_size if self.is_aead else 0
@@ -509,11 +511,11 @@
 
     def __init__(self, name, mac, digestmod, icv_size, key_size=None):
         """
-        @param name: the name of this integrity algorithm
-        @param mac: a Message Authentication Code module
-        @param digestmod: a Hash or Cipher module
-        @param icv_size: the length of the integrity check value of this algo
-        @param key_size: an integer or list/tuple of integers. If specified,
+        :param name: the name of this integrity algorithm
+        :param mac: a Message Authentication Code module
+        :param digestmod: a Hash or Cipher module
+        :param icv_size: the length of the integrity check value of this algo
+        :param key_size: an integer or list/tuple of integers. If specified,
                          force the secret keys length to one of the values.
                          Defaults to the `key_size` of the cipher.
         """
@@ -527,7 +529,7 @@
         """
         Check that the key length is valid.
 
-        @param key:    a byte string
+        :param key:    a byte string
         """
         if self.key_size and len(key) not in self.key_size:
             raise TypeError('invalid key size %s, must be one of %s' %
@@ -536,22 +538,25 @@
     @crypto_validator
     def new_mac(self, key):
         """
-        @param key:    a byte string
-        @return:       an initialized mac object for this algo
+        :param key:    a byte string
+        :returns:       an initialized mac object for this algo
         """
         if self.mac is CMAC:
             return self.mac(self.digestmod(key), default_backend())
         else:
             return self.mac(key, self.digestmod(), default_backend())
 
-    def sign(self, pkt, key):
+    def sign(self, pkt, key, esn_en=False, esn=0):
         """
         Sign an IPsec (ESP or AH) packet with this algo.
 
-        @param pkt:    a packet that contains a valid encrypted ESP or AH layer
-        @param key:    the authentication key, a byte string
+        :param pkt:    a packet that contains a valid encrypted ESP or AH layer
+        :param key:    the authentication key, a byte string
+        :param esn_en: extended sequence number enable which allows to use
+                       64-bit sequence number instead of 32-bit
+        :param esn: extended sequence number (32 MSB)
 
-        @return: the signed packet
+        :returns: the signed packet
         """
         if not self.mac:
             return pkt
@@ -564,19 +569,27 @@
 
         elif pkt.haslayer(AH):
             clone = zero_mutable_fields(pkt.copy(), sending=True)
-            mac.update(raw(clone))
+            if esn_en:
+                temp = raw(clone) + struct.pack('!L', esn)
+            else:
+                temp = raw(clone)
+            mac.update(temp)
             pkt[AH].icv = mac.finalize()[:self.icv_size]
 
         return pkt
 
-    def verify(self, pkt, key):
+    def verify(self, pkt, key, esn_en=False, esn=0):
         """
         Check that the integrity check value (icv) of a packet is valid.
 
-        @param pkt:    a packet that contains a valid encrypted ESP or AH layer
-        @param key:    the authentication key, a byte string
+        :param pkt:    a packet that contains a valid encrypted ESP or AH layer
+        :param key:    the authentication key, a byte string
+        :param esn_en: extended sequence number enable which allows to use
+                       64-bit sequence number instead of 32-bit
+        :param esn: extended sequence number (32 MSB)
 
-        @raise IPSecIntegrityError: if the integrity check fails
+        :raise scapy.layers.ipsec.IPSecIntegrityError: if the integrity check
+            fails
         """
         if not self.mac or self.icv_size == 0:
             return
@@ -584,12 +597,12 @@
         mac = self.new_mac(key)
 
         pkt_icv = 'not found'
-        computed_icv = 'not computed'
 
         if isinstance(pkt, ESP):
             pkt_icv = pkt.data[len(pkt.data) - self.icv_size:]
             clone = pkt.copy()
             clone.data = clone.data[:len(clone.data) - self.icv_size]
+            temp = raw(clone)
 
         elif pkt.haslayer(AH):
             if len(pkt[AH].icv) != self.icv_size:
@@ -598,8 +611,12 @@
                 pkt[AH].icv = pkt[AH].icv[:self.icv_size]
             pkt_icv = pkt[AH].icv
             clone = zero_mutable_fields(pkt.copy(), sending=False)
+            if esn_en:
+                temp = raw(clone) + struct.pack('!L', esn)
+            else:
+                temp = raw(clone)
 
-        mac.update(raw(clone))
+        mac.update(temp)
         computed_icv = mac.finalize()[:self.icv_size]
 
         # XXX: Cannot use mac.verify because the ICV can be truncated
@@ -654,10 +671,10 @@
     Split an IP(v6) packet in the correct location to insert an ESP or AH
     header.
 
-    @param orig_pkt: the packet to split. Must be an IP or IPv6 packet
-    @param transport_proto: the IPsec protocol number that will be inserted
+    :param orig_pkt: the packet to split. Must be an IP or IPv6 packet
+    :param transport_proto: the IPsec protocol number that will be inserted
                             at the split position.
-    @return: a tuple (header, nh, payload) where nh is the protocol number of
+    :returns: a tuple (header, nh, payload) where nh is the protocol number of
              payload.
     """
     # force resolution of default fields to avoid padding errors
@@ -716,9 +733,9 @@
     When using AH, all "mutable" fields must be "zeroed" before calculating
     the ICV. See RFC 4302, Section 3.3.3.1. Handling Mutable Fields.
 
-    @param pkt: an IP(v6) packet containing an AH layer.
+    :param pkt: an IP(v6) packet containing an AH layer.
                 NOTE: The packet will be modified
-    @param sending: if true, ipv6 routing headers will not be reordered
+    :param sending: if true, ipv6 routing headers will not be reordered
     """
 
     if pkt.haslayer(AH):
@@ -793,22 +810,22 @@
     def __init__(self, proto, spi, seq_num=1, crypt_algo=None, crypt_key=None,
                  auth_algo=None, auth_key=None, tunnel_header=None, nat_t_header=None, esn_en=False, esn=0):   # noqa: E501
         """
-        @param proto: the IPsec proto to use (ESP or AH)
-        @param spi: the Security Parameters Index of this SA
-        @param seq_num: the initial value for the sequence number on encrypted
+        :param proto: the IPsec proto to use (ESP or AH)
+        :param spi: the Security Parameters Index of this SA
+        :param seq_num: the initial value for the sequence number on encrypted
                         packets
-        @param crypt_algo: the encryption algorithm name (only used with ESP)
-        @param crypt_key: the encryption key (only used with ESP)
-        @param auth_algo: the integrity algorithm name
-        @param auth_key: the integrity key
-        @param tunnel_header: an instance of a IP(v6) header that will be used
+        :param crypt_algo: the encryption algorithm name (only used with ESP)
+        :param crypt_key: the encryption key (only used with ESP)
+        :param auth_algo: the integrity algorithm name
+        :param auth_key: the integrity key
+        :param tunnel_header: an instance of a IP(v6) header that will be used
                               to encapsulate the encrypted packets.
-        @param nat_t_header: an instance of a UDP header that will be used
+        :param nat_t_header: an instance of a UDP header that will be used
                              for NAT-Traversal.
-        @esn_en: extended sequence number enable which allows to use 64-bit
-                 sequence number instead of 32-bit when using an AEAD
-                 algorithm
-        @esn:    extended sequence number (32 MSB)
+        :param esn_en: extended sequence number enable which allows to use
+                       64-bit sequence number instead of 32-bit when using an
+                       AEAD algorithm
+        :param esn: extended sequence number (32 MSB)
         """
 
         if proto not in (ESP, AH, ESP.name, AH.name):
@@ -840,6 +857,7 @@
         else:
             self.crypt_algo = CRYPT_ALGOS['NULL']
             self.crypt_key = None
+            self.crypt_salt = None
 
         if auth_algo:
             if auth_algo not in AUTH_ALGOS:
@@ -924,7 +942,7 @@
 
         return ip_header / esp
 
-    def _encrypt_ah(self, pkt, seq_num=None):
+    def _encrypt_ah(self, pkt, seq_num=None, esn_en=False, esn=0):
 
         ah = AH(spi=self.spi, seq=seq_num or self.seq_num,
                 icv=b"\x00" * self.auth_algo.icv_size)
@@ -966,7 +984,10 @@
         else:
             ip_header.plen = len(ip_header.payload) + len(ah) + len(payload)
 
-        signed_pkt = self.auth_algo.sign(ip_header / ah / payload, self.auth_key)  # noqa: E501
+        signed_pkt = self.auth_algo.sign(ip_header / ah / payload,
+                                         self.auth_key,
+                                         esn_en=esn_en or self.esn_en,
+                                         esn=esn or self.esn)
 
         # sequence number must always change, unless specified by the user
         if seq_num is None:
@@ -979,17 +1000,17 @@
         Encrypt (and encapsulate) an IP(v6) packet with ESP or AH according
         to this SecurityAssociation.
 
-        @param pkt:     the packet to encrypt
-        @param seq_num: if specified, use this sequence number instead of the
+        :param pkt:     the packet to encrypt
+        :param seq_num: if specified, use this sequence number instead of the
                         generated one
-        @esn_en:        extended sequence number enable which allows to
+        :param esn_en:  extended sequence number enable which allows to
                         use 64-bit sequence number instead of 32-bit when
                         using an AEAD algorithm
-        @esn:           extended sequence number (32 MSB)
-        @param iv:      if specified, use this initialization vector for
+        :param esn:     extended sequence number (32 MSB)
+        :param iv:      if specified, use this initialization vector for
                         encryption instead of a random one.
 
-        @return: the encrypted/encapsulated packet
+        :returns: the encrypted/encapsulated packet
         """
         if not isinstance(pkt, self.SUPPORTED_PROTOS):
             raise TypeError('cannot encrypt %s, supported protos are %s'
@@ -999,7 +1020,8 @@
                                      iv=iv, esn_en=esn_en,
                                      esn=esn)
         else:
-            return self._encrypt_ah(pkt, seq_num=seq_num)
+            return self._encrypt_ah(pkt, seq_num=seq_num,
+                                    esn_en=esn_en, esn=esn)
 
     def _decrypt_esp(self, pkt, verify=True, esn_en=None, esn=None):
 
@@ -1046,11 +1068,13 @@
             # reassemble the ip_header with the ESP payload
             return ip_header / cls(esp.data)
 
-    def _decrypt_ah(self, pkt, verify=True):
+    def _decrypt_ah(self, pkt, verify=True, esn_en=None, esn=None):
 
         if verify:
             self.check_spi(pkt)
-            self.auth_algo.verify(pkt, self.auth_key)
+            self.auth_algo.verify(pkt, self.auth_key,
+                                  esn_en=esn_en or self.esn_en,
+                                  esn=esn or self.esn)
 
         ah = pkt[AH]
         payload = ah.payload
@@ -1080,14 +1104,15 @@
         """
         Decrypt (and decapsulate) an IP(v6) packet containing ESP or AH.
 
-        @param pkt:     the packet to decrypt
-        @param verify:  if False, do not perform the integrity check
-        @esn_en:     extended sequence number enable which allows to use 64-bit
-                     sequence number instead of 32-bit when using an AEAD
-                     algorithm
-        @esn:        extended sequence number (32 MSB)
-        @return: the decrypted/decapsulated packet
-        @raise IPSecIntegrityError: if the integrity check fails
+        :param pkt:     the packet to decrypt
+        :param verify:  if False, do not perform the integrity check
+        :param esn_en:  extended sequence number enable which allows to use
+                        64-bit sequence number instead of 32-bit when using an
+                        AEAD algorithm
+        :param esn:        extended sequence number (32 MSB)
+        :returns: the decrypted/decapsulated packet
+        :raise scapy.layers.ipsec.IPSecIntegrityError: if the integrity check
+            fails
         """
         if not isinstance(pkt, self.SUPPORTED_PROTOS):
             raise TypeError('cannot decrypt %s, supported protos are %s'
@@ -1097,6 +1122,6 @@
             return self._decrypt_esp(pkt, verify=verify,
                                      esn_en=esn_en, esn=esn)
         elif self.proto is AH and pkt.haslayer(AH):
-            return self._decrypt_ah(pkt, verify=verify)
+            return self._decrypt_ah(pkt, verify=verify, esn_en=esn_en, esn=esn)
         else:
             raise TypeError('%s has no %s layer' % (pkt, self.proto.name))

scapy-2.4.3.tar.gz/scapy/layers/l2.py -> scapy-2.4.4.tar.gz/scapy/layers/l2.py Changed

@@ -21,14 +21,17 @@
 from scapy.config import conf
 from scapy import consts
 from scapy.data import ARPHDR_ETHER, ARPHDR_LOOPBACK, ARPHDR_METRICOM, \
-    DLT_LINUX_IRDA, DLT_LINUX_SLL, DLT_LOOP, DLT_NULL, ETHER_ANY, \
-    ETHER_BROADCAST, ETHER_TYPES, ETH_P_ARP, ETH_P_MACSEC
-from scapy.error import warning
+    DLT_ETHERNET_MPACKET, DLT_LINUX_IRDA, DLT_LINUX_SLL, DLT_LOOP, \
+    DLT_NULL, ETHER_ANY, ETHER_BROADCAST, ETHER_TYPES, ETH_P_ARP, \
+    ETH_P_MACSEC
+from scapy.error import warning, ScapyNoDstMacException
 from scapy.fields import BCDFloatField, BitField, ByteField, \
-    ConditionalField, FieldLenField, IntEnumField, IntField, IP6Field, \
-    IPField, LenField, MACField, MultipleTypeField, ShortEnumField, \
-    ShortField, SourceIP6Field, SourceIPField, StrFixedLenField, StrLenField, \
-    X3BytesField, XByteField, XIntField, XShortEnumField, XShortField
+    ConditionalField, FieldLenField, FCSField, \
+    IntEnumField, IntField, IP6Field, IPField, \
+    LenField, MACField, MultipleTypeField, \
+    ShortEnumField, ShortField, SourceIP6Field, SourceIPField, \
+    StrFixedLenField, StrLenField, X3BytesField, XByteField, XIntField, \
+    XShortEnumField, XShortField
 from scapy.modules.six import viewitems
 from scapy.packet import bind_layers, Packet
 from scapy.plist import PacketList, SndRcvList
@@ -76,7 +79,7 @@
     if (tmp[0] & 0xf0) == 0xe0:  # mcast @
         return "01:00:5e:%.2x:%.2x:%.2x" % (tmp[1] & 0x7f, tmp[2], tmp[3])
     iff, _, gw = conf.route.route(ip)
-    if ((iff == consts.LOOPBACK_INTERFACE) or (ip == conf.route.get_if_bcast(iff))):  # noqa: E501
+    if (iff == conf.loopback_name) or (ip in conf.route.get_if_bcast(iff)):
         return "ff:ff:ff:ff:ff:ff"
     if gw != "0.0.0.0":
         ip = gw
@@ -116,8 +119,11 @@
             except socket.error:
                 pass
             if x is None:
-                x = "ff:ff:ff:ff:ff:ff"
-                warning("Mac address to reach destination not found. Using broadcast.")  # noqa: E501
+                if conf.raise_no_dst_mac:
+                    raise ScapyNoDstMacException()
+                else:
+                    x = "ff:ff:ff:ff:ff:ff"
+                    warning("Mac address to reach destination not found. Using broadcast.")  # noqa: E501
         return MACField.i2h(self, pkt, x)
 
     def i2m(self, pkt, x):
@@ -151,8 +157,8 @@
 
 # Layers
 
-ETHER_TYPES['802_AD'] = 0x88a8
-ETHER_TYPES['802_1AE'] = ETH_P_MACSEC
+ETHER_TYPES[0x88a8] = '802_AD'
+ETHER_TYPES[ETH_P_MACSEC] = '802_1AE'
 
 
 class Ether(Packet):
@@ -185,7 +191,7 @@
 class Dot3(Packet):
     name = "802.3"
     fields_desc = [DestMACField("dst"),
-                   MACField("src", ETHER_ANY),
+                   SourceMACField("src"),
                    LenField("len", None, "H")]
 
     def extract_padding(self, s):
@@ -238,6 +244,13 @@
                    XShortEnumField("proto", 0x800, ETHER_TYPES)]
 
 
+class MPacketPreamble(Packet):
+    # IEEE 802.3br Figure 99-3
+    name = "MPacket Preamble"
+    fields_desc = [StrFixedLenField("preamble", b"", length=8),
+                   FCSField("fcs", 0, fmt="!I")]
+
+
 class SNAP(Packet):
     name = "SNAP"
     fields_desc = [X3BytesField("OUI", 0x000000),
@@ -425,19 +438,6 @@
 conf.neighbor.register_l3(Ether, ARP, l2_register_l3_arp)
 
 
-class ERSPAN(Packet):
-    name = "ERSPAN"
-    fields_desc = [BitField("ver", 0, 4),
-                   BitField("vlan", 0, 12),
-                   BitField("cos", 0, 3),
-                   BitField("en", 0, 2),
-                   BitField("t", 0, 1),
-                   BitField("session_id", 0, 10),
-                   BitField("reserved", 0, 12),
-                   BitField("index", 0, 20),
-                   ]
-
-
 class GRErouting(Packet):
     name = "GRE routing information"
     fields_desc = [ShortField("address_family", 0),
@@ -449,6 +449,9 @@
 
 class GRE(Packet):
     name = "GRE"
+    deprecated_fields = {
+        "seqence_number": ("sequence_number", "2.4.4"),
+    }
     fields_desc = [BitField("chksum_present", 0, 1),
                    BitField("routing_present", 0, 1),
                    BitField("key_present", 0, 1),
@@ -461,7 +464,7 @@
                    ConditionalField(XShortField("chksum", None), lambda pkt:pkt.chksum_present == 1 or pkt.routing_present == 1),  # noqa: E501
                    ConditionalField(XShortField("offset", None), lambda pkt:pkt.chksum_present == 1 or pkt.routing_present == 1),  # noqa: E501
                    ConditionalField(XIntField("key", None), lambda pkt:pkt.key_present == 1),  # noqa: E501
-                   ConditionalField(XIntField("seqence_number", None), lambda pkt:pkt.seqnum_present == 1),  # noqa: E501
+                   ConditionalField(XIntField("sequence_number", None), lambda pkt:pkt.seqnum_present == 1),  # noqa: E501
                    ]
 
     @classmethod
@@ -486,6 +489,9 @@
     """
 
     name = "GRE PPTP"
+    deprecated_fields = {
+        "seqence_number": ("sequence_number", "2.4.4"),
+    }
     fields_desc = [BitField("chksum_present", 0, 1),
                    BitField("routing_present", 0, 1),
                    BitField("key_present", 1, 1),
@@ -498,7 +504,7 @@
                    XShortEnumField("proto", 0x880b, ETHER_TYPES),
                    ShortField("payload_len", None),
                    ShortField("call_id", None),
-                   ConditionalField(XIntField("seqence_number", None), lambda pkt: pkt.seqnum_present == 1),  # noqa: E501
+                   ConditionalField(XIntField("sequence_number", None), lambda pkt: pkt.seqnum_present == 1),  # noqa: E501
                    ConditionalField(XIntField("ack_number", None), lambda pkt: pkt.acknum_present == 1)]  # noqa: E501
 
     def post_build(self, p, pay):
@@ -530,7 +536,7 @@
 
 
 class Loopback(Packet):
-    """*BSD loopback layer"""
+    r"""\*BSD loopback layer"""
 
     name = "Loopback"
     if consts.OPENBSD:
@@ -544,7 +550,7 @@
     name = '802_1AD'
 
 
-bind_layers(Dot3, LLC,)
+bind_layers(Dot3, LLC)
 bind_layers(Ether, LLC, type=122)
 bind_layers(Ether, LLC, type=34928)
 bind_layers(Ether, Dot1Q, type=33024)
@@ -552,7 +558,6 @@
 bind_layers(Dot1AD, Dot1AD, type=0x88a8)
 bind_layers(Dot1AD, Dot1Q, type=0x8100)
 bind_layers(Dot1Q, Dot1AD, type=0x88a8)
-bind_layers(ERSPAN, Ether)
 bind_layers(Ether, Ether, type=1)
 bind_layers(Ether, ARP, type=2054)
 bind_layers(CookedLinux, LLC, proto=122)
@@ -560,15 +565,15 @@
 bind_layers(CookedLinux, Dot1AD, type=0x88a8)
 bind_layers(CookedLinux, Ether, proto=1)
 bind_layers(CookedLinux, ARP, proto=2054)
+bind_layers(MPacketPreamble, Ether)
 bind_layers(GRE, LLC, proto=122)
 bind_layers(GRE, Dot1Q, proto=33024)
 bind_layers(GRE, Dot1AD, type=0x88a8)
 bind_layers(GRE, Ether, proto=0x6558)
 bind_layers(GRE, ARP, proto=2054)
-bind_layers(GRE, ERSPAN, proto=0x88be, seqnum_present=1)
 bind_layers(GRE, GRErouting, {"routing_present": 1})
 bind_layers(GRErouting, conf.raw_layer, {"address_family": 0, "SRE_len": 0})
-bind_layers(GRErouting, GRErouting, {})
+bind_layers(GRErouting, GRErouting)
 bind_layers(LLC, STP, dsap=66, ssap=66, ctrl=3)
 bind_layers(LLC, SNAP, dsap=170, ssap=170, ctrl=3)
 bind_layers(SNAP, Dot1Q, code=33024)
@@ -582,6 +587,7 @@
 conf.l2types.register_num2layer(ARPHDR_LOOPBACK, Ether)
 conf.l2types.register_layer2num(ARPHDR_ETHER, Dot3)
 conf.l2types.register(DLT_LINUX_SLL, CookedLinux)
+conf.l2types.register(DLT_ETHERNET_MPACKET, MPacketPreamble)
 conf.l2types.register_num2layer(DLT_LINUX_IRDA, CookedLinux)
 conf.l2types.register(DLT_LOOP, Loopback)
 conf.l2types.register_num2layer(DLT_NULL, Loopback)
@@ -614,8 +620,21 @@
         SndRcvList.__init__(self, res, name, stats)
 
     def show(self):
+        """
+        Print the list of discovered MAC addresses.
+        """
+
+        data = list()
+        padding = 0
+
         for s, r in self.res:
-            print(r.sprintf("%19s,Ether.src% %ARP.psrc%"))
+            manuf = conf.manufdb._get_short_manuf(r.src)
+            manuf = "unknown" if manuf == r.src else manuf
+            padding = max(padding, len(manuf))
+            data.append((r[Ether].src, manuf, r[ARP].psrc))
+
+        for src, manuf, psrc in data:
+            print("  %-17s %-*s %s" % (src, padding, manuf, psrc))
 
 
 @conf.commands.register
@@ -663,16 +682,24 @@
 
     example:
     To respond to an ARP request for 192.168.100 replying on the
-    ingress interface;
+    ingress interface::
+
       farpd(IP_addr='192.168.1.100',ARP_addr='00:01:02:03:04:05')
-    To respond on a different interface add the interface parameter
+
+    To respond on a different interface add the interface parameter::
+
       farpd(IP_addr='192.168.1.100',ARP_addr='00:01:02:03:04:05',iface='eth0')
-    To respond on ANY arp request on an interface with mac address ARP_addr
+
+    To respond on ANY arp request on an interface with mac address ARP_addr::
+
       farpd(ARP_addr='00:01:02:03:04:05',iface='eth1')
-    To respond on ANY arp request with my mac addr on the given interface
+
+    To respond on ANY arp request with my mac addr on the given interface::
+
       farpd(iface='eth1')
 
-    Optional Args
+    Optional Args::
+
      inter=<n>   Interval in seconds between ARP replies being sent
 
     """
@@ -704,7 +731,6 @@
                 ARP_addr = get_if_hwaddr(iff)
             except Exception:
                 ARP_addr = "00:00:00:00:00:00"
-                pass
         else:
             ARP_addr = self.ARP_addr
         resp = Ether(dst=ether.src,

scapy-2.4.3.tar.gz/scapy/layers/netbios.py -> scapy-2.4.4.tar.gz/scapy/layers/netbios.py Changed

scapy-2.4.3.tar.gz/scapy/layers/netflow.py -> scapy-2.4.4.tar.gz/scapy/layers/netflow.py Changed

@@ -8,33 +8,39 @@
 """
 Cisco NetFlow protocol v1, v5, v9 and v10 (IPFix)
 
-HowTo dissect NetflowV9/10 (IPFix) packets:
+HowTo dissect NetflowV9/10 (IPFix) packets
 
 # From a pcap / list of packets
 
-Using sniff and sessions:
->>> sniff(offline=open("my_great_pcap.pcap", "rb"), session=NetflowSession)
+Using sniff and sessions::
+
+    >>> sniff(offline=open("my_great_pcap.pcap", "rb"), session=NetflowSession)
 
 Using the netflowv9_defragment/ipfix_defragment commands:
+
 - get a list of packets containing NetflowV9/10 packets
 - call `netflowv9_defragment(plist)` to defragment the list
 
 (ipfix_defragment is an alias for netflowv9_defragment)
 
-# Live / on-the-flow / other: use NetflowSession
->>> sniff(session=NetflowSession, prn=[...])
+# Live / on-the-flow / other: use NetflowSession::
+
+    >>> sniff(session=NetflowSession, prn=[...])
+
 """
 
+import socket
 import struct
 
 from scapy.config import conf
 from scapy.data import IP_PROTOS
-from scapy.error import warning
+from scapy.error import warning, Scapy_Exception
 from scapy.fields import ByteEnumField, ByteField, Field, FieldLenField, \
     FlagsField, IPField, IntField, MACField, \
     PacketListField, PadField, SecondsIntField, ShortEnumField, ShortField, \
     StrField, StrFixedLenField, ThreeBytesField, UTCTimeField, XByteField, \
-    XShortField, LongField
+    XShortField, LongField, BitField, ConditionalField, BitEnumField, \
+    StrLenField
 from scapy.packet import Packet, bind_layers, bind_bottom_up
 from scapy.plist import PacketList
 from scapy.sessions import IPSession, DefaultSession
@@ -61,11 +67,17 @@
 
 class NetflowHeaderV1(Packet):
     name = "Netflow Header v1"
-    fields_desc = [ShortField("count", 0),
+    fields_desc = [ShortField("count", None),
                    IntField("sysUptime", 0),
                    UTCTimeField("unixSecs", 0),
                    UTCTimeField("unixNanoSeconds", 0, use_nano=True)]
 
+    def post_build(self, pkt, pay):
+        if self.count is None:
+            count = len(self.layers()) - 1
+            pkt = struct.pack("!H", count) + pkt[2:]
+        return pkt + pay
+
 
 class NetflowRecordV1(Packet):
     name = "Netflow Record v1"
@@ -99,7 +111,7 @@
 
 class NetflowHeaderV5(Packet):
     name = "Netflow Header v5"
-    fields_desc = [ShortField("count", 0),
+    fields_desc = [ShortField("count", None),
                    IntField("sysUptime", 0),
                    UTCTimeField("unixSecs", 0),
                    UTCTimeField("unixNanoSeconds", 0, use_nano=True),
@@ -108,6 +120,12 @@
                    ByteField("engineID", 0),
                    ShortField("samplingInterval", 0)]
 
+    def post_build(self, pkt, pay):
+        if self.count is None:
+            count = len(self.layers()) - 1
+            pkt = struct.pack("!H", count) + pkt[2:]
+        return pkt + pay
+
 
 class NetflowRecordV5(Packet):
     name = "Netflow Record v5"
@@ -124,7 +142,7 @@
                    ShortField("dstport", 0),
                    ByteField("pad1", 0),
                    FlagsField("tcpFlags", 0x2, 8, "FSRPAUEC"),
-                   ByteEnumField("prot", IP_PROTOS["tcp"], IP_PROTOS),
+                   ByteEnumField("prot", socket.IPPROTO_TCP, IP_PROTOS),
                    ByteField("tos", 0),
                    ShortField("src_as", 0),
                    ShortField("dst_as", 0),
@@ -1240,12 +1258,21 @@
                    IntField("flowSequence", 0),
                    IntField("ObservationDomainID", 0)]
 
+    def post_build(self, pkt, pay):
+        if self.length is None:
+            length = len(pkt) + len(pay)
+            pkt = struct.pack("!H", length) + pkt[2:]
+        return pkt + pay
+
 
 class NetflowTemplateFieldV9(Packet):
     name = "Netflow Flowset Template Field V9/10"
-    fields_desc = [ShortEnumField("fieldType", None,
-                                  NetflowV910TemplateFieldTypes),
-                   ShortField("fieldLength", 0)]
+    fields_desc = [BitField("enterpriseBit", 0, 1),
+                   BitEnumField("fieldType", None, 15,
+                                NetflowV910TemplateFieldTypes),
+                   ShortField("fieldLength", 0),
+                   ConditionalField(IntField("enterpriseNumber", 0),
+                                    lambda p: p.enterpriseBit)]
 
     def __init__(self, *args, **kwargs):
         Packet.__init__(self, *args, **kwargs)
@@ -1318,6 +1345,34 @@
     return NetflowRecordV9I
 
 
+def GetNetflowRecordV9(flowset, templateID=None):
+    """
+    Get a NetflowRecordV9/10 for a specific NetflowFlowsetV9/10.
+
+    Have a look at the online doc for examples.
+    """
+    definitions = {}
+    for ntv9 in flowset.templates:
+        llist = []
+        for tmpl in ntv9.template_fields:
+            llist.append((tmpl.fieldLength, tmpl.fieldType))
+        if llist:
+            cls = _GenNetflowRecordV9(NetflowRecordV9, llist)
+            definitions[ntv9.templateID] = cls
+    if not definitions:
+        raise Scapy_Exception(
+            "No template IDs detected"
+        )
+    if len(definitions) > 1:
+        if templateID is None:
+            raise Scapy_Exception(
+                "Multiple possible templates ! Specify templateID=.."
+            )
+        return definitions[templateID]
+    else:
+        return list(definitions.values())[0]
+
+
 class NetflowRecordV9(Packet):
     name = "Netflow DataFlowset Record V9/10"
     fields_desc = [StrField("fieldValue", "")]
@@ -1432,7 +1487,11 @@
                 data = data[tot_len:]
             # Inject dissected data
             datafl.records = res
-            datafl.do_dissect_payload(data)
+            if data:
+                if len(data) <= 4:
+                    datafl.add_payload(conf.padding_layer(data))
+                else:
+                    datafl.do_dissect_payload(data)
         # Options
         elif tid in definitions_opts:
             (scope_len, scope_cls,
@@ -1488,8 +1547,8 @@
     """Session used to defragment NetflowV9/10 packets on the flow.
     See help(scapy.layers.netflow) for more infos.
     """
-    def __init__(self, *args):
-        IPSession.__init__(self, *args)
+    def __init__(self, *args, **kwargs):
+        IPSession.__init__(self, *args, **kwargs)
         self.definitions = {}
         self.definitions_opts = {}
         self.ignored = set()
@@ -1520,9 +1579,12 @@
 # Aka Set
 class NetflowOptionsFlowsetOptionV9(Packet):
     name = "Netflow Options Template FlowSet V9/10 - Option"
-    fields_desc = [ShortEnumField("optionFieldType", None,
-                                  NetflowV910TemplateFieldTypes),
-                   ShortField("optionFieldlength", 0)]
+    fields_desc = [BitField("enterpriseBit", 0, 1),
+                   BitEnumField("optionFieldType", None, 15,
+                                NetflowV910TemplateFieldTypes),
+                   ShortField("optionFieldlength", 0),
+                   ConditionalField(ShortField("enterpriseNumber", 0),
+                                    lambda p: p.enterpriseBit)]
 
     def default_payload_class(self, p):
         return conf.padding_layer
@@ -1555,24 +1617,21 @@
                    PacketListField(
                        "options", [],
                        NetflowOptionsFlowsetOptionV9,
-                       length_from=lambda pkt: pkt.option_field_length)]
-
-    def extract_padding(self, s):
-        if self.length is None:
-            return s, ""
-        # Calc pad length
-        pad_len = self.length - self.option_scope_length - \
-            self.option_field_length - 10
-        return s[pad_len:], s[:pad_len]
+                       length_from=lambda pkt: pkt.option_field_length),
+                   StrLenField("pad", None, length_from=lambda pkt: (
+                       pkt.length - pkt.option_scope_length -
+                       pkt.option_field_length - 10))]
 
     def default_payload_class(self, p):
         return conf.padding_layer
 
     def post_build(self, pkt, pay):
-        # Padding 4-bytes with b"\x00"
-        pkt += (-len(pkt) % 4) * b"\x00"
         if self.length is None:
             pkt = pkt[:2] + struct.pack("!H", len(pkt)) + pkt[4:]
+        if self.pad is None:
+            # Padding 4-bytes with b"\x00"
+            start = 10 + self.option_scope_length + self.option_field_length
+            pkt = pkt[:start] + (-len(pkt) % 4) * b"\x00"
         return pkt + pay
 
 
@@ -1603,14 +1662,18 @@
                        NetflowOptionsFlowsetOptionV9,
                        count_from=lambda pkt: (
                            pkt.field_count - pkt.scope_field_count
-                       ))]
+                       )),
+                   StrLenField("pad", None, length_from=lambda pkt: (
+                       pkt.length - (pkt.scope_field_count * 4) - 10))]
 
-    def extract_padding(self, s):
+    def post_build(self, pkt, pay):
         if self.length is None:
-            return s, ""
-        # Calc pad length
-        pad_len = self.length - (self.scope_field_count * 4) - 10
-        return s[pad_len:], s[:pad_len]
+            pkt = pkt[:2] + struct.pack("!H", len(pkt)) + pkt[4:]
+        if self.pad is None:
+            # Padding 4-bytes with b"\x00"
+            start = 10 + self.scope_field_count * 4
+            pkt = pkt[:start] + (-len(pkt) % 4) * b"\x00"
+        return pkt + pay
 
 
 bind_layers(NetflowHeader, NetflowHeaderV9, version=9)

scapy-2.4.3.tar.gz/scapy/layers/ntp.py -> scapy-2.4.4.tar.gz/scapy/layers/ntp.py Changed

@@ -22,7 +22,7 @@
     PadField
 from scapy.layers.inet6 import IP6Field
 from scapy.layers.inet import UDP
-from scapy.utils import issubtype, lhex
+from scapy.utils import lhex
 from scapy.compat import orb
 from scapy.config import conf
 import scapy.modules.six as six
@@ -207,22 +207,6 @@
             raise _NTPInvalidDataException(err)
         return s
 
-    # NTPHeader, NTPControl and NTPPrivate are NTP packets.
-    # This might help, for example when reading a pcap file.
-    def haslayer(self, cls):
-        """Specific: NTPHeader().haslayer(NTP) should return True."""
-        if cls == "NTP":
-            if isinstance(self, NTP):
-                return True
-        elif issubtype(cls, NTP):
-            if isinstance(self, cls):
-                return True
-        return super(NTP, self).haslayer(cls)
-
-    def getlayer(self, cls, nb=1, _track=None, _subclass=True, **flt):
-        return super(NTP, self).getlayer(cls, nb=nb, _track=_track,
-                                         _subclass=True, **flt)
-
     def mysummary(self):
         return self.sprintf("NTP v%ir,NTP.version%, %NTP.mode%")
 
@@ -436,6 +420,7 @@
     #
 
     name = "NTPHeader"
+    match_subclass = True
     fields_desc = [
         BitEnumField("leap", 0, 2, _leap_indicator),
         BitField("version", 4, 3),
@@ -467,10 +452,10 @@
         """
         plen = len(payload)
 
-        if plen > _NTP_AUTH_MD5_TAIL_SIZE:
-            return NTPExtensions
-        elif plen == _NTP_AUTH_MD5_TAIL_SIZE:
+        if plen - 4 in [16, 20, 32, 64]:  # length of MD5, SHA1, SHA256, SHA512
             return NTPAuthenticator
+        elif plen > _NTP_AUTH_MD5_TAIL_SIZE:
+            return NTPExtensions
 
         return Packet.guess_payload_class(self, payload)
 
@@ -805,6 +790,7 @@
     #
 
     name = "Control message"
+    match_subclass = True
     fields_desc = [
         BitField("zeros", 0, 2),
         BitField("version", 2, 3),
@@ -1785,6 +1771,7 @@
     #
 
     name = "Private (mode 7)"
+    match_subclass = True
     fields_desc = [
         BitField("response", 0, 1),
         BitField("more", 0, 1),

scapy-2.4.3.tar.gz/scapy/layers/ppi.py -> scapy-2.4.4.tar.gz/scapy/layers/ppi.py Changed

scapy-2.4.3.tar.gz/scapy/layers/ppp.py -> scapy-2.4.4.tar.gz/scapy/layers/ppp.py Changed

@@ -20,7 +20,7 @@
 from scapy.layers.inet import IP
 from scapy.layers.inet6 import IPv6
 from scapy.fields import BitField, ByteEnumField, ByteField, \
-    ConditionalField, FieldLenField, IntField, IPField, \
+    ConditionalField, EnumField, FieldLenField, IntField, IPField, \
     PacketListField, PacketField, ShortEnumField, ShortField, \
     StrFixedLenField, StrLenField, XByteField, XShortField, XStrLenField
 from scapy.modules import six
@@ -261,31 +261,45 @@
     fields_desc = [ByteEnumField("direction", 0, ["received", "sent"])]
 
 
+class _PPPProtoField(EnumField):
+    """
+    A field that can be either Byte or Short, depending on the PPP RFC.
+
+    See RFC 1661 section 2
+    <https://tools.ietf.org/html/rfc1661#section-2>
+    """
+    def getfield(self, pkt, s):
+        if ord(s[:1]) & 0x01:
+            self.fmt = "!B"
+            self.sz = 1
+        else:
+            self.fmt = "!H"
+            self.sz = 2
+        self.struct = struct.Struct(self.fmt)
+        return super(_PPPProtoField, self).getfield(pkt, s)
+
+    def addfield(self, pkt, s, val):
+        if val < 0x100:
+            self.fmt = "!B"
+            self.sz = 1
+        else:
+            self.fmt = "!H"
+            self.sz = 2
+        self.struct = struct.Struct(self.fmt)
+        return super(_PPPProtoField, self).addfield(pkt, s, val)
+
+
 class PPP(Packet):
     name = "PPP Link Layer"
-    fields_desc = [ShortEnumField("proto", 0x0021, _PPP_PROTOCOLS)]
+    fields_desc = [_PPPProtoField("proto", 0x0021, _PPP_PROTOCOLS)]
 
     @classmethod
     def dispatch_hook(cls, _pkt=None, *args, **kargs):
-        if _pkt:
-            first_byte = orb(_pkt[0])
-            if first_byte == 0xff:
-                return HDLC
-            # See RFC 1661 section 2
-            # <https://tools.ietf.org/html/rfc1661#section-2>
-            if first_byte & 0x01:
-                return PPP_
+        if _pkt and _pkt[:1] == b'\xff':
+            return HDLC
         return cls
 
 
-class PPP_(PPP):
-    fields_desc = [
-        ByteEnumField("proto", 0x21,
-                      {k: v for k, v in six.iteritems(_PPP_PROTOCOLS)
-                       if k < 0x100}),
-    ]
-
-
 _PPP_conftypes = {1: "Configure-Request",
                   2: "Configure-Ack",
                   3: "Configure-Nak",

scapy-2.4.3.tar.gz/scapy/layers/pptp.py -> scapy-2.4.4.tar.gz/scapy/layers/pptp.py Changed

@@ -88,7 +88,7 @@
                    XIntField("magic_cookie", _PPTP_MAGIC_COOKIE),
                    ShortEnumField("ctrl_msg_type", 1, _PPTP_ctrl_msg_type),
                    XShortField("reserved_0", 0x0000),
-                   ShortField("protocol_version", 1),
+                   ShortField("protocol_version", 0x0100),
                    XShortField("reserved_1", 0x0000),
                    FlagsField("framing_capabilities", 0, 32,
                               _PPTP_FRAMING_CAPABILITIES_FLAGS),
@@ -114,7 +114,7 @@
                    XIntField("magic_cookie", _PPTP_MAGIC_COOKIE),
                    ShortEnumField("ctrl_msg_type", 2, _PPTP_ctrl_msg_type),
                    XShortField("reserved_0", 0x0000),
-                   ShortField("protocol_version", 1),
+                   ShortField("protocol_version", 0x0100),
                    ByteEnumField("result_code", 1,
                                  _PPTP_start_control_connection_result),
                    ByteEnumField("error_code", 0, _PPTP_general_error_code),

scapy-2.4.3.tar.gz/scapy/layers/radius.py -> scapy-2.4.4.tar.gz/scapy/layers/radius.py Changed

@@ -12,13 +12,12 @@
 import hashlib
 import hmac
 from scapy.compat import orb, raw
-from scapy.packet import Packet, Padding, bind_layers
+from scapy.packet import Packet, Padding, bind_layers, bind_bottom_up
 from scapy.fields import ByteField, ByteEnumField, IntField, StrLenField,\
     XStrLenField, XStrFixedLenField, FieldLenField, PacketLenField,\
     PacketListField, IPField, MultiEnumField
 from scapy.layers.inet import UDP
 from scapy.layers.eap import EAP
-from scapy.utils import issubtype
 from scapy.config import conf
 from scapy.error import Scapy_Exception
 
@@ -257,19 +256,6 @@
             return cls.registered_attributes.get(attr_type, cls)
         return cls
 
-    def haslayer(self, cls):
-        if cls == "RadiusAttribute":
-            if isinstance(self, RadiusAttribute):
-                return True
-        elif issubtype(cls, RadiusAttribute):
-            if isinstance(self, cls):
-                return True
-        return super(RadiusAttribute, self).haslayer(cls)
-
-    def getlayer(self, cls, nb=1, _track=None, _subclass=True, **flt):
-        return super(RadiusAttribute, self).getlayer(cls, nb=nb, _track=_track,
-                                                     _subclass=True, **flt)
-
     def post_build(self, p, pay):
         length = self.len
         if length is None:
@@ -288,13 +274,15 @@
     """
 
     __slots__ = ["val"]
+    match_subclass = True
 
     def __init__(self, _pkt="", post_transform=None, _internal=0, _underlayer=None, **fields):  # noqa: E501
         super(_SpecificRadiusAttr, self).__init__(
             _pkt,
             post_transform,
             _internal,
-            _underlayer
+            _underlayer,
+            **fields
         )
         self.fields["type"] = self.val
         name_parts = self.__class__.__name__.split('RadiusAttr_')
@@ -321,6 +309,11 @@
     ]
 
 
+class RadiusAttr_User_Name(_SpecificRadiusAttr):
+    """RFC 2865"""
+    val = 1
+
+
 class RadiusAttr_NAS_Port(_RadiusAttrIntValue):
     """RFC 2865"""
     val = 5
@@ -503,7 +496,8 @@
             _pkt,
             post_transform,
             _internal,
-            _underlayer
+            _underlayer,
+            **fields
         )
         self.fields["type"] = self.val
         name_parts = self.__class__.__name__.split('RadiusAttr_')
@@ -526,6 +520,11 @@
     ]
 
 
+class RadiusAttr_User_Password(_RadiusAttrHexStringVal):
+    """RFC 2865"""
+    val = 2
+
+
 class RadiusAttr_State(_RadiusAttrHexStringVal):
     """RFC 2865"""
     val = 24
@@ -1019,6 +1018,7 @@
     """
 
     name = "EAP-Message"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("type", 79, _radius_attribute_types),
         FieldLenField(
@@ -1038,6 +1038,7 @@
     """
 
     name = "Vendor-Specific"
+    match_subclass = True
     fields_desc = [
         ByteEnumField("type", 26, _radius_attribute_types),
         FieldLenField(
@@ -1150,7 +1151,10 @@
         return p
 
 
-bind_layers(UDP, Radius, sport=1812)
-bind_layers(UDP, Radius, dport=1812)
-bind_layers(UDP, Radius, sport=1813)
-bind_layers(UDP, Radius, dport=1813)
+bind_bottom_up(UDP, Radius, sport=1812)
+bind_bottom_up(UDP, Radius, dport=1812)
+bind_bottom_up(UDP, Radius, sport=1813)
+bind_bottom_up(UDP, Radius, dport=1813)
+bind_bottom_up(UDP, Radius, sport=3799)
+bind_bottom_up(UDP, Radius, dport=3799)
+bind_layers(UDP, Radius, sport=1812, dport=1812)

scapy-2.4.3.tar.gz/scapy/layers/rtp.py -> scapy-2.4.4.tar.gz/scapy/layers/rtp.py Changed

scapy-2.4.3.tar.gz/scapy/layers/sixlowpan.py -> scapy-2.4.4.tar.gz/scapy/layers/sixlowpan.py Changed

@@ -9,24 +9,30 @@
 ======================
 
 This implementation follows the next documents:
-    * Transmission of IPv6 Packets over IEEE 802.15.4 Networks
-    * Compression Format for IPv6 Datagrams in Low Power and Lossy
-      networks (6LoWPAN): draft-ietf-6lowpan-hc-15
-    * RFC 4291
-
-                            |-----------------------|
-Application                 | Application Protocols |
-                            |-----------------------|
-Transport                   |   UDP      |   TCP    |
-                            |-----------------------|
-Network                     |          IPv6         | (Only IPv6)
-                            |-----------------------|
-                            |         LoWPAN        | (in the middle between network and data link layer)  # noqa: E501
-                            |-----------------------|
-Data Link Layer             |   IEEE 802.15.4 MAC   |
-                            |-----------------------|
-Physical                    |   IEEE 802.15.4 PHY   |
-                            |-----------------------|
+
+- Transmission of IPv6 Packets over IEEE 802.15.4 Networks
+- Compression Format for IPv6 Datagrams in Low Power and Lossy
+  networks (6LoWPAN): draft-ietf-6lowpan-hc-15
+- RFC 4291
+
++----------------------------+-----------------------+
+|  Application               | Application Protocols |
++----------------------------+------------+----------+
+|  Transport                 |   UDP      |   TCP    |
++----------------------------+------------+----------+
+|  Network                   |          IPv6         |
++----------------------------+-----------------------+
+|                            |         LoWPAN        |
++----------------------------+-----------------------+
+|  Data Link Layer           |   IEEE 802.15.4 MAC   |
++----------------------------+-----------------------+
+|  Physical                  |   IEEE 802.15.4 PHY   |
++----------------------------+-----------------------+
+
+Note that:
+
+ - Only IPv6 is supported
+ - LoWPAN is in the middle between network and data link layer
 
 The Internet Control Message protocol v6 (ICMPv6) is used for control
 messaging.
@@ -37,8 +43,6 @@
 A LoWPAN support addressing; a direct mapping between the link-layer address
 and the IPv6 address is used for achieving compression.
 
-
-
 Known Issues:
     * Unimplemented context information
     * Next header compression techniques
@@ -50,6 +54,7 @@
 import struct
 
 from scapy.compat import chb, orb, raw
+from scapy.data import ETHER_TYPES
 
 from scapy.packet import Packet, bind_layers
 from scapy.fields import BitField, ByteField, BitEnumField, BitFieldLenField, \
@@ -58,8 +63,9 @@
 from scapy.layers.dot15d4 import Dot15d4Data
 from scapy.layers.inet6 import IPv6, IP6Field
 from scapy.layers.inet import UDP
+from scapy.layers.l2 import Ether
 
-from scapy.utils import lhex
+from scapy.utils import lhex, mac2str
 from scapy.config import conf
 from scapy.error import warning
 
@@ -67,6 +73,8 @@
 from scapy.pton_ntop import inet_pton, inet_ntop
 from scapy.volatile import RandShort
 
+ETHER_TYPES[0xA0ED] = "6LoWPAN"
+
 LINK_LOCAL_PREFIX = b"\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"  # noqa: E501
 
 
@@ -344,38 +352,52 @@
         return 0, 0, 0, 0
 
 
-def _extract_dot15d4address(pkt, source=True):
+def _extract_upperaddress(pkt, source=True):
     """This function extracts the source/destination address of a 6LoWPAN
-    from its upper Dot15d4Data (802.15.4 data) layer.
+    from its upper layer.
+
+    (Upper layer could be 802.15.4 data, Ethernet...)
 
     params:
      - source: if True, the address is the source one. Otherwise, it is the
                destination.
     returns: the packed & processed address
     """
+    # https://tools.ietf.org/html/rfc6282#section-3.2.2
+    SUPPORTED_LAYERS = (Ether, Dot15d4Data)
     underlayer = pkt.underlayer
-    while underlayer is not None and not isinstance(underlayer, Dot15d4Data):  # noqa: E501
+    while underlayer and not isinstance(underlayer, SUPPORTED_LAYERS):
         underlayer = underlayer.underlayer
-    if type(underlayer) == Dot15d4Data:
+    # Extract and process address
+    if type(underlayer) == Ether:
+        addr = mac2str(underlayer.src if source else underlayer.dst)
+        # https://tools.ietf.org/html/rfc2464#section-4
+        return LINK_LOCAL_PREFIX[:8] + addr[:3] + b"\xff\xfe" + addr[3:]
+    elif type(underlayer) == Dot15d4Data:
         addr = underlayer.src_addr if source else underlayer.dest_addr
-        if underlayer.underlayer.fcf_destaddrmode == 3:
-            tmp_ip = LINK_LOCAL_PREFIX[0:8] + struct.pack(">Q", addr)  # noqa: E501
+        addr = struct.pack(">Q", addr)
+        if underlayer.underlayer.fcf_destaddrmode == 3:  # Extended/long
+            tmp_ip = LINK_LOCAL_PREFIX[0:8] + addr
             # Turn off the bit 7.
-            tmp_ip = tmp_ip[0:8] + struct.pack("B", (orb(tmp_ip[8]) ^ 0x2)) + tmp_ip[9:16]  # noqa: E501
-        elif underlayer.underlayer.fcf_destaddrmode == 2:
-            tmp_ip = LINK_LOCAL_PREFIX[0:8] + \
-                b"\x00\x00\x00\xff\xfe\x00" + \
-                struct.pack(">Q", addr)[6:]
-        return tmp_ip
+            return tmp_ip[0:8] + struct.pack("B", (orb(tmp_ip[8]) ^ 0x2)) + tmp_ip[9:16]  # noqa: E501
+        elif underlayer.underlayer.fcf_destaddrmode == 2:  # Short
+            return (
+                LINK_LOCAL_PREFIX[0:8] +
+                b"\x00\x00\x00\xff\xfe\x00" +
+                addr[6:]
+            )
     else:
-        # Most of the times, it's necessary the IEEE 802.15.4 data to extract this address  # noqa: E501
-        raise Exception('Unimplemented: IP Header is contained into IEEE 802.15.4 frame, in this case it\'s not available.')  # noqa: E501
+        # Most of the times, it's necessary the IEEE 802.15.4 data to extract
+        # this address, sometimes another layer.
+        raise Exception(
+            'Unimplemented: Unsupported upper layer: %s' % type(underlayer)
+        )
 
 
 class LoWPAN_IPHC(Packet):
     """6LoWPAN IPv6 header compressed packets
 
-    It follows the implementation of draft-ietf-6lowpan-hc-15.
+    It follows the implementation of RFC6282
     """
     # the LOWPAN_IPHC encoding utilizes 13 bits, 5 dispatch type
     name = "LoWPAN IP Header Compression Packet"
@@ -519,13 +541,13 @@
             elif self.dam == 3:
                 # TODO May need some extra changes, we are copying
                 # (self.m == 0 and self.dac == 1)
-                tmp_ip = _extract_dot15d4address(self, source=False)
+                tmp_ip = _extract_upperaddress(self, source=False)
 
         elif self.m == 0 and self.dac == 1:
             if self.dam == 0:
                 raise Exception('Reserved')
             elif self.dam == 0x3:
-                tmp_ip = _extract_dot15d4address(self, source=False)
+                tmp_ip = _extract_upperaddress(self, source=False)
             elif self.dam not in [0x1, 0x2]:
                 warning("Unknown destiny address compression mode !")
         elif self.m == 1 and self.dac == 0:
@@ -541,6 +563,7 @@
                 tmp_ip = b"\xff\x02" + b"\x00" * 13 + tmp_ip[-1:]
         elif self.m == 1 and self.dac == 1:
             if self.dam == 0x0:
+                # See https://tools.ietf.org/html/rfc6282#page-9
                 raise Exception("Unimplemented: I didn't understand the 6lowpan specification")  # noqa: E501
             else:  # all the others values
                 raise Exception("Reserved value by specification.")
@@ -553,7 +576,7 @@
 
         if self.sac == 0:
             if self.sam == 0x0:
-                tmp_ip = tmp_ip
+                pass
             elif self.sam == 0x1:
                 tmp_ip = tmp_ip[8:16]
             elif self.sam == 0x2:
@@ -576,7 +599,7 @@
 
         if self.m == 0 and self.dac == 0:
             if self.dam == 0x0:
-                tmp_ip = tmp_ip
+                pass
             elif self.dam == 0x1:
                 tmp_ip = b"\x00" * 8 + tmp_ip[8:16]
             elif self.dam == 0x2:
@@ -613,7 +636,7 @@
                 tmp = LINK_LOCAL_PREFIX[0:8] + b"\x00\x00\x00\xff\xfe\x00"
                 tmp_ip = tmp + tmp_ip[16 - source_addr_mode2(self):16]
             elif self.sam == 0x3:  # EXTRACT ADDRESS FROM Dot15d4
-                tmp_ip = _extract_dot15d4address(self, source=True)
+                tmp_ip = _extract_upperaddress(self, source=True)
             else:
                 warning("Unknown source address compression mode !")
         else:  # self.sac == 1:
@@ -739,11 +762,12 @@
 
 def sixlowpan_fragment(packet, datagram_tag=1):
     """Split a packet into different links to transmit as 6lowpan packets.
-        Usage example:
-          >>> ipv6 = ..... (very big packet)
-          >>> pkts = sixlowpan_fragment(ipv6, datagram_tag=0x17)
-          >>> send = [Dot15d4()/Dot15d4Data()/x for x in pkts]
-          >>> wireshark(send)
+    Usage example::
+
+      >>> ipv6 = ..... (very big packet)
+      >>> pkts = sixlowpan_fragment(ipv6, datagram_tag=0x17)
+      >>> send = [Dot15d4()/Dot15d4Data()/x for x in pkts]
+      >>> wireshark(send)
     """
     if not packet.haslayer(IPv6):
         raise Exception("SixLoWPAN only fragments IPv6 packets !")
@@ -753,8 +777,8 @@
     if len(str_packet) <= MAX_SIZE:
         return [packet]
 
-    def chunks(l, n):
-        return [l[i:i + n] for i in range(0, len(l), n)]
+    def chunks(li, n):
+        return [li[i:i + n] for i in range(0, len(li), n)]
 
     new_packet = chunks(str_packet, MAX_SIZE)
 
@@ -787,6 +811,9 @@
 bind_layers(SixLoWPAN, LoWPAN_IPHC,)
 bind_layers(LoWPANMesh, LoWPANFragmentationFirst,)
 bind_layers(LoWPANMesh, LoWPANFragmentationSubsequent,)
+
+bind_layers(Ether, SixLoWPAN, type=0xA0ED)
+
 # TODO: I have several doubts about the Broadcast LoWPAN
 # bind_layers( LoWPANBroadcast,   LoWPANHC1CompressedIPv6,            )
 # bind_layers( SixLoWPAN,         LoWPANBroadcast,                    )

scapy-2.4.3.tar.gz/scapy/layers/smb.py -> scapy-2.4.4.tar.gz/scapy/layers/smb.py Changed

@@ -12,6 +12,7 @@
     LEFieldLenField, LEIntField, LELongField, LEShortField, ShortField, \
     StrFixedLenField, StrLenField, StrNullField
 from scapy.layers.netbios import NBTSession
+from scapy.layers.smb2 import SMB2_Header
 
 
 # SMB NetLogon Response Header
@@ -140,6 +141,28 @@
                    ByteField("WordCount", 0),
                    LEShortField("ByteCount", 12)]
 
+# Generic version of SMBNegociate Protocol Request Header
+
+
+class SMBNegociate_Protocol_Request_Header_Generic(Packet):
+    name = "SMBNegociate Protocol Request Header Generic"
+    fields_desc = [StrFixedLenField("Start", b"\xffSMB", 4)]
+
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *args, **kargs):
+        """
+            Depending on the first 4 bytes of the packet,
+            dispatch to the correct version of Header
+            (either SMB or SMB2)
+
+        """
+        if _pkt and len(_pkt) >= 4:
+            if _pkt[:4] == b'\xffSMB':
+                return SMBNegociate_Protocol_Request_Header
+            if _pkt[:4] == b'\xfeSMB':
+                return SMB2_Header
+        return cls
+
 # SMB Negotiate Protocol Request Tail
 
 
@@ -367,7 +390,7 @@
                    StrNullField("NativeFileSystem", "")]
 
 
-bind_layers(NBTSession, SMBNegociate_Protocol_Request_Header, )
+bind_layers(NBTSession, SMBNegociate_Protocol_Request_Header_Generic, )
 bind_layers(NBTSession, SMBNegociate_Protocol_Response_Advanced_Security, ExtendedSecurity=1)  # noqa: E501
 bind_layers(NBTSession, SMBNegociate_Protocol_Response_No_Security, ExtendedSecurity=0, EncryptionKeyLength=8)  # noqa: E501
 bind_layers(NBTSession, SMBNegociate_Protocol_Response_No_Security_No_Key, ExtendedSecurity=0, EncryptionKeyLength=0)  # noqa: E501

scapy-2.4.4.tar.gz/scapy/layers/smb2.py Added

@@ -0,0 +1,330 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Philippe Biondi <phil@secdev.org>
+# This program is published under a GPLv2 license
+
+"""
+SMB (Server Message Block), also known as CIFS - version 2
+"""
+
+from scapy.config import conf
+from scapy.packet import Packet, bind_layers, bind_top_down
+from scapy.fields import (
+    FieldLenField,
+    FieldListField,
+    FlagsField,
+    IntEnumField,
+    IntField,
+    LEIntField,
+    LELongField,
+    LEShortEnumField,
+    LEShortField,
+    PacketListField,
+    PadField,
+    ShortEnumField,
+    ShortField,
+    StrFieldUtf16,
+    StrFixedLenField,
+    UUIDField,
+    XLEIntField,
+    XLELongField,
+    XLEShortField,
+    XLongField,
+    XNBytesField,
+    XStrLenField,
+)
+
+
+# EnumField
+SMB_DIALECTS = {
+    0x0202: 'SMB 2.0.2',
+    0x0210: 'SMB 2.1',
+    0x0300: 'SMB 3.0',
+    0x0302: 'SMB 3.0.2',
+    0x0311: 'SMB 3.1.1',
+}
+
+# EnumField
+SMB2_NEGOCIATE_CONTEXT_TYPES = {
+    0x0001: 'SMB2_PREAUTH_INTEGRITY_CAPABILITIES',
+    0x0002: 'SMB2_ENCRYPTION_CAPABILITIES',
+    0x0003: 'SMB2_COMPRESSION_CAPABILITIES',
+    0x0005: 'SMB2_NETNAME_NEGOCIATE_CONTEXT_ID',
+}
+
+# FlagField
+SMB2_CAPABILITIES = {
+    30: "Encryption",
+    29: "DirectoryLeasing",
+    28: "PersistentHandles",
+    27: "MultiChannel",
+    26: "LargeMTU",
+    25: "Leasing",
+    24: "DFS",
+}
+
+# EnumField
+SMB2_COMPRESSION_ALGORITHMS = {
+    0x0000: "None",
+    0x0001: "LZNT1",
+    0x0002: "LZ77",
+    0x0003: "LZ77 + Huffman",
+    0x0004: "Pattern_V1",
+}
+
+
+class SMB2_Header(Packet):
+    name = "SMB2 Header"
+    fields_desc = [
+        StrFixedLenField("Start", b"\xfeSMB", 4),
+        LEShortField("HeaderLength", 0),
+        LEShortField("CreditCharge", 0),
+        LEShortField("ChannelSequence", 0),
+        LEShortField("Unused", 0),
+        ShortEnumField("Command", 0, {0x0000: "SMB2_COM_NEGOCIATE"}),
+        LEShortField("CreditsRequested", 0),
+        # XLEIntField("Flags", 0),
+        FlagsField("Flags", 0, 32, {
+            24: "SMB2_FLAGS_SERVER_TO_REDIR",
+        }),
+        XLEIntField("ChainOffset", 0),
+        LELongField("MessageID", 0),
+        XLEIntField("ProcessID", 0),
+        XLEIntField("TreeID", 0),
+        XLELongField("SessionID", 0),
+        XNBytesField("Signature", 0, 16),
+    ]
+
+    def guess_payload_class(self, payload):
+        if self.Command == 0x0000:
+            if self.Flags.SMB2_FLAGS_SERVER_TO_REDIR:
+                return SMB2_Negociate_Protocol_Response_Header
+            return SMB2_Negociate_Protocol_Request_Header
+        return super(SMB2_Header, self).guess_payload_class(payload)
+
+
+class SMB2_Compression_Transform_Header(Packet):
+    name = "SMB2 Compression Transform Header"
+    fields_desc = [
+        StrFixedLenField("Start", b"\xfcSMB", 4),
+        LEIntField("OriginalCompressedSegmentSize", 0x0),
+        LEShortEnumField(
+            "CompressionAlgorithm", 0,
+            SMB2_COMPRESSION_ALGORITHMS
+        ),
+        ShortEnumField("Flags", 0x0, {
+            0x0000: "SMB2_COMPRESSION_FLAG_NONE",
+            0x0001: "SMB2_COMPRESSION_FLAG_CHAINED",
+        }),
+        XLEIntField("Offset/Length", 0),
+    ]
+
+
+class SMB2_Negociate_Context(Packet):
+    name = "SMB2 Negociate Context"
+    fields_desc = [
+        LEShortEnumField("ContextType", 0x0, SMB2_NEGOCIATE_CONTEXT_TYPES),
+        FieldLenField("DataLength", 0x0, fmt="<H", length_of="Data"),
+        IntField("Reserved", 0),
+    ]
+
+
+class SMB2_Negociate_Protocol_Request_Header(Packet):
+    name = "SMB2 Negociate Protocol Request Header"
+    fields_desc = [
+        XLEShortField("StructureSize", 0),
+        FieldLenField(
+            "DialectCount", 0,
+            fmt="<H",
+            count_of="Dialects"
+        ),
+        # SecurityMode
+        FlagsField("SecurityMode", 0, 16, {
+            0x7: "Signing Required",
+            0x8: "Signing Enabled",
+        }),
+        LEShortField("Reserved", 0),
+        # Capabilities
+        FlagsField("Capabilities", 0, 32, SMB2_CAPABILITIES),
+        UUIDField("ClientGUID", 0x0, uuid_fmt=UUIDField.FORMAT_LE),
+        XLEIntField("NegociateContextOffset", 0x0),
+        FieldLenField(
+            "NegociateCount", 0x0,
+            fmt="<H",
+            count_of="NegociateContexts"
+        ),
+        ShortField("Reserved2", 0),
+        # Padding the dialects - the whole packet (from the
+        # beginning) should be aligned on 8 bytes ; so the list of
+        # dialects should be aligned on 6 bytes (because it starts
+        # at PKT + 8 * N + 2
+        PadField(FieldListField(
+            "Dialects", [0x0202],
+            LEShortEnumField("", 0x0, SMB_DIALECTS),
+            count_from=lambda pkt: pkt.DialectCount
+        ), 6),
+        PacketListField(
+            "NegociateContexts", [],
+            SMB2_Negociate_Context,
+            count_from=lambda pkt: pkt.NegociateCount
+        ),
+    ]
+
+
+class SMB2_Preauth_Integrity_Capabilities(Packet):
+    name = "SMB2 Preauth Integrity Capabilities"
+    fields_desc = [
+        # According to the spec, this field value must be greater than 0
+        # (cf Section 2.2.3.1.1 of MS-SMB2.pdf)
+        FieldLenField(
+            "HashAlgorithmCount", 1,
+            fmt="<H",
+            count_of="HashAlgorithms"
+        ),
+        FieldLenField("SaltLength", 0, fmt="<H", length_of="Salt"),
+        FieldListField("HashAlgorithms", [0x0001], LEShortEnumField("", 0x0, {
+            # As for today, no other hash algorithm is described by the spec
+            0x0001: "SHA-512",
+        }), count_from=lambda pkt: pkt.HashAlgorithmCount),
+        XStrLenField("Salt", "", length_from=lambda pkt: pkt.SaltLength),
+        # Pad the whole packet on 8 bytes
+        XStrLenField(
+            "Padding", "",
+            length_from=lambda pkt:
+                    (8 - (4 + pkt.HashAlgorithmCount * 2 + pkt.SaltLength)) % 8
+        ),
+    ]
+
+
+class SMB2_Encryption_Capabilities(Packet):
+    name = "SMB2 Encryption Capabilities"
+    fields_desc = [
+        # According to the spec, this field value must be greater than 0
+        # (cf Section 2.2.3.1.2 of MS-SMB2.pdf)
+        FieldLenField("CipherCount", 1, fmt="<H", count_of="Ciphers"),
+        FieldListField("Ciphers", [0x0001], LEShortEnumField("", 0x0, {
+            0x0001: "AES-128-CCM",
+            0x0002: "AES-128-GCM",
+        }), count_from=lambda pkt: pkt.CipherCount),
+        # Pad the whole packet on 8 bytes
+        XStrLenField(
+            "Padding", "",
+            length_from=lambda pkt: (8 - (2 + pkt.CipherCount * 2)) % 8
+        ),
+    ]
+
+
+class SMB2_Compression_Capabilities(Packet):
+    name = "SMB2 Compression Capabilities"
+    fields_desc = [
+        FieldLenField(
+            "CompressionAlgorithmCount", 0,
+            fmt="<H",
+            count_of="CompressionAlgorithms"
+        ),
+        ShortField("Padding", 0x0),
+        IntEnumField("Flags", 0x0, {
+            0x00000000: "SMB2_COMPRESSION_CAPABILITIES_FLAG_NONE",
+            0x00000001: "SMB2_COMPRESSION_CAPABILITIES_FLAG_CHAINED",
+        }),
+        FieldListField(
+            "CompressionAlgorithms",
+            None,
+            LEShortEnumField("", 0x0, SMB2_COMPRESSION_ALGORITHMS),
+            count_from=lambda pkt: pkt.CompressionAlgorithmCount,
+        ),
+        # Pad the whole packet on 8 bytes
+        XStrLenField(
+            "Padding2", "",
+            length_from=lambda pkt:
+                    (8 - (2 + 2 + 4 + pkt.CompressionAlgorithmCount * 2)) % 8
+        ),
+    ]
+
+
+class SMB2_Netname_Negociate_Context_ID(Packet):
+    name = "SMB2 Netname Negociate Context ID"
+    fields_desc = [
+        StrFieldUtf16("NetName", "")
+    ]
+
+
+class SMB2_Negociate_Protocol_Response_Header(Packet):
+    name = "SMB2 Negociate Protocol Response Header"
+    fields_desc = [
+        XLEShortField("StructureSize", 0),
+        FlagsField("SecurityMode", 0, 16, {
+            0x7: "Signing Required",
+            0x8: "Signing Enabled",
+        }),
+        LEShortEnumField("Dialect", 0x0, SMB_DIALECTS),
+        FieldLenField(
+            "NegociateCount", 0x0,
+            fmt="<H",
+            count_of="NegociateContexts"
+        ),
+        UUIDField("ServerGUID", 0x0, uuid_fmt=UUIDField.FORMAT_LE),
+        # Capabilities
+        FlagsField("Capabilities", 0, 32, SMB2_CAPABILITIES),
+        LEIntField("MaxTransactionSize", 0),
+        LEIntField("MaxReadSize", 0),
+        LEIntField("MaxWriteSize", 0),
+        # TODO FIXME
+        XLongField("SystemTime", 0),
+        XLongField("ServerStartTime", 0),
+        XLEShortField("SecurityBufferOffset", 0),
+        FieldLenField(
+            "SecurityBufferLength", 0,
+            fmt="<H",
+            length_of="SecurityBuffer"
+        ),
+        XLEIntField("NegociateContextOffset", 0),
+        # TODO FIXME
+        XStrLenField(
+            "SecurityBuffer", None,
+            length_from=lambda pkt: pkt.SecurityBufferLength
+        ),
+        PacketListField(
+            "NegociateContexts", [],
+            SMB2_Negociate_Context,
+            count_from=lambda pkt: pkt.NegociateCount
+        ),
+    ]
+
+
+bind_layers(SMB2_Preauth_Integrity_Capabilities, conf.padding_layer)
+bind_layers(SMB2_Encryption_Capabilities, conf.padding_layer)
+bind_layers(SMB2_Compression_Capabilities, conf.padding_layer)
+bind_layers(SMB2_Netname_Negociate_Context_ID, conf.padding_layer)
+bind_top_down(
+    SMB2_Header,
+    SMB2_Negociate_Protocol_Request_Header,
+    Command=0x0000,
+    Flags=0
+)
+bind_top_down(
+    SMB2_Header,
+    SMB2_Negociate_Protocol_Response_Header,
+    Command=0x0000,
+    Flags=2 ** 24  # SMB2_FLAGS_SERVER_TO_REDIR
+)
+bind_layers(
+    SMB2_Negociate_Context,
+    SMB2_Preauth_Integrity_Capabilities,
+    ContextType=0x0001
+)
+bind_layers(
+    SMB2_Negociate_Context,
+    SMB2_Encryption_Capabilities,
+    ContextType=0x0002
+)
+bind_layers(
+    SMB2_Negociate_Context,
+    SMB2_Compression_Capabilities,
+    ContextType=0x0003
+)
+bind_layers(
+    SMB2_Negociate_Context,
+    SMB2_Netname_Negociate_Context_ID,
+    ContextType=0x0005
+)

scapy-2.4.3.tar.gz/scapy/layers/tftp.py -> scapy-2.4.4.tar.gz/scapy/layers/tftp.py Changed

@@ -340,7 +340,7 @@
             self.last_packet = self.l3 / TFTP_ACK(block=0)
             self.send(self.last_packet)
         else:
-            opt = [x for x in options.options if x.oname.upper() == "BLKSIZE"]
+            opt = [x for x in options.options if x.oname.upper() == b"BLKSIZE"]
             if opt:
                 self.blksize = int(opt[0].value)
                 self.debug(2, "Negotiated new blksize at %i" % self.blksize)
@@ -426,14 +426,15 @@
             fn = os.path.abspath(os.path.join(self.dir, self.filename))
             if fn.startswith(self.dir):  # Check we're still in the server's directory  # noqa: E501
                 try:
-                    self.data = open(fn).read()
+                    with open(fn) as fd:
+                        self.data = fd.read()
                 except IOError:
                     pass
         if self.data is None:
             self.data = self.joker
 
         if options:
-            opt = [x for x in options.options if x.oname.upper() == "BLKSIZE"]
+            opt = [x for x in options.options if x.oname.upper() == b"BLKSIZE"]
             if opt:
                 self.blksize = int(opt[0].value)
                 self.debug(2, "Negotiated new blksize at %i" % self.blksize)

scapy-2.4.3.tar.gz/scapy/layers/tls/__init__.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/__init__.py Changed

@@ -1,6 +1,7 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard <arno@natisbad.com>
 #               2015, 2016, 2017 Maxence Tury <maxence.tury@ssi.gouv.fr>
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
@@ -19,7 +20,7 @@
     - RSA & ECDSA keys sign/verify methods.
 
     - TLS records and sublayers (handshake...) parsing/building. Works with
-      versions SSLv2 to TLS 1.2. This may be enhanced by a TLS context. For
+      versions SSLv2 to TLS 1.3. This may be enhanced by a TLS context. For
       instance, if Scapy reads a ServerHello with version TLS 1.2 and a cipher
       suite using AES, it will assume the presence of IVs prepending the data.
       See test/tls.uts for real examples.
@@ -44,7 +45,7 @@
 
     - Reading a TLS handshake between a Firefox client and a GitHub server.
 
-    - Reading TLS 1.3 handshakes from test vectors of a draft RFC.
+    - Reading TLS 1.3 handshakes from test vectors of the 8448 RFC.
 
     - Reading a SSLv2 handshake between s_client and s_server, without PFS.
 
@@ -57,14 +58,13 @@
 
     - Features to add (or wait for) in the cryptography library:
 
-        - X448 from RFC 7748 (no support in openssl yet);
-
         - the compressed EC point format.
 
-
     - About the automatons:
 
-        - Add resumption support, through session IDs or session tickets.
+        - Allow upgrade from TLS 1.2 to TLS 1.3 in the Automaton client.
+          Currently we'll use TLS 1.3 only if the automaton client was given
+          version="tls13".
 
         - Add various checks for discrepancies between client and server.
           Is the ServerHello ciphersuite ok? What about the SKE params? Etc.
@@ -81,8 +81,6 @@
 
     - Miscellaneous:
 
-        - Enhance PSK and session ticket support.
-
         - Define several Certificate Transparency objects.
 
         - Add the extended master secret and encrypt-then-mac logic.

scapy-2.4.3.tar.gz/scapy/layers/tls/all.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/all.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/automaton.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/automaton.py Changed

@@ -7,6 +7,8 @@
 The _TLSAutomaton class provides methods common to both TLS client and server.
 """
 
+import select
+import socket
 import struct
 
 from scapy.automaton import Automaton
@@ -39,6 +41,16 @@
     We call these successive groups of messages:
     ClientFlight1, ServerFlight1, ClientFlight2 and ServerFlight2.
 
+    With TLS 1.3, the handshake require only 1-RTT:
+
+    Client        Server
+      | --------->>> |    C1 - ClientHello
+      | <<<--------- |    S1 - ServerHello
+      | <<<--------- |    S1 - Certificate [encrypted]
+      | <<<--------- |    S1 - CertificateVerify [encrypted]
+      | <<<--------- |    S1 - Finished [encrypted]
+      | --------->>> |    C2 - Finished [encrypted]
+
     We want to send our messages from the same flight all at once through the
     socket. This is achieved by managing a list of records in 'buffer_out'.
     We may put several messages (i.e. what RFC 5246 calls the record fragments)
@@ -53,6 +65,8 @@
 
     def parse_args(self, mycert=None, mykey=None, **kargs):
 
+        self.verbose = kargs.pop("verbose", True)
+
         super(_TLSAutomaton, self).parse_args(**kargs)
 
         self.socket = None
@@ -73,8 +87,6 @@
         else:
             self.mykey = None
 
-        self.verbose = kargs.get("verbose", True)
-
     def get_next_msg(self, socket_timeout=2, retry=2):
         """
         The purpose of the function is to make next message(s) available in
@@ -95,7 +107,6 @@
             # A message is already available.
             return
 
-        self.socket.settimeout(socket_timeout)
         is_sslv2_msg = False
         still_getting_len = True
         grablen = 2
@@ -104,8 +115,7 @@
                 grablen = struct.unpack('!H', self.remain_in[3:5])[0] + 5
                 still_getting_len = False
             elif grablen == 2 and len(self.remain_in) >= 2:
-                byte0 = struct.unpack("B", self.remain_in[:1])[0]
-                byte1 = struct.unpack("B", self.remain_in[1:2])[0]
+                byte0, byte1 = struct.unpack("BB", self.remain_in[:2])
                 if (byte0 in _tls_type) and (byte1 == 3):
                     # Retry following TLS scheme. This will cause failure
                     # for SSLv2 packets with length 0x1{4-7}03.
@@ -124,34 +134,53 @@
             if grablen == len(self.remain_in):
                 break
 
+            final = False
             try:
-                tmp = self.socket.recv(grablen - len(self.remain_in))
+                tmp, _, _ = select.select([self.socket], [], [],
+                                          socket_timeout)
                 if not tmp:
                     retry -= 1
                 else:
-                    self.remain_in += tmp
-            except Exception:
-                self.vprint("Could not join host ! Retrying...")
+                    data = tmp[0].recv(grablen - len(self.remain_in))
+                    if not data:
+                        # Socket peer was closed
+                        self.vprint("Peer socket closed !")
+                        final = True
+                    else:
+                        self.remain_in += data
+            except Exception as ex:
+                if not isinstance(ex, socket.timeout):
+                    self.vprint("Could not join host (%s) ! Retrying..." % ex)
                 retry -= 1
+            else:
+                if final:
+                    raise self.SOCKET_CLOSED()
 
         if len(self.remain_in) < 2 or len(self.remain_in) != grablen:
             # Remote peer is not willing to respond
             return
 
-        p = TLS(self.remain_in, tls_session=self.cur_session)
-        self.cur_session = p.tls_session
-        self.remain_in = b""
-        if isinstance(p, SSLv2) and not p.msg:
-            p.msg = Raw("")
-        if self.cur_session.tls_version is None or \
-           self.cur_session.tls_version < 0x0304:
-            self.buffer_in += p.msg
+        if (byte0 == 0x17 and
+                (self.cur_session.advertised_tls_version >= 0x0304 or
+                 self.cur_session.tls_version >= 0x0304)):
+            p = TLS13(self.remain_in, tls_session=self.cur_session)
+            self.remain_in = b""
+            self.buffer_in += p.inner.msg
         else:
-            if isinstance(p, TLS13):
-                self.buffer_in += p.inner.msg
-            else:
-                # should be TLS13ServerHello only
+            p = TLS(self.remain_in, tls_session=self.cur_session)
+            self.cur_session = p.tls_session
+            self.remain_in = b""
+            if isinstance(p, SSLv2) and not p.msg:
+                p.msg = Raw("")
+            if self.cur_session.tls_version is None or \
+               self.cur_session.tls_version < 0x0304:
                 self.buffer_in += p.msg
+            else:
+                if isinstance(p, TLS13):
+                    self.buffer_in += p.inner.msg
+                else:
+                    # should be TLS13ServerHello only
+                    self.buffer_in += p.msg
 
         while p.payload:
             if isinstance(p.payload, Raw):
@@ -164,6 +193,8 @@
                     self.buffer_in += p.msg
                 else:
                     self.buffer_in += p.inner.msg
+            else:
+                p = p.payload
 
     def raise_on_packet(self, pkt_cls, state, get_next_msg=True):
         """
@@ -174,18 +205,21 @@
         # Maybe we already parsed the expected packet, maybe not.
         if get_next_msg:
             self.get_next_msg()
+        from scapy.layers.tls.handshake import TLSClientHello
         if (not self.buffer_in or
-                not isinstance(self.buffer_in[0], pkt_cls)):
+                (not isinstance(self.buffer_in[0], pkt_cls) and
+                 not (isinstance(self.buffer_in[0], TLSClientHello) and
+                 self.cur_session.advertised_tls_version == 0x0304))):
             return
         self.cur_pkt = self.buffer_in[0]
         self.buffer_in = self.buffer_in[1:]
         raise state()
 
-    def add_record(self, is_sslv2=None, is_tls13=None):
+    def add_record(self, is_sslv2=None, is_tls13=None, is_tls12=None):
         """
         Add a new TLS or SSLv2 or TLS 1.3 record to the packets buffered out.
         """
-        if is_sslv2 is None and is_tls13 is None:
+        if is_sslv2 is None and is_tls13 is None and is_tls12 is None:
             v = (self.cur_session.tls_version or
                  self.cur_session.advertised_tls_version)
             if v in [0x0200, 0x0002]:
@@ -196,6 +230,11 @@
             self.buffer_out.append(SSLv2(tls_session=self.cur_session))
         elif is_tls13:
             self.buffer_out.append(TLS13(tls_session=self.cur_session))
+        # For TLS 1.3 middlebox compatibility, TLS record version must
+        # be 0x0303
+        elif is_tls12:
+            self.buffer_out.append(TLS(version="TLS 1.2",
+                                       tls_session=self.cur_session))
         else:
             self.buffer_out.append(TLS(tls_session=self.cur_session))

scapy-2.4.3.tar.gz/scapy/layers/tls/automaton_cli.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/automaton_cli.py Changed

@@ -1,45 +1,76 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
 #               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
 TLS client automaton. This makes for a primitive TLS stack.
 Obviously you need rights for network access.
 
-We support versions SSLv2 to TLS 1.2, along with many features.
-There is no session resumption mechanism for now.
+We support versions SSLv2 to TLS 1.3, along with many features.
 
-In order to run a client to tcp/50000 with one cipher suite of your choice:
-> from scapy.all import *
-> ch = TLSClientHello(ciphers=<int code of the cipher suite>)
-> t = TLSClientAutomaton(dport=50000, client_hello=ch)
-> t.run()
+In order to run a client to tcp/50000 with one cipher suite of your choice::
+
+    from scapy.layers.tls import *
+    ch = TLSClientHello(ciphers=<int code of the cipher suite>)
+    t = TLSClientAutomaton(dport=50000, client_hello=ch)
+    t.run()
+
+You can also use it as a SuperSocket using the ``tlslink`` io::
+
+    from scapy.layers.tls import *
+    a = TLSClientAutomaton.tlslink(Raw, server="scapy.net", dport=443)
+    a.send(HTTP()/HTTPRequest())
+    while True:
+        a.recv()
+
+You can also use the io with a TCPSession, e.g. to get an HTTPS answer::
+
+    from scapy.all import *
+    from scapy.layers.http import *
+    from scapy.layers.tls import *
+    a = TLSClientAutomaton.tlslink(HTTP, server="www.google.com", dport=443)
+    pkt = a.sr1(HTTP()/HTTPRequest(), session=TCPSession(app=True),
+                timeout=2)
 """
 
 from __future__ import print_function
 import socket
+import binascii
+import struct
+import time
 
-from scapy.pton_ntop import inet_pton
+from scapy.config import conf
 from scapy.utils import randstring, repr_hex
-from scapy.automaton import ATMT
+from scapy.automaton import ATMT, select_objects
+from scapy.error import warning
 from scapy.layers.tls.automaton import _TLSAutomaton
 from scapy.layers.tls.basefields import _tls_version, _tls_version_options
 from scapy.layers.tls.session import tlsSession
 from scapy.layers.tls.extensions import TLS_Ext_SupportedGroups, \
-    TLS_Ext_SupportedVersions, TLS_Ext_SignatureAlgorithms
+    TLS_Ext_SupportedVersion_CH, TLS_Ext_SignatureAlgorithms, \
+    TLS_Ext_SupportedVersion_SH, TLS_Ext_PSKKeyExchangeModes, \
+    TLS_Ext_ServerName, ServerName
 from scapy.layers.tls.handshake import TLSCertificate, TLSCertificateRequest, \
     TLSCertificateVerify, TLSClientHello, TLSClientKeyExchange, \
     TLSEncryptedExtensions, TLSFinished, TLSServerHello, TLSServerHelloDone, \
-    TLSServerKeyExchange, TLS13Certificate, TLS13ServerHello
+    TLSServerKeyExchange, TLS13Certificate, TLS13ClientHello,  \
+    TLS13ServerHello, TLS13HelloRetryRequest, TLS13CertificateRequest, \
+    _ASN1CertAndExt, TLS13KeyUpdate, TLS13NewSessionTicket
 from scapy.layers.tls.handshake_sslv2 import SSLv2ClientHello, \
     SSLv2ServerHello, SSLv2ClientMasterKey, SSLv2ServerVerify, \
     SSLv2ClientFinished, SSLv2ServerFinished, SSLv2ClientCertificate, \
     SSLv2RequestCertificate
 from scapy.layers.tls.keyexchange_tls13 import TLS_Ext_KeyShare_CH, \
-    KeyShareEntry
+    KeyShareEntry, TLS_Ext_KeyShare_HRR, PSKIdentity, PSKBinderEntry, \
+    TLS_Ext_PreSharedKey_CH
 from scapy.layers.tls.record import TLSAlert, TLSChangeCipherSpec, \
     TLSApplicationData
+from scapy.layers.tls.crypto.suites import _tls_cipher_suites, \
+    _tls_cipher_suites_cls
+from scapy.layers.tls.crypto.groups import _tls_named_groups
+from scapy.layers.tls.crypto.hkdf import TLS13_HKDF
 from scapy.modules import six
 from scapy.packet import Raw
 from scapy.compat import bytes_encode
@@ -53,48 +84,52 @@
     Rather than with an interruption, the best way to stop this client is by
     typing 'quit'. This won't be a message sent to the server.
 
-    _'mycert' and 'mykey' may be provided as filenames. They will be used in
-    the handshake, should the server ask for client authentication.
-    _'server_name' does not need to be set.
-    _'client_hello' may hold a TLSClientHello or SSLv2ClientHello to be sent
-    to the server. This is particularly useful for extensions tweaking.
-    _'version' is a quicker way to advertise a protocol version ("sslv2",
-    "tls1", "tls12", etc.) It may be overridden by the previous 'client_hello'.
-    _'data' is a list of raw data to be sent to the server once the handshake
-    has been completed. Both 'stop_server' and 'quit' will work this way.
+    :param server: the server IP or hostname. defaults to 127.0.0.1
+    :param dport: the server port. defaults to 4433
+    :param server_name: the SNI to use. It does not need to be set
+    :param mycert:
+    :param mykey: may be provided as filenames. They will be used in
+        the handshake, should the server ask for client authentication.
+    :param client_hello: may hold a TLSClientHello or SSLv2ClientHello to be
+        sent to the server. This is particularly useful for extensions
+        tweaking.
+    :param version: is a quicker way to advertise a protocol version ("sslv2",
+        "tls1", "tls12", etc.) It may be overridden by the previous
+        'client_hello'.
+    :param data: is a list of raw data to be sent to the server once the
+        handshake has been completed. Both 'stop_server' and 'quit' will
+        work this way.
     """
 
     def parse_args(self, server="127.0.0.1", dport=4433, server_name=None,
                    mycert=None, mykey=None,
                    client_hello=None, version=None,
+                   resumption_master_secret=None,
+                   session_ticket_file_in=None,
+                   session_ticket_file_out=None,
+                   psk=None, psk_mode=None,
                    data=None,
+                   ciphersuite=None,
+                   curve=None,
                    **kargs):
 
         super(TLSClientAutomaton, self).parse_args(mycert=mycert,
                                                    mykey=mykey,
                                                    **kargs)
         tmp = socket.getaddrinfo(server, dport)
-        self.remote_name = None
-        try:
-            if ':' in server:
-                inet_pton(socket.AF_INET6, server)
-            else:
-                inet_pton(socket.AF_INET, server)
-        except Exception:
-            self.remote_name = socket.getfqdn(server)
-            if self.remote_name != server:
-                tmp = socket.getaddrinfo(self.remote_name, dport)
-
-        if server_name:
-            self.remote_name = server_name
         self.remote_family = tmp[0][0]
         self.remote_ip = tmp[0][4][0]
         self.remote_port = dport
+        self.server_name = server_name
         self.local_ip = None
         self.local_port = None
         self.socket = None
 
-        self.client_hello = client_hello
+        if (isinstance(client_hello, TLSClientHello) or
+                isinstance(client_hello, TLS13ClientHello)):
+            self.client_hello = client_hello
+        else:
+            self.client_hello = None
         self.advertised_tls_version = None
         if version:
             v = _tls_version_options.get(version, None)
@@ -112,6 +147,33 @@
             self.data_to_send = list(bytes_encode(d) for d in reversed(data))
         else:
             self.data_to_send = []
+        self.curve = None
+
+        if self.advertised_tls_version == 0x0304:
+            self.ciphersuite = 0x1301
+            if ciphersuite is not None:
+                cs = int(ciphersuite, 16)
+                if cs in _tls_cipher_suites.keys():
+                    self.ciphersuite = cs
+            if conf.crypto_valid_advanced:
+                # Default to x25519 if supported
+                self.curve = 29
+            else:
+                # Or secp256r1 otherwise
+                self.curve = 23
+            self.resumption_master_secret = resumption_master_secret
+            self.session_ticket_file_in = session_ticket_file_in
+            self.session_ticket_file_out = session_ticket_file_out
+            self.tls13_psk_secret = psk
+            self.tls13_psk_mode = psk_mode
+            if curve is not None:
+                for (group_id, ng) in _tls_named_groups.items():
+                    if ng == curve:
+                        if curve == "x25519":
+                            if conf.crypto_valid_advanced:
+                                self.curve = group_id
+                        else:
+                            self.curve = group_id
 
     def vprint_sessioninfo(self):
         if self.verbose:
@@ -127,6 +189,10 @@
             self.vprint("Master secret : %s" % repr_hex(ms))
             if s.server_certs:
                 self.vprint("Server certificate chain: %r" % s.server_certs)
+            if s.tls_version >= 0x0304:
+                res_secret = s.tls13_derived_secrets["resumption_secret"]
+                self.vprint("Resumption master secret : %s" %
+                            repr_hex(res_secret))
             self.vprint()
 
     @ATMT.state(initial=True)
@@ -134,17 +200,69 @@
         self.vprint("Starting TLS client automaton.")
         raise self.INIT_TLS_SESSION()
 
+    @ATMT.ioevent(INITIAL, name="tls", as_supersocket="tlslink")
+    def _socket(self, fd):
+        pass
+
     @ATMT.state()
     def INIT_TLS_SESSION(self):
         self.cur_session = tlsSession(connection_end="client")
-        self.cur_session.client_certs = self.mycert
-        self.cur_session.client_key = self.mykey
+        s = self.cur_session
+        s.client_certs = self.mycert
+        s.client_key = self.mykey
         v = self.advertised_tls_version
         if v:
-            self.cur_session.advertised_tls_version = v
+            s.advertised_tls_version = v
         else:
-            default_version = self.cur_session.advertised_tls_version
+            default_version = s.advertised_tls_version
             self.advertised_tls_version = default_version
+
+        if s.advertised_tls_version >= 0x0304:
+            # For out of band PSK, the PSK is given as an argument
+            # to the automaton
+            if self.tls13_psk_secret:
+                s.tls13_psk_secret = binascii.unhexlify(self.tls13_psk_secret)
+
+            # For resumed PSK, the PSK is computed from
+            if self.session_ticket_file_in:
+                with open(self.session_ticket_file_in, 'rb') as f:
+
+                    resumed_ciphersuite_len = struct.unpack("B", f.read(1))[0]
+                    s.tls13_ticket_ciphersuite = \
+                        struct.unpack("!H", f.read(resumed_ciphersuite_len))[0]
+
+                    ticket_nonce_len = struct.unpack("B", f.read(1))[0]
+                    # XXX add client_session_nonce member in tlsSession
+                    s.client_session_nonce = f.read(ticket_nonce_len)
+
+                    client_ticket_age_len = struct.unpack("!H", f.read(2))[0]
+                    tmp = f.read(client_ticket_age_len)
+                    s.client_ticket_age = struct.unpack("!I", tmp)[0]
+
+                    client_ticket_age_add_len = struct.unpack(
+                        "!H", f.read(2))[0]
+                    tmp = f.read(client_ticket_age_add_len)
+                    s.client_session_ticket_age_add = struct.unpack(
+                        "!I", tmp)[0]
+
+                    ticket_len = struct.unpack("!H", f.read(2))[0]
+                    s.client_session_ticket = f.read(ticket_len)
+
+                if self.resumption_master_secret:
+
+                    if s.tls13_ticket_ciphersuite not in _tls_cipher_suites_cls:  # noqa: E501
+                        warning("Unknown cipher suite %d" % s.tls13_ticket_ciphersuite)  # noqa: E501
+                        # we do not try to set a default nor stop the execution
+                    else:
+                        cs_cls = _tls_cipher_suites_cls[s.tls13_ticket_ciphersuite]  # noqa: E501
+
+                    hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+                    hash_len = hkdf.hash.digest_size
+
+                    s.tls13_psk_secret = hkdf.expand_label(binascii.unhexlify(self.resumption_master_secret),  # noqa: E501
+                                                           b"resumption",
+                                                           s.client_session_nonce,  # noqa: E501
+                                                           hash_len)
         raise self.CONNECT()
 
     @ATMT.state()
@@ -172,7 +290,21 @@
 
     @ATMT.condition(PREPARE_CLIENTFLIGHT1)
     def should_add_ClientHello(self):
-        self.add_msg(self.client_hello or TLSClientHello())
+        if self.client_hello:
+            p = self.client_hello
+        else:
+            p = TLSClientHello()
+        ext = []
+        # Add TLS_Ext_SignatureAlgorithms for TLS 1.2 ClientHello
+        if self.cur_session.advertised_tls_version == 0x0303:
+            ext += [TLS_Ext_SignatureAlgorithms(sig_algs=["sha256+rsa"])]
+        # Add TLS_Ext_ServerName
+        if self.server_name:
+            ext += TLS_Ext_ServerName(
+                servernames=[ServerName(servername=self.server_name)]
+            )
+        p.ext = ext
+        self.add_msg(p)
         raise self.ADDED_CLIENTHELLO()
 
     @ATMT.state()
@@ -444,17 +576,36 @@
 
     @ATMT.condition(WAIT_CLIENTDATA, prio=1)
     def add_ClientData(self):
-        """
+        r"""
         The user may type in:
         GET / HTTP/1.1\r\nHost: testserver.com\r\n\r\n
         Special characters are handled so that it becomes a valid HTTP request.
         """
         if not self.data_to_send:
-            data = six.moves.input().replace('\\r', '\r').replace('\\n', '\n').encode()  # noqa: E501
+            if self.is_atmt_socket:
+                # Socket mode
+                fd = select_objects([self.ioin["tls"]], 0)
+                if fd:
+                    self.add_record()
+                    self.add_msg(TLSApplicationData(data=fd[0].recv()))
+                    raise self.ADDED_CLIENTDATA()
+                raise self.WAITING_SERVERDATA()
+            else:
+                data = six.moves.input().replace('\\r', '\r').replace('\\n', '\n').encode()  # noqa: E501
         else:
             data = self.data_to_send.pop()
         if data == b"quit":
             return
+        # Command to skip sending
+        elif data == b"wait":
+            raise self.WAITING_SERVERDATA()
+        # Command to perform a key_update (for a TLS 1.3 session)
+        elif data == b"key_update":
+            if self.cur_session.tls_version >= 0x0304:
+                self.add_record()
+                self.add_msg(TLS13KeyUpdate(request_update="update_requested"))
+                raise self.ADDED_CLIENTDATA()
+
         if self.linebreak:
             data += b"\n"
         self.add_record()
@@ -493,10 +644,50 @@
             raise self.WAIT_CLIENTDATA()
         p = self.buffer_in[0]
         if isinstance(p, TLSApplicationData):
-            print("> Received: %r" % p.data)
+            if self.is_atmt_socket:
+                # Socket mode
+                self.oi.tls.send(p.data)
+            else:
+                print("> Received: %r" % p.data)
         elif isinstance(p, TLSAlert):
             print("> Received: %r" % p)
             raise self.CLOSE_NOTIFY()
+        elif isinstance(p, TLS13NewSessionTicket):
+            print("> Received: %r " % p)
+            # If arg session_ticket_file_out is set, we save
+            # the ticket for resumption...
+            if self.session_ticket_file_out:
+                # Struct of ticket file :
+                #  * ciphersuite_len (1 byte)
+                #  * ciphersuite (ciphersuite_len bytes) :
+                #       we need to the store the ciphersuite for resumption
+                #  * ticket_nonce_len (1 byte)
+                #  * ticket_nonce (ticket_nonce_len bytes) :
+                #       we need to store the nonce to compute the PSK
+                #       for resumption
+                #  * ticket_age_len (2 bytes)
+                #  * ticket_age (ticket_age_len bytes) :
+                #       we need to store the time we received the ticket for
+                #       computing the obfuscated_ticket_age when resuming
+                #  * ticket_age_add_len (2 bytes)
+                #  * ticket_age_add (ticket_age_add_len bytes) :
+                #       we need to store the ticket_age_add value from the
+                #       ticket to compute the obfuscated ticket age
+                #  * ticket_len (2 bytes)
+                #  * ticket (ticket_len bytes)
+                with open(self.session_ticket_file_out, 'wb') as f:
+                    f.write(struct.pack("B", 2))
+                    # we choose wcs arbitrarily...
+                    f.write(struct.pack("!H",
+                                        self.cur_session.wcs.ciphersuite.val))
+                    f.write(struct.pack("B", p.noncelen))
+                    f.write(p.ticket_nonce)
+                    f.write(struct.pack("!H", 4))
+                    f.write(struct.pack("!I", int(time.time())))
+                    f.write(struct.pack("!H", 4))
+                    f.write(struct.pack("!I", p.ticket_age_add))
+                    f.write(struct.pack("!H", p.ticketlen))
+                    f.write(self.cur_session.client_session_ticket)
         else:
             print("> Received: %r" % p)
         self.buffer_in = self.buffer_in[1:]
@@ -820,105 +1011,368 @@
     @ATMT.condition(TLS13_START)
     def tls13_should_add_ClientHello(self):
         # we have to use the legacy, plaintext TLS record here
+        supported_groups = ["secp256r1", "secp384r1", "x448"]
+        if conf.crypto_valid_advanced:
+            supported_groups.append("x25519")
         self.add_record(is_tls13=False)
         if self.client_hello:
             p = self.client_hello
         else:
-            # When trying to connect to a public TLS 1.3 server,
-            # you will most likely need to provide an SNI extension.
-            # sn = ServerName(servername="<put server name here>")
-            ext = [TLS_Ext_SupportedGroups(groups=["secp256r1"]),
-                   # TLS_Ext_ServerName(servernames=[sn]),
-                   TLS_Ext_KeyShare_CH(client_shares=[KeyShareEntry(group=23)]),  # noqa: E501
-                   TLS_Ext_SupportedVersions(versions=["TLS 1.3-d18"]),
-                   TLS_Ext_SignatureAlgorithms(sig_algs=["sha256+rsapss",
-                                                         "sha256+rsa"])]
-            p = TLSClientHello(ciphers=0x1301, ext=ext)
+            if self.ciphersuite is None:
+                c = 0x1301
+            else:
+                c = self.ciphersuite
+            p = TLS13ClientHello(ciphers=c)
+
+        ext = []
+        ext += TLS_Ext_SupportedVersion_CH(versions=["TLS 1.3"])
+
+        s = self.cur_session
+
+        if s.tls13_psk_secret:
+            # Check if DHE is need (both for out of band and resumption PSK)
+            if self.tls13_psk_mode == "psk_dhe_ke":
+                ext += TLS_Ext_PSKKeyExchangeModes(kxmodes="psk_dhe_ke")
+                ext += TLS_Ext_SupportedGroups(groups=supported_groups)
+                ext += TLS_Ext_KeyShare_CH(
+                    client_shares=[KeyShareEntry(group=self.curve)]
+                )
+            else:
+                ext += TLS_Ext_PSKKeyExchangeModes(kxmodes="psk_ke")
+
+            # RFC844, section 4.2.11.
+            # "The "pre_shared_key" extension MUST be the last extension
+            # in the ClientHello "
+            # Compute the pre_shared_key extension for resumption PSK
+            if s.client_session_ticket:
+                cs_cls = _tls_cipher_suites_cls[s.tls13_ticket_ciphersuite]  # noqa: E501
+                hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+                hash_len = hkdf.hash.digest_size
+                # We compute the client's view of the age of the ticket (ie
+                # the time since the receipt of the ticket) in ms
+                agems = int((time.time() - s.client_ticket_age) * 1000)
+                # Then we compute the obfuscated version of the ticket age
+                # by adding the "ticket_age_add" value included in the
+                # ticket (modulo 2^32)
+                obfuscated_age = ((agems + s.client_session_ticket_age_add) &
+                                  0xffffffff)
+
+                psk_id = PSKIdentity(identity=s.client_session_ticket,
+                                     obfuscated_ticket_age=obfuscated_age)
+
+                psk_binder_entry = PSKBinderEntry(binder_len=hash_len,
+                                                  binder=b"\x00" * hash_len)
+
+                ext += TLS_Ext_PreSharedKey_CH(identities=[psk_id],
+                                               binders=[psk_binder_entry])
+            else:
+                # Compute the pre_shared_key extension for out of band PSK
+                # (SHA256 is used as default hash function for HKDF for out
+                # of band PSK)
+                hkdf = TLS13_HKDF("sha256")
+                hash_len = hkdf.hash.digest_size
+                psk_id = PSKIdentity(identity='Client_identity')
+                # XXX see how to not pass binder as argument
+                psk_binder_entry = PSKBinderEntry(binder_len=hash_len,
+                                                  binder=b"\x00" * hash_len)
+
+                ext += TLS_Ext_PreSharedKey_CH(identities=[psk_id],
+                                               binders=[psk_binder_entry])
+        else:
+            ext += TLS_Ext_SupportedGroups(groups=supported_groups)
+            ext += TLS_Ext_KeyShare_CH(
+                client_shares=[KeyShareEntry(group=self.curve)]
+            )
+            ext += TLS_Ext_SignatureAlgorithms(sig_algs=["sha256+rsaepss",
+                                                         "sha256+rsa"])
+        # Add TLS_Ext_ServerName
+        if self.server_name:
+            ext += TLS_Ext_ServerName(
+                servernames=[ServerName(servername=self.server_name)]
+            )
+        p.ext = ext
         self.add_msg(p)
         raise self.TLS13_ADDED_CLIENTHELLO()
 
     @ATMT.state()
     def TLS13_ADDED_CLIENTHELLO(self):
+        raise self.TLS13_SENDING_CLIENTFLIGHT1()
+
+    @ATMT.state()
+    def TLS13_SENDING_CLIENTFLIGHT1(self):
         pass
 
-    @ATMT.condition(TLS13_ADDED_CLIENTHELLO)
-    def tls13_should_send_ClientHello(self):
+    @ATMT.condition(TLS13_SENDING_CLIENTFLIGHT1)
+    def tls13_should_send_ClientFlight1(self):
         self.flush_records()
-        raise self.TLS13_SENT_CLIENTHELLO()
+        raise self.TLS13_SENT_CLIENTFLIGHT1()
 
     @ATMT.state()
-    def TLS13_SENT_CLIENTHELLO(self):
-        raise self.TLS13_WAITING_SERVERHELLO()
+    def TLS13_SENT_CLIENTFLIGHT1(self):
+        raise self.TLS13_WAITING_SERVERFLIGHT1()
 
     @ATMT.state()
-    def TLS13_WAITING_SERVERHELLO(self):
+    def TLS13_WAITING_SERVERFLIGHT1(self):
         self.get_next_msg()
+        raise self.TLS13_RECEIVED_SERVERFLIGHT1()
+
+    @ATMT.state()
+    def TLS13_RECEIVED_SERVERFLIGHT1(self):
+        pass
 
-    @ATMT.condition(TLS13_WAITING_SERVERHELLO)
+    @ATMT.condition(TLS13_RECEIVED_SERVERFLIGHT1, prio=1)
     def tls13_should_handle_ServerHello(self):
+        """
+        XXX We should check the ServerHello attributes for discrepancies with
+        our own ClientHello.
+        """
         self.raise_on_packet(TLS13ServerHello,
-                             self.TLS13_WAITING_ENCRYPTEDEXTENSIONS)
+                             self.TLS13_HANDLED_SERVERHELLO)
+
+    @ATMT.condition(TLS13_RECEIVED_SERVERFLIGHT1, prio=2)
+    def tls13_should_handle_HelloRetryRequest(self):
+        """
+        XXX We should check the ServerHello attributes for discrepancies with
+        our own ClientHello.
+        """
+        self.raise_on_packet(TLS13HelloRetryRequest,
+                             self.TLS13_HELLO_RETRY_REQUESTED)
+
+    @ATMT.condition(TLS13_RECEIVED_SERVERFLIGHT1, prio=3)
+    def tls13_should_handle_AlertMessage_(self):
+        self.raise_on_packet(TLSAlert,
+                             self.TLS13_HANDLED_ALERT_FROM_SERVERFLIGHT1)
 
     @ATMT.state()
-    def TLS13_WAITING_ENCRYPTEDEXTENSIONS(self):
-        self.get_next_msg()
+    def TLS13_HANDLED_ALERT_FROM_SERVERFLIGHT1(self):
+        self.vprint("Received Alert message !")
+        self.vprint(self.cur_pkt.mysummary())
+        raise self.CLOSE_NOTIFY()
+
+    @ATMT.condition(TLS13_RECEIVED_SERVERFLIGHT1, prio=4)
+    def tls13_missing_ServerHello(self):
+        raise self.MISSING_SERVERHELLO()
+
+    @ATMT.state()
+    def TLS13_HELLO_RETRY_REQUESTED(self):
+        pass
+
+    @ATMT.condition(TLS13_HELLO_RETRY_REQUESTED)
+    def tls13_should_add_ClientHello_Retry(self):
+        s = self.cur_session
+        s.tls13_retry = True
+        # we have to use the legacy, plaintext TLS record here
+        self.add_record(is_tls13=False)
+        # We retrieve the group to be used and the selected version from the
+        # previous message
+        hrr = s.handshake_messages_parsed[-1]
+        if isinstance(hrr, TLS13HelloRetryRequest):
+            pass
+        ciphersuite = hrr.cipher
+        if hrr.ext:
+            for e in hrr.ext:
+                if isinstance(e, TLS_Ext_KeyShare_HRR):
+                    selected_group = e.selected_group
+                if isinstance(e, TLS_Ext_SupportedVersion_SH):
+                    selected_version = e.version
+        if not selected_group or not selected_version:
+            raise self.CLOSE_NOTIFY()
+
+        ext = []
+        ext += TLS_Ext_SupportedVersion_CH(versions=[_tls_version[selected_version]])  # noqa: E501
+
+        if s.tls13_psk_secret:
+            if self.tls13_psk_mode == "psk_dhe_ke":
+                ext += TLS_Ext_PSKKeyExchangeModes(kxmodes="psk_dhe_ke"),
+                ext += TLS_Ext_SupportedGroups(groups=[_tls_named_groups[selected_group]])  # noqa: E501
+                ext += TLS_Ext_KeyShare_CH(client_shares=[KeyShareEntry(group=selected_group)])  # noqa: E501
+            else:
+                ext += TLS_Ext_PSKKeyExchangeModes(kxmodes="psk_ke")
+
+            if s.client_session_ticket:
+
+                # XXX Retrieve parameters from first ClientHello...
+                cs_cls = _tls_cipher_suites_cls[s.tls13_ticket_ciphersuite]
+                hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+                hash_len = hkdf.hash.digest_size
+
+                # We compute the client's view of the age of the ticket (ie
+                # the time since the receipt of the ticket) in ms
+                agems = int((time.time() - s.client_ticket_age) * 1000)
+
+                # Then we compute the obfuscated version of the ticket age by
+                # adding the "ticket_age_add" value included in the ticket
+                # (modulo 2^32)
+                obfuscated_age = ((agems + s.client_session_ticket_age_add) &
+                                  0xffffffff)
+
+                psk_id = PSKIdentity(identity=s.client_session_ticket,
+                                     obfuscated_ticket_age=obfuscated_age)
+
+                psk_binder_entry = PSKBinderEntry(binder_len=hash_len,
+                                                  binder=b"\x00" * hash_len)
+
+                ext += TLS_Ext_PreSharedKey_CH(identities=[psk_id],
+                                               binders=[psk_binder_entry])
+            else:
+                hkdf = TLS13_HKDF("sha256")
+                hash_len = hkdf.hash.digest_size
+                psk_id = PSKIdentity(identity='Client_identity')
+                psk_binder_entry = PSKBinderEntry(binder_len=hash_len,
+                                                  binder=b"\x00" * hash_len)
+
+                ext += TLS_Ext_PreSharedKey_CH(identities=[psk_id],
+                                               binders=[psk_binder_entry])
 
-    @ATMT.condition(TLS13_WAITING_ENCRYPTEDEXTENSIONS)
-    def tls13_should_handle_EncryptedExtensions(self):
+        else:
+            ext += TLS_Ext_SupportedGroups(groups=[_tls_named_groups[selected_group]])  # noqa: E501
+            ext += TLS_Ext_KeyShare_CH(client_shares=[KeyShareEntry(group=selected_group)])  # noqa: E501
+            ext += TLS_Ext_SignatureAlgorithms(sig_algs=["sha256+rsaepss"])
+
+        p = TLS13ClientHello(ciphers=ciphersuite, ext=ext)
+        self.add_msg(p)
+        raise self.TLS13_ADDED_CLIENTHELLO()
+
+    @ATMT.state()
+    def TLS13_HANDLED_SERVERHELLO(self):
+        pass
+
+    @ATMT.condition(TLS13_HANDLED_SERVERHELLO, prio=1)
+    def tls13_should_handle_encrytpedExtensions(self):
         self.raise_on_packet(TLSEncryptedExtensions,
-                             self.TLS13_WAITING_CERTIFICATE)
+                             self.TLS13_HANDLED_ENCRYPTEDEXTENSIONS)
+
+    @ATMT.condition(TLS13_HANDLED_SERVERHELLO, prio=2)
+    def tls13_should_handle_ChangeCipherSpec(self):
+        self.raise_on_packet(TLSChangeCipherSpec,
+                             self.TLS13_HANDLED_CHANGE_CIPHER_SPEC)
 
     @ATMT.state()
-    def TLS13_WAITING_CERTIFICATE(self):
-        self.get_next_msg()
+    def TLS13_HANDLED_CHANGE_CIPHER_SPEC(self):
+        self.cur_session.middlebox_compatibility = True
+        raise self.TLS13_HANDLED_SERVERHELLO()
 
-    @ATMT.condition(TLS13_WAITING_CERTIFICATE, prio=1)
-    def tls13_should_handle_Certificate(self):
-        self.raise_on_packet(TLS13Certificate,
-                             self.TLS13_WAITING_CERTIFICATEVERIFY)
+    @ATMT.condition(TLS13_HANDLED_SERVERHELLO, prio=3)
+    def tls13_missing_encryptedExtension(self):
+        self.vprint("Missing TLS 1.3 EncryptedExtensions message!")
+        raise self.CLOSE_NOTIFY()
 
-    @ATMT.condition(TLS13_WAITING_CERTIFICATE, prio=2)
-    def tls13_should_handle_CertificateRequest(self):
-        hs_msg = [type(m) for m in self.cur_session.handshake_messages_parsed]
-        if TLSCertificateRequest in hs_msg:
-            self.vprint("TLSCertificateRequest already received!")
-        self.raise_on_packet(TLSCertificateRequest,
-                             self.TLS13_WAITING_CERTIFICATE)
+    @ATMT.state()
+    def TLS13_HANDLED_ENCRYPTEDEXTENSIONS(self):
+        pass
 
-    @ATMT.condition(TLS13_WAITING_CERTIFICATE, prio=3)
-    def tls13_should_handle_ServerFinished_from_EncryptedExtensions(self):
-        self.raise_on_packet(TLSFinished,
-                             self.TLS13_CONNECTED)
+    @ATMT.condition(TLS13_HANDLED_ENCRYPTEDEXTENSIONS, prio=1)
+    def tls13_should_handle_certificateRequest_from_encryptedExtensions(self):
+        """
+        XXX We should check the CertificateRequest attributes for discrepancies
+        with the cipher suite, etc.
+        """
+        self.raise_on_packet(TLS13CertificateRequest,
+                             self.TLS13_HANDLED_CERTIFICATEREQUEST)
 
-    @ATMT.condition(TLS13_WAITING_CERTIFICATE, prio=4)
-    def tls13_missing_Certificate(self):
-        self.vprint("Missing TLS 1.3 message after EncryptedExtensions!")
-        raise self.FINAL()
+    @ATMT.condition(TLS13_HANDLED_ENCRYPTEDEXTENSIONS, prio=2)
+    def tls13_should_handle_certificate_from_encryptedExtensions(self):
+        self.tls13_should_handle_Certificate()
+
+    @ATMT.condition(TLS13_HANDLED_ENCRYPTEDEXTENSIONS, prio=3)
+    def tls13_should_handle_finished_from_encryptedExtensions(self):
+        if self.cur_session.tls13_psk_secret:
+            self.raise_on_packet(TLSFinished,
+                                 self.TLS13_HANDLED_FINISHED)
 
     @ATMT.state()
-    def TLS13_WAITING_CERTIFICATEVERIFY(self):
-        self.get_next_msg()
+    def TLS13_HANDLED_CERTIFICATEREQUEST(self):
+        pass
 
-    @ATMT.condition(TLS13_WAITING_CERTIFICATEVERIFY)
+    @ATMT.condition(TLS13_HANDLED_CERTIFICATEREQUEST, prio=1)
+    def tls13_should_handle_Certificate_from_CertificateRequest(self):
+        return self.tls13_should_handle_Certificate()
+
+    def tls13_should_handle_Certificate(self):
+        self.raise_on_packet(TLS13Certificate,
+                             self.TLS13_HANDLED_CERTIFICATE)
+
+    @ATMT.state()
+    def TLS13_HANDLED_CERTIFICATE(self):
+        pass
+
+    @ATMT.condition(TLS13_HANDLED_CERTIFICATE, prio=1)
     def tls13_should_handle_CertificateVerify(self):
         self.raise_on_packet(TLSCertificateVerify,
-                             self.TLS13_WAITING_SERVERFINISHED)
+                             self.TLS13_HANDLED_CERTIFICATE_VERIFY)
+
+    @ATMT.condition(TLS13_HANDLED_CERTIFICATE, prio=2)
+    def tls13_missing_CertificateVerify(self):
+        self.vprint("Missing TLS 1.3 CertificateVerify message!")
+        raise self.CLOSE_NOTIFY()
 
     @ATMT.state()
-    def TLS13_WAITING_SERVERFINISHED(self):
-        self.get_next_msg()
+    def TLS13_HANDLED_CERTIFICATE_VERIFY(self):
+        pass
 
-    @ATMT.condition(TLS13_WAITING_SERVERFINISHED)
-    def tls13_should_handle_ServerFinished_from_CertificateVerify(self):
+    @ATMT.condition(TLS13_HANDLED_CERTIFICATE_VERIFY, prio=1)
+    def tls13_should_handle_finished(self):
         self.raise_on_packet(TLSFinished,
-                             self.TLS13_PREPARE_CLIENTFLIGHT2)
+                             self.TLS13_HANDLED_FINISHED)
+
+    @ATMT.state()
+    def TLS13_HANDLED_FINISHED(self):
+        raise self.TLS13_PREPARE_CLIENTFLIGHT2()
 
     @ATMT.state()
     def TLS13_PREPARE_CLIENTFLIGHT2(self):
+        if self.cur_session.middlebox_compatibility:
+            self.add_record(is_tls12=True)
+            self.add_msg(TLSChangeCipherSpec())
         self.add_record(is_tls13=True)
-        # raise self.FINAL()
 
-    @ATMT.condition(TLS13_PREPARE_CLIENTFLIGHT2)
+    @ATMT.condition(TLS13_PREPARE_CLIENTFLIGHT2, prio=1)
+    def tls13_should_add_ClientCertificate(self):
+        """
+        If the server sent a CertificateRequest, we send a Certificate message.
+        If no certificate is available, an empty Certificate message is sent:
+        - this is a SHOULD in RFC 4346 (Section 7.4.6)
+        - this is a MUST in RFC 5246 (Section 7.4.6)
+
+        XXX We may want to add a complete chain.
+        """
+        hs_msg = [type(m) for m in self.cur_session.handshake_messages_parsed]
+        if TLS13CertificateRequest not in hs_msg:
+            raise self.TLS13_ADDED_CLIENTCERTIFICATE()
+            # return
+        certs = []
+        if self.mycert:
+            certs += _ASN1CertAndExt(cert=self.mycert)
+
+        self.add_msg(TLS13Certificate(certs=certs))
+        raise self.TLS13_ADDED_CLIENTCERTIFICATE()
+
+    @ATMT.state()
+    def TLS13_ADDED_CLIENTCERTIFICATE(self):
+        pass
+
+    @ATMT.condition(TLS13_ADDED_CLIENTCERTIFICATE, prio=1)
+    def tls13_should_add_ClientCertificateVerify(self):
+        """
+        XXX Section 7.4.7.1 of RFC 5246 states that the CertificateVerify
+        message is only sent following a client certificate that has signing
+        capability (i.e. not those containing fixed DH params).
+        We should verify that before adding the message. We should also handle
+        the case when the Certificate message was empty.
+        """
+        hs_msg = [type(m) for m in self.cur_session.handshake_messages_parsed]
+        if (TLS13CertificateRequest not in hs_msg or
+                self.mycert is None or
+                self.mykey is None):
+            return self.tls13_should_add_ClientFinished()
+        self.add_msg(TLSCertificateVerify())
+        raise self.TLS13_ADDED_CERTIFICATEVERIFY()
+
+    @ATMT.state()
+    def TLS13_ADDED_CERTIFICATEVERIFY(self):
+        return self.tls13_should_add_ClientFinished()
+
+    @ATMT.condition(TLS13_PREPARE_CLIENTFLIGHT2, prio=2)
     def tls13_should_add_ClientFinished(self):
         self.add_msg(TLSFinished())
         raise self.TLS13_ADDED_CLIENTFINISHED()
@@ -934,7 +1388,14 @@
 
     @ATMT.state()
     def TLS13_SENT_CLIENTFLIGHT2(self):
-        raise self.HANDLED_SERVERFINISHED()
+        self.vprint("TLS 1.3 handshake completed!")
+        self.vprint_sessioninfo()
+        self.vprint("You may send data or use 'quit'.")
+        raise self.WAIT_CLIENTDATA()
+
+    @ATMT.state()
+    def SOCKET_CLOSED(self):
+        raise self.FINAL()
 
     @ATMT.state(final=True)
     def FINAL(self):

scapy-2.4.3.tar.gz/scapy/layers/tls/automaton_srv.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/automaton_srv.py Changed

@@ -1,14 +1,14 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
 #               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
 TLS server automaton. This makes for a primitive TLS stack.
 Obviously you need rights for network access.
 
-We support versions SSLv2 to TLS 1.2, along with many features.
-There is no session resumption mechanism for now.
+We support versions SSLv2 to TLS 1.3, along with many features.
 
 In order to run a server listening on tcp/4433:
 > from scapy.all import *
@@ -18,27 +18,49 @@
 
 from __future__ import print_function
 import socket
+import binascii
+import struct
+import time
 
+from scapy.config import conf
 from scapy.packet import Raw
 from scapy.pton_ntop import inet_pton
-from scapy.utils import randstring, repr_hex
+from scapy.utils import get_temp_file, randstring, repr_hex
 from scapy.automaton import ATMT
+from scapy.error import warning
 from scapy.layers.tls.automaton import _TLSAutomaton
 from scapy.layers.tls.cert import PrivKeyRSA, PrivKeyECDSA
 from scapy.layers.tls.basefields import _tls_version
 from scapy.layers.tls.session import tlsSession
+from scapy.layers.tls.crypto.groups import _tls_named_groups
+from scapy.layers.tls.extensions import TLS_Ext_SupportedVersion_SH, \
+    TLS_Ext_SupportedGroups, TLS_Ext_Cookie, \
+    TLS_Ext_SignatureAlgorithms, TLS_Ext_PSKKeyExchangeModes, \
+    TLS_Ext_EarlyDataIndicationTicket
+from scapy.layers.tls.keyexchange_tls13 import TLS_Ext_KeyShare_SH, \
+    KeyShareEntry, TLS_Ext_KeyShare_HRR, TLS_Ext_PreSharedKey_CH, \
+    TLS_Ext_PreSharedKey_SH
 from scapy.layers.tls.handshake import TLSCertificate, TLSCertificateRequest, \
     TLSCertificateVerify, TLSClientHello, TLSClientKeyExchange, TLSFinished, \
-    TLSServerHello, TLSServerHelloDone, TLSServerKeyExchange
+    TLSServerHello, TLSServerHelloDone, TLSServerKeyExchange, \
+    _ASN1CertAndExt, TLS13ServerHello, TLS13Certificate, TLS13ClientHello, \
+    TLSEncryptedExtensions, TLS13HelloRetryRequest, TLS13CertificateRequest, \
+    TLS13KeyUpdate, TLS13NewSessionTicket
 from scapy.layers.tls.handshake_sslv2 import SSLv2ClientCertificate, \
     SSLv2ClientFinished, SSLv2ClientHello, SSLv2ClientMasterKey, \
     SSLv2RequestCertificate, SSLv2ServerFinished, SSLv2ServerHello, \
     SSLv2ServerVerify
 from scapy.layers.tls.record import TLSAlert, TLSChangeCipherSpec, \
     TLSApplicationData
+from scapy.layers.tls.record_tls13 import TLS13
+from scapy.layers.tls.crypto.hkdf import TLS13_HKDF
 from scapy.layers.tls.crypto.suites import _tls_cipher_suites_cls, \
     get_usable_ciphersuites
 
+if conf.crypto_valid:
+    from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import hashes
+
 
 class TLSServerAutomaton(_TLSAutomaton):
     """
@@ -70,6 +92,12 @@
                    client_auth=False,
                    is_echo_server=True,
                    max_client_idle_time=60,
+                   handle_session_ticket=None,
+                   session_ticket_file=None,
+                   curve=None,
+                   cookie=False,
+                   psk=None,
+                   psk_mode=None,
                    **kargs):
 
         super(TLSServerAutomaton, self).parse_args(mycert=mycert,
@@ -95,6 +123,19 @@
         self.client_auth = client_auth
         self.is_echo_server = is_echo_server
         self.max_client_idle_time = max_client_idle_time
+        self.curve = None
+        self.cookie = cookie
+        self.psk_secret = psk
+        self.psk_mode = psk_mode
+        if handle_session_ticket is None:
+            handle_session_ticket = session_ticket_file is not None
+        if handle_session_ticket:
+            session_ticket_file = session_ticket_file or get_temp_file()
+        self.handle_session_ticket = handle_session_ticket
+        self.session_ticket_file = session_ticket_file
+        for (group_id, ng) in _tls_named_groups.items():
+            if ng == curve:
+                self.curve = group_id
 
     def vprint_sessioninfo(self):
         if self.verbose:
@@ -103,10 +144,18 @@
             self.vprint("Version       : %s" % v)
             cs = s.wcs.ciphersuite.name
             self.vprint("Cipher suite  : %s" % cs)
-            ms = s.master_secret
+            if s.tls_version < 0x0304:
+                ms = s.master_secret
+            else:
+                ms = s.tls13_master_secret
             self.vprint("Master secret : %s" % repr_hex(ms))
             if s.client_certs:
                 self.vprint("Client certificate chain: %r" % s.client_certs)
+
+            if s.tls_version >= 0x0304:
+                res_secret = s.tls13_derived_secrets["resumption_secret"]
+                self.vprint("Resumption master secret : %s" %
+                            repr_hex(res_secret))
             self.vprint()
 
     def http_sessioninfo(self):
@@ -122,7 +171,11 @@
         s += "Version       : %s\n" % v
         cs = self.cur_session.wcs.ciphersuite.name
         s += "Cipher suite  : %s\n" % cs
-        ms = self.cur_session.master_secret
+        if self.cur_session.tls_version < 0x0304:
+            ms = self.cur_session.master_secret
+        else:
+            ms = self.cur_session.tls13_master_secret
+
         s += "Master secret : %s\n" % repr_hex(ms)
         body = "<html><body><pre>%s</pre></body></html>\r\n\r\n" % s
         answer = (header + body) % len(body)
@@ -157,6 +210,10 @@
         raise self.WAITING_CLIENT()
 
     @ATMT.state()
+    def SOCKET_CLOSED(self):
+        raise self.WAITING_CLIENT()
+
+    @ATMT.state()
     def WAITING_CLIENT(self):
         self.buffer_out = []
         self.buffer_in = []
@@ -202,16 +259,17 @@
     #                           TLS handshake                                 #
 
     @ATMT.condition(RECEIVED_CLIENTFLIGHT1, prio=1)
+    def tls13_should_handle_ClientHello(self):
+        self.raise_on_packet(TLS13ClientHello,
+                             self.tls13_HANDLED_CLIENTHELLO)
+
+    @ATMT.condition(RECEIVED_CLIENTFLIGHT1, prio=2)
     def should_handle_ClientHello(self):
         self.raise_on_packet(TLSClientHello,
                              self.HANDLED_CLIENTHELLO)
 
     @ATMT.state()
     def HANDLED_CLIENTHELLO(self):
-        raise self.PREPARE_SERVERFLIGHT1()
-
-    @ATMT.condition(HANDLED_CLIENTHELLO)
-    def should_check_ciphersuites(self):
         """
         We extract cipher suites candidates from the client's proposition.
         """
@@ -220,7 +278,7 @@
         elif isinstance(self.mykey, PrivKeyECDSA):
             kx = "ECDSA"
         if get_usable_ciphersuites(self.cur_pkt.ciphers, kx):
-            return
+            raise self.PREPARE_SERVERFLIGHT1()
         raise self.NO_USABLE_CIPHERSUITE()
 
     @ATMT.state()
@@ -357,6 +415,7 @@
     @ATMT.state()
     def HANDLED_ALERT_FROM_CLIENTCERTIFICATE(self):
         self.vprint("Received Alert message instead of ClientKeyExchange!")
+        self.vprint(self.cur_pkt.mysummary())
         raise self.CLOSE_NOTIFY()
 
     @ATMT.condition(HANDLED_CLIENTCERTIFICATE, prio=3)
@@ -405,6 +464,7 @@
     @ATMT.state()
     def HANDLED_ALERT_FROM_CLIENTKEYEXCHANGE(self):
         self.vprint("Received Alert message instead of ChangeCipherSpec!")
+        self.vprint(self.cur_pkt.mysummary())
         raise self.CLOSE_NOTIFY()
 
     @ATMT.condition(HANDLED_CERTIFICATEVERIFY, prio=3)
@@ -482,6 +542,396 @@
 
     #                       end of TLS handshake                              #
 
+    #                       TLS 1.3 handshake                                 #
+    @ATMT.state()
+    def tls13_HANDLED_CLIENTHELLO(self):
+        """
+          Check if we have to send an HelloRetryRequest
+          XXX check also with non ECC groups
+        """
+        s = self.cur_session
+        m = s.handshake_messages_parsed[-1]
+        #  Check if we have to send an HelloRetryRequest
+        #  XXX check also with non ECC groups
+        if self.curve:
+            # We first look for a KeyShareEntry with same group as self.curve
+            if not _tls_named_groups[self.curve] in s.tls13_client_pubshares:
+                # We then check if self.curve was advertised in SupportedGroups
+                # extension
+                for e in m.ext:
+                    if isinstance(e, TLS_Ext_SupportedGroups):
+                        if self.curve in e.groups:
+                            # Here, we need to send an HelloRetryRequest
+                            raise self.tls13_PREPARE_HELLORETRYREQUEST()
+        raise self.tls13_PREPARE_SERVERFLIGHT1()
+
+    @ATMT.state()
+    def tls13_PREPARE_HELLORETRYREQUEST(self):
+        pass
+
+    @ATMT.condition(tls13_PREPARE_HELLORETRYREQUEST)
+    def tls13_should_add_HelloRetryRequest(self):
+        self.add_record(is_tls13=False)
+        if isinstance(self.mykey, PrivKeyRSA):
+            kx = "RSA"
+        elif isinstance(self.mykey, PrivKeyECDSA):
+            kx = "ECDSA"
+        usable_suites = get_usable_ciphersuites(self.cur_pkt.ciphers, kx)
+        c = usable_suites[0]
+        ext = [TLS_Ext_SupportedVersion_SH(version="TLS 1.3"),
+               TLS_Ext_KeyShare_HRR(selected_group=_tls_named_groups[self.curve])]  # noqa: E501
+        if self.cookie:
+            ext += TLS_Ext_Cookie()
+        p = TLS13HelloRetryRequest(cipher=c, ext=ext)
+        self.add_msg(p)
+        self.flush_records()
+        raise self.tls13_HANDLED_HELLORETRYREQUEST()
+
+    @ATMT.state()
+    def tls13_HANDLED_HELLORETRYREQUEST(self):
+        pass
+
+    @ATMT.condition(tls13_HANDLED_HELLORETRYREQUEST)
+    def tls13_should_add_ServerHello_from_HRR(self):
+        raise self.WAITING_CLIENTFLIGHT1()
+
+    @ATMT.state()
+    def tls13_PREPARE_SERVERFLIGHT1(self):
+        self.add_record(is_tls13=False)
+
+    def verify_psk_binder(self, psk_identity, obfuscated_age, binder):
+        """
+        This function verifies the binder received in the 'pre_shared_key'
+        extension and return the resumption PSK associated with those
+        values.
+
+        The arguments psk_identity, obfuscated_age and binder are taken
+        from 'pre_shared_key' in the ClientHello.
+        """
+        with open(self.session_ticket_file, "rb") as f:
+            for line in f:
+                s = line.strip().split(b';')
+                if len(s) < 8:
+                    continue
+                ticket_label = binascii.unhexlify(s[0])
+                ticket_nonce = binascii.unhexlify(s[1])
+                tmp = binascii.unhexlify(s[2])
+                ticket_lifetime = struct.unpack("!I", tmp)[0]
+                tmp = binascii.unhexlify(s[3])
+                ticket_age_add = struct.unpack("!I", tmp)[0]
+                tmp = binascii.unhexlify(s[4])
+                ticket_start_time = struct.unpack("!I", tmp)[0]
+                resumption_secret = binascii.unhexlify(s[5])
+                tmp = binascii.unhexlify(s[6])
+                res_ciphersuite = struct.unpack("!H", tmp)[0]
+                tmp = binascii.unhexlify(s[7])
+                max_early_data_size = struct.unpack("!I", tmp)[0]
+
+                # Here psk_identity is a Ticket type but ticket_label is bytes,
+                # we need to convert psk_identiy to bytes in order to compare
+                # both strings
+                if psk_identity.__bytes__() == ticket_label:
+
+                    # We compute the resumed PSK associated the resumption
+                    # secret
+                    self.vprint("Ticket found in database !")
+                    if res_ciphersuite not in _tls_cipher_suites_cls:
+                        warning("Unknown cipher suite %d" % res_ciphersuite)
+                        # we do not try to set a default nor stop the execution
+                    else:
+                        cs_cls = _tls_cipher_suites_cls[res_ciphersuite]
+
+                    hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+                    hash_len = hkdf.hash.digest_size
+
+                    tls13_psk_secret = hkdf.expand_label(resumption_secret,
+                                                         b"resumption",
+                                                         ticket_nonce,
+                                                         hash_len)
+                    # We verify that ticket age is not expired
+                    agesec = int((time.time() - ticket_start_time))
+                    # agems = agesec * 1000
+                    ticket_age = (obfuscated_age - ticket_age_add) % 0xffffffff  # noqa: F841, E501
+
+                    # We verify the PSK binder
+                    s = self.cur_session
+                    if s.tls13_retry:
+                        handshake_context = struct.pack("B", 254)
+                        handshake_context += struct.pack("B", 0)
+                        handshake_context += struct.pack("B", 0)
+                        handshake_context += struct.pack("B", hash_len)
+                        digest = hashes.Hash(hkdf.hash, backend=default_backend())  # noqa: E501
+                        digest.update(s.handshake_messages[0])
+                        handshake_context += digest.finalize()
+                        for m in s.handshake_messages[1:]:
+                            if (isinstance(TLS13ClientHello) or
+                                    isinstance(TLSClientHello)):
+                                handshake_context += m[:-hash_len - 3]
+                            else:
+                                handshake_context += m
+                    else:
+                        handshake_context = s.handshake_messages[0][:-hash_len - 3]  # noqa: E501
+
+                    # We compute the binder key
+                    # XXX use the compute_tls13_early_secrets() function
+                    tls13_early_secret = hkdf.extract(None, tls13_psk_secret)
+                    binder_key = hkdf.derive_secret(tls13_early_secret,
+                                                    b"res binder",
+                                                    b"")
+                    computed_binder = hkdf.compute_verify_data(binder_key,
+                                                               handshake_context)  # noqa: E501
+                    if (agesec < ticket_lifetime and
+                            computed_binder == binder):
+                        self.vprint("Ticket has been accepted ! ")
+                        self.max_early_data_size = max_early_data_size
+                        self.resumed_ciphersuite = res_ciphersuite
+                        return tls13_psk_secret
+        self.vprint("Ticket has not been accepted ! Fallback to a complete handshake")  # noqa: E501
+        return None
+
+    @ATMT.condition(tls13_PREPARE_SERVERFLIGHT1)
+    def tls13_should_add_ServerHello(self):
+
+        psk_identity = None
+        psk_key_exchange_mode = None
+        obfuscated_age = None
+        # XXX check ClientHello extensions...
+        for m in reversed(self.cur_session.handshake_messages_parsed):
+            if isinstance(m, (TLS13ClientHello, TLSClientHello)):
+                for e in m.ext:
+                    if isinstance(e, TLS_Ext_PreSharedKey_CH):
+                        psk_identity = e.identities[0].identity
+                        obfuscated_age = e.identities[0].obfuscated_ticket_age
+                        binder = e.binders[0].binder
+
+                        # For out-of-bound PSK, obfuscated_ticket_age should be
+                        # 0. We use this field to distinguish between out-of-
+                        # bound PSK and resumed PSK
+                        is_out_of_band_psk = (obfuscated_age == 0)
+
+                    if isinstance(e, TLS_Ext_PSKKeyExchangeModes):
+                        psk_key_exchange_mode = e.kxmodes[0]
+
+        if isinstance(self.mykey, PrivKeyRSA):
+            kx = "RSA"
+        elif isinstance(self.mykey, PrivKeyECDSA):
+            kx = "ECDSA"
+        usable_suites = get_usable_ciphersuites(self.cur_pkt.ciphers, kx)
+        c = usable_suites[0]
+        group = next(iter(self.cur_session.tls13_client_pubshares))
+        ext = [TLS_Ext_SupportedVersion_SH(version="TLS 1.3")]
+        if (psk_identity and obfuscated_age and psk_key_exchange_mode):
+            s = self.cur_session
+            if is_out_of_band_psk:
+                # Handshake with external PSK authentication
+                # XXX test that self.psk_secret is set
+                s.tls13_psk_secret = binascii.unhexlify(self.psk_secret)
+                # 0: "psk_ke"
+                # 1: "psk_dhe_ke"
+                if psk_key_exchange_mode == 1:
+                    server_kse = KeyShareEntry(group=group)
+                    ext += TLS_Ext_KeyShare_SH(server_share=server_kse)
+                ext += TLS_Ext_PreSharedKey_SH(selected_identity=0)
+            else:
+                resumption_psk = self.verify_psk_binder(psk_identity,
+                                                        obfuscated_age,
+                                                        binder)
+                if resumption_psk is None:
+                    # We did not find a ticket matching the one provided in the
+                    # ClientHello. We fallback to a regular 1-RTT handshake
+                    server_kse = KeyShareEntry(group=group)
+                    ext += [TLS_Ext_KeyShare_SH(server_share=server_kse)]
+                else:
+                    # 0: "psk_ke"
+                    # 1: "psk_dhe_ke"
+                    if psk_key_exchange_mode == 1:
+                        server_kse = KeyShareEntry(group=group)
+                        ext += [TLS_Ext_KeyShare_SH(server_share=server_kse)]
+
+                    ext += [TLS_Ext_PreSharedKey_SH(selected_identity=0)]
+                    self.cur_session.tls13_psk_secret = resumption_psk
+        else:
+            # Standard Handshake
+            ext += TLS_Ext_KeyShare_SH(server_share=KeyShareEntry(group=group))
+
+        if self.cur_session.sid is not None:
+            p = TLS13ServerHello(cipher=c, sid=self.cur_session.sid, ext=ext)
+        else:
+            p = TLS13ServerHello(cipher=c, ext=ext)
+        self.add_msg(p)
+        raise self.tls13_ADDED_SERVERHELLO()
+
+    @ATMT.state()
+    def tls13_ADDED_SERVERHELLO(self):
+        # If the client proposed a non-empty session ID in his ClientHello
+        # he requested the middlebox compatibility mode (RFC8446, appendix D.4)
+        # In this case, the server should send a dummy ChangeCipherSpec in
+        # between the ServerHello and the encrypted handshake messages
+        if self.cur_session.sid is not None:
+            self.add_record(is_tls12=True)
+            self.add_msg(TLSChangeCipherSpec())
+        pass
+
+    @ATMT.condition(tls13_ADDED_SERVERHELLO)
+    def tls13_should_add_EncryptedExtensions(self):
+        self.add_record(is_tls13=True)
+        self.add_msg(TLSEncryptedExtensions(extlen=0))
+        raise self.tls13_ADDED_ENCRYPTEDEXTENSIONS()
+
+    @ATMT.state()
+    def tls13_ADDED_ENCRYPTEDEXTENSIONS(self):
+        pass
+
+    @ATMT.condition(tls13_ADDED_ENCRYPTEDEXTENSIONS)
+    def tls13_should_add_CertificateRequest(self):
+        if self.client_auth:
+            ext = [TLS_Ext_SignatureAlgorithms(sig_algs=["sha256+rsaepss"])]
+            p = TLS13CertificateRequest(ext=ext)
+            self.add_msg(p)
+        raise self.tls13_ADDED_CERTIFICATEREQUEST()
+
+    @ATMT.state()
+    def tls13_ADDED_CERTIFICATEREQUEST(self):
+        pass
+
+    @ATMT.condition(tls13_ADDED_CERTIFICATEREQUEST)
+    def tls13_should_add_Certificate(self):
+        # If a PSK is set, an extension pre_shared_key
+        # was send in the ServerHello. No certificate should
+        # be send here
+        if not self.cur_session.tls13_psk_secret:
+            certs = []
+            for c in self.cur_session.server_certs:
+                certs += _ASN1CertAndExt(cert=c)
+
+            self.add_msg(TLS13Certificate(certs=certs))
+        raise self.tls13_ADDED_CERTIFICATE()
+
+    @ATMT.state()
+    def tls13_ADDED_CERTIFICATE(self):
+        pass
+
+    @ATMT.condition(tls13_ADDED_CERTIFICATE)
+    def tls13_should_add_CertificateVerifiy(self):
+        if not self.cur_session.tls13_psk_secret:
+            self.add_msg(TLSCertificateVerify())
+        raise self.tls13_ADDED_CERTIFICATEVERIFY()
+
+    @ATMT.state()
+    def tls13_ADDED_CERTIFICATEVERIFY(self):
+        pass
+
+    @ATMT.condition(tls13_ADDED_CERTIFICATEVERIFY)
+    def tls13_should_add_Finished(self):
+        self.add_msg(TLSFinished())
+        raise self.tls13_ADDED_SERVERFINISHED()
+
+    @ATMT.state()
+    def tls13_ADDED_SERVERFINISHED(self):
+        pass
+
+    @ATMT.condition(tls13_ADDED_SERVERFINISHED)
+    def tls13_should_send_ServerFlight1(self):
+        self.flush_records()
+        raise self.tls13_WAITING_CLIENTFLIGHT2()
+
+    @ATMT.state()
+    def tls13_WAITING_CLIENTFLIGHT2(self):
+        self.get_next_msg()
+        raise self.tls13_RECEIVED_CLIENTFLIGHT2()
+
+    @ATMT.state()
+    def tls13_RECEIVED_CLIENTFLIGHT2(self):
+        pass
+
+    @ATMT.condition(tls13_RECEIVED_CLIENTFLIGHT2, prio=1)
+    def tls13_should_handle_ClientFlight2(self):
+        self.raise_on_packet(TLS13Certificate,
+                             self.TLS13_HANDLED_CLIENTCERTIFICATE)
+
+    @ATMT.condition(tls13_RECEIVED_CLIENTFLIGHT2, prio=2)
+    def tls13_should_handle_Alert_from_ClientCertificate(self):
+        self.raise_on_packet(TLSAlert,
+                             self.TLS13_HANDLED_ALERT_FROM_CLIENTCERTIFICATE)
+
+    @ATMT.state()
+    def TLS13_HANDLED_ALERT_FROM_CLIENTCERTIFICATE(self):
+        self.vprint("Received Alert message instead of ClientKeyExchange!")
+        self.vprint(self.cur_pkt.mysummary())
+        raise self.CLOSE_NOTIFY()
+
+    # For Middlebox compatibility (see RFC8446, appendix D.4)
+    # a dummy ChangeCipherSpec record can be send. In this case,
+    # this function just read the ChangeCipherSpec message and
+    # go back in a previous state continuing with the next TLS 1.3
+    # record
+    @ATMT.condition(tls13_RECEIVED_CLIENTFLIGHT2, prio=3)
+    def tls13_should_handle_ClientCCS(self):
+        self.raise_on_packet(TLSChangeCipherSpec,
+                             self.tls13_RECEIVED_CLIENTFLIGHT2)
+
+    @ATMT.condition(tls13_RECEIVED_CLIENTFLIGHT2, prio=4)
+    def tls13_no_ClientCertificate(self):
+        if self.client_auth:
+            raise self.TLS13_MISSING_CLIENTCERTIFICATE()
+        self.raise_on_packet(TLSFinished,
+                             self.TLS13_HANDLED_CLIENTFINISHED)
+
+    # RFC8446, section 4.4.2.4 :
+    # "If the client does not send any certificates (i.e., it sends an empty
+    # Certificate message), the server MAY at its discretion either
+    # continue the handshake without client authentication or abort the
+    # handshake with a "certificate_required" alert."
+    # Here, we abort the handshake.
+    @ATMT.state()
+    def TLS13_HANDLED_CLIENTCERTIFICATE(self):
+        if self.client_auth:
+            self.vprint("Received client certificate chain...")
+            if isinstance(self.cur_pkt, TLS13Certificate):
+                if self.cur_pkt.certslen == 0:
+                    self.vprint("but it's empty !")
+                    raise self.TLS13_MISSING_CLIENTCERTIFICATE()
+
+    @ATMT.condition(TLS13_HANDLED_CLIENTCERTIFICATE)
+    def tls13_should_handle_ClientCertificateVerify(self):
+        self.raise_on_packet(TLSCertificateVerify,
+                             self.TLS13_HANDLED_CLIENT_CERTIFICATEVERIFY)
+
+    @ATMT.condition(TLS13_HANDLED_CLIENTCERTIFICATE, prio=2)
+    def tls13_no_Client_CertificateVerify(self):
+        if self.client_auth:
+            raise self.TLS13_MISSING_CLIENTCERTIFICATE()
+        raise self.TLS13_HANDLED_CLIENT_CERTIFICATEVERIFY()
+
+    @ATMT.state()
+    def TLS13_HANDLED_CLIENT_CERTIFICATEVERIFY(self):
+        pass
+
+    @ATMT.condition(TLS13_HANDLED_CLIENT_CERTIFICATEVERIFY)
+    def tls13_should_handle_ClientFinished(self):
+        self.raise_on_packet(TLSFinished,
+                             self.TLS13_HANDLED_CLIENTFINISHED)
+
+    @ATMT.state()
+    def TLS13_MISSING_CLIENTCERTIFICATE(self):
+        self.vprint("Missing ClientCertificate!")
+        self.add_record()
+        self.add_msg(TLSAlert(level=2, descr=0x74))
+        self.flush_records()
+        self.vprint("Sending TLSAlert 116")
+        self.socket.close()
+        raise self.WAITING_CLIENT()
+
+    @ATMT.state()
+    def TLS13_HANDLED_CLIENTFINISHED(self):
+        self.vprint("TLS handshake completed!")
+        self.vprint_sessioninfo()
+        if self.is_echo_server:
+            self.vprint("Will now act as a simple echo server.")
+        raise self.WAITING_CLIENTDATA()
+
+    #                       end of TLS 1.3 handshake                          #
+
     @ATMT.state()
     def WAITING_CLIENTDATA(self):
         self.get_next_msg(self.max_client_idle_time, 1)
@@ -491,6 +941,45 @@
     def RECEIVED_CLIENTDATA(self):
         pass
 
+    def save_ticket(self, ticket):
+        """
+        This function save a ticket and others parameters in the
+        file given as argument to the automaton
+        Warning : The file is not protected and contains sensitive
+        information. It should be used only for testing purpose.
+        """
+        if (not isinstance(ticket, TLS13NewSessionTicket) or
+                self.session_ticket_file is None):
+            return
+
+        s = self.cur_session
+        with open(self.session_ticket_file, "ab") as f:
+            # ticket;ticket_nonce;obfuscated_age;start_time;resumption_secret
+            line = binascii.hexlify(ticket.ticket)
+            line += b";"
+            line += binascii.hexlify(ticket.ticket_nonce)
+            line += b";"
+            line += binascii.hexlify(struct.pack("!I", ticket.ticket_lifetime))
+            line += b";"
+            line += binascii.hexlify(struct.pack("!I", ticket.ticket_age_add))
+            line += b";"
+            line += binascii.hexlify(struct.pack("!I", int(time.time())))
+            line += b";"
+            line += binascii.hexlify(s.tls13_derived_secrets["resumption_secret"])  # noqa: E501
+            line += b";"
+            line += binascii.hexlify(struct.pack("!H", s.wcs.ciphersuite.val))
+            line += b";"
+            if (ticket.ext is None or ticket.extlen is None or
+                    ticket.extlen == 0):
+                line += binascii.hexlify(struct.pack("!I", 0))
+            else:
+                for e in ticket.ext:
+                    if isinstance(e, TLS_Ext_EarlyDataIndicationTicket):
+                        max_size = struct.pack("!I", e.max_early_data_size)
+                        line += binascii.hexlify(max_size)
+            line += b"\n"
+            f.write(line)
+
     @ATMT.condition(RECEIVED_CLIENTDATA)
     def should_handle_ClientData(self):
         if not self.buffer_in:
@@ -504,12 +993,18 @@
             print("> Received: %r" % p.data)
             recv_data = p.data
             lines = recv_data.split(b"\n")
-            for l in lines:
-                if l.startswith(b"stop_server"):
+            for line in lines:
+                if line.startswith(b"stop_server"):
                     raise self.CLOSE_NOTIFY_FINAL()
         elif isinstance(p, TLSAlert):
             print("> Received: %r" % p)
             raise self.CLOSE_NOTIFY()
+        elif isinstance(p, TLS13KeyUpdate):
+            print("> Received: %r" % p)
+            p = TLS13KeyUpdate(request_update=0)
+            self.add_record()
+            self.add_msg(p)
+            raise self.ADDED_SERVERDATA()
         else:
             print("> Received: %r" % p)
 
@@ -519,6 +1014,10 @@
         if self.is_echo_server or recv_data.startswith(b"GET / HTTP/1.1"):
             self.add_record()
             self.add_msg(p)
+            if self.handle_session_ticket:
+                self.add_record()
+                ticket = TLS13NewSessionTicket(ext=[])
+                self.add_msg(ticket)
             raise self.ADDED_SERVERDATA()
 
         raise self.HANDLED_CLIENTDATA()
@@ -533,7 +1032,24 @@
 
     @ATMT.condition(ADDED_SERVERDATA)
     def should_send_ServerData(self):
+        if self.session_ticket_file:
+            save_ticket = False
+            for p in self.buffer_out:
+                if isinstance(p, TLS13):
+                    # Check if there's a NewSessionTicket to send
+                    save_ticket = all(map(lambda x: isinstance(x, TLS13NewSessionTicket),  # noqa: E501
+                                          p.inner.msg))
+                    if save_ticket:
+                        break
         self.flush_records()
+        if self.session_ticket_file and save_ticket:
+            # Loop backward in message send to retrieve the parsed
+            # NewSessionTicket. This message is not completely build before the
+            # flush_records() call. Other way to build this message before ?
+            for p in reversed(self.cur_session.handshake_messages_parsed):
+                if isinstance(p, TLS13NewSessionTicket):
+                    self.save_ticket(p)
+                    break
         raise self.SENT_SERVERDATA()
 
     @ATMT.state()
@@ -570,7 +1086,7 @@
             self.flush_records()
         except Exception:
             self.vprint("Could not send termination Alert, maybe the client left?")  # noqa: E501
-        # We might call shutdown, but unit tests with s_client fail with this.
+        # We might call shutdown, but unit tests with s_client fail with this
         # self.socket.shutdown(1)
         self.socket.close()
         raise self.FINAL()
@@ -806,8 +1322,8 @@
             print("> Received: %r" % p)
 
         lines = cli_data.split(b"\n")
-        for l in lines:
-            if l.startswith(b"stop_server"):
+        for line in lines:
+            if line.startswith(b"stop_server"):
                 raise self.SSLv2_CLOSE_NOTIFY_FINAL()
 
         if cli_data.startswith(b"GET / HTTP/1.1"):

scapy-2.4.3.tar.gz/scapy/layers/tls/cert.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/cert.py Changed

@@ -15,12 +15,14 @@
 If you need to modify an import, just use the corresponding ASN1_Packet.
 
 For instance, here is what you could do in order to modify the serial of
-'cert' and then resign it with whatever 'key':
+'cert' and then resign it with whatever 'key'::
+
     f = open('cert.der')
     c = X509_Cert(f.read())
     c.tbsCertificate.serialNumber = 0x4B1D
     k = PrivKey('key.pem')
     new_x509_cert = k.resignCert(c)
+
 No need for obnoxious openssl tweaking anymore. :)
 """
 
@@ -49,7 +51,6 @@
     from cryptography.hazmat.backends import default_backend
     from cryptography.hazmat.primitives import serialization
     from cryptography.hazmat.primitives.asymmetric import rsa, ec
-if conf.crypto_valid_recent:
     from cryptography.hazmat.backends.openssl.ec import InvalidSignature
 
 
@@ -67,7 +68,7 @@
 @conf.commands.register
 def der2pem(der_string, obj="UNKNOWN"):
     """Convert DER octet string to PEM format (with optional header)"""
-    # Encode a byte string in PEM format. Header advertizes <obj> type.
+    # Encode a byte string in PEM format. Header advertises <obj> type.
     pem_string = ("-----BEGIN %s-----\n" % obj).encode()
     base64_string = base64.b64encode(der_string)
     chunks = [base64_string[i:i + 64] for i in range(0, len(base64_string), 64)]  # noqa: E501
@@ -139,9 +140,8 @@
             if _size > obj_max_size:
                 raise Exception(error_msg)
             try:
-                f = open(obj_path, "rb")
-                _raw = f.read()
-                f.close()
+                with open(obj_path, "rb") as f:
+                    _raw = f.read()
             except Exception:
                 raise Exception(error_msg)
         else:
@@ -329,16 +329,11 @@
     @crypto_validator
     def verify(self, msg, sig, h="sha256", **kwargs):
         # 'sig' should be a DER-encoded signature, as per RFC 3279
-        if conf.crypto_valid_recent:
-            try:
-                self.pubkey.verify(sig, msg, ec.ECDSA(_get_hash(h)))
-                return True
-            except InvalidSignature:
-                return False
-        else:
-            verifier = self.pubkey.verifier(sig, ec.ECDSA(_get_hash(h)))
-            verifier.update(msg)
-            return verifier.verify()
+        try:
+            self.pubkey.verify(sig, msg, ec.ECDSA(_get_hash(h)))
+            return True
+        except InvalidSignature:
+            return False
 
 
 ################
@@ -538,25 +533,15 @@
     @crypto_validator
     def verify(self, msg, sig, h="sha256", **kwargs):
         # 'sig' should be a DER-encoded signature, as per RFC 3279
-        if conf.crypto_valid_recent:
-            try:
-                self.pubkey.verify(sig, msg, ec.ECDSA(_get_hash(h)))
-                return True
-            except InvalidSignature:
-                return False
-        else:
-            verifier = self.pubkey.verifier(sig, ec.ECDSA(_get_hash(h)))
-            verifier.update(msg)
-            return verifier.verify()
+        try:
+            self.pubkey.verify(sig, msg, ec.ECDSA(_get_hash(h)))
+            return True
+        except InvalidSignature:
+            return False
 
     @crypto_validator
     def sign(self, data, h="sha256", **kwargs):
-        if conf.crypto_valid_recent:
-            return self.key.sign(data, ec.ECDSA(_get_hash(h)))
-        else:
-            signer = self.key.signer(ec.ECDSA(_get_hash(h)))
-            signer.update(data)
-            return signer.finalize()
+        return self.key.sign(data, ec.ECDSA(_get_hash(h)))
 
 
 ################
@@ -741,12 +726,11 @@
         """
         Export certificate in 'fmt' format (DER or PEM) to file 'filename'
         """
-        f = open(filename, "wb")
-        if fmt == "DER":
-            f.write(self.der)
-        elif fmt == "PEM":
-            f.write(self.pem)
-        f.close()
+        with open(filename, "wb") as f:
+            if fmt == "DER":
+                f.write(self.der)
+            elif fmt == "PEM":
+                f.write(self.pem)
 
     def show(self):
         print("Serial: %s" % self.serial)
@@ -938,9 +922,8 @@
         certificates can be passed (as a file, this time).
         """
         try:
-            f = open(cafile, "rb")
-            ca_certs = f.read()
-            f.close()
+            with open(cafile, "rb") as f:
+                ca_certs = f.read()
         except Exception:
             raise Exception("Could not read from cafile")
 
@@ -949,9 +932,8 @@
         untrusted = None
         if untrusted_file:
             try:
-                f = open(untrusted_file, "rb")
-                untrusted_certs = f.read()
-                f.close()
+                with open(untrusted_file, "rb") as f:
+                    untrusted_certs = f.read()
             except Exception:
                 raise Exception("Could not read from untrusted_file")
             untrusted = [Cert(c) for c in split_pem(untrusted_certs)]
@@ -969,16 +951,16 @@
         try:
             anchors = []
             for cafile in os.listdir(capath):
-                anchors.append(Cert(open(os.path.join(capath, cafile), "rb").read()))  # noqa: E501
+                with open(os.path.join(capath, cafile), "rb") as fd:
+                    anchors.append(Cert(fd.read()))
         except Exception:
             raise Exception("capath provided is not a valid cert path")
 
         untrusted = None
         if untrusted_file:
             try:
-                f = open(untrusted_file, "rb")
-                untrusted_certs = f.read()
-                f.close()
+                with open(untrusted_file, "rb") as f:
+                    untrusted_certs = f.read()
             except Exception:
                 raise Exception("Could not read from untrusted_file")
             untrusted = [Cert(c) for c in split_pem(untrusted_certs)]

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/all.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/all.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/cipher_aead.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/cipher_aead.py Changed

@@ -329,8 +329,7 @@
         else:
             if (conf.crypto_valid_advanced and
                     isinstance(self._cipher, AESCCM)):
-                res = self._cipher.encrypt(self._get_nonce(seq_num), P, A,
-                                           tag_length=self.tag_len)
+                res = self._cipher.encrypt(self._get_nonce(seq_num), P, A)
             else:
                 res = self._cipher.encrypt(self._get_nonce(seq_num), P, A)
         return res
@@ -360,8 +359,7 @@
             try:
                 if (conf.crypto_valid_advanced and
                         isinstance(self._cipher, AESCCM)):
-                    P = self._cipher.decrypt(self._get_nonce(seq_num), C + mac, A,  # noqa: E501
-                                             tag_length=self.tag_len)
+                    P = self._cipher.decrypt(self._get_nonce(seq_num), C + mac, A)  # noqa: E501
                 else:
                     if (conf.crypto_valid_advanced and
                             isinstance(self, Cipher_CHACHA20_POLY1305)):

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/groups.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/groups.py Changed

@@ -15,10 +15,16 @@
 from __future__ import absolute_import
 
 from scapy.config import conf
+from scapy.error import warning
 from scapy.utils import long_converter
 import scapy.modules.six as six
 if conf.crypto_valid:
     from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives.asymmetric import dh, ec
+    from cryptography.hazmat.primitives import serialization
+if conf.crypto_valid_advanced:
+    from cryptography.hazmat.primitives.asymmetric import x25519
+    from cryptography.hazmat.primitives.asymmetric import x448
 
 # We have to start by a dirty hack in order to allow long generators,
 # which some versions of openssl love to use...
@@ -435,6 +441,79 @@
 _tls_named_groups.update(_tls_named_curves)
 
 
+def _tls_named_groups_import(group, pubbytes):
+    if group in _tls_named_ffdh_groups:
+        params = _ffdh_groups[_tls_named_ffdh_groups[group]][0]
+        pn = params.parameter_numbers()
+        public_numbers = dh.DHPublicNumbers(pubbytes, pn)
+        return public_numbers.public_key(default_backend())
+    elif group in _tls_named_curves:
+        if _tls_named_curves[group] in ["x25519", "x448"]:
+            if conf.crypto_valid_advanced:
+                if _tls_named_curves[group] == "x25519":
+                    import_point = x25519.X25519PublicKey.from_public_bytes
+                else:
+                    import_point = x448.X448PublicKey.from_public_bytes
+                return import_point(pubbytes)
+        else:
+            curve = ec._CURVE_TYPES[_tls_named_curves[group]]()
+            try:  # cryptography >= 2.5
+                return ec.EllipticCurvePublicKey.from_encoded_point(
+                    curve,
+                    pubbytes
+                )
+            except AttributeError:
+                pub_num = ec.EllipticCurvePublicNumbers.from_encoded_point(
+                    curve,
+                    pubbytes
+                ).public_numbers()
+                return pub_num.public_key(default_backend())
+
+
+def _tls_named_groups_pubbytes(privkey):
+    if isinstance(privkey, dh.DHPrivateKey):
+        pubkey = privkey.public_key()
+        return pubkey.public_numbers().y
+    elif isinstance(privkey, (x25519.X25519PrivateKey,
+                              x448.X448PrivateKey)):
+        pubkey = privkey.public_key()
+        return pubkey.public_bytes(
+            serialization.Encoding.Raw,
+            serialization.PublicFormat.Raw
+        )
+    else:
+        pubkey = privkey.public_key()
+        try:
+            # cryptography >= 2.5
+            return pubkey.public_bytes(
+                serialization.Encoding.X962,
+                serialization.PublicFormat.UncompressedPoint
+            )
+        except TypeError:
+            # older versions
+            return pubkey.public_numbers().encode_point()
+
+
+def _tls_named_groups_generate(group):
+    if group in _tls_named_ffdh_groups:
+        params = _ffdh_groups[_tls_named_ffdh_groups[group]][0]
+        return params.generate_private_key()
+    elif group in _tls_named_curves:
+        group_name = _tls_named_curves[group]
+        if group_name in ["x25519", "x448"]:
+            if conf.crypto_valid_advanced:
+                if group_name == "x25519":
+                    return x25519.X25519PrivateKey.generate()
+                else:
+                    return x448.X448PrivateKey.generate()
+            else:
+                warning(
+                    "Your cryptography version doesn't support " + group_name
+                )
+        else:
+            curve = ec._CURVE_TYPES[_tls_named_curves[group]]()
+            return ec.generate_private_key(curve, default_backend())
+
 # Below lies ghost code since the shift from 'ecdsa' to 'cryptography' lib.
 # Part of the code has been kept, but commented out, in case anyone would like
 # to improve ECC support in 'cryptography' (namely for the compressed point

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/pkcs1.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/pkcs1.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/prf.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/prf.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/crypto/suites.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/crypto/suites.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/extensions.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/extensions.py Changed

@@ -8,6 +8,7 @@
 
 from __future__ import print_function
 
+import os
 import struct
 
 from scapy.fields import ByteEnumField, ByteField, EnumField, FieldLenField, \
@@ -20,11 +21,31 @@
                                           SigAndHashAlgsField, _tls_hash_sig)
 from scapy.layers.tls.session import _GenericTLSSessionInheritance
 from scapy.layers.tls.crypto.groups import _tls_named_groups
+from scapy.layers.tls.crypto.suites import _tls_cipher_suites
 from scapy.themes import AnsiColorTheme
 from scapy.compat import raw
 from scapy.config import conf
 
 
+# Because ServerHello and HelloRetryRequest have the same
+# msg_type, the only way to distinguish these message is by
+# checking the random_bytes. If the random_bytes are equal to
+# SHA256('HelloRetryRequest') then we know this is a
+# HelloRetryRequest and the TLS_Ext_KeyShare must be parsed as
+# TLS_Ext_KeyShare_HRR and not as TLS_Ext_KeyShare_SH
+
+# from cryptography.hazmat.backends import default_backend
+# from cryptography.hazmat.primitives import hashes
+# digest = hashes.Hash(hashes.SHA256(), backend=default_backend())
+# digest.update(b"HelloRetryRequest")
+# _tls_hello_retry_magic = digest.finalize()
+
+_tls_hello_retry_magic = (
+    b'\xcf!\xadt\xe5\x9aa\x11\xbe\x1d\x8c\x02\x1ee\xb8\x91\xc2\xa2\x11'
+    b'\x16z\xbb\x8c^\x07\x9e\t\xe2\xc8\xa83\x9c'
+)
+
+
 _tls_ext = {0: "server_name",             # RFC 4366
             1: "max_fragment_length",     # RFC 4366
             2: "client_certificate_url",  # RFC 4366
@@ -61,7 +82,8 @@
             0x33: "key_share",
             0x3374: "next_protocol_negotiation",
             # RFC-draft-agl-tls-nextprotoneg-03
-            0xff01: "renegotiation_info"   # RFC 5746
+            0xff01: "renegotiation_info",   # RFC 5746
+            0xffce: "encrypted_server_name"
             }
 
 
@@ -182,6 +204,27 @@
                                    length_from=lambda pkt: pkt.servernameslen)]
 
 
+class TLS_Ext_EncryptedServerName(TLS_Ext_PrettyPacketList):
+    name = "TLS Extension - Encrypted Server Name"
+    fields_desc = [ShortEnumField("type", 0xffce, _tls_ext),
+                   ShortField("len", None),
+                   EnumField("cipher", None, _tls_cipher_suites),
+                   ShortEnumField("key_exchange_group", None,
+                                  _tls_named_groups),
+                   FieldLenField("key_exchange_len", None,
+                                 length_of="key_exchange", fmt="H"),
+                   XStrLenField("key_exchange", "",
+                                length_from=lambda pkt: pkt.key_exchange_len),
+                   FieldLenField("record_digest_len",
+                                 None, length_of="record_digest"),
+                   XStrLenField("record_digest", "",
+                                length_from=lambda pkt: pkt.record_digest_len),
+                   FieldLenField("encrypted_sni_len", None,
+                                 length_of="encrypted_sni", fmt="H"),
+                   XStrLenField("encrypted_sni", "",
+                                length_from=lambda pkt: pkt.encrypted_sni_len)]
+
+
 class TLS_Ext_MaxFragLen(TLS_Ext_Unknown):                          # RFC 4366
     name = "TLS Extension - Max Fragment Length"
     fields_desc = [ShortEnumField("type", 1, _tls_ext),
@@ -501,7 +544,7 @@
 
 class TLS_Ext_KeyShare(TLS_Ext_Unknown):
     name = "TLS Extension - Key Share (dummy class)"
-    fields_desc = [ShortEnumField("type", 0x28, _tls_ext),
+    fields_desc = [ShortEnumField("type", 0x33, _tls_ext),
                    ShortField("len", None)]
 
 
@@ -566,6 +609,12 @@
                    XStrLenField("cookie", "",
                                 length_from=lambda pkt: pkt.cookielen)]
 
+    def build(self):
+        fval = self.getfieldval("cookie")
+        if fval is None or fval == b"":
+            self.cookie = os.urandom(32)
+        return TLS_Ext_Unknown.build(self)
+
 
 _tls_psk_kx_modes = {0: "psk_ke", 1: "psk_dhe_ke"}
 
@@ -669,7 +718,8 @@
                 # 0x2f: TLS_Ext_CertificateAuthorities,       #XXX
                 # 0x30: TLS_Ext_OIDFilters,                   #XXX
                 0x3374: TLS_Ext_NPN,
-                0xff01: TLS_Ext_RenegotiationInfo
+                0xff01: TLS_Ext_RenegotiationInfo,
+                0xffce: TLS_Ext_EncryptedServerName
                 }
 
 
@@ -710,7 +760,12 @@
 
                 i = self.adjust(pkt, f)
                 if i == 0:  # for correct build if no ext and not explicitly 0
-                    return s
+                    v = pkt.tls_session.tls_version
+                    # With TLS 1.3, zero lengths are always explicit.
+                    if v is None or v < 0x0304:
+                        return s
+                    else:
+                        return s + struct.pack(self.fmt, i)
         return s + struct.pack(self.fmt, i)
 
 
@@ -724,8 +779,8 @@
         return len(self.i2m(pkt, i))
 
     def getfield(self, pkt, s):
-        tmp_len = self.length_from(pkt)
-        if tmp_len is None:
+        tmp_len = self.length_from(pkt) or 0
+        if tmp_len <= 0:
             return s, []
         return s[tmp_len:], self.m2i(pkt, s[:tmp_len])
 
@@ -758,8 +813,15 @@
                 #  - TLS_Ext_KeyShare_HRR if message is a ServerHello and
                 #    the client has not provided a sufficient "key_share"
                 #    extension
-                from scapy.layers.tls.keyexchange_tls13 import _tls_ext_keyshare_cls  # noqa: E501
-                cls = _tls_ext_keyshare_cls.get(pkt.msgtype, TLS_Ext_Unknown)
+                from scapy.layers.tls.keyexchange_tls13 import (
+                    _tls_ext_keyshare_cls, _tls_ext_keyshare_hrr_cls)
+                # If SHA-256("HelloRetryRequest") == server_random,
+                # this message is a HelloRetryRequest
+                if pkt.random_bytes and \
+                        pkt.random_bytes == _tls_hello_retry_magic:
+                    cls = _tls_ext_keyshare_hrr_cls.get(pkt.msgtype, TLS_Ext_Unknown)  # noqa: E501
+                else:
+                    cls = _tls_ext_keyshare_cls.get(pkt.msgtype, TLS_Ext_Unknown)  # noqa: E501
             elif cls is TLS_Ext_PreSharedKey:
                 from scapy.layers.tls.keyexchange_tls13 import _tls_ext_presharedkey_cls  # noqa: E501
                 cls = _tls_ext_presharedkey_cls.get(pkt.msgtype, TLS_Ext_Unknown)  # noqa: E501

scapy-2.4.3.tar.gz/scapy/layers/tls/handshake.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/handshake.py Changed

@@ -1,6 +1,7 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
 #               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
@@ -12,12 +13,25 @@
 
 from __future__ import absolute_import
 import math
+import os
 import struct
 
 from scapy.error import log_runtime, warning
-from scapy.fields import ByteEnumField, ByteField, EnumField, Field, \
-    FieldLenField, IntField, PacketField, PacketListField, ShortField, \
-    StrFixedLenField, StrLenField, ThreeBytesField, UTCTimeField
+from scapy.fields import (
+    ByteEnumField,
+    ByteField,
+    Field,
+    FieldLenField,
+    IntField,
+    PacketField,
+    PacketListField,
+    ShortEnumField,
+    ShortField,
+    StrFixedLenField,
+    StrLenField,
+    ThreeBytesField,
+    UTCTimeField,
+)
 
 from scapy.compat import hex_bytes, orb, raw
 from scapy.config import conf
@@ -29,16 +43,19 @@
 from scapy.layers.tls.basefields import (_tls_version, _TLSVersionField,
                                          _TLSClientVersionField)
 from scapy.layers.tls.extensions import (_ExtensionsLenField, _ExtensionsField,
-                                         _cert_status_type, TLS_Ext_SupportedVersion_CH,  # noqa: E501
+                                         _cert_status_type,
+                                         TLS_Ext_SupportedVersion_CH,
                                          TLS_Ext_SignatureAlgorithms,
                                          TLS_Ext_SupportedVersion_SH,
-                                         TLS_Ext_EarlyDataIndication)
+                                         TLS_Ext_EarlyDataIndication,
+                                         _tls_hello_retry_magic)
 from scapy.layers.tls.keyexchange import (_TLSSignature, _TLSServerParamsField,
                                           _TLSSignatureField, ServerRSAParams,
                                           SigAndHashAlgsField, _tls_hash_sig,
                                           SigAndHashAlgsLenField)
 from scapy.layers.tls.session import (_GenericTLSSessionInheritance,
                                       readConnState, writeConnState)
+from scapy.layers.tls.keyexchange_tls13 import TLS_Ext_PreSharedKey_CH
 from scapy.layers.tls.crypto.compression import (_tls_compression_algs,
                                                  _tls_compression_algs_cls,
                                                  Comp_NULL, _GenericComp,
@@ -47,6 +64,11 @@
                                             _tls_cipher_suites_cls,
                                             _GenericCipherSuite,
                                             _GenericCipherSuiteMetaclass)
+from scapy.layers.tls.crypto.hkdf import TLS13_HKDF
+
+if conf.crypto_valid:
+    from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import hashes
 
 
 ###############################################################################
@@ -286,9 +308,12 @@
         along with the raw string representing this handshake message.
         """
         super(TLSClientHello, self).tls_session_update(msg_str)
-
         s = self.tls_session
         s.advertised_tls_version = self.version
+        # This ClientHello could be a 1.3 one. Let's store the sid
+        # in all cases
+        if self.sidlen and self.sidlen > 0:
+            s.sid = self.sid
         self.random_bytes = msg_str[10:38]
         s.client_random = (struct.pack('!I', self.gmt_unix_time) +
                            self.random_bytes)
@@ -299,13 +324,20 @@
         if self.ext:
             for e in self.ext:
                 if isinstance(e, TLS_Ext_SupportedVersion_CH):
-                    s.advertised_tls_version = e.versions[0]
+                    for ver in e.versions:
+                        # RFC 8701: GREASE of TLS will send unknown versions
+                        # here. We have to ignore them
+                        if ver in _tls_version:
+                            s.advertised_tls_version = ver
+                            break
+                    if s.sid:
+                        s.middlebox_compatibility = True
 
                 if isinstance(e, TLS_Ext_SignatureAlgorithms):
                     s.advertised_sig_algs = e.sig_algs
 
 
-class TLS13ClientHello(TLSClientHello):
+class TLS13ClientHello(_TLSHandshake):
     """
     TLS 1.3 ClientHello, with abilities to handle extensions.
 
@@ -345,7 +377,66 @@
     def post_build(self, p, pay):
         if self.random_bytes is None:
             p = p[:6] + randstring(32) + p[6 + 32:]
-        return super(TLS13ClientHello, self).post_build(p, pay)
+        # We don't call the post_build function from class _TLSHandshake
+        # to compute the message length because we need that value now
+        # for the HMAC in binder
+        tmp_len = len(p)
+        if self.msglen is None:
+            sz = tmp_len - 4
+            p = struct.pack("!I", (orb(p[0]) << 24) | sz) + p[4:]
+        s = self.tls_session
+        if self.ext:
+            for e in self.ext:
+                if isinstance(e, TLS_Ext_PreSharedKey_CH):
+                    if s.client_session_ticket:
+                        # For a resumed PSK, the hash function use
+                        # to compute the binder must be the same
+                        # as the one used to establish the original
+                        # conntection. For that, we assume that
+                        # the ciphersuite associate with the ticket
+                        # is given as argument to tlsSession
+                        # (see layers/tls/automaton_cli.py for an
+                        # example)
+                        res_suite = s.tls13_ticket_ciphersuite
+                        cs_cls = _tls_cipher_suites_cls[res_suite]
+                        hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+                        hash_len = hkdf.hash.digest_size
+                        s.compute_tls13_early_secrets(external=False)
+                    else:
+                        # For out of band PSK, SHA-256 is used as default
+                        # hash functions for HKDF
+                        hkdf = TLS13_HKDF("sha256")
+                        hash_len = hkdf.hash.digest_size
+                        s.compute_tls13_early_secrets(external=True)
+
+                    # RFC8446 4.2.11.2
+                    # "Each entry in the binders list is computed as an HMAC
+                    # over a transcript hash (see Section 4.4.1) containing a
+                    # partial ClientHello up to and including the
+                    # PreSharedKeyExtension.identities field."
+                    # PSK Binders field is :
+                    #   - PSK Binders length (2 bytes)
+                    #   - First PSK Binder length (1 byte) +
+                    #         HMAC (hash_len bytes)
+                    # The PSK Binder is computed in the same way as the
+                    # Finished message with binder_key as BaseKey
+
+                    handshake_context = b""
+                    if s.tls13_retry:
+                        for m in s.handshake_messages:
+                            handshake_context += m
+                    handshake_context += p[:-hash_len - 3]
+
+                    binder_key = s.tls13_derived_secrets["binder_key"]
+                    psk_binder = hkdf.compute_verify_data(binder_key,
+                                                          handshake_context)
+
+                    # Here, we replaced the last 32 bytes of the packet by the
+                    # new HMAC values computed over the ClientHello (without
+                    # the binders)
+                    p = p[:-hash_len] + psk_binder
+
+        return p + pay
 
     def tls_session_update(self, msg_str):
         """
@@ -357,12 +448,19 @@
 
         if self.sidlen and self.sidlen > 0:
             s.sid = self.sid
+            s.middlebox_compatibility = True
+
         self.random_bytes = msg_str[10:38]
         s.client_random = self.random_bytes
         if self.ext:
             for e in self.ext:
                 if isinstance(e, TLS_Ext_SupportedVersion_CH):
-                    self.tls_session.advertised_tls_version = e.versions[0]
+                    for ver in e.versions:
+                        # RFC 8701: GREASE of TLS will send unknown versions
+                        # here. We have to ignore them
+                        if ver in _tls_version:
+                            self.tls_session.advertised_tls_version = ver
+                            break
                 if isinstance(e, TLS_Ext_SignatureAlgorithms):
                     s.advertised_sig_algs = e.sig_algs
 
@@ -395,7 +493,7 @@
                    _SessionIDField("sid", "",
                                    length_from=lambda pkt: pkt.sidlen),
 
-                   EnumField("cipher", None, _tls_cipher_suites),
+                   ShortEnumField("cipher", None, _tls_cipher_suites),
                    _CompressionMethodsField("comp", [0],
                                             _tls_compression_algs,
                                             itemfmt="B",
@@ -403,10 +501,9 @@
 
                    _ExtensionsLenField("extlen", None, length_of="ext"),
                    _ExtensionsField("ext", None,
-                                    length_from=lambda pkt: (pkt.msglen -
-                                                             (pkt.sidlen or 0) -  # noqa: E501
-                                                             38))]
-    # 40)) ]
+                                    length_from=lambda pkt: (
+                                        pkt.msglen - (pkt.sidlen or 0) - 40
+                                    ))]
 
     @classmethod
     def dispatch_hook(cls, _pkt=None, *args, **kargs):
@@ -477,7 +574,7 @@
     FieldLenField("sidlen", None, length_of="sid", fmt="B"),
     _SessionIDField("sid", "",
                     length_from=lambda pkt: pkt.sidlen),
-    EnumField("cipher", None, _tls_cipher_suites),
+    ShortEnumField("cipher", None, _tls_cipher_suites),
     _CompressionMethodsField("comp", [0],
                              _tls_compression_algs,
                              itemfmt="B",
@@ -494,6 +591,18 @@
     name = "TLS 1.3 Handshake - Server Hello"
     fields_desc = _tls_13_server_hello_fields
 
+    # ServerHello and HelloRetryRequest has the same structure and the same
+    # msgId. We need to check the server_random value to determine which it is.
+    @classmethod
+    def dispatch_hook(cls, _pkt=None, *args, **kargs):
+        if _pkt and len(_pkt) >= 38:
+            # If SHA-256("HelloRetryRequest") == server_random,
+            # this message is a HelloRetryRequest
+            random_bytes = _pkt[6:38]
+            if random_bytes == _tls_hello_retry_magic:
+                return TLS13HelloRetryRequest
+        return TLS13ServerHello
+
     def post_build(self, p, pay):
         if self.random_bytes is None:
             p = p[:6] + randstring(32) + p[6 + 32:]
@@ -527,17 +636,20 @@
                 cs_cls = _tls_cipher_suites_cls[cs_val]
 
         connection_end = s.connection_end
-
         if connection_end == "server":
             s.pwcs = writeConnState(ciphersuite=cs_cls,
                                     connection_end=connection_end,
                                     tls_version=s.tls_version)
-            s.triggered_pwcs_commit = True
+
+            if not s.middlebox_compatibility:
+                s.triggered_pwcs_commit = True
         elif connection_end == "client":
+
             s.prcs = readConnState(ciphersuite=cs_cls,
                                    connection_end=connection_end,
                                    tls_version=s.tls_version)
-            s.triggered_prcs_commit = True
+            if not s.middlebox_compatibility:
+                s.triggered_prcs_commit = True
 
         if s.tls13_early_secret is None:
             # In case the connState was not pre-initialized, we could not
@@ -561,6 +673,37 @@
 
     fields_desc = _tls_13_server_hello_fields
 
+    def build(self):
+        fval = self.getfieldval("random_bytes")
+        if fval is None:
+            self.random_bytes = _tls_hello_retry_magic
+        return _TLSHandshake.build(self)
+
+    def tls_session_update(self, msg_str):
+        s = self.tls_session
+        s.tls13_retry = True
+        s.tls13_client_pubshares = {}
+        # If the server responds to a ClientHello with a HelloRetryRequest
+        # The value of the first ClientHello is replaced by a message_hash
+        if s.client_session_ticket:
+            cs_cls = _tls_cipher_suites_cls[s.tls13_ticket_ciphersuite]
+            hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+            hash_len = hkdf.hash.digest_size
+        else:
+            cs_cls = _tls_cipher_suites_cls[self.cipher]
+            hkdf = TLS13_HKDF(cs_cls.hash_alg.name.lower())
+            hash_len = hkdf.hash.digest_size
+
+        handshake_context = struct.pack("B", 254)
+        handshake_context += struct.pack("B", 0)
+        handshake_context += struct.pack("B", 0)
+        handshake_context += struct.pack("B", hash_len)
+        digest = hashes.Hash(hkdf.hash, backend=default_backend())
+        digest.update(s.handshake_messages[0])
+        handshake_context += digest.finalize()
+        s.handshake_messages[0] = handshake_context
+        super(TLS13HelloRetryRequest, self).tls_session_update(msg_str)
+
 
 ###############################################################################
 #   EncryptedExtensions                                                       #
@@ -595,16 +738,18 @@
         # EndOfEarlyData message
         if connection_end == "server":
             if not early_data_accepted:
-                s.prcs = writeConnState(ciphersuite=type(s.wcs.ciphersuite),
-                                        connection_end=connection_end,
-                                        tls_version=s.tls_version)
+                s.prcs = readConnState(ciphersuite=type(s.wcs.ciphersuite),
+                                       connection_end=connection_end,
+                                       tls_version=s.tls_version)
 
-                s.triggered_prcs_commit = True
                 chts = s.tls13_derived_secrets["client_handshake_traffic_secret"]  # noqa: E501
                 s.prcs.tls13_derive_keys(chts)
 
-                s.rcs = self.tls_session.prcs
-                s.triggered_prcs_commit = False
+                if not s.middlebox_compatibility:
+                    s.rcs = self.tls_session.prcs
+                    s.triggered_prcs_commit = False
+                else:
+                    s.triggered_prcs_commit = True
 
     def post_dissection_tls_session_update(self, msg_str):
         self.tls_session_update(msg_str)
@@ -628,13 +773,13 @@
                 s.pwcs = writeConnState(ciphersuite=type(s.rcs.ciphersuite),
                                         connection_end=connection_end,
                                         tls_version=s.tls_version)
-
-                s.triggered_pwcs_commit = True
                 chts = s.tls13_derived_secrets["client_handshake_traffic_secret"]  # noqa: E501
                 s.pwcs.tls13_derive_keys(chts)
-
-                s.wcs = self.tls_session.pwcs
-                s.triggered_pwcs_commit = False
+                if not s.middlebox_compatibility:
+                    s.wcs = self.tls_session.pwcs
+                    s.triggered_pwcs_commit = False
+                else:
+                    s.triggered_prcs_commit = True
 ###############################################################################
 #   Certificate                                                               #
 ###############################################################################
@@ -844,7 +989,7 @@
                                       length_from=lambda pkt: pkt.msglen - len(pkt.params))]  # noqa: E501
 
     def build(self, *args, **kargs):
-        """
+        r"""
         We overload build() method in order to provide a valid default value
         for params based on TLS session if not provided. This cannot be done by
         overriding i2m() because the method is called on a copy of the packet.
@@ -852,16 +997,17 @@
         The 'params' field is built according to key_exchange.server_kx_msg_cls
         which should have been set after receiving a cipher suite in a
         previous ServerHello. Usual cases are:
+
         - None: for RSA encryption or fixed FF/ECDH. This should never happen,
           as no ServerKeyExchange should be generated in the first place.
         - ServerDHParams: for ephemeral FFDH. In that case, the parameter to
           server_kx_msg_cls does not matter.
-        - ServerECDH*Params: for ephemeral ECDH. There are actually three
+        - ServerECDH\*Params: for ephemeral ECDH. There are actually three
           classes, which are dispatched by _tls_server_ecdh_cls_guess on
           the first byte retrieved. The default here is b"\03", which
           corresponds to ServerECDHNamedCurveParams (implicit curves).
 
-        When the Server*DHParams are built via .fill_missing(), the session
+        When the Server\*DHParams are built via .fill_missing(), the session
         server_kx_privkey will be updated accordingly.
         """
         fval = self.getfieldval("params")
@@ -878,7 +1024,6 @@
                 except Exception:
                     if conf.debug_dissector:
                         raise
-                    pass
             else:
                 cls = Raw()
             self.params = cls
@@ -886,7 +1031,7 @@
         fval = self.getfieldval("sig")
         if fval is None:
             s = self.tls_session
-            if s.pwcs:
+            if s.pwcs and s.client_random:
                 if not s.pwcs.key_exchange.anonymous:
                     p = self.params
                     if p is None:
@@ -992,7 +1137,7 @@
                    SigAndHashAlgsLenField("sig_algs_len", None,
                                           length_of="sig_algs"),
                    SigAndHashAlgsField("sig_algs", [0x0403, 0x0401, 0x0201],
-                                       EnumField("hash_sig", None, _tls_hash_sig),  # noqa: E501
+                                       ShortEnumField("hash_sig", None, _tls_hash_sig),  # noqa: E501
                                        length_from=lambda pkt: pkt.sig_algs_len),  # noqa: E501
                    FieldLenField("certauthlen", None, fmt="!H",
                                  length_of="certauth"),
@@ -1012,6 +1157,7 @@
                    _ExtensionsField("ext", None,
                                     length_from=lambda pkt: pkt.msglen -
                                     pkt.cert_req_ctxt_len - 3)]
+
 ###############################################################################
 #   ServerHelloDone                                                           #
 ###############################################################################
@@ -1039,7 +1185,10 @@
         if sig is None:
             s = self.tls_session
             m = b"".join(s.handshake_messages)
-            if s.tls_version >= 0x0304:
+            tls_version = s.tls_version
+            if tls_version is None:
+                tls_version = s.advertised_tls_version
+            if tls_version >= 0x0304:
                 if s.connection_end == "client":
                     context_string = b"TLS 1.3, client CertificateVerify"
                 elif s.connection_end == "server":
@@ -1056,7 +1205,10 @@
     def post_dissection(self, pkt):
         s = self.tls_session
         m = b"".join(s.handshake_messages)
-        if s.tls_version >= 0x0304:
+        tls_version = s.tls_version
+        if tls_version is None:
+            tls_version = s.advertised_tls_version
+        if tls_version >= 0x0304:
             if s.connection_end == "client":
                 context_string = b"TLS 1.3, server CertificateVerify"
             elif s.connection_end == "server":
@@ -1162,7 +1314,10 @@
             s = self.tls_session
             handshake_msg = b"".join(s.handshake_messages)
             con_end = s.connection_end
-            if s.tls_version < 0x0304:
+            tls_version = s.tls_version
+            if tls_version is None:
+                tls_version = s.advertised_tls_version
+            if tls_version < 0x0304:
                 ms = s.master_secret
                 self.vdata = s.wcs.prf.compute_verify_data(con_end, "write",
                                                            handshake_msg, ms)
@@ -1174,7 +1329,10 @@
         s = self.tls_session
         if not s.frozen:
             handshake_msg = b"".join(s.handshake_messages)
-            if s.tls_version < 0x0304 and s.master_secret is not None:
+            tls_version = s.tls_version
+            if tls_version is None:
+                tls_version = s.advertised_tls_version
+            if tls_version < 0x0304 and s.master_secret is not None:
                 ms = s.master_secret
                 con_end = s.connection_end
                 verify_data = s.rcs.prf.compute_verify_data(con_end, "read",
@@ -1182,7 +1340,7 @@
                 if self.vdata != verify_data:
                     pkt_info = pkt.firstlayer().summary()
                     log_runtime.info("TLS: invalid Finished received [%s]", pkt_info)  # noqa: E501
-            elif s.tls_version >= 0x0304:
+            elif tls_version >= 0x0304:
                 con_end = s.connection_end
                 verify_data = s.compute_tls13_verify_data(con_end, "read")
                 if self.vdata != verify_data:
@@ -1192,7 +1350,10 @@
     def post_build_tls_session_update(self, msg_str):
         self.tls_session_update(msg_str)
         s = self.tls_session
-        if s.tls_version >= 0x0304:
+        tls_version = s.tls_version
+        if tls_version is None:
+            tls_version = s.advertised_tls_version
+        if tls_version >= 0x0304:
             s.pwcs = writeConnState(ciphersuite=type(s.wcs.ciphersuite),
                                     connection_end=s.connection_end,
                                     tls_version=s.tls_version)
@@ -1206,7 +1367,10 @@
     def post_dissection_tls_session_update(self, msg_str):
         self.tls_session_update(msg_str)
         s = self.tls_session
-        if s.tls_version >= 0x0304:
+        tls_version = s.tls_version
+        if tls_version is None:
+            tls_version = s.advertised_tls_version
+        if tls_version >= 0x0304:
             s.prcs = readConnState(ciphersuite=type(s.rcs.ciphersuite),
                                    connection_end=s.connection_end,
                                    tls_version=s.tls_version)
@@ -1416,6 +1580,31 @@
                                                              (pkt.ticketlen or 0) -  # noqa: E501
                                                              pkt.noncelen or 0) - 13)]  # noqa: E501
 
+    def build(self):
+        fval = self.getfieldval("ticket")
+        if fval == b"":
+            # Here, the ticket is just a random 48-byte label
+            # The ticket may also be a self-encrypted and self-authenticated
+            # value
+            self.ticket = os.urandom(48)
+
+        fval = self.getfieldval("ticket_nonce")
+        if fval == b"":
+            # Nonce is randomly chosen
+            self.ticket_nonce = os.urandom(32)
+
+        fval = self.getfieldval("ticket_lifetime")
+        if fval == 0xffffffff:
+            # ticket_lifetime is set to 12 hours
+            self.ticket_lifetime = 43200
+
+        fval = self.getfieldval("ticket_age_add")
+        if fval == 0:
+            # ticket_age_add is a random 32-bit value
+            self.ticket_age_add = struct.unpack("!I", os.urandom(4))[0]
+
+        return _TLSHandshake.build(self)
+
     def post_dissection_tls_session_update(self, msg_str):
         self.tls_session_update(msg_str)
         if self.tls_session.connection_end == "client":
@@ -1445,6 +1634,25 @@
                    ThreeBytesField("msglen", None),
                    ByteEnumField("request_update", 0, _key_update_request)]
 
+    def post_build_tls_session_update(self, msg_str):
+        s = self.tls_session
+        s.pwcs = writeConnState(ciphersuite=type(s.wcs.ciphersuite),
+                                connection_end=s.connection_end,
+                                tls_version=s.tls_version)
+        s.triggered_pwcs_commit = True
+        s.compute_tls13_next_traffic_secrets(s.connection_end, "write")
+
+    def post_dissection_tls_session_update(self, msg_str):
+        s = self.tls_session
+        s.prcs = writeConnState(ciphersuite=type(s.rcs.ciphersuite),
+                                connection_end=s.connection_end,
+                                tls_version=s.tls_version)
+        s.triggered_prcs_commit = True
+        if s.connection_end == "server":
+            s.compute_tls13_next_traffic_secrets("client", "read")
+        elif s.connection_end == "client":
+            s.compute_tls13_next_traffic_secrets("server", "read")
+
 
 ###############################################################################
 #   All handshake messages defined in this module                             #

scapy-2.4.3.tar.gz/scapy/layers/tls/handshake_sslv2.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/handshake_sslv2.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/keyexchange.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/keyexchange.py Changed

@@ -1,6 +1,7 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
 #               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
@@ -22,12 +23,17 @@
 from scapy.layers.tls.session import _GenericTLSSessionInheritance
 from scapy.layers.tls.basefields import _tls_version, _TLSClientVersionField
 from scapy.layers.tls.crypto.pkcs1 import pkcs_i2osp, pkcs_os2ip
-from scapy.layers.tls.crypto.groups import _ffdh_groups, _tls_named_curves
-import scapy.modules.six as six
+from scapy.layers.tls.crypto.groups import (
+    _ffdh_groups,
+    _tls_named_curves,
+    _tls_named_groups_generate,
+    _tls_named_groups_import,
+    _tls_named_groups_pubbytes,
+)
+
 
 if conf.crypto_valid:
     from cryptography.hazmat.backends import default_backend
-    from cryptography.hazmat.primitives import serialization
     from cryptography.hazmat.primitives.asymmetric import dh, ec
 
 
@@ -49,12 +55,10 @@
                  0x0502: "sha384+dsa", 0x0503: "sha384+ecdsa",
                  0x0600: "sha512+anon", 0x0601: "sha512+rsa",
                  0x0602: "sha512+dsa", 0x0603: "sha512+ecdsa",
-                 0x0804: "sha256+rsaepss",
-                 0x0805: "sha384+rsaepss",
-                 0x0806: "sha512+rsaepss",
-                 0x0807: "ed25519",
-                 0x0808: "ed448",
-                 0x0809: "sha256+rsapss"}
+                 0x0804: "sha256+rsaepss", 0x0805: "sha384+rsaepss",
+                 0x0806: "sha512+rsaepss", 0x0807: "ed25519",
+                 0x0808: "ed448", 0x0809: "sha256+rsapss",
+                 0x080a: "sha384+rsapss", 0x080b: "sha512+rsapss"}
 
 
 def phantom_mode(pkt):
@@ -156,7 +160,7 @@
     #XXX 'sig_alg' should be set in __init__ depending on the context.
     """
     name = "TLS Digital Signature"
-    fields_desc = [SigAndHashAlgField("sig_alg", 0x0401, _tls_hash_sig),
+    fields_desc = [SigAndHashAlgField("sig_alg", 0x0804, _tls_hash_sig),
                    SigLenField("sig_len", None, fmt="!H",
                                length_of="sig_val"),
                    SigValField("sig_val", None,
@@ -165,9 +169,13 @@
     def __init__(self, *args, **kargs):
         super(_TLSSignature, self).__init__(*args, **kargs)
         if (self.tls_session and
-                self.tls_session.tls_version and
-                self.tls_session.tls_version < 0x0303):
-            self.sig_alg = None
+                self.tls_session.tls_version):
+            if self.tls_session.tls_version < 0x0303:
+                self.sig_alg = None
+            elif self.tls_session.tls_version == 0x0304:
+                # For TLS 1.3 signatures, set the signature
+                # algorithm to RSA-PSS
+                self.sig_alg = 0x0804
 
     def _update_sig(self, m, key):
         """
@@ -264,7 +272,7 @@
         if s.prcs:
             cls = s.prcs.key_exchange.server_kx_msg_cls(m)
             if cls is None:
-                return None, Raw(m[:tmp_len]) / Padding(m[tmp_len:])
+                return Raw(m[:tmp_len]) / Padding(m[tmp_len:])
             return cls(m, tls_session=s)
         else:
             try:
@@ -276,7 +284,7 @@
                 cls = _tls_server_ecdh_cls_guess(m)
                 p = cls(m, tls_session=s)
                 if pkcs_os2ip(p.load[:2]) not in _tls_hash_sig:
-                    return None, Raw(m[:tmp_len]) / Padding(m[tmp_len:])
+                    return Raw(m[:tmp_len]) / Padding(m[tmp_len:])
                 return p
 
 
@@ -565,43 +573,25 @@
             self.curve_type = _tls_ec_curve_types["named_curve"]
 
         if self.named_curve is None:
-            curve = ec.SECP256R1()
-            s.server_kx_privkey = ec.generate_private_key(curve,
-                                                          default_backend())
-            self.named_curve = next((cid for cid, name in six.iteritems(_tls_named_curves)  # noqa: E501
-                                     if name == curve.name), 0)
-        else:
-            curve_name = _tls_named_curves.get(self.named_curve)
-            if curve_name is None:
-                # this fallback is arguable
-                curve = ec.SECP256R1()
-            else:
-                curve_cls = ec._CURVE_TYPES.get(curve_name)
-                if curve_cls is None:
-                    # this fallback is arguable
-                    curve = ec.SECP256R1()
-                else:
-                    curve = curve_cls()
-            s.server_kx_privkey = ec.generate_private_key(curve,
-                                                          default_backend())
+            self.named_curve = 23
+
+        curve_group = self.named_curve
+        if curve_group not in _tls_named_curves:
+            # this fallback is arguable
+            curve_group = 23  # default to secp256r1
+        s.server_kx_privkey = _tls_named_groups_generate(curve_group)
 
         if self.point is None:
-            pubkey = s.server_kx_privkey.public_key()
-            try:
-                # cryptography >= 2.5
-                self.point = pubkey.public_bytes(
-                    serialization.Encoding.X962,
-                    serialization.PublicFormat.UncompressedPoint
-                )
-            except TypeError:
-                # older versions
-                self.key_exchange = pubkey.public_numbers().encode_point()
+            self.point = _tls_named_groups_pubbytes(
+                s.server_kx_privkey
+            )
+
         # else, we assume that the user wrote the server_kx_privkey by himself
         if self.pointlen is None:
             self.pointlen = len(self.point)
 
         if not s.client_kx_ecdh_params:
-            s.client_kx_ecdh_params = curve
+            s.client_kx_ecdh_params = curve_group
 
     @crypto_validator
     def register_pubkey(self):
@@ -613,15 +603,14 @@
         # if self.point[0] in [b'\x02', b'\x03']:
         #    point_format = 1
 
-        curve_name = _tls_named_curves[self.named_curve]
-        curve = ec._CURVE_TYPES[curve_name]()
-        import_point = ec.EllipticCurvePublicNumbers.from_encoded_point
-        pubnum = import_point(curve, self.point)
         s = self.tls_session
-        s.server_kx_pubkey = pubnum.public_key(default_backend())
+        s.server_kx_pubkey = _tls_named_groups_import(
+            self.named_curve,
+            self.point
+        )
 
         if not s.client_kx_ecdh_params:
-            s.client_kx_ecdh_params = curve
+            s.client_kx_ecdh_params = self.named_curve
 
     def post_dissection(self, r):
         try:
@@ -746,8 +735,7 @@
     @crypto_validator
     def fill_missing(self):
         s = self.tls_session
-        params = s.client_kx_ffdh_params
-        s.client_kx_privkey = params.generate_private_key()
+        s.client_kx_privkey = s.client_kx_ffdh_params.generate_private_key()
         pubkey = s.client_kx_privkey.public_key()
         y = pubkey.public_numbers().y
         self.dh_Yc = pkcs_i2osp(y, pubkey.key_size // 8)
@@ -804,15 +792,15 @@
     @crypto_validator
     def fill_missing(self):
         s = self.tls_session
-        params = s.client_kx_ecdh_params
-        s.client_kx_privkey = ec.generate_private_key(params,
-                                                      default_backend())
+        s.client_kx_privkey = _tls_named_groups_generate(
+            s.client_kx_ecdh_params
+        )
         pubkey = s.client_kx_privkey.public_key()
         x = pubkey.public_numbers().x
         y = pubkey.public_numbers().y
         self.ecdh_Yc = (b"\x04" +
-                        pkcs_i2osp(x, params.key_size // 8) +
-                        pkcs_i2osp(y, params.key_size // 8))
+                        pkcs_i2osp(x, pubkey.key_size // 8) +
+                        pkcs_i2osp(y, pubkey.key_size // 8))
 
         if s.client_kx_privkey and s.server_kx_pubkey:
             pms = s.client_kx_privkey.exchange(ec.ECDH(), s.server_kx_pubkey)
@@ -834,9 +822,10 @@
 
         # if there are kx params and keys, we assume the crypto library is ok
         if s.client_kx_ecdh_params:
-            import_point = ec.EllipticCurvePublicNumbers.from_encoded_point
-            pub_num = import_point(s.client_kx_ecdh_params, self.ecdh_Yc)
-            s.client_kx_pubkey = pub_num.public_key(default_backend())
+            s.client_kx_pubkey = _tls_named_groups_import(
+                s.client_kx_ecdh_params,
+                self.ecdh_Yc
+            )
 
         if s.server_kx_privkey and s.client_kx_pubkey:
             ZZ = s.server_kx_privkey.exchange(ec.ECDH(), s.client_kx_pubkey)
@@ -869,7 +858,7 @@
 
     @classmethod
     def dispatch_hook(cls, _pkt=None, *args, **kargs):
-        if 'tls_session' in kargs:
+        if _pkt and 'tls_session' in kargs:
             s = kargs['tls_session']
             if s.server_tmp_rsa_key is None and s.server_rsa_key is None:
                 return _UnEncryptedPreMasterSecret
@@ -878,7 +867,10 @@
     def pre_dissect(self, m):
         s = self.tls_session
         tbd = m
-        if s.tls_version >= 0x0301:
+        tls_version = s.tls_version
+        if tls_version is None:
+            tls_version = s.advertised_tls_version
+        if tls_version >= 0x0301:
             if len(m) < 2:      # Should not happen
                 return m
             tmp_len = struct.unpack("!H", m[:2])[0]
@@ -926,7 +918,10 @@
             warning("No material to encrypt Pre Master Secret")
 
         tmp_len = b""
-        if s.tls_version >= 0x0301:
+        tls_version = s.tls_version
+        if tls_version is None:
+            tls_version = s.advertised_tls_version
+        if tls_version >= 0x0301:
             tmp_len = struct.pack("!H", len(enc))
         return tmp_len + enc + pay

scapy-2.4.3.tar.gz/scapy/layers/tls/keyexchange_tls13.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/keyexchange_tls13.py Changed

@@ -1,5 +1,6 @@
 # This file is part of Scapy
 # Copyright (C) 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
@@ -15,17 +16,18 @@
     StrLenField
 from scapy.packet import Packet, Padding
 from scapy.layers.tls.extensions import TLS_Ext_Unknown, _tls_ext
-from scapy.layers.tls.crypto.groups import _tls_named_ffdh_groups, \
-    _tls_named_curves, _ffdh_groups, \
-    _tls_named_groups
+from scapy.layers.tls.crypto.groups import (
+    _tls_named_curves,
+    _tls_named_ffdh_groups,
+    _tls_named_groups,
+    _tls_named_groups_generate,
+    _tls_named_groups_import,
+    _tls_named_groups_pubbytes,
+)
 import scapy.modules.six as six
 
 if conf.crypto_valid:
-    from cryptography.hazmat.backends import default_backend
-    from cryptography.hazmat.primitives import serialization
-    from cryptography.hazmat.primitives.asymmetric import dh, ec
-if conf.crypto_valid_advanced:
-    from cryptography.hazmat.primitives.asymmetric import x25519
+    from cryptography.hazmat.primitives.asymmetric import ec
 
 
 class KeyShareEntry(Packet):
@@ -60,33 +62,8 @@
         """
         This is called by post_build() for key creation.
         """
-        if self.group in _tls_named_ffdh_groups:
-            params = _ffdh_groups[_tls_named_ffdh_groups[self.group]][0]
-            privkey = params.generate_private_key()
-            self.privkey = privkey
-            pubkey = privkey.public_key()
-            self.key_exchange = pubkey.public_numbers().y
-        elif self.group in _tls_named_curves:
-            if _tls_named_curves[self.group] == "x25519":
-                if conf.crypto_valid_advanced:
-                    privkey = x25519.X25519PrivateKey.generate()
-                    self.privkey = privkey
-                    pubkey = privkey.public_key()
-                    self.key_exchange = pubkey.public_bytes()
-            elif _tls_named_curves[self.group] != "x448":
-                curve = ec._CURVE_TYPES[_tls_named_curves[self.group]]()
-                privkey = ec.generate_private_key(curve, default_backend())
-                self.privkey = privkey
-                pubkey = privkey.public_key()
-                try:
-                    # cryptography >= 2.5
-                    self.key_exchange = pubkey.public_bytes(
-                        serialization.Encoding.X962,
-                        serialization.PublicFormat.UncompressedPoint
-                    )
-                except TypeError:
-                    # older versions
-                    self.key_exchange = pubkey.public_numbers().encode_point()
+        self.privkey = _tls_named_groups_generate(self.group)
+        self.key_exchange = _tls_named_groups_pubbytes(self.privkey)
 
     def post_build(self, pkt, pay):
         if self.group is None:
@@ -107,21 +84,10 @@
 
     @crypto_validator
     def register_pubkey(self):
-        if self.group in _tls_named_ffdh_groups:
-            params = _ffdh_groups[_tls_named_ffdh_groups[self.group]][0]
-            pn = params.parameter_numbers()
-            public_numbers = dh.DHPublicNumbers(self.key_exchange, pn)
-            self.pubkey = public_numbers.public_key(default_backend())
-        elif self.group in _tls_named_curves:
-            if _tls_named_curves[self.group] == "x25519":
-                if conf.crypto_valid_advanced:
-                    import_point = x25519.X25519PublicKey.from_public_bytes
-                    self.pubkey = import_point(self.key_exchange)
-            elif _tls_named_curves[self.group] != "x448":
-                curve = ec._CURVE_TYPES[_tls_named_curves[self.group]]()
-                import_point = ec.EllipticCurvePublicKey.from_encoded_point
-                public_numbers = import_point(curve, self.key_exchange).public_numbers()  # noqa: E501
-                self.pubkey = public_numbers.public_key(default_backend())
+        self.pubkey = _tls_named_groups_import(
+            self.group,
+            self.key_exchange
+        )
 
     def post_dissection(self, r):
         try:
@@ -196,7 +162,7 @@
                 if group_name in six.itervalues(_tls_named_ffdh_groups):
                     pms = privkey.exchange(pubkey)
                 elif group_name in six.itervalues(_tls_named_curves):
-                    if group_name == "x25519":
+                    if group_name in ["x25519", "x448"]:
                         pms = privkey.exchange(pubkey)
                     else:
                         pms = privkey.exchange(ec.ECDH(), pubkey)
@@ -219,7 +185,7 @@
                 if group_name in six.itervalues(_tls_named_ffdh_groups):
                     pms = privkey.exchange(pubkey)
                 elif group_name in six.itervalues(_tls_named_curves):
-                    if group_name == "x25519":
+                    if group_name in ["x25519", "x448"]:
                         pms = privkey.exchange(pubkey)
                     else:
                         pms = privkey.exchange(ec.ECDH(), pubkey)
@@ -230,7 +196,7 @@
                 if group_name in six.itervalues(_tls_named_ffdh_groups):
                     pms = privkey.exchange(pubkey)
                 elif group_name in six.itervalues(_tls_named_curves):
-                    if group_name == "x25519":
+                    if group_name in ["x25519", "x448"]:
                         pms = privkey.exchange(pubkey)
                     else:
                         pms = privkey.exchange(ec.ECDH(), pubkey)
@@ -241,6 +207,8 @@
 _tls_ext_keyshare_cls = {1: TLS_Ext_KeyShare_CH,
                          2: TLS_Ext_KeyShare_SH}
 
+_tls_ext_keyshare_hrr_cls = {2: TLS_Ext_KeyShare_HRR}
+
 
 class Ticket(Packet):
     name = "Recommended Ticket Construction (from RFC 5077)"
@@ -285,7 +253,7 @@
 class TLS_Ext_PreSharedKey_CH(TLS_Ext_Unknown):
     # XXX define post_build and post_dissection methods
     name = "TLS Extension - Pre Shared Key (for ClientHello)"
-    fields_desc = [ShortEnumField("type", 0x28, _tls_ext),
+    fields_desc = [ShortEnumField("type", 0x29, _tls_ext),
                    ShortField("len", None),
                    FieldLenField("identities_len", None,
                                  length_of="identities"),

scapy-2.4.3.tar.gz/scapy/layers/tls/record.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/record.py Changed

@@ -1,6 +1,8 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
-# 2015, 2016, 2017 Maxence Tury
+#               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
+#               2019 Gabriel Potter
 # This program is published under a GPLv2 license
 
 """
@@ -23,7 +25,8 @@
 from scapy.layers.inet import TCP
 from scapy.layers.tls.session import _GenericTLSSessionInheritance
 from scapy.layers.tls.handshake import (_tls_handshake_cls, _TLSHandshake,
-                                        _tls13_handshake_cls, TLS13ServerHello)
+                                        _tls13_handshake_cls, TLS13ServerHello,
+                                        TLS13ClientHello)
 from scapy.layers.tls.basefields import (_TLSVersionField, _tls_version,
                                          _TLSIVField, _TLSMACField,
                                          _TLSPadField, _TLSPadLenField,
@@ -51,7 +54,7 @@
 ###############################################################################
 
 
-class _TLSEncryptedContent(Raw):
+class _TLSEncryptedContent(Raw, _GenericTLSSessionInheritance):
     """
     When the content of a TLS record (more precisely, a TLSCiphertext) could
     not be deciphered, we use this class to represent the encrypted data.
@@ -60,6 +63,7 @@
     version), the nonce_explicit, IV and/or padding will also be parsed.
     """
     name = "Encrypted Content"
+    match_subclass = True
 
 
 class _TLSMsgListField(PacketListField):
@@ -139,6 +143,8 @@
             if (((pkt.tls_session.tls_version or 0x0303) > 0x0200) and
                     hasattr(pkt, "type") and pkt.type == 23):
                 return ret, [TLSApplicationData(data=b"")]
+            elif hasattr(pkt, "type") and pkt.type == 20:
+                return ret, [TLSChangeCipherSpec()]
             else:
                 return ret, [Raw(load=b"")]
 
@@ -199,16 +205,33 @@
         res = b""
         for p in val:
             res += self.i2m(pkt, p)
+
+        # Add TLS13ClientHello in case of HelloRetryRequest
+        # Add ChangeCipherSpec for middlebox compatibility
         if (isinstance(pkt, _GenericTLSSessionInheritance) and
-            _tls_version_check(pkt.tls_session.tls_version, 0x0304) and
-                not isinstance(pkt, TLS13ServerHello)):
+                _tls_version_check(pkt.tls_session.tls_version, 0x0304) and
+                not isinstance(pkt.msg[0], TLS13ServerHello) and
+                not isinstance(pkt.msg[0], TLS13ClientHello) and
+                not isinstance(pkt.msg[0], TLSChangeCipherSpec)):
             return s + res
+
         if not pkt.type:
             pkt.type = 0
+
         hdr = struct.pack("!B", pkt.type) + s[1:5]
         return hdr + res
 
 
+def _ssl_looks_like_sslv2(dat):
+    """
+    This is a copycat of wireshark's `packet-tls.c` ssl_looks_like_sslv2
+    """
+    if len(dat) < 3:
+        return
+    from scapy.layers.tls.handshake_sslv2 import _sslv2_handshake_type
+    return ord(dat[:1]) >= 0x80 and ord(dat[2:3]) in _sslv2_handshake_type
+
+
 class TLS(_GenericTLSSessionInheritance):
     """
     The generic TLS Record message, based on section 6.2 of RFC 5246.
@@ -235,11 +258,13 @@
     Indeed, the need for a proper context may also present itself when trying
     to parse clear handshake messages.
 
-    For instance, suppose you sniffed the beginning of a DHE-RSA negotiation:
+    For instance, suppose you sniffed the beginning of a DHE-RSA negotiation::
+
         t1 = TLS(<client_hello>)
         t2 = TLS(<server_hello | certificate | server_key_exchange>)
         t3 = TLS(<server_hello | certificate | server_key_exchange>,
                  tls_session=t1.tls_session)
+
     (Note that to do things properly, here 't1.tls_session' should actually be
     't1.tls_session.mirror()'. See session.py for explanations.)
 
@@ -287,23 +312,33 @@
         as SSLv2 records but TLS ones instead, but hey, we can't be held
         responsible for low-minded extensibility choices.
         """
-        if _pkt and len(_pkt) >= 2:
-            byte0 = orb(_pkt[0])
-            byte1 = orb(_pkt[1])
-            if (byte0 not in _tls_type) or (byte1 != 3):
-                from scapy.layers.tls.record_sslv2 import SSLv2
-                return SSLv2
-            else:
+        if _pkt is not None:
+            plen = len(_pkt)
+            if plen >= 2:
+                byte0, byte1 = struct.unpack("BB", _pkt[:2])
                 s = kargs.get("tls_session", None)
+                if byte0 not in _tls_type or byte1 != 3:  # Unknown type
+                    # Check SSLv2: either the session is already SSLv2,
+                    # either the packet looks like one. As said above, this
+                    # isn't 100% reliable, but Wireshark does the same
+                    if s and (s.tls_version == 0x0002 or
+                              s.advertised_tls_version == 0x0002) or \
+                             (_ssl_looks_like_sslv2(_pkt) and (not s or
+                              s.tls_version is None)):
+                        from scapy.layers.tls.record_sslv2 import SSLv2
+                        return SSLv2
+                    # Not SSLv2: continuation
+                    return _TLSEncryptedContent
+                # Check TLS 1.3
                 if s and _tls_version_check(s.tls_version, 0x0304):
-                    if s.rcs and not isinstance(s.rcs.cipher, Cipher_NULL):
+                    if (s.rcs and not isinstance(s.rcs.cipher, Cipher_NULL) and
+                            byte0 == 0x17):
                         from scapy.layers.tls.record_tls13 import TLS13
                         return TLS13
-        if _pkt and len(_pkt) < 5:
-            # Layer detected as TLS but too small to be a real packet (len<5).
-            # Those packets are usually customly implemented
-            # Scapy should not try to decode them
-            return conf.raw_layer
+            if plen < 5:
+                # Layer detected as TLS but too small to be a
+                # parsed. Scapy should not try to decode them
+                return _TLSEncryptedContent
         return TLS
 
     # Parsing methods
@@ -682,11 +717,18 @@
 
         return hdr + efrag + pay
 
+    def mysummary(self):
+        s = super(TLS, self).mysummary()
+        if self.msg:
+            s += " / "
+            s += " / ".join(getattr(x, "_name", x.name) for x in self.msg)
+        return s
 
 ###############################################################################
 #   TLS ChangeCipherSpec                                                      #
 ###############################################################################
 
+
 _tls_changecipherspec_type = {1: "change_cipher_spec"}
 
 
@@ -738,6 +780,9 @@
     fields_desc = [ByteEnumField("level", None, _tls_alert_level),
                    ByteEnumField("descr", None, _tls_alert_description)]
 
+    def mysummary(self):
+        return self.sprintf("Alert %level%: %descr%")
+
     def post_dissection_tls_session_update(self, msg_str):
         pass

scapy-2.4.3.tar.gz/scapy/layers/tls/record_tls13.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/record_tls13.py Changed

scapy-2.4.3.tar.gz/scapy/layers/tls/session.py -> scapy-2.4.4.tar.gz/scapy/layers/tls/session.py Changed

@@ -1,6 +1,7 @@
 # This file is part of Scapy
 # Copyright (C) 2007, 2008, 2009 Arnaud Ebalard
 #               2015, 2016, 2017 Maxence Tury
+#               2019 Romain Perez
 # This program is published under a GPLv2 license
 
 """
@@ -15,7 +16,10 @@
 import scapy.modules.six as six
 from scapy.error import log_runtime, warning
 from scapy.packet import Packet
+from scapy.pton_ntop import inet_pton
+from scapy.sessions import DefaultSession
 from scapy.utils import repr_hex, strxor
+from scapy.layers.inet import TCP
 from scapy.layers.tls.crypto.compression import Comp_NULL
 from scapy.layers.tls.crypto.hkdf import TLS13_HKDF
 from scapy.layers.tls.crypto.prf import PRF
@@ -418,6 +422,9 @@
         self.pre_master_secret = None
         self.master_secret = None
 
+        # The agreed-upon signature algorithm (for TLS 1.2-TLS 1.3 only)
+        self.selected_sig_alg = None
+
         # A session ticket received by the client.
         self.client_session_ticket = None
 
@@ -436,6 +443,10 @@
         self.tls13_handshake_secret = None
         self.tls13_master_secret = None
         self.tls13_derived_secrets = {}
+        self.post_handshake_auth = False
+        self.tls13_ticket_ciphersuite = None
+        self.tls13_retry = False
+        self.middlebox_compatibility = False
 
         # Handshake messages needed for Finished computation/validation.
         # No record layer headers, no HelloRequests, no ChangeCipherSpecs.
@@ -565,7 +576,8 @@
         early_exporter_master_secret (See RFC8446, section 7.1).
 
         The parameter external is used for the computation of the
-        binder_key :
+        binder_key:
+
         - For external PSK provisioned outside out of TLS, the parameter
           external must be True.
         - For resumption PSK, the parameter external must be False.
@@ -798,8 +810,8 @@
         family = socket.AF_INET
         if ':' in self.ipsrc:
             family = socket.AF_INET6
-        s1 += socket.inet_pton(family, self.ipsrc)
-        s2 += socket.inet_pton(family, self.ipdst)
+        s1 += inet_pton(family, self.ipsrc)
+        s2 += inet_pton(family, self.ipdst)
         return strxor(s1, s2)
 
     def eq(self, other):
@@ -851,8 +863,10 @@
         except Exception:
             setme = True
 
+        newses = False
         if setme:
             if tls_session is None:
+                newses = True
                 self.tls_session = tlsSession()
             else:
                 self.tls_session = tls_session
@@ -860,6 +874,31 @@
         self.rcs_snap_init = self.tls_session.rcs.snapshot()
         self.wcs_snap_init = self.tls_session.wcs.snapshot()
 
+        if isinstance(_underlayer, TCP):
+            tcp = _underlayer
+            self.tls_session.sport = tcp.sport
+            self.tls_session.dport = tcp.dport
+            try:
+                self.tls_session.ipsrc = tcp.underlayer.src
+                self.tls_session.ipdst = tcp.underlayer.dst
+            except AttributeError:
+                pass
+            if conf.tls_session_enable:
+                if newses:
+                    s = conf.tls_sessions.find(self.tls_session)
+                    if s:
+                        if s.dport == self.tls_session.dport:
+                            self.tls_session = s
+                        else:
+                            self.tls_session = s.mirror()
+                    else:
+                        conf.tls_sessions.add(self.tls_session)
+            if self.tls_session.connection_end == "server":
+                srk = conf.tls_sessions.server_rsa_key
+                if not self.tls_session.server_rsa_key and \
+                        srk:
+                    self.tls_session.server_rsa_key = srk
+
         Packet.__init__(self, _pkt=_pkt, post_transform=post_transform,
                         _internal=_internal, _underlayer=_underlayer,
                         **fields)
@@ -959,9 +998,28 @@
         s.rcs = rcs_snap
         s.wcs = wcs_snap
 
-    # Uncomment this when the automata update IPs and ports properly
-    # def mysummary(self):
-    #    return "TLS %s" % repr(self.tls_session)
+    def mysummary(self):
+        return "TLS %s / %s" % (repr(self.tls_session),
+                                getattr(self, "_name", self.name))
+
+    @classmethod
+    def tcp_reassemble(cls, data, metadata):
+        # Used with TLSSession
+        from scapy.layers.tls.record import TLS
+        from scapy.layers.tls.record_tls13 import TLS13
+        if cls in (TLS, TLS13):
+            length = struct.unpack("!H", data[3:5])[0] + 5
+            if len(data) == length:
+                return cls(data)
+            elif len(data) > length:
+                pkt = cls(data)
+                if hasattr(pkt.payload, "tcp_reassemble"):
+                    if pkt.payload.tcp_reassemble(data[length:], metadata):
+                        return pkt
+                else:
+                    return pkt
+        else:
+            return cls(data)
 
 
 ###############################################################################
@@ -971,6 +1029,7 @@
 class _tls_sessions(object):
     def __init__(self):
         self.sessions = {}
+        self.server_rsa_key = None
 
     def add(self, session):
         s = self.find(session)
@@ -994,7 +1053,10 @@
         self.sessions[h].remove(session)
 
     def find(self, session):
-        h = session.hash()
+        try:
+            h = session.hash()
+        except Exception:
+            return None
         if h in self.sessions:
             for k in self.sessions[h]:
                 if k.eq(session):
@@ -1007,18 +1069,33 @@
 
     def __repr__(self):
         res = [("First endpoint", "Second endpoint", "Session ID")]
-        for l in six.itervalues(self.sessions):
-            for s in l:
+        for li in six.itervalues(self.sessions):
+            for s in li:
                 src = "%s[%d]" % (s.ipsrc, s.sport)
                 dst = "%s[%d]" % (s.ipdst, s.dport)
                 sid = repr(s.sid)
                 if len(sid) > 12:
                     sid = sid[:11] + "..."
                 res.append((src, dst, sid))
-        colwidth = (max([len(y) for y in x]) for x in zip(*res))
+        colwidth = (max(len(y) for y in x) for x in zip(*res))
         fmt = "  ".join(map(lambda x: "%%-%ds" % x, colwidth))
         return "\n".join(map(lambda x: fmt % x, res))
 
 
+class TLSSession(DefaultSession):
+    def __init__(self, *args, **kwargs):
+        server_rsa_key = kwargs.pop("server_rsa_key", None)
+        super(TLSSession, self).__init__(*args, **kwargs)
+        self._old_conf_status = conf.tls_session_enable
+        conf.tls_session_enable = True
+        if server_rsa_key:
+            conf.tls_sessions.server_rsa_key = server_rsa_key
+
+    def toPacketList(self):
+        conf.tls_session_enable = self._old_conf_status
+        return super(TLSSession, self).toPacketList()
+
+
 conf.tls_sessions = _tls_sessions()
+conf.tls_session_enable = False
 conf.tls_verbose = False

scapy-2.4.3.tar.gz/scapy/layers/vrrp.py -> scapy-2.4.4.tar.gz/scapy/layers/vrrp.py Changed

@@ -10,7 +10,7 @@
 
 from scapy.packet import Packet, bind_layers
 from scapy.fields import BitField, ByteField, FieldLenField, FieldListField, \
-    IPField, IntField, XShortField
+    IPField, IP6Field, IntField, MultipleTypeField, StrField, XShortField
 from scapy.compat import chb, orb
 from scapy.layers.inet import IP, in4_chksum, checksum
 from scapy.layers.inet6 import IPv6, in6_chksum
@@ -62,9 +62,18 @@
         BitField("res", 0, 4),
         BitField("adv", 100, 12),
         XShortField("chksum", None),
-        # FIXME: addrlist should also allow IPv6 addresses :/
-        FieldListField("addrlist", [], IPField("", "0.0.0.0"),
-                       count_from=lambda pkt: pkt.ipcount)]
+        MultipleTypeField(
+            [
+                (FieldListField("addrlist", [], IPField("", "0.0.0.0"),
+                                count_from=lambda pkt: pkt.ipcount),
+                 lambda p: isinstance(p.underlayer, IP)),
+                (FieldListField("addrlist", [], IP6Field("", "::"),
+                                count_from=lambda pkt: pkt.ipcount),
+                 lambda p: isinstance(p.underlayer, IPv6)),
+            ],
+            StrField("addrlist", "")
+        )
+    ]
 
     def post_build(self, p, pay):
         if self.chksum is None:

scapy-2.4.3.tar.gz/scapy/layers/zigbee.py -> scapy-2.4.4.tar.gz/scapy/layers/zigbee.py Changed

@@ -4,7 +4,7 @@
 # Copyright (C) Ryan Speers <ryan@rmspeers.com> 2011-2012
 # Copyright (C) Roger Meyer <roger.meyer@csus.edu>: 2012-03-10 Added frames
 # Copyright (C) Gabriel Potter <gabriel@potter.fr>: 2018
-# Intern at INRIA Grand Nancy Est
+# Copyright (C) 2020 Dimitrios-Georgios Akestoridis <akestoridis@cmu.edu>
 # This program is published under a GPLv2 license
 
 """
@@ -277,6 +277,7 @@
 
 class LinkStatusEntry(Packet):
     name = "ZigBee Link Status Entry"
+
     fields_desc = [
         # Neighbor network address (2 octets)
         XLEShortField("neighbor_network_address", 0x0000),
@@ -287,6 +288,9 @@
         BitField("incoming_cost", 0, 3),
     ]
 
+    def extract_padding(self, p):
+        return b"", p
+
 
 class ZigbeeNWKCommandPayload(Packet):
     name = "Zigbee Network Layer Command Payload"
@@ -301,8 +305,10 @@
             7: "rejoin response",
             8: "link status",
             9: "network report",
-            10: "network update"
-            # 0x0b - 0xff reserved
+            10: "network update",
+            11: "end device timeout request",
+            12: "end device timeout response"
+            # 0x0d - 0xff reserved
         }),
 
         # - Route Request Command - #
@@ -453,6 +459,51 @@
         ConditionalField(XLEShortField("new_PAN_ID", 0x0000),
                          lambda pkt: (pkt.cmd_identifier == 10 and pkt.update_command_identifier == 0)),  # noqa: E501
 
+        # - End Device Timeout Request Command - #
+        # Requested Timeout (1 octet)
+        ConditionalField(
+            ByteEnumField("req_timeout", 3, {
+                0: "10 seconds",
+                1: "2 minutes",
+                2: "4 minutes",
+                3: "8 minutes",
+                4: "16 minutes",
+                5: "32 minutes",
+                6: "64 minutes",
+                7: "128 minutes",
+                8: "256 minutes",
+                9: "512 minutes",
+                10: "1024 minutes",
+                11: "2048 minutes",
+                12: "4096 minutes",
+                13: "8192 minutes",
+                14: "16384 minutes"
+            }),
+            lambda pkt: pkt.cmd_identifier == 11),
+        # End Device Configuration (1 octet)
+        ConditionalField(
+            ByteField("ed_conf", 0),
+            lambda pkt: pkt.cmd_identifier == 11),
+
+        # - End Device Timeout Response Command - #
+        # Status (1 octet)
+        ConditionalField(
+            ByteEnumField("status", 0, {
+                0: "Success",
+                1: "Incorrect Value"
+            }),
+            lambda pkt: pkt.cmd_identifier == 12),
+        # Parent Information (1 octet)
+        ConditionalField(
+            BitField("reserved", 0, 6),
+            lambda pkt: pkt.cmd_identifier == 12),
+        ConditionalField(
+            BitField("ed_timeout_req_keepalive", 0, 1),
+            lambda pkt: pkt.cmd_identifier == 12),
+        ConditionalField(
+            BitField("mac_data_poll_keepalive", 0, 1),
+            lambda pkt: pkt.cmd_identifier == 12)
+
         # StrField("data", ""),
     ]
 
@@ -530,7 +581,7 @@
     fields_desc = [
         # Frame control (1 octet)
         FlagsField("frame_control", 2, 4,
-                   ['reserved1', 'security', 'ack_req', 'extended_hdr']),
+                   ['ack_format', 'security', 'ack_req', 'extended_hdr']),
         BitEnumField("delivery_mode", 0, 2,
                      {0: 'unicast', 1: 'indirect',
                       2: 'broadcast', 3: 'group_addressing'}),
@@ -539,24 +590,37 @@
         # Destination endpoint (0/1 octet)
         ConditionalField(
             ByteField("dst_endpoint", 10),
-            lambda pkt: (pkt.frame_control.ack_req or pkt.aps_frametype == 2)
+            lambda pkt: ((pkt.aps_frametype == 0 and
+                          pkt.delivery_mode in [0, 2]) or
+                         (pkt.aps_frametype == 2 and not
+                          pkt.frame_control.ack_format))
+        ),
+        # Group address (0/2 octets)
+        ConditionalField(
+            XLEShortField("group_addr", 0x0000),
+            lambda pkt: (pkt.aps_frametype == 0 and pkt.delivery_mode == 3)
         ),
-        # Group address (0/2 octets) TODO
         # Cluster identifier (0/2 octets)
         ConditionalField(
             # unsigned short (little-endian)
             EnumField("cluster", 0, _zcl_cluster_identifier, fmt="<H"),
-            lambda pkt: (pkt.frame_control.ack_req or pkt.aps_frametype == 2)
+            lambda pkt: ((pkt.aps_frametype == 0) or
+                         (pkt.aps_frametype == 2 and not
+                          pkt.frame_control.ack_format))
         ),
         # Profile identifier (0/2 octets)
         ConditionalField(
             EnumField("profile", 0, _zcl_profile_identifier, fmt="<H"),
-            lambda pkt: (pkt.frame_control.ack_req or pkt.aps_frametype == 2)
+            lambda pkt: ((pkt.aps_frametype == 0) or
+                         (pkt.aps_frametype == 2 and not
+                          pkt.frame_control.ack_format))
         ),
         # Source endpoint (0/1 octets)
         ConditionalField(
             ByteField("src_endpoint", 10),
-            lambda pkt: (pkt.frame_control.ack_req or pkt.aps_frametype == 2)
+            lambda pkt: ((pkt.aps_frametype == 0) or
+                         (pkt.aps_frametype == 2 and not
+                          pkt.frame_control.ack_format))
         ),
         # APS counter (1 octet)
         ByteField("counter", 0),
@@ -566,10 +630,19 @@
             ByteEnumField(
                 "fragmentation", 0,
                 {0: "none", 1: "first_block", 2: "middle_block"}),
-            lambda pkt: pkt.frame_control.extended_hdr
+            lambda pkt: (pkt.aps_frametype in [0, 2] and
+                         pkt.frame_control.extended_hdr)
+        ),
+        ConditionalField(
+            ByteField("block_number", 0),
+            lambda pkt: (pkt.aps_frametype in [0, 2] and
+                         pkt.fragmentation in [1, 2])
+        ),
+        ConditionalField(
+            ByteField("ack_bitfield", 0),
+            lambda pkt: (pkt.aps_frametype == 2 and
+                         pkt.fragmentation in [1, 2])
         ),
-        ConditionalField(ByteField("block_number", 0),
-                         lambda pkt: pkt.fragmentation),
         # variable length frame payload:
         # 3 frame types: data, APS command, and acknowledgement
         # ConditionalField(StrField("data", ""), lambda pkt:pkt.aps_frametype == 0),  # noqa: E501
@@ -579,7 +652,10 @@
         if self.frame_control & 0x02:  # we have a security header
             return ZigbeeSecurityHeader
         elif self.aps_frametype == 0:  # data
-            return ZigbeeClusterLibrary  # TODO might also be another frame
+            if self.profile == 0x0000:
+                return ZigbeeDeviceProfile
+            else:
+                return ZigbeeClusterLibrary
         elif self.aps_frametype == 1:  # command
             return ZigbeeAppCommandPayload
         else:
@@ -596,6 +672,34 @@
 }
 
 
+_RequestKeyKeyTypes = {
+    0x02: "Application Link Key",
+    0x04: "Trust Center Link Key",
+}
+
+
+_ApsStatusValues = {
+    0x00: "SUCCESS",
+    0xa0: "ASDU_TOO_LONG",
+    0xa1: "DEFRAG_DEFERRED",
+    0xa2: "DEFRAG_UNSUPPORTED",
+    0xa3: "ILLEGAL_REQUEST",
+    0xa4: "INVALID_BINDING",
+    0xa5: "INVALID_GROUP",
+    0xa6: "INVALID_PARAMETER",
+    0xa7: "NO_ACK",
+    0xa8: "NO_BOUND_DEVICE",
+    0xa9: "NO_SHORT_ADDRESS",
+    0xaa: "NOT_SUPPORTED",
+    0xab: "SECURED_LINK_KEY",
+    0xac: "SECURED_NWK_KEY",
+    0xad: "SECURITY_FAIL",
+    0xae: "TABLE_FULL",
+    0xaf: "UNSECURED",
+    0xb0: "UNSUPPORTED_ATTRIBUTE"
+}
+
+
 class ZigbeeAppCommandPayload(Packet):
     name = "Zigbee Application Layer Command Payload"
     fields_desc = [
@@ -609,12 +713,14 @@
             7: "APS_CMD_REMOVE_DEVICE",
             8: "APS_CMD_REQUEST_KEY",
             9: "APS_CMD_SWITCH_KEY",
-            # TODO: implement 10 to 14
+            # TODO: implement 10 to 13
             10: "APS_CMD_EA_INIT_CHLNG",
             11: "APS_CMD_EA_RSP_CHLNG",
             12: "APS_CMD_EA_INIT_MAC_DATA",
             13: "APS_CMD_EA_RSP_MAC_DATA",
-            14: "APS_CMD_TUNNEL"
+            14: "APS_CMD_TUNNEL",
+            15: "APS_CMD_VERIFY_KEY",
+            16: "APS_CMD_CONFIRM_KEY"
         }),
         # SKKE Commands
         ConditionalField(dot15d4AddressField("initiator", 0,
@@ -626,19 +732,32 @@
         ConditionalField(StrFixedLenField("data", 0, length=16),
                          lambda pkt: pkt.cmd_identifier in [1, 2, 3, 4]),
         # Transport-key Command
-        ConditionalField(ByteEnumField("key_type", 0, _TransportKeyKeyTypes),
-                         lambda pkt: pkt.cmd_identifier == 5),
-        ConditionalField(StrFixedLenField("key", None, 16),
-                         lambda pkt: pkt.cmd_identifier == 5),
-        ConditionalField(ByteField("key_seqnum", 0),
-                         lambda pkt: (pkt.cmd_identifier == 5 and
-                                      pkt.key_type in [0x01, 0x05])),
-        ConditionalField(dot15d4AddressField("dest_addr", 0,
-                                             adjust=lambda pkt, x: 8),
-                         lambda pkt: pkt.cmd_identifier == 5),
-        ConditionalField(dot15d4AddressField("src_addr", 0,
-                                             adjust=lambda pkt, x: 8),
-                         lambda pkt: pkt.cmd_identifier == 5),
+        ConditionalField(
+            ByteEnumField("key_type", 0, _TransportKeyKeyTypes),
+            lambda pkt: pkt.cmd_identifier == 5),
+        ConditionalField(
+            StrFixedLenField("key", None, 16),
+            lambda pkt: pkt.cmd_identifier == 5),
+        ConditionalField(
+            ByteField("key_seqnum", 0),
+            lambda pkt: (pkt.cmd_identifier == 5 and
+                         pkt.key_type in [0x01, 0x05])),
+        ConditionalField(
+            dot15d4AddressField("dest_addr", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: (pkt.cmd_identifier == 5 and
+                         pkt.key_type not in [0x02, 0x03])),
+        ConditionalField(
+            dot15d4AddressField("src_addr", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: (pkt.cmd_identifier == 5 and
+                         pkt.key_type not in [0x02, 0x03])),
+        ConditionalField(
+            dot15d4AddressField("partner_addr", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: (pkt.cmd_identifier == 5 and
+                         pkt.key_type in [0x02, 0x03])),
+        ConditionalField(
+            ByteField("initiator_flag", 0),
+            lambda pkt: (pkt.cmd_identifier == 5 and
+                         pkt.key_type in [0x02, 0x03])),
         # Update-Device Command
         ConditionalField(dot15d4AddressField("address", 0,
                                              adjust=lambda pkt, x: 8),
@@ -652,19 +771,78 @@
                                              adjust=lambda pkt, x: 8),
                          lambda pkt: pkt.cmd_identifier == 7),
         # Request-Key Command
-        ConditionalField(ByteEnumField("key_type", 0, _TransportKeyKeyTypes),
-                         lambda pkt: pkt.cmd_identifier == 8),
-        ConditionalField(StrFixedLenField("key", None, 16),
-                         lambda pkt: pkt.cmd_identifier == 8),
+        ConditionalField(
+            ByteEnumField("key_type", 0, _RequestKeyKeyTypes),
+            lambda pkt: pkt.cmd_identifier == 8),
+        ConditionalField(
+            dot15d4AddressField("partner_addr", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: (pkt.cmd_identifier == 8 and pkt.key_type == 0x02)),
         # Switch-Key Command
         ConditionalField(StrFixedLenField("seqnum", None, 8),
                          lambda pkt: pkt.cmd_identifier == 9),
-        # Un-implemented: 10-14 (+?)
+        # Un-implemented: 10-13 (+?)
         ConditionalField(StrField("data", ""),
-                         lambda pkt: (pkt.cmd_identifier < 0 or
-                                      pkt.cmd_identifier > 9))
+                         lambda pkt: (pkt.cmd_identifier >= 10 and
+                                      pkt.cmd_identifier <= 13)),
+        # Tunnel Command
+        ConditionalField(
+            dot15d4AddressField("dest_addr", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: pkt.cmd_identifier == 14),
+        ConditionalField(
+            FlagsField("frame_control", 2, 4, [
+                "ack_format",
+                "security",
+                "ack_req",
+                "extended_hdr"
+            ]),
+            lambda pkt: pkt.cmd_identifier == 14),
+        ConditionalField(
+            BitEnumField("delivery_mode", 0, 2, {
+                0: "unicast",
+                1: "indirect",
+                2: "broadcast",
+                3: "group_addressing"
+            }),
+            lambda pkt: pkt.cmd_identifier == 14),
+        ConditionalField(
+            BitEnumField("aps_frametype", 1, 2, {
+                0: "data",
+                1: "command",
+                2: "ack"
+            }),
+            lambda pkt: pkt.cmd_identifier == 14),
+        ConditionalField(
+            ByteField("counter", 0),
+            lambda pkt: pkt.cmd_identifier == 14),
+        # Verify-Key Command
+        ConditionalField(
+            ByteEnumField("key_type", 0, _TransportKeyKeyTypes),
+            lambda pkt: pkt.cmd_identifier == 15),
+        ConditionalField(
+            dot15d4AddressField("address", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: pkt.cmd_identifier == 15),
+        ConditionalField(
+            StrFixedLenField("key_hash", None, 16),
+            lambda pkt: pkt.cmd_identifier == 15),
+        # Confirm-Key Command
+        ConditionalField(
+            ByteEnumField("status", 0, _ApsStatusValues),
+            lambda pkt: pkt.cmd_identifier == 16),
+        ConditionalField(
+            ByteEnumField("key_type", 0, _TransportKeyKeyTypes),
+            lambda pkt: pkt.cmd_identifier == 16),
+        ConditionalField(
+            dot15d4AddressField("address", 0, adjust=lambda pkt, x: 8),
+            lambda pkt: pkt.cmd_identifier == 16)
     ]
 
+    def guess_payload_class(self, payload):
+        if self.cmd_identifier == 14:
+            # Tunneled APS Auxiliary Header
+            return ZigbeeSecurityHeader
+        else:
+            return Packet.guess_payload_class(self, payload)
+
 
 class ZigBeeBeacon(Packet):
     name = "ZigBee Beacon Payload"
@@ -733,6 +911,20 @@
         ),
     ]
 
+
+# Zigbee Device Profile #
+
+
+class ZigbeeDeviceProfile(Packet):
+    name = "Zigbee Device Profile (ZDP) Frame"
+    fields_desc = [
+        # Transaction Sequence Number (1 octet)
+        ByteField("trans_seqnum", 0),
+
+        # TODO: Transaction Data (variable)
+    ]
+
+
 # ZigBee Cluster Library #

scapy-2.4.4.tar.gz/scapy/libs Added

scapy-2.4.4.tar.gz/scapy/libs/__init__.py Added

scapy-2.4.4.tar.gz/scapy/libs/ethertypes.py Changed

scapy-2.4.4.tar.gz/scapy/libs/structures.py Added

scapy-2.4.4.tar.gz/scapy/libs/winpcapy.py Added

@@ -0,0 +1,903 @@
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Massimo Ciani (2009)
+#               Gabriel Potter (2016-2019)
+# This program is published under a GPLv2 license
+
+# Modified for scapy's usage - To support Npcap/Monitor mode
+
+
+from ctypes import *
+from ctypes.util import find_library
+import os
+
+from scapy.libs.structures import bpf_program
+from scapy.consts import WINDOWS
+
+if WINDOWS:
+    # Try to load Npcap, or Winpcap
+    SOCKET = c_uint
+    npcap_folder = os.environ["WINDIR"] + "\\System32\\Npcap"
+    if os.path.exists(npcap_folder):
+        # Try to load npcap
+        os.environ['PATH'] = npcap_folder + ";" + os.environ['PATH']
+        # Set DLL directory priority
+        windll.kernel32.SetDllDirectoryW(npcap_folder)
+        # Packet.dll is unused, but needs to overwrite the winpcap one if it
+        # exists
+        cdll.LoadLibrary(npcap_folder + "\\Packet.dll")
+        _lib = cdll.LoadLibrary(npcap_folder + "\\wpcap.dll")
+    else:
+        _lib = CDLL("wpcap.dll")
+    del npcap_folder
+else:
+    # Try to load libpcap
+    SOCKET = c_int
+    _lib_name = find_library("pcap")
+    if not _lib_name:
+        raise OSError("Cannot find libpcap.so library")
+    _lib = CDLL(_lib_name)
+
+
+##
+# misc
+##
+u_short = c_ushort
+bpf_int32 = c_int
+u_int = c_int
+bpf_u_int32 = u_int
+pcap = c_void_p
+pcap_dumper = c_void_p
+u_char = c_ubyte
+FILE = c_void_p
+STRING = c_char_p
+
+
+class bpf_version(Structure):
+    _fields_ = [("bv_major", c_ushort),
+                ("bv_minor", c_ushort)]
+
+
+class timeval(Structure):
+    _fields_ = [('tv_sec', c_long),
+                ('tv_usec', c_long)]
+
+
+# sockaddr is used by pcap_addr.
+# For example if sa_family==socket.AF_INET then we need cast
+# with sockaddr_in
+if WINDOWS:
+    class sockaddr(Structure):
+        _fields_ = [("sa_family", c_ushort),
+                    ("sa_data", c_ubyte * 14)]
+
+    class sockaddr_in(Structure):
+        _fields_ = [("sin_family", c_ushort),
+                    ("sin_port", c_uint16),
+                    ("sin_addr", 4 * c_ubyte)]
+
+    class sockaddr_in6(Structure):
+        _fields_ = [("sin6_family", c_ushort),
+                    ("sin6_port", c_uint16),
+                    ("sin6_flowinfo", c_uint32),
+                    ("sin6_addr", 16 * c_ubyte),
+                    ("sin6_scope", c_uint32)]
+else:
+    class sockaddr(Structure):
+        _fields_ = [("sa_len", c_ubyte),
+                    ("sa_family", c_ubyte),
+                    ("sa_data", c_ubyte * 14)]
+
+    class sockaddr_in(Structure):
+        _fields_ = [("sin_len", c_ubyte),
+                    ("sin_family", c_ubyte),
+                    ("sin_port", c_uint16),
+                    ("sin_addr", 4 * c_ubyte),
+                    ("sin_zero", 8 * c_char)]
+
+    class sockaddr_in6(Structure):
+        _fields_ = [("sin6_len", c_ubyte),
+                    ("sin6_family", c_ubyte),
+                    ("sin6_port", c_uint16),
+                    ("sin6_flowinfo", c_uint32),
+                    ("sin6_addr", 16 * c_ubyte),
+                    ("sin6_scope", c_uint32)]
+
+    class sockaddr_dl(Structure):
+        _fields_ = [("sdl_len", c_ubyte),
+                    ("sdl_family", c_ubyte),
+                    ("sdl_index", c_ushort),
+                    ("sdl_type", c_ubyte),
+                    ("sdl_nlen", c_ubyte),
+                    ("sdl_alen", c_ubyte),
+                    ("sdl_slen", c_ubyte),
+                    ("sdl_data", 46 * c_ubyte)]
+##
+# END misc
+##
+
+##
+# Data Structures
+##
+
+# struct   pcap_file_header
+# Header of a libpcap dump file.
+
+
+class pcap_file_header(Structure):
+    _fields_ = [('magic', bpf_u_int32),
+                ('version_major', u_short),
+                ('version_minor', u_short),
+                ('thiszone', bpf_int32),
+                ('sigfigs', bpf_u_int32),
+                ('snaplen', bpf_u_int32),
+                ('linktype', bpf_u_int32)]
+
+# struct   pcap_pkthdr
+# Header of a packet in the dump file.
+
+
+class pcap_pkthdr(Structure):
+    _fields_ = [('ts', timeval),
+                ('caplen', bpf_u_int32),
+                ('len', bpf_u_int32)]
+
+# struct   pcap_stat
+# Structure that keeps statistical values on an interface.
+
+
+class pcap_stat(Structure):
+    pass
+
+
+# _fields_ list in Structure is final.
+# We need a temp list
+_tmpList = [("ps_recv", c_uint), ("ps_drop", c_uint), ("ps_ifdrop", c_uint)]
+if WINDOWS:
+    _tmpList.append(("ps_capt", c_uint))
+    _tmpList.append(("ps_sent", c_uint))
+    _tmpList.append(("ps_netdrop", c_uint))
+pcap_stat._fields_ = _tmpList
+
+# struct   pcap_addr
+# Representation of an interface address, used by pcap_findalldevs().
+
+
+class pcap_addr(Structure):
+    pass
+
+
+pcap_addr._fields_ = [('next', POINTER(pcap_addr)),
+                      ('addr', POINTER(sockaddr)),
+                      ('netmask', POINTER(sockaddr)),
+                      ('broadaddr', POINTER(sockaddr)),
+                      ('dstaddr', POINTER(sockaddr))]
+
+# struct   pcap_if
+# Item in a list of interfaces, used by pcap_findalldevs().
+
+
+class pcap_if(Structure):
+    pass
+
+
+pcap_if._fields_ = [('next', POINTER(pcap_if)),
+                    ('name', STRING),
+                    ('description', STRING),
+                    ('addresses', POINTER(pcap_addr)),
+                    ('flags', bpf_u_int32)]
+
+##
+# END Data Structures
+##
+
+##
+# Defines
+##
+
+
+# define  PCAP_VERSION_MAJOR   2
+#   Major libpcap dump file version.
+PCAP_VERSION_MAJOR = 2
+# define  PCAP_VERSION_MINOR   4
+#   Minor libpcap dump file version.
+PCAP_VERSION_MINOR = 4
+# define  PCAP_ERRBUF_SIZE   256
+#   Size to use when allocating the buffer that contains the libpcap errors.
+PCAP_ERRBUF_SIZE = 256
+# define  PCAP_IF_LOOPBACK   0x00000001
+#   interface is loopback
+PCAP_IF_LOOPBACK = 1
+# define  MODE_CAPT   0
+#   Capture mode, to be used when calling pcap_setmode().
+MODE_CAPT = 0
+# define  MODE_STAT   1
+#   Statistical mode, to be used when calling pcap_setmode().
+MODE_STAT = 1
+
+##
+# END Defines
+##
+
+##
+# Typedefs
+##
+
+# typedef int  bpf_int32 (already defined)
+#   32-bit integer
+# typedef u_int  bpf_u_int32 (already defined)
+#   32-bit unsigned integer
+# typedef struct pcap  pcap_t
+# Descriptor of an open capture instance. This structure is opaque to the
+# user, that handles its content through the functions provided by
+# wpcap.dll.
+pcap_t = pcap
+# typedef struct pcap_dumper   pcap_dumper_t
+#   libpcap savefile descriptor.
+pcap_dumper_t = pcap_dumper
+# typedef struct pcap_if   pcap_if_t
+#   Item in a list of interfaces, see pcap_if.
+pcap_if_t = pcap_if
+# typedef struct pcap_addr   pcap_addr_t
+#   Representation of an interface address, see pcap_addr.
+pcap_addr_t = pcap_addr
+
+##
+# END Typedefs
+##
+
+
+# values for enumeration 'pcap_direction_t'
+# pcap_direction_t = c_int # enum
+
+##
+# Unix-compatible Functions
+# These functions are part of the libpcap library, and therefore work both on Windows and on Linux.
+##
+
+# typedef void(* pcap_handler )(u_char *user, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data)
+#   Prototype of the callback function that receives the packets.
+# This one is defined from programmer
+pcap_handler = CFUNCTYPE(
+    None,
+    POINTER(c_ubyte),
+    POINTER(pcap_pkthdr),
+    POINTER(c_ubyte)
+)
+
+# pcap_t *   pcap_open_live (const char *device, int snaplen, int promisc, int to_ms, char *ebuf)
+#   Open a live capture from the network.
+pcap_open_live = _lib.pcap_open_live
+pcap_open_live.restype = POINTER(pcap_t)
+pcap_open_live.argtypes = [STRING, c_int, c_int, c_int, STRING]
+
+# pcap_t *   pcap_open_dead (int linktype, int snaplen)
+#   Create a pcap_t structure without starting a capture.
+pcap_open_dead = _lib.pcap_open_dead
+pcap_open_dead.restype = POINTER(pcap_t)
+pcap_open_dead.argtypes = [c_int, c_int]
+
+# pcap_t *   pcap_open_offline (const char *fname, char *errbuf)
+#   Open a savefile in the tcpdump/libpcap format to read packets.
+pcap_open_offline = _lib.pcap_open_offline
+pcap_open_offline.restype = POINTER(pcap_t)
+pcap_open_offline.argtypes = [STRING, STRING]
+
+try:
+    # NPCAP/LINUX ONLY function
+    # int pcap_set_rfmon (pcap_t *p)
+    # sets whether monitor mode should be set on a capture handle when the
+    # handle is activated.
+    pcap_set_rfmon = _lib.pcap_set_rfmon
+    pcap_set_rfmon.restype = c_int
+    pcap_set_rfmon.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_create (pcap_t *p)
+    #   create a packet capture handle to look at packets on the network.
+    pcap_create = _lib.pcap_create
+    pcap_create.restype = POINTER(pcap_t)
+    pcap_create.argtypes = [STRING, STRING]
+
+    # int pcap_set_snaplen(pcap_t *p, int snaplen)
+    #   set the snapshot length for a not-yet-activated capture handle
+    pcap_set_snaplen = _lib.pcap_set_snaplen
+    pcap_set_snaplen.restype = c_int
+    pcap_set_snaplen.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_set_promisc(pcap_t *p, int promisc)
+    #   set promiscuous mode for a not-yet-activated capture handle
+    pcap_set_promisc = _lib.pcap_set_promisc
+    pcap_set_promisc.restype = c_int
+    pcap_set_promisc.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_set_timeout(pcap_t *p, int to_ms)
+    #   set the packet buffer timeout for a not-yet-activated capture handle
+    pcap_set_timeout = _lib.pcap_set_timeout
+    pcap_set_timeout.restype = c_int
+    pcap_set_timeout.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_activate(pcap_t *p)
+    #   activate a capture handle
+    pcap_activate = _lib.pcap_activate
+    pcap_activate.restype = c_int
+    pcap_activate.argtypes = [POINTER(pcap_t)]
+except AttributeError:
+    pass
+
+# pcap_dumper_t *   pcap_dump_open (pcap_t *p, const char *fname)
+#   Open a file to write packets.
+pcap_dump_open = _lib.pcap_dump_open
+pcap_dump_open.restype = POINTER(pcap_dumper_t)
+pcap_dump_open.argtypes = [POINTER(pcap_t), STRING]
+
+# int pcap_setnonblock (pcap_t *p, int nonblock, char *errbuf)
+#   Switch between blocking and nonblocking mode.
+pcap_setnonblock = _lib.pcap_setnonblock
+pcap_setnonblock.restype = c_int
+pcap_setnonblock.argtypes = [POINTER(pcap_t), c_int, STRING]
+
+# int pcap_getnonblock (pcap_t *p, char *errbuf)
+#   Get the "non-blocking" state of an interface.
+pcap_getnonblock = _lib.pcap_getnonblock
+pcap_getnonblock.restype = c_int
+pcap_getnonblock.argtypes = [POINTER(pcap_t), STRING]
+
+# int pcap_findalldevs (pcap_if_t **alldevsp, char *errbuf)
+# Construct a list of network devices that can be opened with
+# pcap_open_live().
+pcap_findalldevs = _lib.pcap_findalldevs
+pcap_findalldevs.restype = c_int
+pcap_findalldevs.argtypes = [POINTER(POINTER(pcap_if_t)), STRING]
+
+# void pcap_freealldevs (pcap_if_t *alldevsp)
+#   Free an interface list returned by pcap_findalldevs().
+pcap_freealldevs = _lib.pcap_freealldevs
+pcap_freealldevs.restype = None
+pcap_freealldevs.argtypes = [POINTER(pcap_if_t)]
+
+# char *   pcap_lookupdev (char *errbuf)
+#   Return the first valid device in the system.
+pcap_lookupdev = _lib.pcap_lookupdev
+pcap_lookupdev.restype = STRING
+pcap_lookupdev.argtypes = [STRING]
+
+# int pcap_lookupnet (const char *device, bpf_u_int32 *netp, bpf_u_int32 *maskp, char *errbuf)
+#   Return the subnet and netmask of an interface.
+pcap_lookupnet = _lib.pcap_lookupnet
+pcap_lookupnet.restype = c_int
+pcap_lookupnet.argtypes = [
+    STRING,
+    POINTER(bpf_u_int32),
+    POINTER(bpf_u_int32),
+    STRING
+]
+
+# int pcap_dispatch (pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+#   Collect a group of packets.
+pcap_dispatch = _lib.pcap_dispatch
+pcap_dispatch.restype = c_int
+pcap_dispatch.argtypes = [
+    POINTER(pcap_t),
+    c_int,
+    pcap_handler,
+    POINTER(u_char)
+]
+
+# int pcap_loop (pcap_t *p, int cnt, pcap_handler callback, u_char *user)
+#   Collect a group of packets.
+pcap_loop = _lib.pcap_loop
+pcap_loop.restype = c_int
+pcap_loop.argtypes = [POINTER(pcap_t), c_int, pcap_handler, POINTER(u_char)]
+
+# u_char *   pcap_next (pcap_t *p, struct pcap_pkthdr *h)
+#   Return the next available packet.
+pcap_next = _lib.pcap_next
+pcap_next.restype = POINTER(u_char)
+pcap_next.argtypes = [POINTER(pcap_t), POINTER(pcap_pkthdr)]
+
+# int pcap_next_ex (pcap_t *p, struct pcap_pkthdr **pkt_header, const u_char **pkt_data)
+#   Read a packet from an interface or from an offline capture.
+pcap_next_ex = _lib.pcap_next_ex
+pcap_next_ex.restype = c_int
+pcap_next_ex.argtypes = [
+    POINTER(pcap_t),
+    POINTER(
+        POINTER(pcap_pkthdr)
+    ),
+    POINTER(
+        POINTER(u_char)
+    )
+]
+
+# void pcap_breakloop (pcap_t *)
+# set a flag that will force pcap_dispatch() or pcap_loop() to return
+# rather than looping.
+pcap_breakloop = _lib.pcap_breakloop
+pcap_breakloop.restype = None
+pcap_breakloop.argtypes = [POINTER(pcap_t)]
+
+# int pcap_sendpacket (pcap_t *p, u_char *buf, int size)
+#   Send a raw packet.
+pcap_sendpacket = _lib.pcap_sendpacket
+pcap_sendpacket.restype = c_int
+# pcap_sendpacket.argtypes = [POINTER(pcap_t), POINTER(u_char), c_int]
+pcap_sendpacket.argtypes = [POINTER(pcap_t), c_void_p, c_int]
+
+# void pcap_dump (u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+#   Save a packet to disk.
+pcap_dump = _lib.pcap_dump
+pcap_dump.restype = None
+pcap_dump.argtypes = [
+    POINTER(pcap_dumper_t),
+    POINTER(pcap_pkthdr),
+    POINTER(u_char)
+]
+
+# long pcap_dump_ftell (pcap_dumper_t *)
+#   Return the file position for a "savefile".
+pcap_dump_ftell = _lib.pcap_dump_ftell
+pcap_dump_ftell.restype = c_long
+pcap_dump_ftell.argtypes = [POINTER(pcap_dumper_t)]
+
+# int pcap_compile (pcap_t *p, struct bpf_program *fp, char *str, int optimize, bpf_u_int32 netmask)
+# Compile a packet filter, converting an high level filtering expression
+# (see Filtering expression syntax) in a program that can be interpreted
+# by the kernel-level filtering engine.
+pcap_compile = _lib.pcap_compile
+pcap_compile.restype = c_int
+pcap_compile.argtypes = [
+    POINTER(pcap_t),
+    POINTER(bpf_program),
+    STRING,
+    c_int,
+    bpf_u_int32]
+
+# int pcap_compile_nopcap (int snaplen_arg, int linktype_arg, struct bpf_program *program, char *buf, int optimize, bpf_u_int32 mask)
+# Compile a packet filter without the need of opening an adapter. This
+# function converts an high level filtering expression (see Filtering
+# expression syntax) in a program that can be interpreted by the
+# kernel-level filtering engine.
+pcap_compile_nopcap = _lib.pcap_compile_nopcap
+pcap_compile_nopcap.restype = c_int
+pcap_compile_nopcap.argtypes = [
+    c_int,
+    c_int,
+    POINTER(bpf_program),
+    STRING,
+    c_int,
+    bpf_u_int32
+]
+
+# int pcap_setfilter (pcap_t *p, struct bpf_program *fp)
+#   Associate a filter to a capture.
+pcap_setfilter = _lib.pcap_setfilter
+pcap_setfilter.restype = c_int
+pcap_setfilter.argtypes = [POINTER(pcap_t), POINTER(bpf_program)]
+
+# void pcap_freecode (struct bpf_program *fp)
+#   Free a filter.
+pcap_freecode = _lib.pcap_freecode
+pcap_freecode.restype = None
+pcap_freecode.argtypes = [POINTER(bpf_program)]
+
+# int pcap_datalink (pcap_t *p)
+#   Return the link layer of an adapter.
+pcap_datalink = _lib.pcap_datalink
+pcap_datalink.restype = c_int
+pcap_datalink.argtypes = [POINTER(pcap_t)]
+
+# int pcap_list_datalinks (pcap_t *p, int **dlt_buf)
+#   list datalinks
+pcap_list_datalinks = _lib.pcap_list_datalinks
+pcap_list_datalinks.restype = c_int
+# pcap_list_datalinks.argtypes = [POINTER(pcap_t), POINTER(POINTER(c_int))]
+
+# int pcap_set_datalink (pcap_t *p, int dlt)
+# Set the current data link type of the pcap descriptor to the type
+# specified by dlt. -1 is returned on failure.
+pcap_set_datalink = _lib.pcap_set_datalink
+pcap_set_datalink.restype = c_int
+pcap_set_datalink.argtypes = [POINTER(pcap_t), c_int]
+
+# int pcap_datalink_name_to_val (const char *name)
+# Translates a data link type name, which is a DLT_ name with the DLT_
+# removed, to the corresponding data link type value. The translation is
+# case-insensitive. -1 is returned on failure.
+pcap_datalink_name_to_val = _lib.pcap_datalink_name_to_val
+pcap_datalink_name_to_val.restype = c_int
+pcap_datalink_name_to_val.argtypes = [STRING]
+
+# const char *   pcap_datalink_val_to_name (int dlt)
+# Translates a data link type value to the corresponding data link type
+# name. NULL is returned on failure.
+pcap_datalink_val_to_name = _lib.pcap_datalink_val_to_name
+pcap_datalink_val_to_name.restype = STRING
+pcap_datalink_val_to_name.argtypes = [c_int]
+
+# const char *   pcap_datalink_val_to_description (int dlt)
+# Translates a data link type value to a short description of that data
+# link type. NULL is returned on failure.
+pcap_datalink_val_to_description = _lib.pcap_datalink_val_to_description
+pcap_datalink_val_to_description.restype = STRING
+pcap_datalink_val_to_description.argtypes = [c_int]
+
+# int pcap_snapshot (pcap_t *p)
+# Return the dimension of the packet portion (in bytes) that is delivered
+# to the application.
+pcap_snapshot = _lib.pcap_snapshot
+pcap_snapshot.restype = c_int
+pcap_snapshot.argtypes = [POINTER(pcap_t)]
+
+# int pcap_is_swapped (pcap_t *p)
+# returns true if the current savefile uses a different byte order than
+# the current system.
+pcap_is_swapped = _lib.pcap_is_swapped
+pcap_is_swapped.restype = c_int
+pcap_is_swapped.argtypes = [POINTER(pcap_t)]
+
+# int pcap_major_version (pcap_t *p)
+# return the major version number of the pcap library used to write the
+# savefile.
+pcap_major_version = _lib.pcap_major_version
+pcap_major_version.restype = c_int
+pcap_major_version.argtypes = [POINTER(pcap_t)]
+
+# int pcap_minor_version (pcap_t *p)
+# return the minor version number of the pcap library used to write the
+# savefile.
+pcap_minor_version = _lib.pcap_minor_version
+pcap_minor_version.restype = c_int
+pcap_minor_version.argtypes = [POINTER(pcap_t)]
+
+# FILE *   pcap_file (pcap_t *p)
+#   Return the standard stream of an offline capture.
+pcap_file = _lib.pcap_file
+pcap_file.restype = FILE
+pcap_file.argtypes = [POINTER(pcap_t)]
+
+# int pcap_stats (pcap_t *p, struct pcap_stat *ps)
+#   Return statistics on current capture.
+pcap_stats = _lib.pcap_stats
+pcap_stats.restype = c_int
+pcap_stats.argtypes = [POINTER(pcap_t), POINTER(pcap_stat)]
+
+# void pcap_perror (pcap_t *p, char *prefix)
+# print the text of the last pcap library error on stderr, prefixed by
+# prefix.
+pcap_perror = _lib.pcap_perror
+pcap_perror.restype = None
+pcap_perror.argtypes = [POINTER(pcap_t), STRING]
+
+# char *   pcap_geterr (pcap_t *p)
+#   return the error text pertaining to the last pcap library error.
+pcap_geterr = _lib.pcap_geterr
+pcap_geterr.restype = STRING
+pcap_geterr.argtypes = [POINTER(pcap_t)]
+
+# char *   pcap_strerror (int error)
+#   Provided in case strerror() isn't available.
+pcap_strerror = _lib.pcap_strerror
+pcap_strerror.restype = STRING
+pcap_strerror.argtypes = [c_int]
+
+# const char *   pcap_lib_version (void)
+# Returns a pointer to a string giving information about the version of
+# the libpcap library being used; note that it contains more information
+# than just a version number.
+pcap_lib_version = _lib.pcap_lib_version
+pcap_lib_version.restype = STRING
+pcap_lib_version.argtypes = []
+
+# void pcap_close (pcap_t *p)
+#   close the files associated with p and deallocates resources.
+pcap_close = _lib.pcap_close
+pcap_close.restype = None
+pcap_close.argtypes = [POINTER(pcap_t)]
+
+# FILE *   pcap_dump_file (pcap_dumper_t *p)
+#   return the standard I/O stream of the 'savefile' opened by
+# pcap_dump_open().
+pcap_dump_file = _lib.pcap_dump_file
+pcap_dump_file.restype = FILE
+pcap_dump_file.argtypes = [POINTER(pcap_dumper_t)]
+
+# int pcap_dump_flush (pcap_dumper_t *p)
+# Flushes the output buffer to the ``savefile,'' so that any packets
+# written with pcap_dump() but not yet written to the ``savefile'' will be
+# written. -1 is returned on error, 0 on success.
+pcap_dump_flush = _lib.pcap_dump_flush
+pcap_dump_flush.restype = c_int
+pcap_dump_flush.argtypes = [POINTER(pcap_dumper_t)]
+
+# void pcap_dump_close (pcap_dumper_t *p)
+#   Closes a savefile.
+pcap_dump_close = _lib.pcap_dump_close
+pcap_dump_close.restype = None
+pcap_dump_close.argtypes = [POINTER(pcap_dumper_t)]
+
+if not WINDOWS:
+    # int pcap_get_selectable_fd(pcap_t, *p)
+    # Returns, on UNIX, a file descriptor number for a file descriptor on
+    # which one can do a select(), poll(). -1 is returned if no such
+    # descriptor exists.
+    pcap_get_selectable_fd = _lib.pcap_get_selectable_fd
+    pcap_get_selectable_fd.restype = c_int
+    pcap_get_selectable_fd.argtypes = [POINTER(pcap_t)]
+
+###########################################
+# Windows-specific Extensions
+# The functions in this section extend libpcap to offer advanced functionalities
+# (like remote packet capture, packet buffer size variation or high-precision packet injection).
+# However, at the moment they can be used only in Windows.
+###########################################
+if WINDOWS:
+    HANDLE = c_void_p
+
+    ##############
+    # Identifiers related to the new source syntax
+    ##############
+    # define   PCAP_SRC_FILE   2
+    # define   PCAP_SRC_IFLOCAL   3
+    # define   PCAP_SRC_IFREMOTE   4
+    # Internal representation of the type of source in use (file, remote/local
+    # interface).
+    PCAP_SRC_FILE = 2
+    PCAP_SRC_IFLOCAL = 3
+    PCAP_SRC_IFREMOTE = 4
+
+    ##############
+    # Strings related to the new source syntax
+    ##############
+    # define   PCAP_SRC_FILE_STRING   "file://"
+    # define   PCAP_SRC_IF_STRING   "rpcap://"
+    # String that will be used to determine the type of source in use (file,
+    # remote/local interface).
+    PCAP_SRC_FILE_STRING = "file://"
+    PCAP_SRC_IF_STRING = "rpcap://"
+
+    ##############
+    # Flags defined in the pcap_open() function
+    ##############
+    # define  PCAP_OPENFLAG_PROMISCUOUS   1
+    #   Defines if the adapter has to go in promiscuous mode.
+    PCAP_OPENFLAG_PROMISCUOUS = 1
+    # define  PCAP_OPENFLAG_DATATX_UDP   2
+    # Defines if the data transfer (in case of a remote capture) has to be
+    # done with UDP protocol.
+    PCAP_OPENFLAG_DATATX_UDP = 2
+    # define  PCAP_OPENFLAG_NOCAPTURE_RPCAP   4
+    PCAP_OPENFLAG_NOCAPTURE_RPCAP = 4
+    #   Defines if the remote probe will capture its own generated traffic.
+    # define  PCAP_OPENFLAG_NOCAPTURE_LOCAL   8
+    PCAP_OPENFLAG_NOCAPTURE_LOCAL = 8
+    # define  PCAP_OPENFLAG_MAX_RESPONSIVENESS   16
+    #   This flag configures the adapter for maximum responsiveness.
+    PCAP_OPENFLAG_MAX_RESPONSIVENESS = 16
+
+    ##############
+    # Sampling methods defined in the pcap_setsampling() function
+    ##############
+    # define  PCAP_SAMP_NOSAMP   0
+    # No sampling has to be done on the current capture.
+    PCAP_SAMP_NOSAMP = 0
+    # define  PCAP_SAMP_1_EVERY_N   1
+    # It defines that only 1 out of N packets must be returned to the user.
+    PCAP_SAMP_1_EVERY_N = 1
+    # define   PCAP_SAMP_FIRST_AFTER_N_MS   2
+    # It defines that we have to return 1 packet every N milliseconds.
+    PCAP_SAMP_FIRST_AFTER_N_MS = 2
+
+    ##############
+    # Authentication methods supported by the RPCAP protocol
+    ##############
+    # define  RPCAP_RMTAUTH_NULL   0
+    # It defines the NULL authentication.
+    RPCAP_RMTAUTH_NULL = 0
+    # define  RPCAP_RMTAUTH_PWD   1
+    # It defines the username/password authentication.
+    RPCAP_RMTAUTH_PWD = 1
+
+    ##############
+    # Remote struct and defines
+    ##############
+    # define  PCAP_BUF_SIZE   1024
+    # Defines the maximum buffer size in which address, port, interface names
+    # are kept.
+    PCAP_BUF_SIZE = 1024
+    # define  RPCAP_HOSTLIST_SIZE   1024
+    # Maximum length of an host name (needed for the RPCAP active mode).
+    RPCAP_HOSTLIST_SIZE = 1024
+
+    class pcap_send_queue(Structure):
+        _fields_ = [("maxlen", c_uint),
+                    ("len", c_uint),
+                    ("buffer", c_char_p)]
+
+    # struct   pcap_rmtauth
+    # This structure keeps the information needed to authenticate the user on a
+    # remote machine
+    class pcap_rmtauth(Structure):
+        _fields_ = [("type", c_int),
+                    ("username", c_char_p),
+                    ("password", c_char_p)]
+
+    # struct   pcap_samp
+    # This structure defines the information related to sampling
+    class pcap_samp(Structure):
+        _fields_ = [("method", c_int),
+                    ("value", c_int)]
+
+    # PAirpcapHandle   pcap_get_airpcap_handle (pcap_t *p)
+    # Returns the AirPcap handler associated with an adapter. This handler can
+    # be used to change the wireless-related settings of the CACE Technologies
+    # AirPcap wireless capture adapters.
+
+    # bool pcap_offline_filter (struct bpf_program *prog, const struct pcap_pkthdr *header, const u_char *pkt_data)
+    #   Returns if a given filter applies to an offline packet.
+    pcap_offline_filter = _lib.pcap_offline_filter
+    pcap_offline_filter.restype = c_bool
+    pcap_offline_filter.argtypes = [
+        POINTER(bpf_program),
+        POINTER(pcap_pkthdr),
+        POINTER(u_char)
+    ]
+
+    # int pcap_live_dump (pcap_t *p, char *filename, int maxsize, int maxpacks)
+    #   Save a capture to file.
+    pcap_live_dump = _lib.pcap_live_dump
+    pcap_live_dump.restype = c_int
+    pcap_live_dump.argtypes = [POINTER(pcap_t), POINTER(c_char), c_int, c_int]
+
+    # int pcap_live_dump_ended (pcap_t *p, int sync)
+    # Return the status of the kernel dump process, i.e. tells if one of the
+    # limits defined with pcap_live_dump() has been reached.
+    pcap_live_dump_ended = _lib.pcap_live_dump_ended
+    pcap_live_dump_ended.restype = c_int
+    pcap_live_dump_ended.argtypes = [POINTER(pcap_t), c_int]
+
+    # struct pcap_stat *  pcap_stats_ex (pcap_t *p, int *pcap_stat_size)
+    #   Return statistics on current capture.
+    pcap_stats_ex = _lib.pcap_stats_ex
+    pcap_stats_ex.restype = POINTER(pcap_stat)
+    pcap_stats_ex.argtypes = [POINTER(pcap_t), POINTER(c_int)]
+
+    # int pcap_setbuff (pcap_t *p, int dim)
+    #   Set the size of the kernel buffer associated with an adapter.
+    pcap_setbuff = _lib.pcap_setbuff
+    pcap_setbuff.restype = c_int
+    pcap_setbuff.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_setmode (pcap_t *p, int mode)
+    #   Set the working mode of the interface p to mode.
+    pcap_setmode = _lib.pcap_setmode
+    pcap_setmode.restype = c_int
+    pcap_setmode.argtypes = [POINTER(pcap_t), c_int]
+
+    # int pcap_setmintocopy (pcap_t *p, int size)
+    #   Set the minimum amount of data received by the kernel in a single call.
+    pcap_setmintocopy = _lib.pcap_setmintocopy
+    pcap_setmintocopy.restype = c_int
+    pcap_setmintocopy.argtype = [POINTER(pcap_t), c_int]
+
+    # HANDLE pcap_getevent (pcap_t *p)
+    #   Return the handle of the event associated with the interface p.
+    pcap_getevent = _lib.pcap_getevent
+    pcap_getevent.restype = HANDLE
+    pcap_getevent.argtypes = [POINTER(pcap_t)]
+
+    # pcap_send_queue *  pcap_sendqueue_alloc (u_int memsize)
+    #   Allocate a send queue.
+    pcap_sendqueue_alloc = _lib.pcap_sendqueue_alloc
+    pcap_sendqueue_alloc.restype = POINTER(pcap_send_queue)
+    pcap_sendqueue_alloc.argtypes = [c_uint]
+
+    # void pcap_sendqueue_destroy (pcap_send_queue *queue)
+    #   Destroy a send queue.
+    pcap_sendqueue_destroy = _lib.pcap_sendqueue_destroy
+    pcap_sendqueue_destroy.restype = None
+    pcap_sendqueue_destroy.argtypes = [POINTER(pcap_send_queue)]
+
+    # int pcap_sendqueue_queue (pcap_send_queue *queue, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data)
+    #   Add a packet to a send queue.
+    pcap_sendqueue_queue = _lib.pcap_sendqueue_queue
+    pcap_sendqueue_queue.restype = c_int
+    pcap_sendqueue_queue.argtypes = [
+        POINTER(pcap_send_queue),
+        POINTER(pcap_pkthdr),
+        POINTER(u_char)
+    ]
+
+    # u_int pcap_sendqueue_transmit (pcap_t *p, pcap_send_queue *queue, int sync)
+    #   Send a queue of raw packets to the network.
+    pcap_sendqueue_transmit = _lib.pcap_sendqueue_transmit
+    pcap_sendqueue_transmit.retype = u_int
+    pcap_sendqueue_transmit.argtypes = [
+        POINTER(pcap_t), POINTER(pcap_send_queue), c_int]
+
+    # int pcap_findalldevs_ex (char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf)
+    #   Create a list of network devices that can be opened with pcap_open().
+    pcap_findalldevs_ex = _lib.pcap_findalldevs_ex
+    pcap_findalldevs_ex.retype = c_int
+    pcap_findalldevs_ex.argtypes = [
+        STRING,
+        POINTER(pcap_rmtauth),
+        POINTER(
+            POINTER(pcap_if_t)
+        ),
+        STRING
+    ]
+
+    # int pcap_createsrcstr (char *source, int type, const char *host, const char *port, const char *name, char *errbuf)
+    # Accept a set of strings (host name, port, ...), and it returns the
+    # complete source string according to the new format (e.g.
+    # 'rpcap://1.2.3.4/eth0').
+    pcap_createsrcstr = _lib.pcap_createsrcstr
+    pcap_createsrcstr.restype = c_int
+    pcap_createsrcstr.argtypes = [
+        STRING, c_int, STRING, STRING, STRING, STRING
+    ]
+
+    # int pcap_parsesrcstr (const char *source, int *type, char *host, char *port, char *name, char *errbuf)
+    # Parse the source string and returns the pieces in which the source can
+    # be split.
+    pcap_parsesrcstr = _lib.pcap_parsesrcstr
+    pcap_parsesrcstr.retype = c_int
+    pcap_parsesrcstr.argtypes = [
+        STRING,
+        POINTER(c_int),
+        STRING,
+        STRING,
+        STRING,
+        STRING
+    ]
+
+    # pcap_t *   pcap_open (const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf)
+    # Open a generic source in order to capture / send (WinPcap only) traffic.
+    pcap_open = _lib.pcap_open
+    pcap_open.restype = POINTER(pcap_t)
+    pcap_open.argtypes = [
+        STRING,
+        c_int,
+        c_int,
+        c_int,
+        POINTER(pcap_rmtauth),
+        STRING
+    ]
+
+    # struct pcap_samp *  pcap_setsampling (pcap_t *p)
+    #   Define a sampling method for packet capture.
+    pcap_setsampling = _lib.pcap_setsampling
+    pcap_setsampling.restype = POINTER(pcap_samp)
+    pcap_setsampling.argtypes = [POINTER(pcap_t)]
+
+    # SOCKET pcap_remoteact_accept (const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf)
+    #   Block until a network connection is accepted (active mode only).
+    pcap_remoteact_accept = _lib.pcap_remoteact_accept
+    pcap_remoteact_accept.restype = SOCKET
+    pcap_remoteact_accept.argtypes = [
+        STRING,
+        STRING,
+        STRING,
+        STRING,
+        POINTER(pcap_rmtauth),
+        STRING
+    ]
+
+    # int pcap_remoteact_close (const char *host, char *errbuf)
+    #   Drop an active connection (active mode only).
+    pcap_remoteact_close = _lib.pcap_remoteact_close
+    pcap_remoteact_close.restypes = c_int
+    pcap_remoteact_close.argtypes = [STRING, STRING]
+
+    # void pcap_remoteact_cleanup ()
+    #   Clean the socket that is currently used in waiting active connections.
+    pcap_remoteact_cleanup = _lib.pcap_remoteact_cleanup
+    pcap_remoteact_cleanup.restypes = None
+    pcap_remoteact_cleanup.argtypes = []
+
+    # int pcap_remoteact_list (char *hostlist, char sep, int size, char *errbuf)
+    # Return the hostname of the host that have an active connection with us
+    # (active mode only).
+    pcap_remoteact_list = _lib.pcap_remoteact_list
+    pcap_remoteact_list.restype = c_int
+    pcap_remoteact_list.argtypes = [STRING, c_char, c_int, STRING]

scapy-2.4.3.tar.gz/scapy/main.py -> scapy-2.4.4.tar.gz/scapy/main.py Changed

@@ -23,17 +23,17 @@
 import warnings
 from random import choice
 
-# Never add any global import, in main.py, that would trigger a warning message  # noqa: E501
-# before the console handlers gets added in interact()
+# Never add any global import, in main.py, that would trigger a
+# warning message before the console handlers gets added in interact()
 from scapy.error import log_interactive, log_loading, log_scapy, \
     Scapy_Exception, ScapyColoredFormatter
 import scapy.modules.six as six
 from scapy.themes import DefaultTheme, BlackAndWhite, apply_ipython_style
 from scapy.consts import WINDOWS
 
-IGNORED = list(six.moves.builtins.__dict__)
+from scapy.compat import cast, Any, Dict, List, Optional, Tuple, Union
 
-GLOBKEYS = []
+IGNORED = list(six.moves.builtins.__dict__)
 
 LAYER_ALIASES = {
     "tls": "tls.all"
@@ -44,14 +44,17 @@
     ("Craft packets like I craft my beer.", "Jean De Clerck"),
     ("Craft packets before they craft you.", "Socrate"),
     ("Craft me if you can.", "IPv6 layer"),
-    ("To craft a packet, you have to be a packet, and learn how to swim in the "  # noqa: E501
-     "wires and in the waves.", "Jean-Claude Van Damme"),
+    ("To craft a packet, you have to be a packet, and learn how to swim in "
+     "the wires and in the waves.", "Jean-Claude Van Damme"),
     ("We are in France, we say Skappee. OK? Merci.", "Sebastien Chabal"),
-    ("Wanna support scapy? Rate it on sectools! http://sectools.org/tool/scapy/", "Satoshi Nakamoto"),  # noqa: E501
+    ("Wanna support scapy? Rate it on sectools! "
+     "http://sectools.org/tool/scapy/", "Satoshi Nakamoto"),
+    ("What is dead may never die!", "Python 2"),
 ]
 
 
 def _probe_config_file(cf):
+    # type: (str) -> Union[str, None]
     cf_path = os.path.join(os.path.expanduser("~"), cf)
     try:
         os.stat(cf_path)
@@ -61,19 +64,22 @@
         return cf_path
 
 
-def _read_config_file(cf, _globals=globals(), _locals=locals(), interactive=True):  # noqa: E501
-    """Read a config file: execute a python file while loading scapy, that may contain  # noqa: E501
-    some pre-configured values.
+def _read_config_file(cf, _globals=globals(), _locals=locals(),
+                      interactive=True):
+    # type: (str, Dict[str, Any], Dict[str, Any], bool) -> None
+    """Read a config file: execute a python file while loading scapy, that
+    may contain some pre-configured values.
 
-    If _globals or _locals are specified, they will be updated with the loaded vars.  # noqa: E501
-    This allows an external program to use the function. Otherwise, vars are only available  # noqa: E501
-    from inside the scapy console.
+    If _globals or _locals are specified, they will be updated with
+    the loaded vars.  This allows an external program to use the
+    function. Otherwise, vars are only available from inside the scapy
+    console.
 
     params:
     - _globals: the globals() vars
     - _locals: the locals() vars
-    - interactive: specified whether or not errors should be printed using the scapy console or  # noqa: E501
-    raised.
+    - interactive: specified whether or not errors should be printed
+    using the scapy console or raised.
 
     ex, content of a config.py file:
         'conf.verb = 42\n'
@@ -81,6 +87,7 @@
         >>> _read_config_file("./config.py"))
         >>> conf.verb
         42
+
     """
     log_loading.debug("Loading config file [%s]", cf)
     try:
@@ -96,10 +103,12 @@
     except Exception:
         if interactive:
             raise
-        log_loading.exception("Error during evaluation of config file [%s]", cf)  # noqa: E501
+        log_loading.exception("Error during evaluation of config file [%s]",
+                              cf)
 
 
 def _validate_local(x):
+    # type: (str) -> bool
     """Returns whether or not a variable should be imported.
     Will return False for any default modules (sys), or if
     they are detected as private vars (starting with a _)"""
@@ -109,10 +118,10 @@
 
 DEFAULT_PRESTART_FILE = _probe_config_file(".scapy_prestart.py")
 DEFAULT_STARTUP_FILE = _probe_config_file(".scapy_startup.py")
-SESSION = None
 
 
 def _usage():
+    # type: () -> None
     print(
         "Usage: scapy.py [-s sessionfile] [-c new_startup_file] "
         "[-p new_prestart_file] [-C] [-P] [-H]\n"
@@ -130,6 +139,7 @@
 
 
 def _load(module, globals_dict=None, symb_list=None):
+    # type: (str, Optional[Dict[str, Any]], Optional[List[str]]) -> None
     """Loads a Python module to make variables, objects and functions
 available globally.
 
@@ -159,6 +169,7 @@
 
 
 def load_module(name, globals_dict=None, symb_list=None):
+    # type: (str, Optional[Dict[str, Any]], Optional[List[str]]) -> None
     """Loads a Scapy module to make variables, objects and functions
     available globally.
 
@@ -168,6 +179,7 @@
 
 
 def load_layer(name, globals_dict=None, symb_list=None):
+    # type: (str, Optional[Dict[str, Any]], Optional[List[str]]) -> None
     """Loads a Scapy layer module to make variables, objects and functions
     available globally.
 
@@ -177,6 +189,7 @@
 
 
 def load_contrib(name, globals_dict=None, symb_list=None):
+    # type: (str, Optional[Dict[str, Any]], Optional[List[str]]) -> None
     """Loads a Scapy contrib module to make variables, objects and
     functions available globally.
 
@@ -197,11 +210,17 @@
             raise e  # Let's raise the original error to avoid confusion
 
 
-def list_contrib(name=None, ret=False, _debug=False):
+def list_contrib(name=None,  # type: Optional[str]
+                 ret=False,  # type: bool
+                 _debug=False  # type: bool
+                 ):
+    # type: (...) -> Optional[List[Dict[str, Union[str, None]]]]
     """Show the list of all existing contribs.
-    Params:
-     - name: filter to search the contribs
-     - ret: whether the function should return a dict instead of printing it
+
+    :param name: filter to search the contribs
+    :param ret: whether the function should return a dict instead of
+        printing it
+    :returns: None or a dictionary containing the results if ret=True
     """
     # _debug: checks that all contrib modules have correctly defined:
     # # scapy.contrib.description = [...]
@@ -214,7 +233,7 @@
         name = "*.py"
     elif "*" not in name and "?" not in name and not name.endswith(".py"):
         name += ".py"
-    results = []
+    results = []  # type: List[Dict[str, Union[str, None]]]
     dir_path = os.path.join(os.path.dirname(__file__), "contrib")
     if sys.version_info >= (3, 5):
         name = os.path.join(dir_path, "**", name)
@@ -230,15 +249,15 @@
             mod = mod[:-3]
         desc = {"description": None, "status": None, "name": mod}
         with io.open(f, errors="replace") as fd:
-            for l in fd:
-                if l[0] != "#":
+            for line in fd:
+                if line[0] != "#":
                     continue
-                p = l.find("scapy.contrib.")
+                p = line.find("scapy.contrib.")
                 if p >= 0:
                     p += 14
-                    q = l.find("=", p)
-                    key = l[p:q].strip()
-                    value = l[q + 1:].strip()
+                    q = line.find("=", p)
+                    key = line[p:q].strip()
+                    value = line[q + 1:].strip()
                     desc[key] = value
                 if desc["status"] == "skip":
                     break
@@ -257,6 +276,7 @@
     else:
         for desc in results:
             print("%(name)-20s: %(description)-40s status=%(status)s" % desc)
+        return None
 
 
 ##############################
@@ -264,15 +284,17 @@
 ##############################
 
 def update_ipython_session(session):
+    # type: (Dict[str, Any]) -> None
     """Updates IPython session with a custom one"""
     try:
-        global get_ipython
+        from IPython import get_ipython
         get_ipython().user_ns.update(session)
     except Exception:
         pass
 
 
-def save_session(fname=None, session=None, pickleProto=-1):
+def save_session(fname="", session=None, pickleProto=-1):
+    # type: (str, Optional[Dict[str, Any]], int) -> None
     """Save current Scapy session to the file specified in the fname arg.
 
     params:
@@ -281,31 +303,34 @@
      - pickleProto: pickle proto version (default: -1 = latest)"""
     from scapy import utils
     from scapy.config import conf, ConfClass
-    if fname is None:
+    if not fname:
         fname = conf.session
         if not fname:
             conf.session = fname = utils.get_temp_file(keep=True)
     log_interactive.info("Use [%s] as session file" % fname)
 
-    if session is None:
+    if not session:
         try:
+            from IPython import get_ipython
             session = get_ipython().user_ns
         except Exception:
             session = six.moves.builtins.__dict__["scapy_session"]
 
-    to_be_saved = session.copy()
+    to_be_saved = cast(Dict[str, Any], session).copy()
     if "__builtins__" in to_be_saved:
         del(to_be_saved["__builtins__"])
 
     for k in list(to_be_saved):
         i = to_be_saved[k]
-        if hasattr(i, "__module__") and (k[0] == "_" or i.__module__.startswith("IPython")):  # noqa: E501
+        if hasattr(i, "__module__") and (k[0] == "_" or
+                                         i.__module__.startswith("IPython")):
             del(to_be_saved[k])
         if isinstance(i, ConfClass):
             del(to_be_saved[k])
         elif isinstance(i, (type, type, types.ModuleType)):
             if k[0] != "_":
-                log_interactive.error("[%s] (%s) can't be saved.", k, type(to_be_saved[k]))  # noqa: E501
+                log_interactive.error("[%s] (%s) can't be saved.", k,
+                                      type(to_be_saved[k]))
             del(to_be_saved[k])
 
     try:
@@ -316,10 +341,10 @@
     f = gzip.open(fname, "wb")
     six.moves.cPickle.dump(to_be_saved, f, pickleProto)
     f.close()
-    del f
 
 
 def load_session(fname=None):
+    # type: (Optional[Union[str, None]]) -> None
     """Load current Scapy session from the file specified in the fname arg.
     This will erase any existing session.
 
@@ -346,6 +371,7 @@
 
 
 def update_session(fname=None):
+    # type: (Optional[Union[str, None]]) -> None
     """Update current Scapy session from the file specified in the fname arg.
 
     params:
@@ -362,16 +388,22 @@
     update_ipython_session(scapy_session)
 
 
-def init_session(session_name, mydict=None):
+def init_session(session_name,  # type: Optional[Union[str, None]]
+                 mydict=None  # type: Optional[Union[Dict[str, Any], None]]
+                 ):
+    # type: (...) -> Tuple[Dict[str, Any], List[str]]
     from scapy.config import conf
-    global SESSION
-    global GLOBKEYS
-
-    scapy_builtins = {k: v for k, v in six.iteritems(importlib.import_module(".all", "scapy").__dict__) if _validate_local(k)}  # noqa: E501
+    SESSION = {}  # type: Dict[str, Any]
+    GLOBKEYS = []  # type: List[str]
+
+    scapy_builtins = {k: v
+                      for k, v in six.iteritems(
+                          importlib.import_module(".all", "scapy").__dict__
+                      )
+                      if _validate_local(k)}
     six.moves.builtins.__dict__.update(scapy_builtins)
     GLOBKEYS.extend(scapy_builtins)
     GLOBKEYS.append("scapy_session")
-    scapy_builtins = None
 
     if session_name:
         try:
@@ -381,14 +413,19 @@
         else:
             try:
                 try:
-                    SESSION = six.moves.cPickle.load(gzip.open(session_name, "rb"))  # noqa: E501
+                    SESSION = six.moves.cPickle.load(gzip.open(session_name,
+                                                               "rb"))
                 except IOError:
                     SESSION = six.moves.cPickle.load(open(session_name, "rb"))
                 log_loading.info("Using session [%s]" % session_name)
+            except ValueError:
+                msg = "Error opening Python3 pickled session on Python2 [%s]"
+                log_loading.error(msg % session_name)
             except EOFError:
                 log_loading.error("Error opening session [%s]" % session_name)
             except AttributeError:
-                log_loading.error("Error opening session [%s]. Attribute missing" % session_name)  # noqa: E501
+                log_loading.error("Error opening session [%s]. "
+                                  "Attribute missing" % session_name)
 
         if SESSION:
             if "conf" in SESSION:
@@ -409,37 +446,30 @@
         six.moves.builtins.__dict__["scapy_session"].update(mydict)
         update_ipython_session(mydict)
         GLOBKEYS.extend(mydict)
+    return SESSION, GLOBKEYS
 
 ################
 #     Main     #
 ################
 
 
-def scapy_delete_temp_files():
-    from scapy.config import conf
-    for f in conf.temp_files:
-        try:
-            os.unlink(f)
-        except Exception:
-            pass
-    del(conf.temp_files[:])
-
-
 def _prepare_quote(quote, author, max_len=78):
+    # type: (str, str, int) -> List[str]
     """This function processes a quote and returns a string that is ready
 to be used in the fancy prompt.
 
     """
-    quote = quote.split(' ')
+    _quote = quote.split(' ')
     max_len -= 6
     lines = []
-    cur_line = []
+    cur_line = []  # type: List[str]
 
     def _len(line):
+        # type: (List[str]) -> int
         return sum(len(elt) for elt in line) + len(line) - 1
-    while quote:
-        if not cur_line or (_len(cur_line) + len(quote[0]) - 1 <= max_len):
-            cur_line.append(quote.pop(0))
+    while _quote:
+        if not cur_line or (_len(cur_line) + len(_quote[0]) - 1 <= max_len):
+            cur_line.append(_quote.pop(0))
             continue
         lines.append('   | %s' % ' '.join(cur_line))
         cur_line = []
@@ -451,10 +481,8 @@
 
 
 def interact(mydict=None, argv=None, mybanner=None, loglevel=logging.INFO):
+    # type: (Optional[Any], Optional[Any], Optional[Any], int) -> None
     """Starts Scapy's console."""
-    global SESSION
-    global GLOBKEYS
-
     try:
         if WINDOWS:
             # colorama is bundled within IPython.
@@ -518,7 +546,9 @@
                 conf.logLevel = max(1, conf.logLevel - 10)
 
         if len(opts[1]) > 0:
-            raise getopt.GetoptError("Too many parameters : [%s]" % " ".join(opts[1]))  # noqa: E501
+            raise getopt.GetoptError(
+                "Too many parameters : [%s]" % " ".join(opts[1])
+            )
 
     except getopt.GetoptError as msg:
         log_loading.error(msg)
@@ -527,7 +557,7 @@
     # Reset sys.argv, otherwise IPython thinks it is for him
     sys.argv = sys.argv[:1]
 
-    init_session(session_name, mydict)
+    SESSION, GLOBKEYS = init_session(session_name, mydict)
 
     if STARTUP_FILE:
         _read_config_file(STARTUP_FILE, interactive=True)
@@ -616,7 +646,7 @@
             quote, author = choice(QUOTES)
             the_banner.extend(_prepare_quote(quote, author, max_len=39))
             the_banner.append("   |")
-        the_banner = "\n".join(
+        banner_text = "\n".join(
             logo + banner for logo, banner in six.moves.zip_longest(
                 (conf.color_theme.logo(line) for line in the_logo),
                 (conf.color_theme.success(line) for line in the_banner),
@@ -624,13 +654,13 @@
             )
         )
     else:
-        the_banner = "Welcome to Scapy (%s)" % conf.version
+        banner_text = "Welcome to Scapy (%s)" % conf.version
     if mybanner is not None:
-        the_banner += "\n"
-        the_banner += mybanner
+        banner_text += "\n"
+        banner_text += mybanner
 
     if IPYTHON:
-        banner = the_banner + " using IPython %s\n" % IPython.__version__
+        banner = banner_text + " using IPython %s\n" % IPython.__version__
         try:
             from traitlets.config.loader import Config
         except ImportError:
@@ -645,19 +675,26 @@
                     exec_lines=["print(\"\"\"" + banner + "\"\"\")"]
                 )
             except Exception:
-                code.interact(banner=the_banner, local=SESSION)
+                code.interact(banner=banner_text, local=SESSION)
         else:
             cfg = Config()
             try:
-                get_ipython
-            except NameError:
-                # Set "classic" prompt style when launched from run_scapy(.bat) files  # noqa: E501
-                # Register and apply scapy color+prompt style
+                from IPython import get_ipython
+                if not get_ipython():
+                    raise ImportError
+            except ImportError:
+                # Set "classic" prompt style when launched from
+                # run_scapy(.bat) files Register and apply scapy
+                # color+prompt style
                 apply_ipython_style(shell=cfg.TerminalInteractiveShell)
                 cfg.TerminalInteractiveShell.confirm_exit = False
                 cfg.TerminalInteractiveShell.separate_in = u''
             if int(IPython.__version__[0]) >= 6:
-                cfg.TerminalInteractiveShell.term_title_format = "Scapy v%s" % conf.version  # noqa: E501
+                cfg.TerminalInteractiveShell.term_title_format = ("Scapy v%s" %
+                                                                  conf.version)
+                # As of IPython 6-7, the jedi completion module is a dumpster
+                # of fire that should be scrapped never to be seen again.
+                cfg.Completer.use_jedi = False
             else:
                 cfg.TerminalInteractiveShell.term_title = False
             cfg.HistoryAccessor.hist_file = conf.histfile
@@ -666,9 +703,9 @@
             try:
                 start_ipython(config=cfg, user_ns=SESSION)
             except (AttributeError, TypeError):
-                code.interact(banner=the_banner, local=SESSION)
+                code.interact(banner=banner_text, local=SESSION)
     else:
-        code.interact(banner=the_banner, local=SESSION)
+        code.interact(banner=banner_text, local=SESSION)
 
     if conf.session:
         save_session(conf.session, SESSION)

scapy-2.4.3.tar.gz/scapy/modules/krack/__init__.py -> scapy-2.4.4.tar.gz/scapy/modules/krack/__init__.py Changed

scapy-2.4.3.tar.gz/scapy/modules/krack/automaton.py -> scapy-2.4.4.tar.gz/scapy/modules/krack/automaton.py Changed

@@ -12,11 +12,24 @@
 from scapy.base_classes import Net
 from scapy.config import conf
 from scapy.compat import raw, chb
-from scapy.consts import WINDOWS
-from scapy.error import log_runtime, Scapy_Exception
-from scapy.layers.dot11 import RadioTap, Dot11, Dot11AssoReq, Dot11AssoResp, \
-    Dot11Auth, Dot11Beacon, Dot11Elt, Dot11EltRates, Dot11EltRSN, \
-    Dot11ProbeReq, Dot11ProbeResp, RSNCipherSuite, AKMSuite
+from scapy.consts import LINUX
+from scapy.error import log_runtime
+from scapy.layers.dot11 import (
+    AKMSuite,
+    Dot11,
+    Dot11AssoReq,
+    Dot11AssoResp,
+    Dot11Auth,
+    Dot11Beacon,
+    Dot11Elt,
+    Dot11EltDSSSet,
+    Dot11EltRSN,
+    Dot11EltRates,
+    Dot11ProbeReq,
+    Dot11ProbeResp,
+    RSNCipherSuite,
+    RadioTap,
+)
 from scapy.layers.eap import EAPOL
 from scapy.layers.l2 import ARP, LLC, SNAP, Ether
 from scapy.layers.dhcp import DHCP_am
@@ -66,7 +79,8 @@
 
     def __init__(self, *args, **kargs):
         kargs.setdefault("ll", conf.L2socket)
-        kargs.setdefault("monitor", True)
+        if not LINUX:
+            kargs.setdefault("monitor", True)
         super(KrackAP, self).__init__(*args, **kargs)
 
     def parse_args(self, ap_mac, ssid, passphrase,
@@ -82,27 +96,33 @@
                    **kwargs):
         """
         Mandatory arguments:
-        @iface: interface to use (must be in monitor mode)
-        @ap_mac: AP's MAC
-        @ssid: AP's SSID
-        @passphrase: AP's Passphrase (min 8 char.)
+
+        :param iface: interface to use (must be in monitor mode)
+        :param ap_mac: AP's MAC
+        :param ssid: AP's SSID
+        :param passphrase: AP's Passphrase (min 8 char.)
 
         Optional arguments:
-        @channel: used by the interface. Default 6, autodetected on windows
+
+        :param channel: used by the interface. Default 6
 
         Krack attacks options:
 
          - Msg 3/4 handshake replay:
-        double_3handshake: double the 3/4 handshake message
-        encrypt_3handshake: encrypt the second 3/4 handshake message
-        wait_3handshake: time to wait (in sec.) before sending the second 3/4
-         - double GTK rekeying:
-        double_gtk_refresh: double the 1/2 GTK rekeying message
-        wait_gtk: time to wait (in sec.) before sending the GTK rekeying
-        arp_target_ip: Client IP to use in ARP req. (to detect attack success)
-                       If None, use a DHCP server
-        arp_source_ip: Server IP to use in ARP req. (to detect attack success)
-                       If None, use the DHCP server gateway address
+
+        :param double_3handshake: double the 3/4 handshake message
+        :param encrypt_3handshake: encrypt the second 3/4 handshake message
+        :param wait_3handshake: time to wait (in sec.) before sending the
+            second 3/4
+
+        - double GTK rekeying:
+
+        :param double_gtk_refresh: double the 1/2 GTK rekeying message
+        :param wait_gtk: time to wait (in sec.) before sending the GTK rekeying
+        :param arp_target_ip: Client IP to use in ARP req. (to detect attack
+            success). If None, use a DHCP server
+        :param arp_source_ip: Server IP to use in ARP req. (to detect attack
+            success). If None, use the DHCP server gateway address
         """
         super(KrackAP, self).parse_args(**kwargs)
 
@@ -111,13 +131,7 @@
         self.ssid = ssid
         self.passphrase = passphrase
         if channel is None:
-            if WINDOWS:
-                try:
-                    channel = kwargs.get("iface", conf.iface).channel()
-                except (Scapy_Exception, AttributeError):
-                    channel = 6
-            else:
-                channel = 6
+            channel = 6
         self.channel = channel
 
         # Internal structures
@@ -220,13 +234,14 @@
         """Build a packet with info describing the current AP
         For beacon / proberesp use
         """
+        ts = int(time.time() * 1e6) & 0xffffffffffffffff
         return RadioTap() \
             / Dot11(addr1=dest, addr2=self.mac, addr3=self.mac) \
-            / layer_cls(timestamp=0, beacon_interval=100,
+            / layer_cls(timestamp=ts, beacon_interval=100,
                         cap='ESS+privacy') \
             / Dot11Elt(ID="SSID", info=self.ssid) \
             / Dot11EltRates(rates=[130, 132, 139, 150, 12, 18, 24, 36]) \
-            / Dot11Elt(ID="DSset", info=chb(self.channel)) \
+            / Dot11EltDSSSet(channel=self.channel) \
             / Dot11EltRSN(group_cipher_suite=RSNCipherSuite(cipher=0x2),
                           pairwise_cipher_suites=[RSNCipherSuite(cipher=0x2)],
                           akm_suites=[AKMSuite(suite=0x2)])
@@ -486,7 +501,7 @@
         log_runtime.warning("Client %s connected!", self.client)
 
         # Launch DHCP Server
-        self.dhcp_server.run()
+        self.dhcp_server()
 
         rep = RadioTap()
         rep /= Dot11(addr1=self.client, addr2=self.mac, addr3=self.mac)

scapy-2.4.3.tar.gz/scapy/modules/krack/crypto.py -> scapy-2.4.4.tar.gz/scapy/modules/krack/crypto.py Changed

scapy-2.4.3.tar.gz/scapy/packet.py -> scapy-2.4.4.tar.gz/scapy/packet.py Changed

@@ -4,11 +4,18 @@
 # This program is published under a GPLv2 license
 
 """
-Packet class. Binding mechanism. fuzz() method.
+Packet class
+
+Provides:
+ - the default Packet classes
+ - binding mechanisms
+ - fuzz() method
+ - exploration methods: explore() / ls()
 """
 
 from __future__ import absolute_import
 from __future__ import print_function
+from collections import defaultdict
 import re
 import time
 import itertools
@@ -67,8 +74,6 @@
         "direction", "sniffed_on",
         # handle snaplen Vs real length
         "wirelen",
-        # used while performing advanced dissection to handle padding
-        "_tmp_dissect_pos",
     ]
     name = None
     fields_desc = []
@@ -98,18 +103,16 @@
         for lower, fval in six.iteritems(self._overload_fields):
             print("%-20s  %s" % (lower.__name__, ", ".join("%-12s" % ("%s=%r" % i) for i in six.iteritems(fval))))  # noqa: E501
 
-    def _unpickle(self, dlist):
-        """Used to unpack pickling"""
-        self.__init__(b"".join(dlist))
-        return self
-
     def __reduce__(self):
         """Used by pickling methods"""
-        return (self.__class__, (), (self.build(),))
-
-    def __reduce_ex__(self, proto):
-        """Used by pickling methods"""
-        return self.__reduce__()
+        return (self.__class__, (), (
+            self.build(),
+            self.time,
+            self.sent_time,
+            self.direction,
+            self.sniffed_on,
+            self.wirelen,
+        ))
 
     def __getstate__(self):
         """Mark object as pickable"""
@@ -117,7 +120,13 @@
 
     def __setstate__(self, state):
         """Rebuild state using pickable methods"""
-        return self._unpickle(state)
+        self.__init__(state[0])
+        self.time = state[1]
+        self.sent_time = state[2]
+        self.direction = state[3]
+        self.sniffed_on = state[4]
+        self.wirelen = state[5]
+        return self
 
     def __deepcopy__(self, memo):
         """Used by copy.deepcopy"""
@@ -143,6 +152,8 @@
         self.raw_packet_cache = None
         self.raw_packet_cache_fields = None
         self.wirelen = None
+        self.direction = None
+        self.sniffed_on = None
         if _pkt:
             self.dissect(_pkt)
             if not _internal:
@@ -778,7 +789,6 @@
                 if fdump:
                     dt, target, last_shift, last_y = make_dump(fdump, last_shift, last_y, col, bkcol)  # noqa: E501
 
-                    dtb = dt.bbox()
                     dtb = target
                     vtb = vt.bbox()
                     bxvt = make_box(vtb)
@@ -821,24 +831,17 @@
         return s
 
     def do_dissect(self, s):
-        if not isinstance(s, bytes):
-            s = bytes_encode(s)
         _raw = s
         self.raw_packet_cache_fields = {}
-        # Temporary value, used by getfield() in some advanced cases (eg: dot11)  # noqa: E501
-        _lr = len(_raw)
-        self._tmp_dissect_pos = 0  # How many bytes have already been dissected
         for f in self.fields_desc:
             if not s:
                 break
             s, fval = f.getfield(self, s)
-            self._tmp_dissect_pos = _lr - len(s)
             # We need to track fields with mutable values to discard
             # .raw_packet_cache when needed.
             if f.islist or f.holds_packets or f.ismutable:
                 self.raw_packet_cache_fields[f.name] = f.do_copy(fval)
             self.fields[f.name] = fval
-        del self._tmp_dissect_pos
         self.raw_packet_cache = _raw[:-len(s)] if s else _raw
         self.explicit = 1
         return s
@@ -1024,7 +1027,7 @@
         return length
 
     def iterpayloads(self):
-        """Used to iter through the paylods of a Packet.
+        """Used to iter through the payloads of a Packet.
         Useful for DNS or 802.11 for instance.
         """
         yield self
@@ -1064,6 +1067,8 @@
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    __hash__ = None
+
     def hashret(self):
         """DEV: returns a string that has the same value for a request
         and its answer."""
@@ -1084,10 +1089,19 @@
             lyr = lyr.payload.getlayer(0, _subclass=True)
         return layers
 
-    def haslayer(self, cls):
-        """true if self has a layer that is an instance of cls. Superseded by "cls in self" syntax."""  # noqa: E501
-        if self.__class__ == cls or cls in [self.__class__.__name__,
-                                            self._name]:
+    def haslayer(self, cls, _subclass=None):
+        """
+        true if self has a layer that is an instance of cls.
+        Superseded by "cls in self" syntax.
+        """
+        if _subclass is None:
+            _subclass = self.match_subclass or None
+        if _subclass:
+            match = issubtype
+        else:
+            match = lambda cls1, cls2: cls1 == cls2
+        if cls is None or match(self.__class__, cls) \
+           or cls in [self.__class__.__name__, self._name]:
             return True
         for f in self.packetfields:
             fvalue_gen = self.getfieldval(f.name)
@@ -1097,10 +1111,10 @@
                 fvalue_gen = SetGen(fvalue_gen, _iterpacket=0)
             for fvalue in fvalue_gen:
                 if isinstance(fvalue, Packet):
-                    ret = fvalue.haslayer(cls)
+                    ret = fvalue.haslayer(cls, _subclass=_subclass)
                     if ret:
                         return ret
-        return self.payload.haslayer(cls)
+        return self.payload.haslayer(cls, _subclass=_subclass)
 
     def getlayer(self, cls, nb=1, _track=None, _subclass=None, **flt):
         """Return the nb^th layer that is an instance of cls, matching flt
@@ -1109,7 +1123,7 @@
         if _subclass is None:
             _subclass = self.match_subclass or None
         if _subclass:
-            match = lambda cls1, cls2: issubclass(cls1, cls2)
+            match = issubtype
         else:
             match = lambda cls1, cls2: cls1 == cls2
         if isinstance(cls, int):
@@ -1275,28 +1289,38 @@
         return self.__class__(raw(self)).show(dump, indent, lvl, label_lvl)
 
     def sprintf(self, fmt, relax=1):
-        """sprintf(format, [relax=1]) -> str
-where format is a string that can include directives. A directive begins and
-ends by % and has the following format %[fmt[r],][cls[:nb].]field%.
-
-fmt is a classic printf directive, "r" can be appended for raw substitution
-(ex: IP.flags=0x18 instead of SA), nb is the number of the layer we want
-(ex: for IP/IP packets, IP:2.src is the src of the upper IP layer).
-Special case : "%.time%" is the creation time.
-Ex : p.sprintf("%.time% %-15s,IP.src% -> %-15s,IP.dst% %IP.chksum% "
-               "%03xr,IP.proto% %r,TCP.flags%")
-
-Moreover, the format string can include conditional statements. A conditional
-statement looks like : {layer:string} where layer is a layer name, and string
-is the string to insert in place of the condition if it is true, i.e. if layer
-is present. If layer is preceded by a "!", the result is inverted. Conditions
-can be imbricated. A valid statement can be :
-  p.sprintf("This is a{TCP: TCP}{UDP: UDP}{ICMP:n ICMP} packet")
-  p.sprintf("{IP:%IP.dst% {ICMP:%ICMP.type%}{TCP:%TCP.dport%}}")
-
-A side effect is that, to obtain "{" and "}" characters, you must use
-"%(" and "%)".
-"""
+        """
+        sprintf(format, [relax=1]) -> str
+
+        Where format is a string that can include directives. A directive
+        begins and ends by % and has the following format:
+        ``%[fmt[r],][cls[:nb].]field%``
+
+        :param fmt: is a classic printf directive, "r" can be appended for raw
+          substitution:
+          (ex: IP.flags=0x18 instead of SA), nb is the number of the layer
+          (ex: for IP/IP packets, IP:2.src is the src of the upper IP layer).
+          Special case : "%.time%" is the creation time.
+          Ex::
+
+            p.sprintf(
+              "%.time% %-15s,IP.src% -> %-15s,IP.dst% %IP.chksum% "
+              "%03xr,IP.proto% %r,TCP.flags%"
+            )
+
+          Moreover, the format string can include conditional statements. A
+          conditional statement looks like : {layer:string} where layer is a
+          layer name, and string is the string to insert in place of the
+          condition if it is true, i.e. if layer is present. If layer is
+          preceded by a "!", the result is inverted. Conditions can be
+          imbricated. A valid statement can be::
+
+            p.sprintf("This is a{TCP: TCP}{UDP: UDP}{ICMP:n ICMP} packet")
+            p.sprintf("{IP:%IP.dst% {ICMP:%ICMP.type%}{TCP:%TCP.dport%}}")
+
+          A side effect is that, to obtain "{" and "}" characters, you must use
+          "%(" and "%)".
+        """
 
         escape = {"%": "%",
                   "(": "{",
@@ -1451,13 +1475,6 @@
             c += "/" + pc
         return c
 
-    def __hash__(self):
-        """Needed for Python 2 only: Packet() subclasses should not be
-hashable.
-
-        """
-        raise TypeError('unhashable type: %r' % self.__class__.__name__)
-
     def convert_to(self, other_cls, **kwargs):
         """Converts this Packet to another type.
 
@@ -1466,8 +1483,8 @@
         By default, this only implements conversion to ``Raw``.
 
         :param other_cls: Reference to a Packet class to convert to.
-        :type other_cls: Type[Packet]
-        :returns: Converted form of the packet.
+        :type other_cls: Type[scapy.packet.Packet]
+        :return: Converted form of the packet.
         :rtype: other_cls
         :raises TypeError: When conversion is not possible
         """
@@ -1490,8 +1507,8 @@
         This is not guaranteed to be a lossless process.
 
         :param pkt: The packet to convert.
-        :type pkt: Packet
-        :returns: Converted form of the packet.
+        :type pkt: scapy.packet.Packet
+        :return: Converted form of the packet.
         :rtype: cls
         :raises TypeError: When conversion is not possible
         """
@@ -1605,7 +1622,7 @@
     def answers(self, other):
         return isinstance(other, NoPayload) or isinstance(other, conf.padding_layer)  # noqa: E501
 
-    def haslayer(self, cls):
+    def haslayer(self, cls, _subclass=None):
         return 0
 
     def getlayer(self, cls, nb=1, _track=None, **flt):
@@ -1650,12 +1667,13 @@
     name = "Raw"
     fields_desc = [StrField("load", "")]
 
+    def __init__(self, _pkt=None, *args, **kwargs):
+        if _pkt and not isinstance(_pkt, bytes):
+            _pkt = bytes_encode(_pkt)
+        super(Raw, self).__init__(_pkt, *args, **kwargs)
+
     def answers(self, other):
         return 1
-#        s = raw(other)
-#        t = self.load
-#        l = min(len(s), len(t))
-#        return  s[:l] == t[:l]
 
     def mysummary(self):
         cs = conf.raw_summary
@@ -1693,10 +1711,10 @@
 
 
 def bind_bottom_up(lower, upper, __fval=None, **fval):
-    """Bind 2 layers for dissection.
+    r"""Bind 2 layers for dissection.
     The upper layer will be chosen for dissection on top of the lower layer, if
-    ALL the passed arguments are validated. If multiple calls are made with the same  # noqa: E501
-    layers, the last one will be used as default.
+    ALL the passed arguments are validated. If multiple calls are made with
+    the same layers, the last one will be used as default.
 
     ex:
         >>> bind_bottom_up(Ether, SNAP, type=0x1234)
@@ -1711,8 +1729,8 @@
 
 def bind_top_down(lower, upper, __fval=None, **fval):
     """Bind 2 layers for building.
-    When the upper layer is added as a payload of the lower layer, all the arguments  # noqa: E501
-    will be applied to them.
+    When the upper layer is added as a payload of the lower layer, all the
+    arguments will be applied to them.
 
     ex:
         >>> bind_top_down(Ether, SNAP, type=0x1234)
@@ -1832,7 +1850,7 @@
             call_ptk = lambda x: x
         # 1 - Ask for layer or contrib
         btn_diag = button_dialog(
-            title="Scapy v%s" % conf.version,
+            title=six.text_type("Scapy v%s" % conf.version),
             text=HTML(
                 six.text_type(
                     '<style bg="white" fg="red">Chose the type of packets'
@@ -1848,40 +1866,101 @@
         # 2 - Retrieve list of Packets
         if action == "layers":
             # Get all loaded layers
-            _radio_values = conf.layers.layers()
+            values = conf.layers.layers()
             # Restrict to layers-only (not contribs) + packet.py and asn1*.py
-            _radio_values = [x for x in _radio_values if ("layers" in x[0] or
-                                                          "packet" in x[0] or
-                                                          "asn1" in x[0])]
+            values = [x for x in values if ("layers" in x[0] or
+                                            "packet" in x[0] or
+                                            "asn1" in x[0])]
         elif action == "contribs":
             # Get all existing contribs
             from scapy.main import list_contrib
-            _radio_values = list_contrib(ret=True)
-            _radio_values = [(x['name'], x['description'])
-                             for x in _radio_values]
+            values = list_contrib(ret=True)
+            values = [(x['name'], x['description'])
+                      for x in values]
             # Remove very specific modules
-            _radio_values = [x for x in _radio_values if not ("can" in x[0])]
+            values = [x for x in values if "can" not in x[0]]
         else:
             # Escape/Cancel was pressed
             return
         # Python 2 compat
         if six.PY2:
-            _radio_values = [(six.text_type(x), six.text_type(y))
-                             for x, y in _radio_values]
+            values = [(six.text_type(x), six.text_type(y))
+                      for x, y in values]
+        # Build tree
+        if action == "contribs":
+            # A tree is a dictionary. Each layer contains a keyword
+            # _l which contains the files in the layer, and a _name
+            # argument which is its name. The other keys are the subfolders,
+            # which are similar dictionaries
+            tree = defaultdict(list)
+            for name, desc in values:
+                if "." in name:  # Folder detected
+                    parts = name.split(".")
+                    subtree = tree
+                    for pa in parts[:-1]:
+                        if pa not in subtree:
+                            subtree[pa] = {}
+                        subtree = subtree[pa]  # one layer deeper
+                        subtree["_name"] = pa
+                    if "_l" not in subtree:
+                        subtree["_l"] = []
+                    subtree["_l"].append((parts[-1], desc))
+                else:
+                    tree["_l"].append((name, desc))
+        elif action == "layers":
+            tree = {"_l": values}
         # 3 - Ask for the layer/contrib module to explore
-        rd_diag = radiolist_dialog(
-            values=_radio_values,
-            title="Scapy v%s" % conf.version,
-            text=HTML(
-                six.text_type(
-                    '<style bg="white" fg="red">Please select a layer among'
-                    ' the following, to see all packets contained in'
-                    ' it:</style>'
+        current = tree
+        previous = []
+        while True:
+            # Generate tests & form
+            folders = list(current.keys())
+            _radio_values = [
+                ("$" + name, six.text_type('[+] ' + name.capitalize()))
+                for name in folders if not name.startswith("_")
+            ] + current.get("_l", [])
+            cur_path = ""
+            if previous:
+                cur_path = ".".join(
+                    itertools.chain(
+                        (x["_name"] for x in previous[1:]),
+                        (current["_name"],)
+                    )
                 )
-            ))
-        result = call_ptk(rd_diag)
-        if result is None:
-            return  # User pressed "Cancel"
+            extra_text = (
+                '\n<style bg="white" fg="green">> scapy.%s</style>'
+            ) % (action + ("." + cur_path if cur_path else ""))
+            # Show popup
+            rd_diag = radiolist_dialog(
+                values=_radio_values,
+                title=six.text_type(
+                    "Scapy v%s" % conf.version
+                ),
+                text=HTML(
+                    six.text_type((
+                        '<style bg="white" fg="red">Please select a file'
+                        'among the following, to see all layers contained in'
+                        ' it:</style>'
+                    ) + extra_text)
+                ),
+                cancel_text="Back" if previous else "Cancel"
+            )
+            result = call_ptk(rd_diag)
+            if result is None:
+                # User pressed "Cancel/Back"
+                if previous:  # Back
+                    current = previous.pop()
+                    continue
+                else:  # Cancel
+                    return
+            if result.startswith("$"):
+                previous.append(current)
+                current = current[result[1:]]
+            else:
+                # Enter on layer
+                if previous:  # In subfolder
+                    result = cur_path + "." + result
+                break
         # 4 - (Contrib only): load contrib
         if action == "contribs":
             from scapy.main import load_contrib
@@ -1924,13 +2003,76 @@
     print(pretty_list(rtlst, [("Class", "Name")], borders=True))
 
 
+def _pkt_ls(obj, verbose=False):
+    """Internal function used to resolve `fields_desc` to display it.
+
+    :param obj: a packet object or class
+    :returns: a list containing tuples [(name, clsname, clsname_extras,
+        default, long_attrs)]
+    """
+    is_pkt = isinstance(obj, Packet)
+    if not issubtype(obj, Packet) and not is_pkt:
+        raise ValueError
+    fields = []
+    for f in obj.fields_desc:
+        cur_fld = f
+        attrs = []
+        long_attrs = []
+        while isinstance(cur_fld, (Emph, ConditionalField)):
+            if isinstance(cur_fld, ConditionalField):
+                attrs.append(cur_fld.__class__.__name__[:4])
+            cur_fld = cur_fld.fld
+        if verbose and isinstance(cur_fld, EnumField) \
+           and hasattr(cur_fld, "i2s"):
+            if len(cur_fld.i2s) < 50:
+                long_attrs.extend(
+                    "%s: %d" % (strval, numval)
+                    for numval, strval in
+                    sorted(six.iteritems(cur_fld.i2s))
+                )
+        elif isinstance(cur_fld, MultiEnumField):
+            fld_depend = cur_fld.depends_on(obj.__class__
+                                            if is_pkt else obj)
+            attrs.append("Depends on %s" % fld_depend.name)
+            if verbose:
+                cur_i2s = cur_fld.i2s_multi.get(
+                    cur_fld.depends_on(obj if is_pkt else obj()), {}
+                )
+                if len(cur_i2s) < 50:
+                    long_attrs.extend(
+                        "%s: %d" % (strval, numval)
+                        for numval, strval in
+                        sorted(six.iteritems(cur_i2s))
+                    )
+        elif verbose and isinstance(cur_fld, FlagsField):
+            names = cur_fld.names
+            long_attrs.append(", ".join(names))
+        cls = cur_fld.__class__
+        class_name_extras = "(%s)" % (
+            ", ".join(attrs)
+        ) if attrs else ""
+        if isinstance(cur_fld, BitField):
+            class_name_extras += " (%d bit%s)" % (
+                cur_fld.size,
+                "s" if cur_fld.size > 1 else ""
+            )
+        fields.append(
+            (f.name,
+             cls,
+             class_name_extras,
+             f.default,
+             long_attrs)
+        )
+    return fields
+
+
 @conf.commands.register
 def ls(obj=None, case_sensitive=False, verbose=False):
     """List  available layers, or infos on a given layer class or name.
-    params:
-     - obj: Packet / packet name to use
-     - case_sensitive: if obj is a string, is it case sensitive?
-     - verbose
+
+    :param obj: Packet / packet name to use
+    :param case_sensitive: if obj is a string, is it case sensitive?
+    :param verbose:
     """
     is_string = isinstance(obj, six.string_types)
 
@@ -1960,62 +2102,130 @@
             print("\nTIP: You may use explore() to navigate through all "
                   "layers using a clear GUI")
     else:
-        is_pkt = isinstance(obj, Packet)
-        if issubtype(obj, Packet) or is_pkt:
-            for f in obj.fields_desc:
-                cur_fld = f
-                attrs = []
-                long_attrs = []
-                while isinstance(cur_fld, (Emph, ConditionalField)):
-                    if isinstance(cur_fld, ConditionalField):
-                        attrs.append(cur_fld.__class__.__name__[:4])
-                    cur_fld = cur_fld.fld
-                if verbose and isinstance(cur_fld, EnumField) \
-                   and hasattr(cur_fld, "i2s"):
-                    if len(cur_fld.i2s) < 50:
-                        long_attrs.extend(
-                            "%s: %d" % (strval, numval)
-                            for numval, strval in
-                            sorted(six.iteritems(cur_fld.i2s))
-                        )
-                elif isinstance(cur_fld, MultiEnumField):
-                    fld_depend = cur_fld.depends_on(obj.__class__
-                                                    if is_pkt else obj)
-                    attrs.append("Depends on %s" % fld_depend.name)
-                    if verbose:
-                        cur_i2s = cur_fld.i2s_multi.get(
-                            cur_fld.depends_on(obj if is_pkt else obj()), {}
-                        )
-                        if len(cur_i2s) < 50:
-                            long_attrs.extend(
-                                "%s: %d" % (strval, numval)
-                                for numval, strval in
-                                sorted(six.iteritems(cur_i2s))
-                            )
-                elif verbose and isinstance(cur_fld, FlagsField):
-                    names = cur_fld.names
-                    long_attrs.append(", ".join(names))
-                class_name = "%s (%s)" % (
-                    cur_fld.__class__.__name__,
-                    ", ".join(attrs)) if attrs else cur_fld.__class__.__name__
-                if isinstance(cur_fld, BitField):
-                    class_name += " (%d bit%s)" % (cur_fld.size,
-                                                   "s" if cur_fld.size > 1
-                                                   else "")
-                print("%-10s : %-35s =" % (f.name, class_name), end=' ')
+        try:
+            fields = _pkt_ls(obj, verbose=verbose)
+            is_pkt = isinstance(obj, Packet)
+            # Print
+            for fname, cls, clsne, dflt, long_attrs in fields:
+                cls = cls.__name__ + " " + clsne
+                print("%-10s : %-35s =" % (fname, cls), end=' ')
                 if is_pkt:
-                    print("%-15r" % (getattr(obj, f.name),), end=' ')
-                print("(%r)" % (f.default,))
+                    print("%-15r" % (getattr(obj, fname),), end=' ')
+                print("(%r)" % (dflt,))
                 for attr in long_attrs:
                     print("%-15s%s" % ("", attr))
+            # Restart for payload if any
             if is_pkt and not isinstance(obj.payload, NoPayload):
                 print("--")
                 ls(obj.payload)
-
-        else:
+        except ValueError:
             print("Not a packet class or name. Type 'ls()' to list packet classes.")  # noqa: E501
 
 
+@conf.commands.register
+def rfc(cls, ret=False, legend=True):
+    """
+    Generate an RFC-like representation of a packet def.
+
+    :param cls: the Packet class
+    :param ret: return the result instead of printing (def. False)
+    :param legend: show text under the diagram (default True)
+
+    Ex::
+
+        >>> rfc(Ether)
+
+    """
+    if not issubclass(cls, Packet):
+        raise TypeError("Packet class expected")
+    cur_len = 0
+    cur_line = []
+    lines = []
+    # Get the size (width) that a field will take
+    # when formatted, from its length in bits
+    clsize = lambda x: 2 * x - 1
+    ident = 0  # Fields UUID
+    # Generate packet groups
+    for f in cls.fields_desc:
+        flen = int(f.sz * 8)
+        cur_len += flen
+        ident += 1
+        # Fancy field name
+        fname = f.name.upper().replace("_", " ")
+        # The field might exceed the current line or
+        # take more than one line. Copy it as required
+        while True:
+            over = max(0, cur_len - 32)  # Exceed
+            len1 = clsize(flen - over)  # What fits
+            cur_line.append((fname[:len1], len1, ident))
+            if cur_len >= 32:
+                # Current line is full. start a new line
+                lines.append(cur_line)
+                cur_len = flen = over
+                fname = ""  # do not repeat the field
+                cur_line = []
+                if not over:
+                    # there is no data left
+                    break
+            else:
+                # End of the field
+                break
+    # Add the last line if un-finished
+    if cur_line:
+        lines.append(cur_line)
+    # Calculate separations between lines
+    seps = []
+    seps.append("+-" * 32 + "+\n")
+    for i in range(len(lines) - 1):
+        # Start with a full line
+        sep = "+-" * 32 + "+\n"
+        # Get the line above and below the current
+        # separation
+        above, below = lines[i], lines[i + 1]
+        # The last field of above is shared with below
+        if above[-1][2] == below[0][2]:
+            # where the field in "above" starts
+            pos_above = sum(x[1] for x in above[:-1])
+            # where the field in "below" ends
+            pos_below = below[0][1]
+            if pos_above < pos_below:
+                # they are overlapping.
+                # Now crop the space between those pos
+                # and fill it with " "
+                pos_above = pos_above + pos_above % 2
+                sep = (
+                    sep[:1 + pos_above] +
+                    " " * (pos_below - pos_above) +
+                    sep[1 + pos_below:]
+                )
+        # line is complete
+        seps.append(sep)
+    # Graph
+    result = ""
+    # Bytes markers
+    result += " " + (" " * 19).join(
+        str(x) for x in range(4)
+    ) + "\n"
+    # Bits markers
+    result += " " + " ".join(
+        str(x % 10) for x in range(32)
+    ) + "\n"
+    # Add fields and their separations
+    for line, sep in zip(lines, seps):
+        result += sep
+        for elt, flen, _ in line:
+            result += "|" + elt.center(flen, " ")
+        result += "|\n"
+    result += "+-" * (cur_len or 32) + "+\n"
+    # Annotate with the figure name
+    if legend:
+        result += "\n" + ("Fig. " + cls.__name__).center(66, " ")
+    # return if asked for, else print
+    if ret:
+        return result
+    print(result)
+
+
 #############
 #  Fuzzing  #
 #############
@@ -2027,7 +2237,7 @@
     by random objects.
 
     :param p: the Packet instance to fuzz
-    :returns: the fuzzed packet.
+    :return: the fuzzed packet.
     """
     if not _inplace:
         p = p.copy()
@@ -2038,7 +2248,6 @@
         for f in q.fields_desc:
             if isinstance(f, PacketListField):
                 for r in getattr(q, f.name):
-                    print("fuzzing", repr(r))
                     fuzz(r, _inplace=1)
             elif isinstance(f, MultipleTypeField):
                 # the type of the field will depend on others

scapy-2.4.3.tar.gz/scapy/pipetool.py -> scapy-2.4.4.tar.gz/scapy/pipetool.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Philippe Biondi <phil@secdev.org>
@@ -91,11 +89,11 @@
             self.active_sinks.add(pipe)
 
     def get_pipe_list(self, pipe):
-        def flatten(p, l):
-            l.add(p)
+        def flatten(p, li):
+            li.add(p)
             for q in p.sources | p.sinks | p.high_sources | p.high_sinks:
-                if q not in l:
-                    flatten(q, l)
+                if q not in li:
+                    flatten(q, li)
         pl = set()
         flatten(pipe, pl)
         return pl
@@ -357,12 +355,15 @@
 
 class Drain(Pipe):
     """Repeat messages from low/high entries to (resp.) low/high exits
-     +-------+
-  >>-|-------|->>
-     |       |
-   >-|-------|->
-     +-------+
-"""
+
+    .. code::
+
+         +-------+
+      >>-|-------|->>
+         |       |
+       >-|-------|->
+         +-------+
+    """
 
     def push(self, msg):
         self._send(msg)
@@ -378,10 +379,34 @@
 
 
 class Sink(Pipe):
+    """
+    Does nothing; interface to extend for custom sinks.
+
+    All sinks have the following constructor parameters:
+
+    :param name: a human-readable name for the element
+    :type name: str
+    """
     def push(self, msg):
+        """
+        Called by :py:class:`PipeEngine` when there is a new message for the
+        low entry.
+
+        :param msg: The message data
+        :returns: None
+        :rtype: None
+        """
         pass
 
     def high_push(self, msg):
+        """
+        Called by :py:class:`PipeEngine` when there is a new message for the
+        high entry.
+
+        :param msg: The message data
+        :returns: None
+        :rtype: None
+        """
         pass
 
     def start(self):
@@ -446,29 +471,39 @@
 
 
 class ConsoleSink(Sink):
-    """Print messages on low and high entries
-     +-------+
-  >>-|--.    |->>
-     | print |
-   >-|--'    |->
-     +-------+
-"""
+    """Print messages on low and high entries to ``stdout``
+
+    .. code::
+
+         +-------+
+      >>-|--.    |->>
+         | print |
+       >-|--'    |->
+         +-------+
+    """
 
     def push(self, msg):
-        print(">%r" % msg)
+        print(">" + repr(msg))
 
     def high_push(self, msg):
-        print(">>%r" % msg)
+        print(">>" + repr(msg))
 
 
 class RawConsoleSink(Sink):
     """Print messages on low and high entries, using os.write
-     +-------+
-  >>-|--.    |->>
-     | write |
-   >-|--'    |->
-     +-------+
-"""
+
+    .. code::
+
+         +-------+
+      >>-|--.    |->>
+         | write |
+       >-|--'    |->
+         +-------+
+
+    :param newlines: Include a new-line character after printing each packet.
+                     Defaults to True.
+    :type newlines: bool
+    """
 
     def __init__(self, name=None, newlines=True):
         Sink.__init__(self, name=name)
@@ -487,13 +522,16 @@
 
 
 class CLIFeeder(AutoSource):
-    """Send messages from python command line
-     +--------+
-  >>-|        |->>
-     | send() |
-   >-|   `----|->
-     +--------+
-"""
+    """Send messages from python command line:
+
+    .. code::
+
+         +--------+
+      >>-|        |->>
+         | send() |
+       >-|   `----|->
+         +--------+
+    """
 
     def send(self, msg):
         self._gen_data(msg)
@@ -503,26 +541,32 @@
 
 
 class CLIHighFeeder(CLIFeeder):
-    """Send messages from python command line to high output
-     +--------+
-  >>-|   .----|->>
-     | send() |
-   >-|        |->
-     +--------+
-"""
+    """Send messages from python command line to high output:
+
+    .. code::
+
+         +--------+
+      >>-|   .----|->>
+         | send() |
+       >-|        |->
+         +--------+
+    """
 
     def send(self, msg):
         self._gen_high_data(msg)
 
 
 class PeriodicSource(ThreadGenSource):
-    """Generage messages periodically on low exit
-     +-------+
-  >>-|       |->>
-     | msg,T |
-   >-|  `----|->
-     +-------+
-"""
+    """Generage messages periodically on low exit:
+
+    .. code::
+
+         +-------+
+      >>-|       |->>
+         | msg,T |
+       >-|  `----|->
+         +-------+
+    """
 
     def __init__(self, msg, period, period2=0, name=None):
         ThreadGenSource.__init__(self, name=name)
@@ -546,15 +590,32 @@
 
 
 class TermSink(Sink):
-    """Print messages on low and high entries on a separate terminal
-     +-------+
-  >>-|--.    |->>
-     | print |
-   >-|--'    |->
-     +-------+
-"""
-
-    def __init__(self, name=None, keepterm=True, newlines=True, openearly=True):  # noqa: E501
+    """
+    Prints messages on the low and high entries, on a separate terminal (xterm
+    or cmd).
+
+    .. code::
+
+         +-------+
+      >>-|--.    |->>
+         | print |
+       >-|--'    |->
+         +-------+
+
+    :param keepterm: Leave the terminal window open after :py:meth:`~Pipe.stop`
+                     is called. Defaults to True.
+    :type keepterm: bool
+    :param newlines: Include a new-line character after printing each packet.
+                     Defaults to True.
+    :type newlines: bool
+    :param openearly: Automatically starts the terminal when the constructor is
+                      called, rather than waiting for :py:meth:`~Pipe.start`.
+                      Defaults to True.
+    :type openearly: bool
+    """
+
+    def __init__(self, name=None, keepterm=True, newlines=True,
+                 openearly=True):
         Sink.__init__(self, name=name)
         self.keepterm = keepterm
         self.newlines = newlines
@@ -637,13 +698,19 @@
 
 
 class QueueSink(Sink):
-    """Collect messages from high and low entries and queue them. Messages are unqueued with the .recv() method.  # noqa: E501
-     +-------+
-  >>-|--.    |->>
-     | queue |
-   >-|--'    |->
-     +-------+
-"""
+    """
+    Collects messages on the low and high entries into a :py:class:`Queue`.
+    Messages are dequeued with :py:meth:`recv`.
+    Both high and low entries share the same :py:class:`Queue`.
+
+    .. code::
+
+         +-------+
+      >>-|--.    |->>
+         | queue |
+       >-|--'    |->
+         +-------+
+    """
 
     def __init__(self, name=None):
         Sink.__init__(self, name=name)
@@ -656,6 +723,20 @@
         self.q.put(msg)
 
     def recv(self, block=True, timeout=None):
+        """
+        Reads the next message from the queue.
+
+        If no message is available in the queue, returns None.
+
+        :param block: Blocks execution until a packet is available in the
+                      queue. Defaults to True.
+        :type block: bool
+        :param timeout: Controls how long to wait if ``block=True``. If None
+                        (the default), this method will wait forever. If a
+                        non-negative number, this is a number of seconds to
+                        wait before giving up (and returning None).
+        :type timeout: None, int or float
+        """
         try:
             return self.q.get(block=block, timeout=timeout)
         except six.moves.queue.Empty:
@@ -663,13 +744,16 @@
 
 
 class TransformDrain(Drain):
-    """Apply a function to messages on low and high entry
-     +-------+
-  >>-|--[f]--|->>
-     |       |
-   >-|--[f]--|->
-     +-------+
-"""
+    """Apply a function to messages on low and high entry:
+
+    .. code::
+
+         +-------+
+      >>-|--[f]--|->>
+         |       |
+       >-|--[f]--|->
+         +-------+
+    """
 
     def __init__(self, f, name=None):
         Drain.__init__(self, name=name)
@@ -683,13 +767,16 @@
 
 
 class UpDrain(Drain):
-    """Repeat messages from low entry to high exit
-     +-------+
-  >>-|    ,--|->>
-     |   /   |
-   >-|--'    |->
-     +-------+
-"""
+    """Repeat messages from low entry to high exit:
+
+    .. code::
+
+         +-------+
+      >>-|    ,--|->>
+         |   /   |
+       >-|--'    |->
+         +-------+
+    """
 
     def push(self, msg):
         self._high_send(msg)
@@ -699,13 +786,16 @@
 
 
 class DownDrain(Drain):
-    r"""Repeat messages from high entry to low exit
-     +-------+
-  >>-|--.    |->>
-     |   \   |
-   >-|    `--|->
-     +-------+
-"""
+    r"""Repeat messages from high entry to low exit:
+
+    .. code::
+
+         +-------+
+      >>-|--.    |->>
+         |   \   |
+       >-|    `--|->
+         +-------+
+    """
 
     def push(self, msg):
         pass

scapy-2.4.3.tar.gz/scapy/plist.py -> scapy-2.4.4.tar.gz/scapy/plist.py Changed

@@ -16,13 +16,16 @@
 from scapy.compat import lambda_tuple_converter
 from scapy.config import conf
 from scapy.base_classes import BasePacket, BasePacketList, _CanvasDumpExtended
+from scapy.fields import IPField, ShortEnumField, PacketField
 from scapy.utils import do_graph, hexdump, make_table, make_lined_table, \
     make_tex_table, issubtype
-from scapy.extlib import plt, MATPLOTLIB_INLINED, MATPLOTLIB_DEFAULT_PLOT_KARGS
+from scapy.extlib import plt, Line2D, \
+    MATPLOTLIB_INLINED, MATPLOTLIB_DEFAULT_PLOT_KARGS
 from functools import reduce
 import scapy.modules.six as six
 from scapy.modules.six.moves import range, zip
-
+from scapy.compat import Optional, List, Union, Tuple, Dict, Any, Callable
+from scapy.packet import Packet
 #############
 #  Results  #
 #############
@@ -46,18 +49,23 @@
         self.listname = name
 
     def __len__(self):
+        # type: () -> int
         return len(self.res)
 
     def _elt2pkt(self, elt):
+        # type: (Packet) -> Packet
         return elt
 
     def _elt2sum(self, elt):
+        # type: (Packet) -> str
         return elt.summary()
 
     def _elt2show(self, elt):
+        # type: (Packet) -> str
         return self._elt2sum(elt)
 
     def __repr__(self):
+        # type: () -> str
         stats = {x: 0 for x in self.stats}
         other = 0
         for r in self.res:
@@ -85,9 +93,12 @@
                                ct.punct(">"))
 
     def __getstate__(self):
+        # type: () -> Dict[str, Union[List[PacketField], List[Packet], str]]
         """
-        create a basic representation of the instance, used in conjunction with __setstate__() e.g. by pickle  # noqa: E501
-        :return: dict representing this instance
+        Creates a basic representation of the instance, used in
+        conjunction with __setstate__() e.g. by pickle
+
+        :returns: dict representing this instance
         """
         state = {
             'res': self.res,
@@ -97,8 +108,11 @@
         return state
 
     def __setstate__(self, state):
+        # type: (Dict[str, Union[List[PacketField], List[Packet], str]]) -> None  # noqa: E501
         """
-        set instance attributes to values given by state, used in conjunction with __getstate__() e.g. by pickle  # noqa: E501
+        Sets instance attributes to values given by state, used in
+        conjunction with __getstate__() e.g. by pickle
+
         :param state: dict representing this instance
         """
         self.res = state['res']
@@ -106,6 +120,7 @@
         self.listname = state['listname']
 
     def __getattr__(self, attr):
+        # type: (str) -> Any
         return getattr(self.res, attr)
 
     def __getitem__(self, item):
@@ -117,69 +132,93 @@
                                   name="mod %s" % self.listname)
         return self.res.__getitem__(item)
 
-    def __getslice__(self, *args, **kargs):
-        return self.__class__(self.res.__getslice__(*args, **kargs),
-                              name="mod %s" % self.listname)
-
     def __add__(self, other):
+        # type: (PacketList) -> PacketList
         return self.__class__(self.res + other.res,
                               name="%s+%s" % (self.listname, other.listname))
 
     def summary(self, prn=None, lfilter=None):
+        # type: (Optional[Callable], Optional[Callable]) -> None
         """prints a summary of each packet
-prn:     function to apply to each packet instead of lambda x:x.summary()
-lfilter: truth function to apply to each packet to decide whether it will be displayed"""  # noqa: E501
+
+        :param prn: function to apply to each packet instead of
+                    lambda x:x.summary()
+        :param lfilter: truth function to apply to each packet to decide
+                        whether it will be displayed
+        """
+        # Python 2 backward compatibility
+        prn = lambda_tuple_converter(prn)
+        lfilter = lambda_tuple_converter(lfilter)
+
         for r in self.res:
             if lfilter is not None:
-                if not lfilter(r):
+                if not lfilter(*r):
                     continue
             if prn is None:
                 print(self._elt2sum(r))
             else:
-                print(prn(r))
+                print(prn(*r))
 
     def nsummary(self, prn=None, lfilter=None):
+        # type: (Optional[Callable], Optional[Callable]) -> None
         """prints a summary of each packet with the packet's number
-prn:     function to apply to each packet instead of lambda x:x.summary()
-lfilter: truth function to apply to each packet to decide whether it will be displayed"""  # noqa: E501
+
+        :param prn: function to apply to each packet instead of
+                    lambda x:x.summary()
+        :param lfilter: truth function to apply to each packet to decide
+                        whether it will be displayed
+        """
+        # Python 2 backward compatibility
+        prn = lambda_tuple_converter(prn)
+        lfilter = lambda_tuple_converter(lfilter)
+
         for i, res in enumerate(self.res):
             if lfilter is not None:
-                if not lfilter(res):
+                if not lfilter(*res):
                     continue
             print(conf.color_theme.id(i, fmt="%04i"), end=' ')
             if prn is None:
                 print(self._elt2sum(res))
             else:
-                print(prn(res))
+                print(prn(*res))
 
     def display(self):  # Deprecated. Use show()
         """deprecated. is show()"""
         self.show()
 
     def show(self, *args, **kargs):
+        # type: (Any, Any) -> None
         """Best way to display the packet list. Defaults to nsummary() method"""  # noqa: E501
         return self.nsummary(*args, **kargs)
 
     def filter(self, func):
+        # type: (Callable) -> PacketList
         """Returns a packet list filtered by a truth function. This truth
         function has to take a packet as the only argument and return a boolean value."""  # noqa: E501
-        return self.__class__([x for x in self.res if func(x)],
+        # Python 2 backward compatibility
+        func = lambda_tuple_converter(func)
+
+        return self.__class__([x for x in self.res if func(*x)],
                               name="filtered %s" % self.listname)
 
     def make_table(self, *args, **kargs):
+        # type: (Any, Any) -> None
         """Prints a table using a function that returns for each packet its head column value, head row value and displayed value  # noqa: E501
         ex: p.make_table(lambda x:(x[IP].dst, x[TCP].dport, x[TCP].sprintf("%flags%")) """  # noqa: E501
         return make_table(self.res, *args, **kargs)
 
     def make_lined_table(self, *args, **kargs):
+        # type: (Any, Any) -> None
         """Same as make_table, but print a table with lines"""
         return make_lined_table(self.res, *args, **kargs)
 
     def make_tex_table(self, *args, **kargs):
+        # type: (Any, Any) -> None
         """Same as make_table, but print a table with LaTeX syntax"""
         return make_tex_table(self.res, *args, **kargs)
 
     def plot(self, f, lfilter=None, plot_xy=False, **kargs):
+        # type: (Callable, Optional[Callable], bool, Any) -> Line2D
         """Applies a function to each packet to get a value that will be plotted
         with matplotlib. A list of matplotlib.lines.Line2D is returned.
 
@@ -211,6 +250,7 @@
         return lines
 
     def diffplot(self, f, delay=1, lfilter=None, **kargs):
+        # type: (Callable, int, Optional[Callable], Any) -> Line2D
         """diffplot(f, delay=1, lfilter=None)
         Applies a function to couples (l[i],l[i+delay])
 
@@ -238,6 +278,7 @@
         return lines
 
     def multiplot(self, f, lfilter=None, plot_xy=False, **kargs):
+        # type: (Callable, Optional[Callable], bool, Any) -> Line2D
         """Uses a function that returns a label and a value for this label, then
         plots all the values label by label.
 
@@ -255,7 +296,7 @@
             lst_pkts = (f(*e) for e in self.res if lfilter(*e))
 
         # Apply the function f to the packets
-        d = {}
+        d = {}  # type: Dict[str, List[float]]
         for k, v in lst_pkts:
             d.setdefault(k, []).append(v)
 
@@ -278,11 +319,13 @@
         return lines
 
     def rawhexdump(self):
+        # type: (Optional[Callable]) -> None
         """Prints an hexadecimal dump of each packet in the list"""
         for p in self:
             hexdump(self._elt2pkt(p))
 
     def hexraw(self, lfilter=None):
+        # type: (Optional[Callable]) -> None
         """Same as nsummary(), except that if a packet has a Raw layer, it will be hexdumped  # noqa: E501
         lfilter: a truth function that decides whether a packet must be displayed"""  # noqa: E501
         for i, res in enumerate(self.res):
@@ -296,6 +339,7 @@
                 hexdump(p.getlayer(conf.raw_layer).load)
 
     def hexdump(self, lfilter=None):
+        # type: (Optional[Callable]) -> None
         """Same as nsummary(), except that packets are also hexdumped
         lfilter: a truth function that decides whether a packet must be displayed"""  # noqa: E501
         for i, res in enumerate(self.res):
@@ -308,6 +352,7 @@
             hexdump(p)
 
     def padding(self, lfilter=None):
+        # type: (Optional[Callable]) -> None
         """Same as hexraw(), for Padding layer"""
         for i, res in enumerate(self.res):
             p = self._elt2pkt(res)
@@ -319,6 +364,7 @@
                     hexdump(p.getlayer(conf.padding_layer).load)
 
     def nzpadding(self, lfilter=None):
+        # type: (Optional[Callable]) -> None
         """Same as padding() but only non null padding"""
         for i, res in enumerate(self.res):
             p = self._elt2pkt(res)
@@ -335,13 +381,17 @@
     def conversations(self, getsrcdst=None, **kargs):
         """Graphes a conversations between sources and destinations and display it
         (using graphviz and imagemagick)
-        getsrcdst: a function that takes an element of the list and
-                   returns the source, the destination and optionally
-                   a label. By default, returns the IP source and
-                   destination from IP and ARP layers
-        type: output type (svg, ps, gif, jpg, etc.), passed to dot's "-T" option  # noqa: E501
-        target: filename or redirect. Defaults pipe to Imagemagick's display program  # noqa: E501
-        prog: which graphviz program to use"""
+
+        :param getsrcdst: a function that takes an element of the list and
+            returns the source, the destination and optionally
+            a label. By default, returns the IP source and
+            destination from IP and ARP layers
+        :param type: output type (svg, ps, gif, jpg, etc.), passed to dot's
+            "-T" option
+        :param target: filename or redirect. Defaults pipe to Imagemagick's
+            display program
+        :param prog: which graphviz program to use
+        """
         if getsrcdst is None:
             def getsrcdst(pkt):
                 """Extract src and dst addresses"""
@@ -377,6 +427,7 @@
         return do_graph(gr, **kargs)
 
     def afterglow(self, src=None, event=None, dst=None, **kargs):
+        # type: (Optional[Callable], Optional[Callable], Optional[Callable], Any) -> None  # noqa: E501
         """Experimental clone attempt of http://sourceforge.net/projects/afterglow
         each datum is reduced as src -> event -> dst and the data are graphed.
         by default we have IP.src -> IP.dport -> IP.dst"""
@@ -386,9 +437,9 @@
             event = lambda x: x['IP'].dport
         if dst is None:
             dst = lambda x: x['IP'].dst
-        sl = {}
-        el = {}
-        dl = {}
+        sl = {}  # type: Dict[IPField, Tuple[int, List[ShortEnumField]]]
+        el = {}  # type: Dict[ShortEnumField, Tuple[int, List[IPField]]]
+        dl = {}  # type: Dict[IPField, ShortEnumField]
         for i in self.res:
             try:
                 s, e, d = src(i), event(i), dst(i)
@@ -435,11 +486,11 @@
         gr += "# event nodes\n"
         for e in el:
             n, _ = el[e]
-            n = n = 1 + float(n - mine) / (maxe - mine)
+            n = 1 + float(n - mine) / (maxe - mine)
             gr += '"evt.%s" [label = "%s", shape=circle, fillcolor="#00FFFF", style=filled, fixedsize=1, height=%.2f, width=%.2f];\n' % (repr(e), repr(e), n, n)  # noqa: E501
         for d in dl:
             n = dl[d]
-            n = n = 1 + float(n - mind) / (maxd - mind)
+            n = 1 + float(n - mind) / (maxd - mind)
             gr += '"dst.%s" [label = "%s", shape=triangle, fillcolor="#0000ff", style=filled, fixedsize=1, height=%.2f, width=%.2f];\n' % (repr(d), repr(d), n, n)  # noqa: E501
 
         gr += "###\n"
@@ -456,6 +507,7 @@
         return do_graph(gr, **kargs)
 
     def canvas_dump(self, **kargs):
+        # type: (Any) -> Any  # Using Any since pyx is imported later
         import pyx
         d = pyx.document.document()
         len_res = len(self.res)
@@ -471,6 +523,7 @@
         return d
 
     def sr(self, multi=0):
+        # type: (int) -> Tuple[SndRcvList, PacketList]
         """sr([multi=1]) -> (SndRcvList, PacketList)
         Matches packets in the list and return ( (matched couples), (unmatched packets) )"""  # noqa: E501
         remain = self.res[:]
@@ -533,6 +586,7 @@
         return dict(sessions)
 
     def replace(self, *args, **kargs):
+        # type: (Any, Any) -> PacketList
         """
         lst.replace(<field>,[<oldvalue>,]<newvalue>)
         lst.replace( (fld,[ov],nv),(fld,[ov,]nv),...)
@@ -565,13 +619,19 @@
             x.append(p)
         return x
 
-    def getlayer(self, cls, nb=None, flt=None, name=None, stats=None):
+    def getlayer(self, cls,  # type: Packet
+                 nb=None,  # type: Optional[int]
+                 flt=None,  # type: Optional[Dict[str, Any]]
+                 name=None,  # type: Optional[str]
+                 stats=None  # type: Optional[List[Packet]]
+                 ):
+        # type: (...) -> PacketList
         """Returns the packet list from a given layer.
 
         See ``Packet.getlayer`` for more info.
 
         :param cls: search for a layer that is an instance of ``cls``
-        :type cls: Type[Packet]
+        :type cls: Type[scapy.packet.Packet]
 
         :param nb: return the nb^th layer that is an instance of ``cls``
         :type nb: Optional[int]
@@ -584,15 +644,15 @@
 
         :param stats: optional list of protocols to give stats on; if not
                       specified, inherits from this PacketList.
-        :type stats: Optional[List[Type[Packet]]]
-        :rtype: PacketList
+        :type stats: Optional[List[Type[scapy.packet.Packet]]]
+        :rtype: scapy.plist.PacketList
         """
         if name is None:
             name = "{} layer {}".format(self.listname, cls.__name__)
         if stats is None:
             stats = self.stats
 
-        getlayer_arg = {}
+        getlayer_arg = {}  # type: Dict[str, Any]
         if flt is not None:
             getlayer_arg.update(flt)
         getlayer_arg['cls'] = cls
@@ -607,21 +667,22 @@
         )
 
     def convert_to(self, other_cls, name=None, stats=None):
+        # type: (Packet, Optional[str], Optional[List[Packet]]) -> PacketList
         """Converts all packets to another type.
 
         See ``Packet.convert_to`` for more info.
 
         :param other_cls: reference to a Packet class to convert to
-        :type other_cls: Type[Packet]
+        :type other_cls: Type[scapy.packet.Packet]
 
         :param name: optional name for the new PacketList
         :type name: Optional[str]
 
         :param stats: optional list of protocols to give stats on;
                       if not specified, inherits from this PacketList.
-        :type stats: Optional[List[Type[Packet]]]
+        :type stats: Optional[List[Type[scapy.packet.Packet]]]
 
-        :rtype: PacketList
+        :rtype: scapy.plist.PacketList
         """
         if name is None:
             name = "{} converted to {}".format(
@@ -636,13 +697,20 @@
 
 
 class SndRcvList(PacketList):
-    __slots__ = []
-
-    def __init__(self, res=None, name="Results", stats=None):
+    __slots__ = []  # type: List[str]
+
+    def __init__(self,
+                 res=None,  # type: Optional[Union[List[Packet], PacketList]]
+                 name="Results",  # type: str
+                 stats=None  # type: Optional[List[Packet]]
+                 ):
+        # type: (...) -> None
         PacketList.__init__(self, res, name, stats)
 
     def _elt2pkt(self, elt):
+        # type: (Tuple[Packet, Packet]) -> Packet
         return elt[1]
 
     def _elt2sum(self, elt):
+        # type: (Tuple[Packet, Packet]) -> str
         return "%s ==> %s" % (elt[0].summary(), elt[1].summary())

scapy-2.4.3.tar.gz/scapy/route.py -> scapy-2.4.4.tar.gz/scapy/route.py Changed

@@ -160,7 +160,7 @@
             aa = atol(a)
             if aa == atol_dst:
                 paths.append(
-                    (0xffffffff, 1, (scapy.consts.LOOPBACK_INTERFACE, a, "0.0.0.0"))  # noqa: E501
+                    (0xffffffff, 1, (conf.loopback_name, a, "0.0.0.0"))  # noqa: E501
                 )
             if (atol_dst & m) == (d & m):
                 paths.append((m, me, (i, a, gw)))
@@ -168,7 +168,7 @@
         if not paths:
             if verbose:
                 warning("No route found (no default route?)")
-            return scapy.consts.LOOPBACK_INTERFACE, "0.0.0.0", "0.0.0.0"
+            return conf.loopback_name, "0.0.0.0", "0.0.0.0"
         # Choose the more specific route
         # Sort by greatest netmask and use metrics as a tie-breaker
         paths.sort(key=lambda x: (-x[0], x[1]))
@@ -178,27 +178,29 @@
         return ret
 
     def get_if_bcast(self, iff):
+        bcast_list = []
         for net, msk, gw, iface, addr, metric in self.routes:
             if net == 0:
-                continue
+                continue    # Ignore default route "0.0.0.0"
+            elif msk == 0xffffffff:
+                continue    # Ignore host-specific routes
             if scapy.consts.WINDOWS:
                 if iff.guid != iface.guid:
                     continue
             elif iff != iface:
                 continue
-            bcast = atol(addr) | (~msk & 0xffffffff)  # FIXME: check error in atol()  # noqa: E501
-            return ltoa(bcast)
-        warning("No broadcast address found for iface %s\n", iff)
+            bcast = net | (~msk & 0xffffffff)
+            bcast_list.append(ltoa(bcast))
+        if not bcast_list:
+            warning("No broadcast address found for iface %s\n", iff)
+        return bcast_list
 
 
 conf.route = Route()
 
 iface = conf.route.route(None, verbose=0)[0]
 
-# Warning: scapy.consts.LOOPBACK_INTERFACE must always be used statically, because it  # noqa: E501
-# may be changed by scapy/arch/windows during execution
-
-if getattr(iface, "name", iface) == scapy.consts.LOOPBACK_INTERFACE:
+if getattr(iface, "name", iface) == conf.loopback_name:
     from scapy.arch import get_working_if
     conf.iface = get_working_if()
 else:

scapy-2.4.3.tar.gz/scapy/route6.py -> scapy-2.4.4.tar.gz/scapy/route6.py Changed

@@ -16,7 +16,6 @@
 
 from __future__ import absolute_import
 import socket
-import scapy.consts
 from scapy.config import conf
 from scapy.utils6 import in6_ptop, in6_cidr2mask, in6_and, \
     in6_islladdr, in6_ismlladdr, in6_isincluded, in6_isgladdr, \
@@ -40,6 +39,7 @@
 
     def flush(self):
         self.invalidate_cache()
+        self.ipv6_ifaces = set()
         self.routes = []
 
     def resync(self):
@@ -47,6 +47,9 @@
         #        if any. Change that ...
         self.invalidate_cache()
         self.routes = read_routes6()
+        self.ipv6_ifaces = set()
+        for route in self.routes:
+            self.ipv6_ifaces.add(route[3])
         if self.routes == []:
             log_loading.info("No IPv6 support in kernel")
 
@@ -68,7 +71,6 @@
     # Unlike Scapy's Route.make_route() function, we do not have 'host' and 'net'  # noqa: E501
     # parameters. We only have a 'dst' parameter that accepts 'prefix' and
     # 'prefix/prefixlen' values.
-    # WARNING: Providing a specific device will at the moment not work correctly.  # noqa: E501
     def make_route(self, dst, gw=None, dev=None):
         """Internal function : create a route for 'dst' via 'gw'.
         """
@@ -80,12 +82,12 @@
         if dev is None:
             dev, ifaddr, x = self.route(gw)
         else:
-            # TODO: do better than that
-            # replace that unique address by the list of all addresses
             lifaddr = in6_getifaddr()
             devaddrs = [x for x in lifaddr if x[2] == dev]
             ifaddr = construct_source_candidate_set(prefix, plen, devaddrs)
 
+        self.ipv6_ifaces.add(dev)
+
         return (prefix, plen, gw, dev, ifaddr, 1)
 
     def add(self, *args, **kargs):
@@ -97,6 +99,18 @@
         self.invalidate_cache()
         self.routes.append(self.make_route(*args, **kargs))
 
+    def remove_ipv6_iface(self, iface):
+        """
+        Remove the network interface 'iface' from the list of interfaces
+        supporting IPv6.
+        """
+
+        if not all(r[3] == iface for r in conf.route6.routes):
+            try:
+                self.ipv6_ifaces.remove(iface)
+            except KeyError:
+                pass
+
     def delt(self, dst, gw=None):
         """ Ex:
         delt(dst="::/0")
@@ -119,6 +133,7 @@
         else:
             i = self.routes.index(to_del[0])
             self.invalidate_cache()
+            self.remove_ipv6_iface(self.routes[i][3])
             del(self.routes[i])
 
     def ifchange(self, iff, addr):
@@ -133,6 +148,9 @@
             net, plen, gw, iface, addr, metric = route
             if iface != iff:
                 continue
+
+            self.ipv6_ifaces.add(iface)
+
             if gw == '::':
                 self.routes[i] = (the_net, the_plen, gw, iface, [the_addr], metric)  # noqa: E501
             else:
@@ -148,6 +166,7 @@
                 new_routes.append(rt)
         self.invalidate_cache()
         self.routes = new_routes
+        self.remove_ipv6_iface(iff)
 
     def ifadd(self, iff, addr):
         """
@@ -170,15 +189,16 @@
         prefix = inet_ntop(socket.AF_INET6, in6_and(nmask, naddr))
         self.invalidate_cache()
         self.routes.append((prefix, plen, '::', iff, [addr], 1))
+        self.ipv6_ifaces.add(iff)
 
     def route(self, dst=None, dev=None, verbose=conf.verb):
         """
         Provide best route to IPv6 destination address, based on Scapy
         internal routing table content.
 
-        When a set of address is passed (e.g. 2001:db8:cafe:*::1-5) an address
-        of the set is used. Be aware of that behavior when using wildcards in
-        upper parts of addresses !
+        When a set of address is passed (e.g. ``2001:db8:cafe:*::1-5``) an
+        address of the set is used. Be aware of that behavior when using
+        wildcards in upper parts of addresses !
 
         If 'dst' parameter is a FQDN, name resolution is performed and result
         is used.
@@ -203,9 +223,34 @@
             dst = socket.getaddrinfo(savedst, None, socket.AF_INET6)[0][-1][0]
             # TODO : Check if name resolution went well
 
-        # Use the default interface while dealing with link-local addresses
+        # Choose a valid IPv6 interface while dealing with link-local addresses
         if dev is None and (in6_islladdr(dst) or in6_ismlladdr(dst)):
-            dev = conf.iface
+            dev = conf.iface  # default interface
+
+            # Check if the default interface supports IPv6!
+            if dev not in self.ipv6_ifaces and self.ipv6_ifaces:
+
+                tmp_routes = [route for route in self.routes
+                              if route[3] != conf.iface]
+
+                default_routes = [route for route in tmp_routes
+                                  if (route[0], route[1]) == ("::", 0)]
+
+                ll_routes = [route for route in tmp_routes
+                             if (route[0], route[1]) == ("fe80::", 64)]
+
+                if default_routes:
+                    # Fallback #1 - the first IPv6 default route
+                    dev = default_routes[0][3]
+                elif ll_routes:
+                    # Fallback #2 - the first link-local prefix
+                    dev = ll_routes[0][3]
+                else:
+                    # Fallback #3 - the loopback
+                    dev = conf.loopback_name
+
+                warning("The conf.iface interface (%s) does not support IPv6! "
+                        "Using %s instead for routing!" % (conf.iface, dev))
 
         # Deal with dev-specific request for cache search
         k = dst
@@ -229,10 +274,13 @@
                 paths.append((plen, me, (iface, cset, gw)))
 
         if not paths:
-            if verbose:
-                warning("No route found for IPv6 destination %s "
-                        "(no default route?)", dst)
-            return (scapy.consts.LOOPBACK_INTERFACE, "::", "::")
+            if dst == "::1":
+                return (conf.loopback_name, "::1", "::")
+            else:
+                if verbose:
+                    warning("No route found for IPv6 destination %s "
+                            "(no default route?)", dst)
+                return (conf.loopback_name, "::", "::")
 
         # Sort with longest prefix first then use metrics as a tie-breaker
         paths.sort(key=lambda x: (-x[0], x[1]))
@@ -249,14 +297,14 @@
 
         if res == []:
             warning("Found a route for IPv6 destination '%s', but no possible source address.", dst)  # noqa: E501
-            return (scapy.consts.LOOPBACK_INTERFACE, "::", "::")
+            return (conf.loopback_name, "::", "::")
 
         # Symptom  : 2 routes with same weight (our weight is plen)
         # Solution :
         #  - dst is unicast global. Check if it is 6to4 and we have a source
         #    6to4 address in those available
         #  - dst is link local (unicast or multicast) and multiple output
-        #    interfaces are available. Take main one (conf.iface6)
+        #    interfaces are available. Take main one (conf.iface)
         #  - if none of the previous or ambiguity persists, be lazy and keep
         #    first one
 
@@ -268,7 +316,7 @@
                 tmp = [x for x in res if in6_isaddr6to4(x[2][1])]
             elif in6_ismaddr(dst) or in6_islladdr(dst):
                 # TODO : I'm sure we are not covering all addresses. Check that
-                tmp = [x for x in res if x[2][0] == conf.iface6]
+                tmp = [x for x in res if x[2][0] == conf.iface]
 
             if tmp:
                 res = tmp
@@ -283,7 +331,3 @@
 
 
 conf.route6 = Route6()
-try:
-    conf.iface6 = conf.route6.route(None)[0]
-except Exception:
-    pass

scapy-2.4.3.tar.gz/scapy/scapypipes.py -> scapy-2.4.4.tar.gz/scapy/scapypipes.py Changed

@@ -12,18 +12,18 @@
 from scapy.config import conf
 from scapy.compat import raw
 from scapy.utils import ContextManagerSubprocess, PcapReader, PcapWriter
-from scapy.automaton import recv_error
-from scapy.consts import WINDOWS
 
 
 class SniffSource(Source):
     """Read packets from an interface and send them to low exit.
 
-         +-----------+
-      >>-|           |->>
-         |           |
-       >-|  [iface]--|->
-         +-----------+
+    .. code::
+
+             +-----------+
+          >>-|           |->>
+             |           |
+           >-|  [iface]--|->
+             +-----------+
 
     If neither of the ``iface`` or ``socket`` parameters are specified, then
     Scapy will capture from the first network interface.
@@ -62,20 +62,24 @@
 
     def deliver(self):
         try:
-            self._send(self.s.recv())
-        except recv_error:
-            if not WINDOWS:
-                raise
+            pkt = self.s.recv()
+            if pkt is not None:
+                self._send(pkt)
+        except EOFError:
+            self.is_exhausted = True
 
 
 class RdpcapSource(Source):
     """Read packets from a PCAP file send them to low exit.
-     +----------+
-  >>-|          |->>
-     |          |
-   >-|  [pcap]--|->
-     +----------+
-"""
+
+    .. code::
+
+         +----------+
+      >>-|          |->>
+         |          |
+       >-|  [pcap]--|->
+         +----------+
+    """
 
     def __init__(self, fname, name=None):
         Source.__init__(self, name=name)
@@ -105,12 +109,15 @@
 
 class InjectSink(Sink):
     """Packets received on low input are injected to an interface
-     +-----------+
-  >>-|           |->>
-     |           |
-   >-|--[iface]  |->
-     +-----------+
-"""
+
+    .. code::
+
+         +-----------+
+      >>-|           |->>
+         |           |
+       >-|--[iface]  |->
+         +-----------+
+    """
 
     def __init__(self, iface=None, name=None):
         Sink.__init__(self, name=name)
@@ -134,13 +141,42 @@
 
 
 class WrpcapSink(Sink):
-    """Packets received on low input are written to PCAP file
-     +----------+
-  >>-|          |->>
-     |          |
-   >-|--[pcap]  |->
-     +----------+
-"""
+    """
+    Writes :py:class:`Packet` on the low entry to a ``pcap`` file.
+    Ignores all messages on the high entry.
+
+    .. note::
+
+        Due to limitations of the ``pcap`` format, all packets **must** be of
+        the same link type. This class will not mutate packets to conform with
+        the expected link type.
+
+    .. code::
+
+         +----------+
+      >>-|          |->>
+         |          |
+       >-|--[pcap]  |->
+         +----------+
+
+    :param fname: Filename to write packets to.
+    :type fname: str
+    :param linktype: See :py:attr:`linktype`.
+    :type linktype: None or int
+
+    .. py:attribute:: linktype
+
+        Set an explicit link-type (``DLT_``) for packets.  This must be an
+        ``int`` or ``None``.
+
+        This is the same as the :py:func:`wrpcap` ``linktype`` parameter.
+
+        If ``None`` (the default), the linktype will be auto-detected on the
+        first packet. This field will *not* be updated with the result of this
+        auto-detection.
+
+        This attribute has no effect after calling :py:meth:`PipeEngine.start`.
+    """
 
     def __init__(self, fname, name=None, linktype=None):
         Sink.__init__(self, name=name)
@@ -162,13 +198,40 @@
 
 
 class WiresharkSink(WrpcapSink):
-    """Packets received on low input are pushed to Wireshark.
+    """
+    Streams :py:class:`Packet` from the low entry to Wireshark.
+
+    Packets are written into a ``pcap`` stream (like :py:class:`WrpcapSink`),
+    and streamed to a new Wireshark process on its ``stdin``.
+
+    Wireshark is run with the ``-ki -`` arguments, which cause it to treat
+    ``stdin`` as a capture device.  Arguments in :py:attr:`args` will be
+    appended after this.
+
+    Extends :py:mod:`WrpcapSink`.
+
+    .. code::
 
          +----------+
       >>-|          |->>
          |          |
        >-|--[pcap]  |->
          +----------+
+
+    :param linktype: See :py:attr:`WrpcapSink.linktype`.
+    :type linktype: None or int
+    :param args: See :py:attr:`args`.
+    :type args: None or list[str]
+
+    .. py:attribute:: args
+
+        Additional arguments for the Wireshark process.
+
+        This must be either ``None`` (the default), or a ``list`` of ``str``.
+
+        This attribute has no effect after calling :py:meth:`PipeEngine.start`.
+
+        See :manpage:`wireshark(1)` for more details.
     """
 
     def __init__(self, name=None, linktype=None, args=None):
@@ -178,8 +241,8 @@
     def start(self):
         # Wireshark must be running first, because PcapWriter will block until
         # data has been read!
-        with ContextManagerSubprocess("WiresharkSink", conf.prog.wireshark):
-            args = [conf.prog.wireshark, "-ki", "-"]
+        with ContextManagerSubprocess(conf.prog.wireshark):
+            args = [conf.prog.wireshark, "-Slki", "-"]
             if self.args:
                 args.extend(self.args)
 
@@ -196,12 +259,15 @@
 
 class UDPDrain(Drain):
     """UDP payloads received on high entry are sent over UDP
-     +-------------+
-  >>-|--[payload]--|->>
-     |      X      |
-   >-|----[UDP]----|->
-     +-------------+
-"""
+
+    .. code::
+
+         +-------------+
+      >>-|--[payload]--|->>
+         |      X      |
+       >-|----[UDP]----|->
+         +-------------+
+    """
 
     def __init__(self, ip="127.0.0.1", port=1234):
         Drain.__init__(self)
@@ -222,12 +288,15 @@
 
 class FDSourceSink(Source):
     """Use a file descriptor as source and sink
-     +-------------+
-  >>-|             |->>
-     |             |
-   >-|-[file desc]-|->
-     +-------------+
-"""
+
+    .. code::
+
+         +-------------+
+      >>-|             |->>
+         |             |
+       >-|-[file desc]-|->
+         +-------------+
+    """
 
     def __init__(self, fd, name=None):
         Source.__init__(self, name=name)
@@ -245,12 +314,15 @@
 
 class TCPConnectPipe(Source):
     """TCP connect to addr:port and use it as source and sink
-     +-------------+
-  >>-|             |->>
-     |             |
-   >-|-[addr:port]-|->
-     +-------------+
-"""
+
+    .. code::
+
+         +-------------+
+      >>-|             |->>
+         |             |
+       >-|-[addr:port]-|->
+         +-------------+
+    """
     __selectable_force_select__ = True
 
     def __init__(self, addr="", port=0, name=None):
@@ -284,13 +356,17 @@
 
 
 class TCPListenPipe(TCPConnectPipe):
-    """TCP listen on [addr:]port and use first connection as source and sink ; send peer address to high output  # noqa: E501
-     +------^------+
-  >>-|    +-[peer]-|->>
-     |   /         |
-   >-|-[addr:port]-|->
-     +-------------+
-"""
+    """TCP listen on [addr:]port and use first connection as source and sink;
+    send peer address to high output
+
+    .. code::
+
+         +------^------+
+      >>-|    +-[peer]-|->>
+         |   /         |
+       >-|-[addr:port]-|->
+         +-------------+
+    """
     __selectable_force_select__ = True
 
     def __init__(self, addr="", port=0, name=None):
@@ -336,12 +412,15 @@
 
 class TriggeredMessage(Drain):
     """Send a preloaded message when triggered and trigger in chain
-     +------^------+
-  >>-|      | /----|->>
-     |      |/     |
-   >-|-[ message ]-|->
-     +------^------+
-"""
+
+    .. code::
+
+         +------^------+
+      >>-|      | /----|->>
+         |      |/     |
+       >-|-[ message ]-|->
+         +------^------+
+    """
 
     def __init__(self, msg, name=None):
         Drain.__init__(self, name=name)
@@ -355,12 +434,15 @@
 
 class TriggerDrain(Drain):
     """Pass messages and trigger when a condition is met
-     +------^------+
-  >>-|-[condition]-|->>
-     |      |      |
-   >-|-[condition]-|->
-     +-------------+
-"""
+
+    .. code::
+
+         +------^------+
+      >>-|-[condition]-|->>
+         |      |      |
+       >-|-[condition]-|->
+         +-------------+
+    """
 
     def __init__(self, f, name=None):
         Drain.__init__(self, name=name)
@@ -381,12 +463,15 @@
 
 class TriggeredValve(Drain):
     """Let messages alternatively pass or not, changing on trigger
-     +------^------+
-  >>-|-[pass/stop]-|->>
-     |      |      |
-   >-|-[pass/stop]-|->
-     +------^------+
-"""
+
+.. code::
+
+         +------^------+
+      >>-|-[pass/stop]-|->>
+         |      |      |
+       >-|-[pass/stop]-|->
+         +------^------+
+    """
 
     def __init__(self, start_state=True, name=None):
         Drain.__init__(self, name=name)
@@ -407,12 +492,15 @@
 
 class TriggeredQueueingValve(Drain):
     """Let messages alternatively pass or queued, changing on trigger
-     +------^-------+
-  >>-|-[pass/queue]-|->>
-     |      |       |
-   >-|-[pass/queue]-|->
-     +------^-------+
-"""
+
+    .. code::
+
+         +------^-------+
+      >>-|-[pass/queue]-|->>
+         |      |       |
+       >-|-[pass/queue]-|->
+         +------^-------+
+    """
 
     def __init__(self, start_state=True, name=None):
         Drain.__init__(self, name=name)
@@ -451,12 +539,15 @@
 
 class TriggeredSwitch(Drain):
     r"""Let messages alternatively high or low, changing on trigger
-     +------^------+
-  >>-|-\    |    /-|->>
-     |  [up/down]  |
-   >-|-/    |    \-|->
-     +------^------+
-"""
+
+    .. code::
+
+         +------^------+
+      >>-|-\    |    /-|->>
+         |  [up/down]  |
+       >-|-/    |    \-|->
+         +------^------+
+    """
 
     def __init__(self, start_state=True, name=None):
         Drain.__init__(self, name=name)
@@ -477,6 +568,8 @@
 class ConvertPipe(Drain):
     """Packets sent on entry are converted to another type of packet.
 
+    .. code::
+
          +-------------+
       >>-|--[convert]--|->>
          |             |

scapy-2.4.3.tar.gz/scapy/sendrecv.py -> scapy-2.4.4.tar.gz/scapy/sendrecv.py Changed

@@ -51,37 +51,51 @@
 ####################
 
 _DOC_SNDRCV_PARAMS = """
-    pks: SuperSocket instance to send/receive packets
-    pkt: the packet to send
-    rcv_pks: if set, will be used instead of pks to receive packets.
-             packets will still be sent through pks
-    nofilter: put 1 to avoid use of BPF filters
-    retry:    if positive, how many times to resend unanswered packets
-              if negative, how many times to retry when no more packets
-              are answered
-    timeout:  how much time to wait after the last packet has been sent
-    verbose:  set verbosity level
-    multi:    whether to accept multiple answers for the same stimulus
-    store_unanswered: whether to store not-answered packets or not.
-                      setting it to False will increase speed, and will return
-                      None as the unans list.
-    process:  if specified, only result from process(pkt) will be stored.
-              the function should follow the following format:
-                lambda sent, received: (func(sent), func2(received))
-              if the packet is unanswered, `received` will be None.
-              if `store_unanswered` is False, the function won't be called on
-              un-answered packets.
-    prebuild: pre-build the packets before starting to send them. Automatically
-              enabled when a generator is passed as the packet
+    :param pks: SuperSocket instance to send/receive packets
+    :param pkt: the packet to send
+    :param rcv_pks: if set, will be used instead of pks to receive packets.
+        packets will still be sent through pks
+    :param nofilter: put 1 to avoid use of BPF filters
+    :param retry: if positive, how many times to resend unanswered packets
+        if negative, how many times to retry when no more packets
+        are answered
+    :param timeout: how much time to wait after the last packet has been sent
+    :param verbose: set verbosity level
+    :param multi: whether to accept multiple answers for the same stimulus
+    :param store_unanswered: whether to store not-answered packets or not.
+        setting it to False will increase speed, and will return
+        None as the unans list.
+    :param process: if specified, only result from process(pkt) will be stored.
+        the function should follow the following format:
+        ``lambda sent, received: (func(sent), func2(received))``
+        if the packet is unanswered, `received` will be None.
+        if `store_unanswered` is False, the function won't be called on
+        un-answered packets.
+    :param prebuild: pre-build the packets before starting to send them.
+        Automatically enabled when a generator is passed as the packet
     """
 
 
 class SndRcvHandler(object):
+    """
+    Util to send/receive packets, used by sr*().
+    Do not use directly.
+
+    This matches the requests and answers.
+
+    Notes::
+      - threaded mode: enabling threaded mode will likely
+        break packet timestamps, but might result in a speedup
+        when sending a big amount of packets. Disabled by default
+      - DEVS: store the outgoing timestamp right BEFORE sending the packet
+        to avoid races that could result in negative latency. We aren't Stadia
+    """
     def __init__(self, pks, pkt,
                  timeout=None, inter=0, verbose=None,
                  chainCC=False,
                  retry=0, multi=False, rcv_pks=None,
                  prebuild=False, _flood=None,
+                 threaded=False,
                  session=None):
         # Instantiate all arguments
         if verbose is None:
@@ -125,21 +139,24 @@
         while retry >= 0:
             self.hsent = {}
 
-            # Send packets in thread.
-            # https://github.com/secdev/scapy/issues/1791
-            snd_thread = Thread(
-                target=self._sndrcv_snd
-            )
-            snd_thread.setDaemon(True)
+            if threaded or _flood:
+                # Send packets in thread.
+                # https://github.com/secdev/scapy/issues/1791
+                snd_thread = Thread(
+                    target=self._sndrcv_snd
+                )
+                snd_thread.setDaemon(True)
 
-            # Start routine with callback
-            self._sndrcv_rcv(snd_thread.start)
+                # Start routine with callback
+                self._sndrcv_rcv(snd_thread.start)
 
-            # Ended. Let's close gracefully
-            if _flood:
-                # Flood: stop send thread
-                _flood[1]()
-            snd_thread.join()
+                # Ended. Let's close gracefully
+                if _flood:
+                    # Flood: stop send thread
+                    _flood[1]()
+                snd_thread.join()
+            else:
+                self._sndrcv_rcv(self._sndrcv_snd)
 
             if multi:
                 remain = [
@@ -283,11 +300,11 @@
                 if realtime:
                     ct = time.time()
                     if dt0:
-                        st = dt0 + p.time - ct
+                        st = dt0 + float(p.time) - ct
                         if st > 0:
                             time.sleep(st)
                     else:
-                        dt0 = ct - p.time
+                        dt0 = ct - float(p.time)
                 s.send(p)
                 if return_packets:
                     sent_packets.append(p)
@@ -306,13 +323,25 @@
 
 
 @conf.commands.register
-def send(x, inter=0, loop=0, count=None,
-         verbose=None, realtime=None,
-         return_packets=False, socket=None, *args, **kargs):
-    """Send packets at layer 3
-send(packets, [inter=0], [loop=0], [count=None], [verbose=conf.verb], [realtime=None], [return_packets=False],  # noqa: E501
-     [socket=None]) -> None"""
+def send(x, inter=0, loop=0, count=None, verbose=None, realtime=None,
+         return_packets=False, socket=None, iface=None, *args, **kargs):
+    """
+    Send packets at layer 3
+
+    :param x: the packets
+    :param inter: time (in s) between two packets (default 0)
+    :param loop: send packet indefinetly (default 0)
+    :param count: number of packets to send (default None=1)
+    :param verbose: verbose mode (default None=conf.verbose)
+    :param realtime: check that a packet was sent before sending the next one
+    :param return_packets: return the sent packets
+    :param socket: the socket to use (default is conf.L3socket(kargs))
+    :param iface: the interface to send the packets on
+    :param monitor: (not on linux) send in monitor mode
+    :returns: None
+    """
     need_closing = socket is None
+    kargs["iface"] = _interface_selection(iface, x)
     socket = socket or conf.L3socket(*args, **kargs)
     results = __gen_send(socket, x, inter=inter, loop=loop,
                          count=count, verbose=verbose,
@@ -326,9 +355,21 @@
 def sendp(x, inter=0, loop=0, iface=None, iface_hint=None, count=None,
           verbose=None, realtime=None,
           return_packets=False, socket=None, *args, **kargs):
-    """Send packets at layer 2
-sendp(packets, [inter=0], [loop=0], [iface=None], [iface_hint=None], [count=None], [verbose=conf.verb],  # noqa: E501
-      [realtime=None], [return_packets=False], [socket=None]) -> None"""
+    """
+    Send packets at layer 2
+
+    :param x: the packets
+    :param inter: time (in s) between two packets (default 0)
+    :param loop: send packet indefinetly (default 0)
+    :param count: number of packets to send (default None=1)
+    :param verbose: verbose mode (default None=conf.verbose)
+    :param realtime: check that a packet was sent before sending the next one
+    :param return_packets: return the sent packets
+    :param socket: the socket to use (default is conf.L3socket(kargs))
+    :param iface: the interface to send the packets on
+    :param monitor: (not on linux) send in monitor mode
+    :returns: None
+    """
     if iface is None and iface_hint is not None and socket is None:
         iface = conf.route.route(iface_hint)[0]
     need_closing = socket is None
@@ -345,15 +386,19 @@
 def sendpfast(x, pps=None, mbps=None, realtime=None, loop=0, file_cache=False, iface=None, replay_args=None,  # noqa: E501
               parse_results=False):
     """Send packets at layer 2 using tcpreplay for performance
-    pps:  packets per second
-    mpbs: MBits per second
-    realtime: use packet's timestamp, bending time with real-time value
-    loop: number of times to process the packet list
-    file_cache: cache packets in RAM instead of reading from disk at each iteration  # noqa: E501
-    iface: output interface
-    replay_args: List of additional tcpreplay args (List[str])
-    parse_results: Return a dictionary of information outputted by tcpreplay (default=False)  # noqa: E501
-    :returns stdout, stderr, command used"""
+
+    :param pps:  packets per second
+    :param mpbs: MBits per second
+    :param realtime: use packet's timestamp, bending time with real-time value
+    :param loop: number of times to process the packet list
+    :param file_cache: cache packets in RAM instead of reading from
+        disk at each iteration
+    :param iface: output interface
+    :param replay_args: List of additional tcpreplay args (List[str])
+    :param parse_results: Return a dictionary of information
+        outputted by tcpreplay (default=False)
+    :returns: stdout, stderr, command used
+    """
     if iface is None:
         iface = conf.iface
     argv = [conf.prog.tcpreplay, "--intf1=%s" % iface]
@@ -379,7 +424,7 @@
     argv.append(f)
     wrpcap(f, x)
     results = None
-    with ContextManagerSubprocess("sendpfast()", conf.prog.tcpreplay):
+    with ContextManagerSubprocess(conf.prog.tcpreplay):
         try:
             cmd = subprocess.Popen(argv, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
@@ -457,7 +502,9 @@
 
 @conf.commands.register
 def sr(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs):
-    """Send and receive packets at layer 3"""
+    """
+    Send and receive packets at layer 3
+    """
     s = conf.L3socket(promisc=promisc, filter=filter,
                       iface=iface, nofilter=nofilter)
     result = sndrcv(s, x, *args, **kargs)
@@ -482,7 +529,9 @@
 
 @conf.commands.register
 def sr1(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs):
-    """Send packets at layer 3 and return only the first answer"""
+    """
+    Send packets at layer 3 and return only the first answer
+    """
     iface = _interface_selection(iface, x)
     s = conf.L3socket(promisc=promisc, filter=filter,
                       nofilter=nofilter, iface=iface)
@@ -490,14 +539,14 @@
     s.close()
     if len(ans) > 0:
         return ans[0][1]
-    else:
-        return None
 
 
 @conf.commands.register
 def srp(x, promisc=None, iface=None, iface_hint=None, filter=None,
         nofilter=0, type=ETH_P_ALL, *args, **kargs):
-    """Send and receive packets at layer 2"""
+    """
+    Send and receive packets at layer 2
+    """
     if iface is None and iface_hint is not None:
         iface = conf.route.route(iface_hint)[0]
     s = conf.L2socket(promisc=promisc, iface=iface,
@@ -509,17 +558,18 @@
 
 @conf.commands.register
 def srp1(*args, **kargs):
-    """Send and receive packets at layer 2 and return only the first answer"""
+    """
+    Send and receive packets at layer 2 and return only the first answer
+    """
     ans, _ = srp(*args, **kargs)
     if len(ans) > 0:
         return ans[0][1]
-    else:
-        return None
 
 
 # Append doc
 for sr_func in [srp, srp1, sr, sr1]:
-    sr_func.__doc__ += _DOC_SNDRCV_PARAMS
+    if sr_func.__doc__ is not None:
+        sr_func.__doc__ += _DOC_SNDRCV_PARAMS
 
 
 # SEND/RECV LOOP METHODS
@@ -624,11 +674,13 @@
 @conf.commands.register
 def srflood(x, promisc=None, filter=None, iface=None, nofilter=None, *args, **kargs):  # noqa: E501
     """Flood and receive packets at layer 3
-prn:      function applied to packets received
-unique:   only consider packets whose print
-nofilter: put 1 to avoid use of BPF filters
-filter:   provide a BPF filter
-iface:    listen answers only on the given interface"""
+
+    :param prn:      function applied to packets received
+    :param unique:   only consider packets whose print
+    :param nofilter: put 1 to avoid use of BPF filters
+    :param filter:   provide a BPF filter
+    :param iface:    listen answers only on the given interface
+    """
     s = conf.L3socket(promisc=promisc, filter=filter, iface=iface, nofilter=nofilter)  # noqa: E501
     r = sndrcvflood(s, x, *args, **kargs)
     s.close()
@@ -638,28 +690,30 @@
 @conf.commands.register
 def sr1flood(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs):  # noqa: E501
     """Flood and receive packets at layer 3 and return only the first answer
-prn:      function applied to packets received
-verbose:  set verbosity level
-nofilter: put 1 to avoid use of BPF filters
-filter:   provide a BPF filter
-iface:    listen answers only on the given interface"""
+
+    :param prn:      function applied to packets received
+    :param verbose:  set verbosity level
+    :param nofilter: put 1 to avoid use of BPF filters
+    :param filter:   provide a BPF filter
+    :param iface:    listen answers only on the given interface
+    """
     s = conf.L3socket(promisc=promisc, filter=filter, nofilter=nofilter, iface=iface)  # noqa: E501
     ans, _ = sndrcvflood(s, x, *args, **kargs)
     s.close()
     if len(ans) > 0:
         return ans[0][1]
-    else:
-        return None
 
 
 @conf.commands.register
 def srpflood(x, promisc=None, filter=None, iface=None, iface_hint=None, nofilter=None, *args, **kargs):  # noqa: E501
     """Flood and receive packets at layer 2
-prn:      function applied to packets received
-unique:   only consider packets whose print
-nofilter: put 1 to avoid use of BPF filters
-filter:   provide a BPF filter
-iface:    listen answers only on the given interface"""
+
+    :param prn:      function applied to packets received
+    :param unique:   only consider packets whose print
+    :param nofilter: put 1 to avoid use of BPF filters
+    :param filter:   provide a BPF filter
+    :param iface:    listen answers only on the given interface
+    """
     if iface is None and iface_hint is not None:
         iface = conf.route.route(iface_hint)[0]
     s = conf.L2socket(promisc=promisc, filter=filter, iface=iface, nofilter=nofilter)  # noqa: E501
@@ -671,18 +725,18 @@
 @conf.commands.register
 def srp1flood(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs):  # noqa: E501
     """Flood and receive packets at layer 2 and return only the first answer
-prn:      function applied to packets received
-verbose:  set verbosity level
-nofilter: put 1 to avoid use of BPF filters
-filter:   provide a BPF filter
-iface:    listen answers only on the given interface"""
+
+    :param prn:      function applied to packets received
+    :param verbose:  set verbosity level
+    :param nofilter: put 1 to avoid use of BPF filters
+    :param filter:   provide a BPF filter
+    :param iface:    listen answers only on the given interface
+    """
     s = conf.L2socket(promisc=promisc, filter=filter, nofilter=nofilter, iface=iface)  # noqa: E501
     ans, _ = sndrcvflood(s, x, *args, **kargs)
     s.close()
     if len(ans) > 0:
         return ans[0][1]
-    else:
-        return None
 
 # SNIFF METHODS
 
@@ -698,13 +752,16 @@
              is displayed.
              --Ex: prn = lambda x: x.summary()
         session: a session = a flow decoder used to handle stream of packets.
-                 e.g: IPSession (to defragment on-the-flow) or NetflowSession
+                 --Ex: session=TCPSession
+                 See below for more details.
         filter: BPF filter to apply.
         lfilter: Python function applied to each packet to determine if
                  further action may be done.
                  --Ex: lfilter = lambda x: x.haslayer(Padding)
         offline: PCAP file (or list of PCAP files) to read packets from,
                  instead of sniffing them
+        quiet:   when set to True, the process stderr is discarded
+                 (default: False).
         timeout: stop sniffing after a given time (default: None).
         L2socket: use the provided L2socket (default: use conf.L2listen).
         opened_socket: provide an object (or a list of objects) ready to use
@@ -722,6 +779,9 @@
     element, a list of elements, or a dict object mapping an element to a
     label (see examples below).
 
+    For more information about the session argument, see
+    https://scapy.rtfd.io/en/latest/usage.html#advanced-sniffing-sniffing-sessions
+
     Examples: synchronous
       >>> sniff(filter="arp")
       >>> sniff(filter="tcp",
@@ -762,7 +822,7 @@
 
     def _run(self,
              count=0, store=True, offline=None,
-             prn=None, lfilter=None,
+             quiet=False, prn=None, lfilter=None,
              L2socket=None, timeout=None, opened_socket=None,
              stop_filter=None, iface=None, started_callback=None,
              session=None, session_args=[], session_kwargs={},
@@ -770,8 +830,13 @@
         self.running = True
         # Start main thread
         # instantiate session
-        session = session or DefaultSession
-        session = session(prn, store, *session_args, **session_kwargs)
+        if not isinstance(session, DefaultSession):
+            session = session or DefaultSession
+            session = session(prn=prn, store=store,
+                              *session_args, **session_kwargs)
+        else:
+            session.prn = prn
+            session.store = store
         # sniff_sockets follows: {socket: label}
         sniff_sockets = {}
         if opened_socket is not None:
@@ -789,21 +854,17 @@
                 sniff_sockets[opened_socket] = "socket0"
         if offline is not None:
             flt = karg.get('filter')
-            from scapy.arch.common import TCPDUMP
-            if not TCPDUMP and flt is not None:
-                message = "tcpdump is not available. Cannot use filter!"
-                raise Scapy_Exception(message)
 
             if isinstance(offline, list) and \
                     all(isinstance(elt, str) for elt in offline):
                 sniff_sockets.update((PcapReader(
                     fname if flt is None else
-                    tcpdump(fname, args=["-w", "-", flt], getfd=True)
+                    tcpdump(fname, args=["-w", "-"], flt=flt, getfd=True)
                 ), fname) for fname in offline)
             elif isinstance(offline, dict):
                 sniff_sockets.update((PcapReader(
                     fname if flt is None else
-                    tcpdump(fname, args=["-w", "-", flt], getfd=True)
+                    tcpdump(fname, args=["-w", "-"], flt=flt, getfd=True)
                 ), label) for fname, label in six.iteritems(offline))
             else:
                 # Write Scapy Packet objects to a pcap file
@@ -820,7 +881,11 @@
 
                 sniff_sockets[PcapReader(
                     offline if flt is None else
-                    tcpdump(offline, args=["-w", "-", flt], getfd=True)
+                    tcpdump(offline,
+                            args=["-w", "-"],
+                            flt=flt,
+                            getfd=True,
+                            quiet=quiet)
                 )] = offline
         if not sniff_sockets or iface is not None:
             if L2socket is None:
@@ -843,7 +908,6 @@
 
         # Get select information from the sockets
         _main_socket = next(iter(sniff_sockets))
-        read_allowed_exceptions = _main_socket.read_allowed_exceptions
         select_func = _main_socket.select
         _backup_read_func = _main_socket.__class__.recv
         nonblocking_socket = _main_socket.nonblocking_socket
@@ -853,10 +917,6 @@
                     "The used select function "
                     "will be the one of the first socket")
 
-        # Fill if empty
-        if not read_allowed_exceptions:
-            read_allowed_exceptions = (IOError,)
-
         if nonblocking_socket:
             # select is non blocking
             def stop_cb():
@@ -900,10 +960,12 @@
                         p = read_func(s)
                     except EOFError:
                         # End of stream
+                        try:
+                            s.close()
+                        except Exception:
+                            pass
                         dead_sockets.append(s)
                         continue
-                    except read_allowed_exceptions:
-                        continue
                     except Exception as ex:
                         msg = " It was closed."
                         try:
@@ -915,6 +977,8 @@
                             "Socket %s failed with '%s'." % (s, ex) + msg
                         )
                         dead_sockets.append(s)
+                        if conf.debug_dissector >= 2:
+                            raise
                         continue
                     if p is None:
                         continue
@@ -980,24 +1044,20 @@
 def bridge_and_sniff(if1, if2, xfrm12=None, xfrm21=None, prn=None, L2socket=None,  # noqa: E501
                      *args, **kargs):
     """Forward traffic between interfaces if1 and if2, sniff and return
-the exchanged packets.
-
-Arguments:
-
-  if1, if2: the interfaces to use (interface names or opened sockets).
-
-  xfrm12: a function to call when forwarding a packet from if1 to
-      if2. If it returns True, the packet is forwarded as it. If it
-      returns False or None, the packet is discarded. If it returns a
-      packet, this packet is forwarded instead of the original packet
-      one.
-
-  xfrm21: same as xfrm12 for packets forwarded from if2 to if1.
-
-  The other arguments are the same than for the function sniff(),
-      except for offline, opened_socket and iface that are ignored.
-      See help(sniff) for more.
-
+    the exchanged packets.
+
+    :param if1: the interfaces to use (interface names or opened sockets).
+    :param if2:
+    :param xfrm12: a function to call when forwarding a packet from if1 to
+        if2. If it returns True, the packet is forwarded as it. If it
+        returns False or None, the packet is discarded. If it returns a
+        packet, this packet is forwarded instead of the original packet
+        one.
+    :param xfrm21: same as xfrm12 for packets forwarded from if2 to if1.
+
+    The other arguments are the same than for the function sniff(),
+    except for offline, opened_socket and iface that are ignored.
+    See help(sniff) for more.
     """
     for arg in ['opened_socket', 'offline', 'iface']:
         if arg in kargs:

scapy-2.4.3.tar.gz/scapy/sessions.py -> scapy-2.4.4.tar.gz/scapy/sessions.py Changed

@@ -17,18 +17,53 @@
 class DefaultSession(object):
     """Default session: no stream decoding"""
 
-    def __init__(self, prn, store, *args, **karg):
-        self.prn = prn
-        self.store = store
+    def __init__(self, prn=None, store=False, supersession=None,
+                 *args, **karg):
+        self.__prn = prn
+        self.__store = store
         self.lst = []
         self.__count = 0
+        self._supersession = supersession
+        if self._supersession:
+            self._supersession.prn = self.__prn
+            self._supersession.store = self.__store
+            self.__store = False
+            self.__prn = None
+
+    @property
+    def store(self):
+        return self.__store
+
+    @store.setter
+    def store(self, val):
+        if self._supersession:
+            self._supersession.store = val
+        else:
+            self.__store = val
+
+    @property
+    def prn(self):
+        return self.__prn
+
+    @prn.setter
+    def prn(self, f):
+        if self._supersession:
+            self._supersession.prn = f
+        else:
+            self.__prn = f
 
     @property
     def count(self):
-        return self.__count
+        if self._supersession:
+            return self._supersession.count
+        else:
+            return self.__count
 
     def toPacketList(self):
-        return PacketList(self.lst, "Sniffed")
+        if self._supersession:
+            return PacketList(self._supersession.lst, "Sniffed")
+        else:
+            return PacketList(self.lst, "Sniffed")
 
     def on_packet_received(self, pkt):
         """DEV: entry point. Will be called by sniff() for each
@@ -51,12 +86,13 @@
 
 class IPSession(DefaultSession):
     """Defragment IP packets 'on-the-flow'.
+
     Usage:
-      >>> sniff(session=IPSession)
+    >>> sniff(session=IPSession)
     """
 
-    def __init__(self, *args):
-        DefaultSession.__init__(self, *args)
+    def __init__(self, *args, **kwargs):
+        DefaultSession.__init__(self, *args, **kwargs)
         self.fragments = defaultdict(list)
 
     def _ip_process_packet(self, packet):
@@ -144,7 +180,8 @@
     """A Session that matches seq/ack packets together to dissect
     special protocols, such as HTTP.
 
-    DEV: implement a class-function `tcp_reassemble` in your Packet class:
+    DEV: implement a class-function `tcp_reassemble` in your Packet class::
+
         @classmethod
         def tcp_reassemble(cls, data, metadata):
             # data = the reassembled data from the same request/flow
@@ -157,31 +194,56 @@
             # as you need additional data.
             return None
 
-    A (hard to understand) example can be found in scapy/layers/http.py
+    For more details and a real example, see:
+    https://scapy.readthedocs.io/en/latest/usage.html#how-to-use-tcpsession-to-defragment-tcp-packets
+
+    :param app: Whether the socket is on application layer = has no TCP
+                layer. This is used for instance if you are using a native
+                TCP socket. Default to False
     """
 
     fmt = ('TCP {IP:%IP.src%}{IPv6:%IPv6.src%}:%r,TCP.sport% > ' +
            '{IP:%IP.dst%}{IPv6:%IPv6.dst%}:%r,TCP.dport%')
 
-    def __init__(self, *args):
-        super(TCPSession, self).__init__(*args)
-        # The StringBuffer() is used to build a global
-        # string from fragments and their seq nulber
-        self.tcp_frags = defaultdict(
-            lambda: (StringBuffer(), {})
-        )
+    def __init__(self, app=False, *args, **kwargs):
+        super(TCPSession, self).__init__(*args, **kwargs)
+        self.app = app
+        if app:
+            self.data = b""
+            self.metadata = {}
+        else:
+            # The StringBuffer() is used to build a global
+            # string from fragments and their seq nulber
+            self.tcp_frags = defaultdict(
+                lambda: (StringBuffer(), {})
+            )
 
     def _process_packet(self, pkt):
         """Process each packet: matches the TCP seq/ack numbers
         to follow the TCP streams, and orders the fragments.
         """
+        if self.app:
+            # Special mode: Application layer. Use on top of TCP
+            pay_class = pkt.__class__
+            if not hasattr(pay_class, "tcp_reassemble"):
+                # Being on top of TCP, we have no way of knowing
+                # when a packet ends.
+                return pkt
+            self.data += bytes(pkt)
+            pkt = pay_class.tcp_reassemble(self.data, self.metadata)
+            if pkt:
+                self.data = b""
+                self.metadata = {}
+                return pkt
+            return
+
         from scapy.layers.inet import IP, TCP
-        if TCP not in pkt:
+        if not pkt or TCP not in pkt:
             return pkt
         pay = pkt[TCP].payload
         if isinstance(pay, (NoPayload, conf.padding_layer)):
             return pkt
-        new_data = raw(pay)
+        new_data = pay.original
         # Match packets by a uniqute TCP identifier
         seq = pkt[TCP].seq
         ident = pkt.sprintf(self.fmt)
@@ -189,32 +251,42 @@
         # Let's guess which class is going to be used
         if "pay_class" not in metadata:
             pay_class = pay.__class__
-            if not hasattr(pay_class, "tcp_reassemble"):
-                # Cannot tcp-reassemble
+            if hasattr(pay_class, "tcp_reassemble"):
+                tcp_reassemble = pay_class.tcp_reassemble
+            else:
+                # We can't know for sure when a packet ends.
+                # Ignore.
                 return pkt
             metadata["pay_class"] = pay_class
+            metadata["tcp_reassemble"] = tcp_reassemble
         else:
-            pay_class = metadata["pay_class"]
+            tcp_reassemble = metadata["tcp_reassemble"]
         # Get a relative sequence number for a storage purpose
         relative_seq = metadata.get("relative_seq", None)
-        if not relative_seq:
+        if relative_seq is None:
             relative_seq = metadata["relative_seq"] = seq - 1
         seq = seq - relative_seq
         # Add the data to the buffer
         # Note that this take care of retransmission packets.
         data.append(new_data, seq)
         # Check TCP FIN or TCP RESET
-        if pkt[TCP].flags.F or pkt[TCP].flags.R or pkt[TCP].flags.P:
+        if pkt[TCP].flags.F or pkt[TCP].flags.R:
             metadata["tcp_end"] = True
+
+        # In case any app layer protocol requires it,
+        # allow the parser to inspect TCP PSH flag
+        if pkt[TCP].flags.P:
+            metadata["tcp_psh"] = True
         # XXX TODO: check that no empty space is missing in the buffer.
         # XXX Currently, if a TCP fragment was missing, we won't notice it.
         packet = None
         if data.full():
             # Reassemble using all previous packets
-            packet = pay_class.tcp_reassemble(bytes(data), metadata)
+            packet = tcp_reassemble(bytes(data), metadata)
         # Stack the result on top of the previous frames
         if packet:
             data.clear()
+            metadata.clear()
             del self.tcp_frags[ident]
             pay.underlayer.remove_payload()
             if IP in pkt:

scapy-2.4.3.tar.gz/scapy/supersocket.py -> scapy-2.4.4.tar.gz/scapy/supersocket.py Changed

@@ -9,6 +9,7 @@
 
 from __future__ import absolute_import
 from select import select, error as select_error
+import ctypes
 import errno
 import os
 import socket
@@ -17,7 +18,7 @@
 
 from scapy.config import conf
 from scapy.consts import LINUX, DARWIN, WINDOWS
-from scapy.data import MTU, ETH_P_IP
+from scapy.data import MTU, ETH_P_IP, SOL_PACKET, SO_TIMESTAMPNS
 from scapy.compat import raw, bytes_encode
 from scapy.error import warning, log_runtime
 import scapy.modules.six as six
@@ -25,6 +26,8 @@
 from scapy.utils import PcapReader, tcpdump
 
 
+# Utils
+
 class _SuperSocket_metaclass(type):
     def __repr__(self):
         if self.desc is not None:
@@ -33,11 +36,31 @@
             return "<%s>" % self.__name__
 
 
+# Used to get ancillary data
+PACKET_AUXDATA = 8
+ETH_P_8021Q = 0x8100
+TP_STATUS_VLAN_VALID = 1 << 4
+
+
+class tpacket_auxdata(ctypes.Structure):
+    _fields_ = [
+        ("tp_status", ctypes.c_uint),
+        ("tp_len", ctypes.c_uint),
+        ("tp_snaplen", ctypes.c_uint),
+        ("tp_mac", ctypes.c_ushort),
+        ("tp_net", ctypes.c_ushort),
+        ("tp_vlan_tci", ctypes.c_ushort),
+        ("tp_padding", ctypes.c_ushort),
+    ]
+
+
+# SuperSocket
+
 class SuperSocket(six.with_metaclass(_SuperSocket_metaclass)):
     desc = None
     closed = 0
     nonblocking_socket = False
-    read_allowed_exceptions = ()
+    auxdata_available = False
 
     def __init__(self, family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0):  # noqa: E501
         self.ins = socket.socket(family, type, proto)
@@ -46,12 +69,63 @@
 
     def send(self, x):
         sx = raw(x)
-        sent = self.outs.send(sx)
         try:
             x.sent_time = time.time()
         except AttributeError:
             pass
-        return sent
+        return self.outs.send(sx)
+
+    if six.PY2:
+        def _recv_raw(self, sock, x):
+            """Internal function to receive a Packet"""
+            pkt, sa_ll = sock.recvfrom(x)
+            return pkt, sa_ll, None
+    else:
+        def _recv_raw(self, sock, x):
+            """Internal function to receive a Packet,
+            and process ancillary data.
+            """
+            timestamp = None
+            if not self.auxdata_available:
+                pkt, _, _, sa_ll = sock.recvmsg(x)
+                return pkt, sa_ll, timestamp
+            flags_len = socket.CMSG_LEN(4096)
+            pkt, ancdata, flags, sa_ll = sock.recvmsg(x, flags_len)
+            if not pkt:
+                return pkt, sa_ll, timestamp
+            for cmsg_lvl, cmsg_type, cmsg_data in ancdata:
+                # Check available ancillary data
+                if (cmsg_lvl == SOL_PACKET and cmsg_type == PACKET_AUXDATA):
+                    # Parse AUXDATA
+                    try:
+                        auxdata = tpacket_auxdata.from_buffer_copy(cmsg_data)
+                    except ValueError:
+                        # Note: according to Python documentation, recvmsg()
+                        #       can return a truncated message. A ValueError
+                        #       exception likely indicates that Auxiliary
+                        #       Data is not supported by the Linux kernel.
+                        return pkt, sa_ll, timestamp
+                    if auxdata.tp_vlan_tci != 0 or \
+                            auxdata.tp_status & TP_STATUS_VLAN_VALID:
+                        # Insert VLAN tag
+                        tag = struct.pack(
+                            "!HH",
+                            ETH_P_8021Q,
+                            auxdata.tp_vlan_tci
+                        )
+                        pkt = pkt[:12] + tag + pkt[12:]
+                elif cmsg_lvl == socket.SOL_SOCKET and \
+                        cmsg_type == SO_TIMESTAMPNS:
+                    length = len(cmsg_data)
+                    if length == 16:  # __kernel_timespec
+                        tmp = struct.unpack("ll", cmsg_data)
+                    elif length == 8:  # timespec
+                        tmp = struct.unpack("ii", cmsg_data)
+                    else:
+                        log_runtime.warning("Unknown timespec format.. ?!")
+                        continue
+                    timestamp = tmp[0] + tmp[1] * 1e-9
+            return pkt, sa_ll, timestamp
 
     def recv_raw(self, x=MTU):
         """Returns a tuple containing (cls, pkt_data, time)"""
@@ -115,17 +189,15 @@
         """This function is called during sendrecv() routine to select
         the available sockets.
 
-        params:
-         - sockets: an array of sockets that need to be selected
-        returns:
-         - an array of sockets that were selected
-         - the function to be called next to get the packets (i.g. recv)
+        :param sockets: an array of sockets that need to be selected
+        :returns: an array of sockets that were selected and
+            the function to be called next to get the packets (i.g. recv)
         """
         try:
             inp, _, _ = select(sockets, [], [], remain)
         except (IOError, select_error) as exc:
             # select.error has no .errno attribute
-            if exc.args[0] != errno.EINTR:
+            if not exc.args or exc.args[0] != errno.EINTR:
                 raise
         return inp, None
 
@@ -148,11 +220,27 @@
         self.outs = socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.IPPROTO_RAW)  # noqa: E501
         self.outs.setsockopt(socket.SOL_IP, socket.IP_HDRINCL, 1)
         self.ins = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, socket.htons(type))  # noqa: E501
+        self.iface = iface
         if iface is not None:
-            self.ins.bind((iface, type))
+            self.ins.bind((self.iface, type))
+        if not six.PY2:
+            try:
+                # Receive Auxiliary Data (VLAN tags)
+                self.ins.setsockopt(SOL_PACKET, PACKET_AUXDATA, 1)
+                self.ins.setsockopt(
+                    socket.SOL_SOCKET,
+                    SO_TIMESTAMPNS,
+                    1
+                )
+                self.auxdata_available = True
+            except OSError:
+                # Note: Auxiliary Data is only supported since
+                #       Linux 2.6.21
+                msg = "Your Linux Kernel does not support Auxiliary Data!"
+                log_runtime.info(msg)
 
     def recv(self, x=MTU):
-        pkt, sa_ll = self.ins.recvfrom(x)
+        pkt, sa_ll, ts = self._recv_raw(self.ins, x)
         if sa_ll[2] == socket.PACKET_OUTGOING:
             return None
         if sa_ll[3] in conf.l2types:
@@ -178,15 +266,17 @@
             pkt = pkt.payload
 
         if pkt is not None:
-            from scapy.arch import get_last_packet_timestamp
-            pkt.time = get_last_packet_timestamp(self.ins)
+            if ts is None:
+                from scapy.arch import get_last_packet_timestamp
+                ts = get_last_packet_timestamp(self.ins)
+            pkt.time = ts
         return pkt
 
     def send(self, x):
         try:
             sx = raw(x)
             x.sent_time = time.time()
-            self.outs.sendto(sx, (x.dst, 0))
+            return self.outs.sendto(sx, (x.dst, 0))
         except socket.error as msg:
             log_runtime.error(msg)
 
@@ -269,16 +359,16 @@
                  prog=None, *arg, **karg):
         self.outs = None
         args = ['-w', '-', '-s', '65535']
+        if iface is None and (WINDOWS or DARWIN):
+            iface = conf.iface
+        if WINDOWS:
+            try:
+                iface = iface.pcap_name
+            except AttributeError:
+                pass
+        self.iface = iface
         if iface is not None:
-            if WINDOWS:
-                try:
-                    args.extend(['-i', iface.pcap_name])
-                except AttributeError:
-                    args.extend(['-i', iface])
-            else:
-                args.extend(['-i', iface])
-        elif WINDOWS or DARWIN:
-            args.extend(['-i', conf.iface.pcap_name if WINDOWS else conf.iface])  # noqa: E501
+            args.extend(['-i', self.iface])
         if not promisc:
             args.append('-p')
         if not nofilter:
@@ -299,6 +389,12 @@
         SuperSocket.close(self)
         self.tcpdump_proc.kill()
 
+    @staticmethod
+    def select(sockets, remain=None):
+        if (WINDOWS or DARWIN):
+            return sockets, None
+        return SuperSocket.select(sockets, remain=remain)
+
 
 class TunTapInterface(SuperSocket):
     """A socket to act as the host's peer of a tun / tap interface.
@@ -350,8 +446,6 @@
 
     def send(self, x):
         sx = raw(x)
-        if hasattr(x, "sent_time"):
-            x.sent_time = time.time()
         if self.mode_tun:
             try:
                 proto = conf.l3types[type(x)]
@@ -364,6 +458,10 @@
                 proto = 0
             sx = struct.pack('!HH', 0, proto) + sx
         try:
-            os.write(self.outs.fileno(), sx)
+            try:
+                x.sent_time = time.time()
+            except AttributeError:
+                pass
+            return os.write(self.outs.fileno(), sx)
         except socket.error:
             log_runtime.error("%s send", self.__class__.__name__, exc_info=True)  # noqa: E501

scapy-2.4.3.tar.gz/scapy/tools/UTscapy.py -> scapy-2.4.4.tar.gz/scapy/tools/UTscapy.py Changed

@@ -3,22 +3,22 @@
 # Copyright (C) Philippe Biondi <phil@secdev.org>
 # This program is published under a GPLv2 license
 
-# flake8: noqa: E501
-
 """
 Unit testing infrastructure for Scapy
 """
 
-from __future__ import absolute_import
 from __future__ import print_function
-import sys
+import bz2
+import copy
+import code
 import getopt
 import glob
-import importlib
 import hashlib
-import copy
-import bz2
+import importlib
+import json
+import logging
 import os.path
+import sys
 import time
 import traceback
 import warnings
@@ -27,6 +27,7 @@
 from scapy.consts import WINDOWS
 import scapy.modules.six as six
 from scapy.modules.six.moves import range
+from scapy.config import conf
 from scapy.compat import base64_bytes, bytes_hex, plain_str
 
 
@@ -35,11 +36,12 @@
 class Bunch:
     __init__ = lambda self, **kw: setattr(self, '__dict__', kw)
 
+
 def retry_test(func):
     """Retries the passed function 3 times before failing"""
     success = False
     ex = Exception("Unknown")
-    for i in six.moves.range(3):
+    for _ in six.moves.range(3):
         try:
             result = func()
         except Exception as e:
@@ -151,6 +153,7 @@
     HTML = 3
     LATEX = 4
     XUNIT = 5
+    LIVE = 6
 
 
 #    TEST CLASSES    #
@@ -186,11 +189,15 @@
         self.preexec_output = None
         self.end_pos = 0
         self.interrupted = False
+        self.duration = 0.0
+
     def add_testset(self, testset):
         self.campaign.append(testset)
         testset.keywords.update(self.keywords)
+
     def trunc(self, index):
         self.campaign = self.campaign[:index]
+
     def startNum(self, beginpos):
         for ts in self:
             for t in ts:
@@ -219,8 +226,10 @@
     def add_test(self, test):
         self.tests.append(test)
         test.keywords.update(self.keywords)
+
     def trunc(self, index):
         self.tests = self.tests[:index]
+
     def __iter__(self):
         return self.tests.__iter__()
 
@@ -230,7 +239,9 @@
         self.name = name
         self.test = ""
         self.comments = ""
-        self.result = "passed" # make instance True at init to have a different truth value than None
+        self.result = "passed"
+        # make instance True at init to have a different truth value than None
+        self.duration = 0
         self.output = ""
         self.num = -1
         self.keywords = set()
@@ -260,8 +271,8 @@
       "onlyfailed": false,
       "verb": 3,
       "dump": 0,
+      "docs": 0,
       "crc": true,
-      "scapy": "scapy",
       "preexec": {},
       "global_preexec": "",
       "outputfile": null,
@@ -274,9 +285,8 @@
     }
 
     """
-    import json
     with open(config_path) as config_file:
-        data = json.load(config_file, encoding="utf8")
+        data = json.load(config_file)
         if verb > 2:
             print("### Loaded config file", config_path, file=sys.stderr)
 
@@ -288,7 +298,7 @@
                  onlyfailed=get_if_exist("onlyfailed", False),
                  verb=get_if_exist("verb", 3),
                  dump=get_if_exist("dump", 0), crc=get_if_exist("crc", 1),
-                 scapy=get_if_exist("scapy", "scapy"),
+                 docs=get_if_exist("docs", 0),
                  preexec=get_if_exist("preexec", {}),
                  global_preexec=get_if_exist("global_preexec", ""),
                  outfile=get_if_exist("outputfile", sys.stdout),
@@ -309,38 +319,39 @@
     test = None
     testnb = 0
 
-    for l in campaign_file.readlines():
-        if l[0] == '#':
+    for line in campaign_file.readlines():
+        if line[0] == '#':
             continue
-        if l[0] == "~":
-            (test or testset or test_campaign).add_keywords(l[1:].split())
-        elif l[0] == "%":
-            test_campaign.title = l[1:].strip()
-        elif l[0] == "+":
-            testset = TestSet(l[1:].strip())
+        if line[0] == "~":
+            (test or testset or test_campaign).add_keywords(line[1:].split())
+        elif line[0] == "%":
+            test_campaign.title = line[1:].strip()
+        elif line[0] == "+":
+            testset = TestSet(line[1:].strip())
             test_campaign.add_testset(testset)
             test = None
-        elif l[0] == "=":
-            test = UnitTest(l[1:].strip())
+        elif line[0] == "=":
+            test = UnitTest(line[1:].strip())
             test.num = testnb
             testnb += 1
             if testset is None:
                 error_m = "Please create a test set (i.e. '+' section)."
                 raise getopt.GetoptError(error_m)
             testset.add_test(test)
-        elif l[0] == "*":
+        elif line[0] == "*":
             if test is not None:
-                test.comments += l[1:]
+                test.comments += line[1:]
             elif testset is not None:
-                testset.comments += l[1:]
+                testset.comments += line[1:]
             else:
-                test_campaign.headcomments += l[1:]
+                test_campaign.headcomments += line[1:]
         else:
             if test is None:
-                if l.strip():
-                    print("Unknown content [%s]" % l.strip(), file=sys.stderr)
+                if line.strip():
+                    print("Unknown content [%s]" % line.strip(),
+                          file=sys.stderr)
             else:
-                test.test += l
+                test.test += line
     return test_campaign
 
 
@@ -370,6 +381,33 @@
                 print("    %s%s" % (c, k))
 
 
+def docs_campaign(test_campaign):
+    print("%(title)s" % test_campaign)
+    print("=" * (len(test_campaign.title)))
+    print()
+    if len(test_campaign.headcomments):
+        print("%s" % test_campaign.headcomments.strip().replace("\n", ""))
+        print()
+    for ts in test_campaign:
+        print("%s" % ts.name)
+        print("-" * len(ts.name))
+        print()
+        if len(ts.comments):
+            print("%s" % ts.comments.strip().replace("\n", ""))
+            print()
+        for t in ts:
+            print("%s" % t.name)
+            print("^" * len(t.name))
+            print()
+            if len(t.comments):
+                print("%s" % t.comments.strip().replace("\n", ""))
+                print()
+            print("Usage example::")
+            for line in t.test.split('\n'):
+                if not line.rstrip().endswith('# no_docs'):
+                    print("\t%s" % line)
+
+
 #    COMPUTE CAMPAIGN DIGESTS    #
 if six.PY2:
     def crc32(x):
@@ -436,10 +474,11 @@
     test_campaign.campaign = [ts for ts in test_campaign.campaign if ts.tests]
 
 
-#### RUN TEST #####
+# RUN TEST #
 
 def run_test(test, get_interactive_session, verb=3, ignore_globals=None, my_globals=None):
     """An internal UTScapy function to run a single test"""
+    start_time = time.time()
     test.output, res = get_interactive_session(test.test.strip(), ignore_globals=ignore_globals, verb=verb, my_globals=my_globals)
     test.result = "failed"
     try:
@@ -452,6 +491,7 @@
         test.output += "UTscapy: Error during result interpretation:\n"
         test.output += "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2],))
     finally:
+        test.duration = time.time() - start_time
         if test.result == "failed":
             from scapy.sendrecv import debug
             # Add optional debugging data to log
@@ -460,24 +500,43 @@
                 test.output += "\n\nPACKET DISSECTION FAILED ON:\n %s(hex_bytes('%s'))" % (cls.__name__, plain_str(bytes_hex(val)))
                 debug.crashed_on = None
         test.decode()
-        if verb > 1:
+        if verb > 2:
+            print("%(result)6s %(crc)s %(duration)06.2fs %(name)s" % test, file=sys.stderr)
+        elif verb > 1:
             print("%(result)6s %(crc)s %(name)s" % test, file=sys.stderr)
 
     return bool(test)
 
-#### RUN CAMPAIGN #####
+# RUN CAMPAIGN #
+
 
 def import_UTscapy_tools(ses):
     """Adds UTScapy tools directly to a session"""
     ses["retry_test"] = retry_test
     ses["Bunch"] = Bunch
+    if WINDOWS:
+        from scapy.arch.windows import _route_add_loopback, IFACES
+        _route_add_loopback()
+        ses["IFACES"] = IFACES
+        ses["conf"].route.routes = conf.route.routes
+        ses["conf"].route6.routes = conf.route6.routes
 
-def run_campaign(test_campaign, get_interactive_session, verb=3, ignore_globals=None):  # noqa: E501
+
+def run_campaign(test_campaign, get_interactive_session, drop_to_interpreter=False, verb=3, ignore_globals=None, scapy_ses=None):  # noqa: E501
     passed = failed = 0
-    scapy_ses = importlib.import_module(".all", "scapy").__dict__
-    import_UTscapy_tools(scapy_ses)
     if test_campaign.preexec:
-        test_campaign.preexec_output = get_interactive_session(test_campaign.preexec.strip(), ignore_globals=ignore_globals, my_globals=scapy_ses)[0]
+        test_campaign.preexec_output = get_interactive_session(
+            test_campaign.preexec.strip(), ignore_globals=ignore_globals,
+            my_globals=scapy_ses)[0]
+
+    # Drop
+    def drop(scapy_ses):
+        code.interact(banner="Test '%s' failed. "
+                             "exit() to stop, Ctrl-D to leave "
+                             "this interpreter and continue "
+                             "with the current test campaign"
+                             % t.name, local=scapy_ses)
+
     try:
         for i, testset in enumerate(test_campaign):
             for j, t in enumerate(testset):
@@ -485,17 +544,25 @@
                     passed += 1
                 else:
                     failed += 1
+                    if drop_to_interpreter:
+                        drop(scapy_ses)
+                test_campaign.duration += t.duration
     except KeyboardInterrupt:
         failed += 1
-        testset.trunc(j+1)
-        test_campaign.trunc(i+1)
+        testset.trunc(j + 1)
+        test_campaign.trunc(i + 1)
         test_campaign.interrupted = True
         if verb:
             print("Campaign interrupted!", file=sys.stderr)
+            if drop_to_interpreter:
+                drop(scapy_ses)
 
     test_campaign.passed = passed
     test_campaign.failed = failed
-    if verb:
+    if verb > 2:
+        print("Campaign CRC=%(crc)s in %(duration)06.2fs SHA=%(sha)s" % test_campaign, file=sys.stderr)  # noqa: E501
+        print("PASSED=%i FAILED=%i" % (passed, failed), file=sys.stderr)
+    elif verb:
         print("Campaign CRC=%(crc)s  SHA=%(sha)s" % test_campaign, file=sys.stderr)  # noqa: E501
         print("PASSED=%i FAILED=%i" % (passed, failed), file=sys.stderr)
     return failed
@@ -522,8 +589,8 @@
 #    CAMPAIGN TO something    #
 
 def campaign_to_TEXT(test_campaign):
-    output="%(title)s\n" % test_campaign
-    output += "-- "+info_line(test_campaign)+"\n\n"
+    output = "%(title)s\n" % test_campaign
+    output += "-- " + info_line(test_campaign) + "\n\n"
     output += "Passed=%(passed)i\nFailed=%(failed)i\n\n%(headcomments)s\n" % test_campaign
 
     for testset in test_campaign:
@@ -563,7 +630,7 @@
 
     if test_campaign.crc is not None and test_campaign.sha is not None:
         output += "CRC=<span class=crc>%(crc)s</span> SHA=<span class=crc>%(sha)s</span><br>" % test_campaign
-    output += "<small><em>"+html_info_line(test_campaign)+"</em></small>"
+    output += "<small><em>" + html_info_line(test_campaign) + "</em></small>"
     output += "".join([
         test_campaign.headcomments,
         "\n<p>",
@@ -685,26 +752,29 @@
     return output
 
 
-#### USAGE ####
+# USAGE #
 
 def usage():
-    print("""Usage: UTscapy [-m module] [-f {text|ansi|HTML|LaTeX}] [-o output_file]
+    print("""Usage: UTscapy [-m module] [-f {text|ansi|HTML|LaTeX|live}] [-o output_file]
                [-t testfile] [-T testfile] [-k keywords [-k ...]] [-K keywords [-K ...]]
-               [-l] [-b] [-d|-D] [-F] [-q[q]] [-P preexecute_python_code]
-               [-s /path/to/scapy] [-c configfile]
+               [-l] [-b] [-d|-D] [-F] [-q[q]] [-i] [-P preexecute_python_code]
+               [-c configfile]
 -t\t\t: provide test files (can be used many times)
 -T\t\t: if -t is used with *, remove a specific file (can be used many times)
 -l\t\t: generate local .js and .css files
 -F\t\t: expand only failed tests
--b\t\t: stop at first failed campaign
+-b\t\t: don't stop at the first failed campaign
 -d\t\t: dump campaign
 -D\t\t: dump campaign and stop
+-R\t\t: dump campaign as reStructuredText
 -C\t\t: don't calculate CRC and SHA
--s\t\t: path to scapy.py
 -c\t\t: load a .utsc config file
+-i\t\t: drop into Python interpreter if test failed
 -q\t\t: quiet mode
 -qq\t\t: [silent mode]
+-x\t\t: use pyannotate
 -n <testnum>\t: only tests whose numbers are given (eg. 1,3-7,12)
+-N\t\t: force non root
 -m <module>\t: additional module to put in the namespace
 -k <kw1>,<kw2>,...\t: include only tests with one of those keywords (can be used many times)
 -K <kw1>,<kw2>,...\t: remove tests with one of those keywords (can be used many times)
@@ -715,8 +785,8 @@
 
 #    MAIN    #
 
-def execute_campaign(TESTFILE, OUTPUTFILE, PREEXEC, NUM, KW_OK, KW_KO, DUMP,
-                     FORMAT, VERB, ONLYFAILED, CRC, autorun_func, pos_begin=0, ignore_globals=None):  # noqa: E501
+def execute_campaign(TESTFILE, OUTPUTFILE, PREEXEC, NUM, KW_OK, KW_KO, DUMP, DOCS,
+                     FORMAT, VERB, ONLYFAILED, CRC, INTERPRETER, autorun_func, pos_begin=0, ignore_globals=None, scapy_ses=None):  # noqa: E501
     # Parse test file
     test_campaign = parse_campaign_file(TESTFILE)
 
@@ -743,9 +813,14 @@
         if DUMP > 1:
             sys.exit()
 
+    # Dump campaign as reStructuredText
+    if DOCS:
+        docs_campaign(test_campaign)
+        sys.exit()
+
     # Run tests
     test_campaign.output_file = OUTPUTFILE
-    result = run_campaign(test_campaign, autorun_func[FORMAT], verb=VERB, ignore_globals=None)  # noqa: E501
+    result = run_campaign(test_campaign, autorun_func[FORMAT], drop_to_interpreter=INTERPRETER, verb=VERB, ignore_globals=None, scapy_ses=scapy_ses)  # noqa: E501
 
     # Shrink passed
     if ONLYFAILED:
@@ -767,6 +842,8 @@
         output = campaign_to_LATEX(test_campaign)
     elif FORMAT == Format.XUNIT:
         output = campaign_to_xUNIT(test_campaign)
+    elif FORMAT == Format.LIVE:
+        output = ""
 
     return output, (result == 0), test_campaign
 
@@ -781,6 +858,8 @@
 
 def main():
     argv = sys.argv[1:]
+    logger = logging.getLogger("scapy")
+    logger.addHandler(logging.StreamHandler())
     ignore_globals = list(six.moves.builtins.__dict__)
 
     # Parse arguments
@@ -789,37 +868,44 @@
     OUTPUTFILE = sys.stdout
     LOCAL = 0
     NUM = None
+    NON_ROOT = False
     KW_OK = []
     KW_KO = []
     DUMP = 0
+    DOCS = 0
     CRC = True
     BREAKFAILED = True
     ONLYFAILED = False
     VERB = 3
     GLOB_PREEXEC = ""
     PREEXEC_DICT = {}
-    SCAPY = "scapy"
     MODULES = []
     TESTFILES = []
+    ANNOTATIONS_MODE = False
+    INTERPRETER = False
     try:
-        opts = getopt.getopt(argv, "o:t:T:c:f:hbln:m:k:K:DdCFqP:s:")
+        opts = getopt.getopt(argv, "o:t:T:c:f:hbln:m:k:K:DRdCiFqNP:s:x")
         for opt, optarg in opts[0]:
             if opt == "-h":
                 usage()
             elif opt == "-b":
-                BREAKFAILED =  True
+                BREAKFAILED = False
             elif opt == "-F":
                 ONLYFAILED = True
             elif opt == "-q":
                 VERB -= 1
             elif opt == "-D":
                 DUMP = 2
+            elif opt == "-R":
+                DOCS = 1
             elif opt == "-d":
                 DUMP = 1
             elif opt == "-C":
                 CRC = False
-            elif opt == "-s":
-                SCAPY = optarg
+            elif opt == "-i":
+                INTERPRETER = True
+            elif opt == "-x":
+                ANNOTATIONS_MODE = True
             elif opt == "-P":
                 GLOB_PREEXEC += "\n" + optarg
             elif opt == "-f":
@@ -839,7 +925,6 @@
                 VERB = data.verb
                 DUMP = data.dump
                 CRC = data.crc
-                SCAPY = data.scapy
                 PREEXEC_DICT = data.preexec
                 GLOB_PREEXEC = data.global_preexec
                 OUTPUTFILE = data.outfile
@@ -874,6 +959,8 @@
                     except ValueError:
                         v1, v2 = [int(e) for e in v.split('-', 1)]
                         NUM.extend(range(v1, v2 + 1))
+            elif opt == "-N":
+                NON_ROOT = True
             elif opt == "-m":
                 MODULES.append(optarg)
             elif opt == "-k":
@@ -881,9 +968,39 @@
             elif opt == "-K":
                 KW_KO.extend(optarg.split(","))
 
+        # Disable tests if needed
+
         # Discard Python3 tests when using Python2
         if six.PY2:
             KW_KO.append("python3_only")
+            if VERB > 2:
+                print("### Python 2 mode ###")
+        try:
+            if NON_ROOT or os.getuid() != 0:  # Non root
+                # Discard root tests
+                KW_KO.append("netaccess")
+                KW_KO.append("needs_root")
+                if VERB > 2:
+                    print("### Non-root mode ###")
+        except AttributeError:
+            pass
+
+        if conf.use_pcap:
+            KW_KO.append("not_pcapdnet")
+            if VERB > 2:
+                print("### libpcap mode ###")
+
+        # Process extras
+        if six.PY3:
+            KW_KO.append("FIXME_py3")
+
+        if ANNOTATIONS_MODE:
+            try:
+                from pyannotate_runtime import collect_types
+            except ImportError:
+                raise ImportError("Please install pyannotate !")
+            collect_types.init_types_collection()
+            collect_types.start()
 
         if VERB > 2:
             print("### Booting scapy...", file=sys.stderr)
@@ -901,10 +1018,6 @@
             except ImportError as e:
                 raise getopt.GetoptError("cannot import [%s]: %s" % (m, e))
 
-        if WINDOWS:
-            from scapy.arch.windows import route_add_loopback
-            route_add_loopback()
-
         # Add SCAPY_ROOT_DIR environment variable, used for tests
         os.environ['SCAPY_ROOT_DIR'] = os.environ.get("PWD", os.getcwd())
 
@@ -918,6 +1031,7 @@
         Format.HTML: scapy.autorun_get_html_interactive_session,
         Format.LATEX: scapy.autorun_get_latex_interactive_session,
         Format.XUNIT: scapy.autorun_get_text_interactive_session,
+        Format.LIVE: scapy.autorun_get_live_interactive_session,
     }
 
     if VERB > 2:
@@ -941,17 +1055,20 @@
     pos_begin = 0
 
     runned_campaigns = []
+
+    scapy_ses = importlib.import_module(".all", "scapy").__dict__
+    import_UTscapy_tools(scapy_ses)
+
     # Execute all files
     for TESTFILE in TESTFILES:
         if VERB > 2:
             print("### Loading:", TESTFILE, file=sys.stderr)
         PREEXEC = PREEXEC_DICT[TESTFILE] if TESTFILE in PREEXEC_DICT else GLOB_PREEXEC
         with open(TESTFILE) as testfile:
-            output, result, campaign = execute_campaign(testfile, OUTPUTFILE,
-                                                        PREEXEC, NUM, KW_OK, KW_KO,
-                                                        DUMP, FORMAT, VERB, ONLYFAILED,
-                                                        CRC, autorun_func, pos_begin,
-                                                        ignore_globals)
+            output, result, campaign = execute_campaign(
+                testfile, OUTPUTFILE, PREEXEC, NUM, KW_OK, KW_KO, DUMP, DOCS,
+                FORMAT, VERB, ONLYFAILED, CRC, INTERPRETER, autorun_func,
+                pos_begin, ignore_globals, copy.copy(scapy_ses))
         runned_campaigns.append(campaign)
         pos_begin = campaign.end_pos
         if UNIQUE:
@@ -964,6 +1081,11 @@
 
     if VERB > 2:
         print("### Writing output...", file=sys.stderr)
+
+    if ANNOTATIONS_MODE:
+        collect_types.stop()
+        collect_types.dump_stats("pyannotate_results")
+
     # Concenate outputs
     if FORMAT == Format.HTML:
         glob_output = pack_html_campaigns(runned_campaigns, glob_output, LOCAL, glob_title)

scapy-2.4.3.tar.gz/scapy/tools/automotive/isotpscanner.py -> scapy-2.4.4.tar.gz/scapy/tools/automotive/isotpscanner.py Changed

@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # This file is part of Scapy
 # See http://www.secdev.org/projects/scapy for more information
 # Copyright (C) Nils Weiss <nils@we155.de>
@@ -11,12 +9,15 @@
 import getopt
 import sys
 import signal
+import re
+
+from ast import literal_eval
 
 import scapy.modules.six as six
 from scapy.config import conf
 from scapy.consts import LINUX
 
-if six.PY2 or not LINUX:
+if six.PY2 or not LINUX or conf.use_pypy:
     conf.contribs['CANSocket'] = {'use-python-can': True}
 
 from scapy.contrib.cansocket import CANSocket, PYTHON_CAN   # noqa: E402
@@ -28,10 +29,11 @@
     sys.exit(0)
 
 
-def usage():
-    print('''usage:\tisotpscanner [-i interface] [-c channel] [-b bitrate]
-                [-n NOISE_LISTEN_TIME] [-t SNIFF_TIME] [-x|--extended]
-                [-C|--piso] [-v|--verbose] [-h|--help] [-s start] [-e end]\n
+def usage(is_error):
+    print('''usage:\tisotpscanner [-i interface] [-c channel]
+                [-a python-can_args] [-n NOISE_LISTEN_TIME] [-t SNIFF_TIME]
+                [-x|--extended] [-C|--piso] [-v|--verbose] [-h|--help]
+                [-s start] [-e end]\n
     Scan for open ISOTP-Sockets.\n
     required arguments:
     -c, --channel         python-can channel or Linux SocketCAN interface name
@@ -44,8 +46,8 @@
                           be provided. Please see:
                           https://python-can.readthedocs.io for
                           further interface examples.
-    -b, --bitrate         python-can bitrate.\n
     optional arguments:
+    -a, --python-can_args Additional arguments for a python-can Bus object.\n
     -h, --help            show this help message and exit
     -n NOISE_LISTEN_TIME, --noise_listen_time NOISE_LISTEN_TIME
                           Seconds listening for noise before scan.
@@ -53,35 +55,42 @@
                           Duration in milliseconds a sniff is waiting for a
                           flow-control response.
     -x, --extended        Scan with ISOTP extended addressing.
+                          This has nothing to do with extended CAN identifiers
     -C, --piso            Print 'Copy&Paste'-ready ISOTPSockets.
     -v, --verbose         Display information during scan.\n
+        --extended_can_id Use extended CAN identifiers
     Example of use:\n
     Python2 or Windows:
-    python2 -m scapy.tools.automotive.isotpscanner --interface=pcan --channel=PCAN_USBBUS1 --bitrate=250000 --start 0 --end 100
-    python2 -m scapy.tools.automotive.isotpscanner --interface vector --channel 0 --bitrate 250000 --start 0 --end 100
-    python2 -m scapy.tools.automotive.isotpscanner --interface socketcan --channel=can0 --bitrate=250000 --start 0 --end 100\n
+        python2 -m scapy.tools.automotive.isotpscanner --interface=pcan --channel=PCAN_USBBUS1 --start 0 --end 100
+    python2 -m scapy.tools.automotive.isotpscanner --interface=pcan --channel=PCAN_USBBUS1 -a 'bitrate=500000 fd=True' --start 0 --end 100
+    python2 -m scapy.tools.automotive.isotpscanner --interface vector --channel 0 --start 0 --end 100
+    python2 -m scapy.tools.automotive.isotpscanner --interface vector --channel 0 --python-can_args 'bitrate=500000, poll_interval=1' --start 0 --end 100
+    python2 -m scapy.tools.automotive.isotpscanner --interface socketcan --channel=can0 --start 0 --end 100\n
     Python3 on Linux:
     python3 -m scapy.tools.automotive.isotpscanner --channel can0 --start 0 --end 100 \n''',  # noqa: E501
-          file=sys.stderr)
+          file=sys.stderr if is_error else sys.stdout)
 
 
 def main():
     extended = False
     piso = False
     verbose = False
+    extended_can_id = False
     sniff_time = 100
     noise_listen_time = 2
     start = None
     end = None
     channel = None
     interface = None
-    bitrate = None
+    python_can_args = None
+    conf.verb = -1
 
     options = getopt.getopt(
         sys.argv[1:],
-        'vxCt:n:i:c:b:s:e:h',
+        'vxCt:n:i:c:a:s:e:h:w',
         ['verbose', 'noise_listen_time=', 'sniff_time=', 'interface=', 'piso',
-         'channel=', 'bitrate=', 'start=', 'end=', 'help', 'extended'])
+         'channel=', 'python-can_args=', 'start=', 'end=', 'help', 'extended',
+         'extended_can_id'])
 
     try:
         for opt, arg in options[0]:
@@ -92,8 +101,8 @@
             elif opt in ('-C', '--piso'):
                 piso = True
             elif opt in ('-h', '--help'):
-                usage()
-                sys.exit(-1)
+                usage(False)
+                sys.exit(0)
             elif opt in ('-t', '--sniff_time'):
                 sniff_time = int(arg)
             elif opt in ('-n', '--noise_listen_time'):
@@ -102,77 +111,92 @@
                 interface = arg
             elif opt in ('-c', '--channel'):
                 channel = arg
-            elif opt in ('-b', '--bitrate'):
-                bitrate = int(arg)
+            elif opt in ('-a', '--python-can_args'):
+                python_can_args = arg
             elif opt in ('-s', '--start'):
                 start = int(arg, 16)
             elif opt in ('-e', '--end'):
                 end = int(arg, 16)
+            elif opt in '--extended_can_id':
+                extended_can_id = True
     except getopt.GetoptError as msg:
-        usage()
+        usage(True)
         print("ERROR:", msg, file=sys.stderr)
         raise SystemExit
 
     if start is None or \
             end is None or \
             channel is None or \
-            (PYTHON_CAN and (bitrate is None or interface is None)):
-        usage()
+            (PYTHON_CAN and interface is None):
+        usage(True)
         print("\nPlease provide all required arguments.\n", file=sys.stderr)
-        sys.exit(-1)
+        sys.exit(1)
 
-    if end >= 0x800:
-        print("end must be < 0x800.", file=sys.stderr)
-        sys.exit(-1)
+    if end >= 2**29 or start >= 2**29:
+        print("Argument 'start' and 'end' must be < " + hex(2**29),
+              file=sys.stderr)
+        sys.exit(1)
+
+    if not extended_can_id and (end >= 0x800 or start >= 0x800):
+        print("Standard can identifiers must be < 0x800.\n"
+              "Use --extended_can_id option to scan with "
+              "extended CAN identifiers.",
+              file=sys.stderr)
+        sys.exit(1)
 
     if end < start:
         print("start must be equal or smaller than end.", file=sys.stderr)
-        sys.exit(-1)
-
-    if PYTHON_CAN:
-        import can
-        try:
-            can.rc['interface'] = interface
-            can.rc['channel'] = channel
-            can.rc['bitrate'] = bitrate
-            scan_interface = can.interface.Bus()
-            interface_string = "CANSocket(iface=can.interface.Bus(bustype=" \
-                               "'%s', channel='%s', bitrate=%d))" % \
-                               (interface, channel, bitrate)
-        except Exception as e:
-            usage()
-            print("\nCheck python-can interface assignment.\n",
-                  file=sys.stderr)
-            print(e, file=sys.stderr)
-            sys.exit(-1)
-    else:
-        scan_interface = channel
-        interface_string = "\"%s\"" % channel
+        sys.exit(1)
+
+    sock = None
 
     try:
-        sock = CANSocket(iface=scan_interface)
+        if PYTHON_CAN:
+            if python_can_args:
+                interface_string = "CANSocket(bustype=" \
+                                   "'%s', channel='%s', %s)" % \
+                                   (interface, channel, python_can_args)
+                arg_dict = dict((k, literal_eval(v)) for k, v in
+                                (pair.split('=') for pair in
+                                 re.split(', | |,', python_can_args)))
+                sock = CANSocket(bustype=interface, channel=channel,
+                                 **arg_dict)
+            else:
+                interface_string = "CANSocket(bustype=" \
+                                   "'%s', channel='%s')" % \
+                                   (interface, channel)
+                sock = CANSocket(bustype=interface, channel=channel)
+        else:
+            sock = CANSocket(channel=channel)
+            interface_string = "\"%s\"" % channel
+
+        if verbose:
+            print("Start scan (%s - %s)" % (hex(start), hex(end)))
+
+        signal.signal(signal.SIGINT, signal_handler)
+
+        result = ISOTPScan(sock,
+                           range(start, end + 1),
+                           extended_addressing=extended,
+                           noise_listen_time=noise_listen_time,
+                           sniff_time=float(sniff_time) / 1000,
+                           output_format="code" if piso else "text",
+                           can_interface=interface_string,
+                           extended_can_id=extended_can_id,
+                           verbose=verbose)
+
+        print("Scan: \n%s" % result)
+
     except Exception as e:
-        usage()
+        usage(True)
         print("\nSocket couldn't be created. Check your arguments.\n",
               file=sys.stderr)
         print(e, file=sys.stderr)
-        sys.exit(-1)
-
-    if verbose:
-        print("Start scan (%s - %s)" % (hex(start), hex(end)))
-
-    signal.signal(signal.SIGINT, signal_handler)
-
-    result = ISOTPScan(sock,
-                       range(start, end + 1),
-                       extended_addressing=extended,
-                       noise_listen_time=noise_listen_time,
-                       sniff_time=float(sniff_time) / 1000,
-                       output_format="code" if piso else "text",
-                       can_interface=interface_string,
-                       verbose=verbose)
+        sys.exit(1)
 
-    print("Scan: \n%s" % result)
+    finally:
+        if sock is not None:
+            sock.close()
 
 
 if __name__ == '__main__':

scapy-2.4.4.tar.gz/scapy/tools/automotive/obdscanner.py Added

@@ -0,0 +1,209 @@
+#! /usr/bin/env python
+
+# This file is part of Scapy
+# See http://www.secdev.org/projects/scapy for more information
+# Copyright (C) Andreas Korb <andreas.korb@e-mundo.de>
+# Copyright (C) Friedrich Feigel <friedrich.feigel@e-mundo.de>
+# Copyright (C) Nils Weiss <nils@we155.de>
+# This program is published under a GPLv2 license
+
+from __future__ import print_function
+
+import getopt
+import sys
+import signal
+import re
+
+from ast import literal_eval
+
+import scapy.modules.six as six
+from scapy.config import conf
+from scapy.consts import LINUX
+
+if six.PY2 or not LINUX or conf.use_pypy:
+    conf.contribs['CANSocket'] = {'use-python-can': True}
+
+from scapy.contrib.isotp import ISOTPSocket                    # noqa: E402
+from scapy.contrib.cansocket import CANSocket, PYTHON_CAN      # noqa: E402
+from scapy.contrib.automotive.obd.obd import OBD               # noqa: E402
+from scapy.contrib.automotive.obd.scanner import OBD_Scanner, OBD_S01_Enumerator, OBD_S02_Enumerator, OBD_S03_Enumerator, OBD_S06_Enumerator, OBD_S07_Enumerator, OBD_S08_Enumerator, OBD_S09_Enumerator, OBD_S0A_Enumerator  # noqa: E402 E501
+
+
+def signal_handler(sig, frame):
+    print('Interrupting scan!')
+    sys.exit(0)
+
+
+def usage(is_error):
+    print('''usage:\tobdscanner [-i|--interface] [-c|--channel] [-b|--bitrate]
+                                [-a|--python-can_args] [-h|--help]
+                                [-s|--source] [-d|--destination]
+                                [-t|--timeout] [-f|--full]
+                                [-v|--verbose]\n
+    Scan for all possible obd service classes and their subfunctions.\n
+    optional arguments:
+    -c, --channel               python-can channel or Linux SocketCAN interface name\n
+    additional required arguments for WINDOWS or Python 2:
+    -i, --interface             python-can interface for the scan.
+                                Depends on used interpreter and system,
+                                see examples below. Any python-can interface can
+                                be provided. Please see:
+                                https://python-can.readthedocs.io for
+                                further interface examples.
+    optional arguments:
+    -a, --python-can_args       Additional arguments for a python-can Bus object.
+    -h, --help                  show this help message and exit
+    -s, --source                ISOTP-socket source id (hex)
+    -d, --destination           ISOTP-socket destination id (hex)
+    -t, --timeout               Timeout after which the scanner proceeds to next service [seconds]
+    -f, --full                  Full scan on id services
+    -v, --verbose               Display information during scan
+    -1                          Scan OBD Service 01
+    -2                          Scan OBD Service 02
+    -3                          Scan OBD Service 03
+    -6                          Scan OBD Service 06
+    -7                          Scan OBD Service 07
+    -8                          Scan OBD Service 08
+    -9                          Scan OBD Service 09
+    -A                          Scan OBD Service 0A\n
+    Example of use:\n
+    Python2 or Windows:
+    python2 -m scapy.tools.automotive.obdscanner --interface=pcan --channel=PCAN_USBBUS1 --source=0x070 --destination 0x034
+    python2 -m scapy.tools.automotive.obdscanner --interface vector --channel 0 --source 0x000 --destination 0x734
+    python2 -m scapy.tools.automotive.obdscanner --interface socketcan --channel=can0 --source 0x089 --destination 0x234
+    python2 -m scapy.tools.automotive.obdscanner --interface vector --channel 0 --python-can_args 'bitrate=500000, poll_interval=1' --source=0x070 --destination 0x034\n
+    Python3 on Linux:
+    python3 -m scapy.tools.automotive.obdscanner --channel can0 --source 0x123 --destination 0x456 \n''',  # noqa: E501
+          file=sys.stderr if is_error else sys.stdout)
+
+
+def main():
+
+    channel = None
+    interface = None
+    source = 0x7e0
+    destination = 0x7df
+    timeout = 0.1
+    full_scan = False
+    specific_scan = False
+    verbose = False
+    python_can_args = None
+    custom_enumerators = []
+    conf.verb = -1
+
+    options = getopt.getopt(
+        sys.argv[1:],
+        'i:c:s:d:a:t:hfv1236789A',
+        ['interface=', 'channel=', 'source=', 'destination=',
+         'help', 'timeout=', 'python-can_args=', 'full',
+         'verbose'])
+
+    try:
+        for opt, arg in options[0]:
+            if opt in ('-i', '--interface'):
+                interface = arg
+            elif opt in ('-c', '--channel'):
+                channel = arg
+            elif opt in ('-a', '--python-can_args'):
+                python_can_args = arg
+            elif opt in ('-s', '--source'):
+                source = int(arg, 16)
+            elif opt in ('-d', '--destination'):
+                destination = int(arg, 16)
+            elif opt in ('-h', '--help'):
+                usage(False)
+                sys.exit(0)
+            elif opt in ('-t', '--timeout'):
+                timeout = float(arg)
+            elif opt in ('-f', '--full'):
+                full_scan = True
+            elif opt == '-1':
+                specific_scan = True
+                custom_enumerators += [OBD_S01_Enumerator]
+            elif opt == '-2':
+                specific_scan = True
+                custom_enumerators += [OBD_S02_Enumerator]
+            elif opt == '-3':
+                specific_scan = True
+                custom_enumerators += [OBD_S03_Enumerator]
+            elif opt == '-6':
+                specific_scan = True
+                custom_enumerators += [OBD_S06_Enumerator]
+            elif opt == '-7':
+                specific_scan = True
+                custom_enumerators += [OBD_S07_Enumerator]
+            elif opt == '-8':
+                specific_scan = True
+                custom_enumerators += [OBD_S08_Enumerator]
+            elif opt == '-9':
+                specific_scan = True
+                custom_enumerators += [OBD_S09_Enumerator]
+            elif opt == '-A':
+                specific_scan = True
+                custom_enumerators += [OBD_S0A_Enumerator]
+            elif opt in ('-v', '--verbose'):
+                verbose = True
+    except getopt.GetoptError as msg:
+        usage(True)
+        print("ERROR:", msg, file=sys.stderr)
+        raise SystemExit
+
+    if channel is None or \
+            (PYTHON_CAN and interface is None):
+        usage(True)
+        print("\nPlease provide all required arguments.\n",
+              file=sys.stderr)
+        sys.exit(1)
+
+    if 0 > source >= 0x800 or 0 > destination >= 0x800\
+            or source == destination:
+        print("The ids must be >= 0 and < 0x800 and not equal.",
+              file=sys.stderr)
+        sys.exit(1)
+
+    if 0 > timeout:
+        print("The timeout must be a positive value")
+        sys.exit(1)
+
+    csock = None
+    try:
+        if PYTHON_CAN:
+            if python_can_args:
+                arg_dict = dict((k, literal_eval(v)) for k, v in
+                                (pair.split('=') for pair in
+                                 re.split(', | |,', python_can_args)))
+                csock = CANSocket(bustype=interface, channel=channel,
+                                  **arg_dict)
+            else:
+                csock = CANSocket(bustype=interface, channel=channel)
+        else:
+            csock = CANSocket(channel=channel)
+
+        with ISOTPSocket(csock, source, destination,
+                         basecls=OBD, padding=True) as isock:
+            signal.signal(signal.SIGINT, signal_handler)
+            if specific_scan:
+                es = custom_enumerators
+            else:
+                es = OBD_Scanner.default_enumerator_clss
+            s = OBD_Scanner(isock, enumerators=es, full_scan=full_scan,
+                            verbose=verbose, timeout=timeout)
+            print("Starting OBD-Scan...")
+            s.scan()
+            for e in s.enumerators:
+                e.show()
+
+    except Exception as e:
+        usage(True)
+        print("\nSocket couldn't be created. Check your arguments.\n",
+              file=sys.stderr)
+        print(e, file=sys.stderr)
+        sys.exit(1)
+
+    finally:
+        if csock is not None:
+            csock.close()
+
+
+if __name__ == '__main__':
+    main()

scapy-2.4.3.tar.gz/scapy/tools/check_asdis.py -> scapy-2.4.4.tar.gz/scapy/tools/check_asdis.py Changed

scapy-2.4.3.tar.gz/scapy/tools/generate_ethertypes.py -> scapy-2.4.4.tar.gz/scapy/tools/generate_ethertypes.py Changed

@@ -4,8 +4,8 @@
 # Copyright (C) Gabriel Potter <gabriel@potter.fr>
 # This program is published under a GPLv2 license
 
-"""Generate the ethertypes file (/etc/ethertypes)
-based on the OpenBSD source.
+"""Generate the ethertypes file (/etc/ethertypes) based on the OpenBSD source
+https://github.com/openbsd/src/blob/master/sys/net/ethertypes.h
 
 It allows to have a file with the format of
 http://git.netfilter.org/ebtables/plain/ethertypes
@@ -20,7 +20,7 @@
 with urllib.request.urlopen(URL) as stream:
     DATA = stream.read()
 
-reg = rb".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/"
+reg = br".*ETHERTYPE_([^\s]+)\s.0x([0-9A-Fa-f]+).*\/\*(.*)\*\/"
 COMPILED = b"""#
 # Ethernet frame types
 #       This file describes some of the various Ethernet
@@ -33,10 +33,16 @@
 # <name>    <hexnumber> <alias1>...<alias35> #Comment
 #
 """
+ALIASES = {
+    b"IP": b"IPv4",
+    b"IPV6": b"IPv6"
+}
+
 for line in DATA.split(b"\n"):
     match = re.match(reg, line)
     if match:
-        name = match.group(1).ljust(16)
+        name = match.group(1)
+        name = ALIASES.get(name, name).ljust(16)
         number = match.group(2).upper()
         comment = match.group(3).strip()
         compiled_line = (b"%b%b" + b" " * 25 + b"# %b\n") % (
@@ -44,5 +50,10 @@
         )
         COMPILED += compiled_line
 
-with open("ethertypes", "wb") as output:
-    print("Written: %s" % output.write(COMPILED))
+with open("../libs/ethertypes.py", "rb") as inp:
+    data = inp.read()
+
+with open("../libs/ethertypes.py", "wb") as out:
+    ini, sep, _ = data.partition(b"DATA = b\"\"\"")
+    COMPILED = ini + sep + b"\n" + COMPILED + b"\"\"\"\n"
+    print("Written: %s" % out.write(COMPILED))

scapy-2.4.4.tar.gz/scapy/tools/scapy_pyannotate.py Added

scapy-2.4.3.tar.gz/scapy/utils.py -> scapy-2.4.4.tar.gz/scapy/utils.py Changed

@@ -26,7 +26,7 @@
 import threading
 
 import scapy.modules.six as six
-from scapy.modules.six.moves import range
+from scapy.modules.six.moves import range, input
 
 from scapy.config import conf
 from scapy.consts import DARWIN, WINDOWS, WINDOWS_XP, OPENBSD
@@ -48,7 +48,70 @@
     When using a tuple as the second argument issubtype(X, (A, B, ...)),
     is a shortcut for issubtype(X, A) or issubtype(X, B) or ... (etc.).
     """
-    return isinstance(x, type) and issubclass(x, t)
+    if isinstance(t, str):
+        return t in (z.__name__ for z in x.__bases__)
+    if isinstance(x, type) and issubclass(x, t):
+        return True
+    return False
+
+
+class EDecimal(Decimal):
+    """Extended Decimal
+
+    This implements arithmetic and comparison with float for
+    backward compatibility
+    """
+
+    def __add__(self, other, **kwargs):
+        return EDecimal(Decimal.__add__(self, Decimal(other), **kwargs))
+
+    def __radd__(self, other, **kwargs):
+        return EDecimal(Decimal.__add__(self, Decimal(other), **kwargs))
+
+    def __sub__(self, other, **kwargs):
+        return EDecimal(Decimal.__sub__(self, Decimal(other), **kwargs))
+
+    def __rsub__(self, other, **kwargs):
+        return EDecimal(Decimal.__rsub__(self, Decimal(other), **kwargs))
+
+    def __mul__(self, other, **kwargs):
+        return EDecimal(Decimal.__mul__(self, Decimal(other), **kwargs))
+
+    def __rmul__(self, other, **kwargs):
+        return EDecimal(Decimal.__mul__(self, Decimal(other), **kwargs))
+
+    def __truediv__(self, other, **kwargs):
+        return EDecimal(Decimal.__truediv__(self, Decimal(other), **kwargs))
+
+    def __floordiv__(self, other, **kwargs):
+        return EDecimal(Decimal.__floordiv__(self, Decimal(other), **kwargs))
+
+    def __div__(self, other, **kwargs):
+        return EDecimal(Decimal.__div__(self, Decimal(other), **kwargs))
+
+    def __rdiv__(self, other, **kwargs):
+        return EDecimal(Decimal.__rdiv__(self, Decimal(other), **kwargs))
+
+    def __mod__(self, other, **kwargs):
+        return EDecimal(Decimal.__mod__(self, Decimal(other), **kwargs))
+
+    def __rmod__(self, other, **kwargs):
+        return EDecimal(Decimal.__rmod__(self, Decimal(other), **kwargs))
+
+    def __divmod__(self, other, **kwargs):
+        return EDecimal(Decimal.__divmod__(self, Decimal(other), **kwargs))
+
+    def __rdivmod__(self, other, **kwargs):
+        return EDecimal(Decimal.__rdivmod__(self, Decimal(other), **kwargs))
+
+    def __pow__(self, other, **kwargs):
+        return EDecimal(Decimal.__pow__(self, Decimal(other), **kwargs))
+
+    def __rpow__(self, other, **kwargs):
+        return EDecimal(Decimal.__rpow__(self, Decimal(other), **kwargs))
+
+    def __eq__(self, other, **kwargs):
+        return super(EDecimal, self).__eq__(other) or float(self) == other
 
 
 def get_temp_file(keep=False, autoext="", fd=False):
@@ -126,6 +189,9 @@
 
 
 def lhex(x):
+    from scapy.volatile import VolatileValue
+    if isinstance(x, VolatileValue):
+        return repr(x)
     if type(x) in six.integer_types:
         return hex(x)
     elif isinstance(x, tuple):
@@ -142,7 +208,7 @@
 
     :param x: a Packet
     :param dump: define if the result must be printed or returned in a variable
-    :returns: a String only when dump=True
+    :return: a String only when dump=True
     """
     s = ""
     x = bytes_encode(x)
@@ -175,7 +241,7 @@
     :param onlyasc: 1 to display only the ascii view
     :param onlyhex: 1 to display only the hexadecimal view
     :param dump: print the view if False
-    :returns: a String only when dump=True
+    :return: a String only when dump=True
     """
     s = ""
     s = hexstr(x, onlyasc=onlyasc, onlyhex=onlyhex, color=not dump)
@@ -195,7 +261,7 @@
 
     :param x: a Packet
     :param dump: print the view if False
-    :returns: a String only if dump=True
+    :return: a String only if dump=True
     """
     x = bytes_encode(x)
     s = ", ".join("%#04x" % orb(x) for x in x)
@@ -416,18 +482,20 @@
     return ("%02x:" * 6)[:-1] % tuple(s)
 
 
-def randstring(l):
+def randstring(length):
     """
-    Returns a random string of length l (l >= 0)
+    Returns a random string of length (length >= 0)
     """
-    return b"".join(struct.pack('B', random.randint(0, 255)) for _ in range(l))
+    return b"".join(struct.pack('B', random.randint(0, 255))
+                    for _ in range(length))
 
 
-def zerofree_randstring(l):
+def zerofree_randstring(length):
     """
-    Returns a random string of length l (l >= 0) without zero in it.
+    Returns a random string of length (length >= 0) without zero in it.
     """
-    return b"".join(struct.pack('B', random.randint(1, 255)) for _ in range(l))
+    return b"".join(struct.pack('B', random.randint(1, 255))
+                    for _ in range(length))
 
 
 def strxor(s1, s2):
@@ -533,29 +601,38 @@
 
 class ContextManagerSubprocess(object):
     """
-    Context manager that eases checking for unknown command.
+    Context manager that eases checking for unknown command, without
+    crashing.
 
     Example:
-    >>> with ContextManagerSubprocess("my custom message", "unknown_command"):
-    >>>     subprocess.Popen(["unknown_command"])
+    >>> with ContextManagerSubprocess("tcpdump"):
+    >>>     subprocess.Popen(["tcpdump", "--version"])
+    ERROR: Could not execute tcpdump, is it installed?
 
     """
 
-    def __init__(self, name, prog):
-        self.name = name
+    def __init__(self, prog, suppress=True):
         self.prog = prog
+        self.suppress = suppress
 
     def __enter__(self):
         pass
 
     def __exit__(self, exc_type, exc_value, traceback):
-        if isinstance(exc_value, (OSError, TypeError)):
-            msg = "%s: executing %r failed" % (self.name, self.prog) if self.prog else "Could not execute %s, is it installed ?" % self.name  # noqa: E501
-            if not conf.interactive:
-                raise OSError(msg)
-            else:
-                log_runtime.error(msg, exc_info=True)
-                return True  # Suppress the exception
+        if exc_value is None:
+            return
+        # Errored
+        if isinstance(exc_value, EnvironmentError):
+            msg = "Could not execute %s, is it installed?" % self.prog
+        else:
+            msg = "%s: execution failed (%s)" % (
+                self.prog,
+                exc_type.__class__.__name__
+            )
+        if not self.suppress:
+            raise exc_type(msg)
+        log_runtime.error(msg, exc_info=True)
+        return True  # Suppress the exception
 
 
 class ContextManagerCaptureOutput(object):
@@ -596,24 +673,27 @@
         return self.result_export_object
 
 
-def do_graph(graph, prog=None, format=None, target=None, type=None, string=None, options=None):  # noqa: E501
-    """do_graph(graph, prog=conf.prog.dot, format="svg",
-         target="| conf.prog.display", options=None, [string=1]):
-    string: if not None, simply return the graph string
-    graph: GraphViz graph description
-    format: output type (svg, ps, gif, jpg, etc.), passed to dot's "-T" option
-    target: filename or redirect. Defaults pipe to Imagemagick's display program  # noqa: E501
-    prog: which graphviz program to use
-    options: options to be passed to prog"""
+def do_graph(graph, prog=None, format=None, target=None, type=None,
+             string=None, options=None):
+    """Processes graph description using an external software.
+    This method is used to convert a graphviz format to an image.
+
+    :param graph: GraphViz graph description
+    :param prog: which graphviz program to use
+    :param format: output type (svg, ps, gif, jpg, etc.), passed to dot's "-T"
+        option
+    :param string: if not None, simply return the graph string
+    :param target: filename or redirect. Defaults pipe to Imagemagick's
+        display program
+    :param options: options to be passed to prog
+    """
 
     if format is None:
-        if WINDOWS:
-            format = "png"  # use common format to make sure a viewer is installed  # noqa: E501
-        else:
-            format = "svg"
+        format = "svg"
     if string:
         return graph
     if type is not None:
+        warning("type is deprecated, and was renamed format")
         format = type
     if prog is None:
         prog = conf.prog.dot
@@ -623,7 +703,7 @@
             target = get_temp_file(autoext="." + format)
             start_viewer = True
         else:
-            with ContextManagerSubprocess("do_graph()", conf.prog.display):
+            with ContextManagerSubprocess(conf.prog.display):
                 target = subprocess.Popen([conf.prog.display],
                                           stdin=subprocess.PIPE).stdin
     if format is not None:
@@ -636,11 +716,17 @@
             target = open(target[1:].lstrip(), "wb")
         else:
             target = open(os.path.abspath(target), "wb")
-    proc = subprocess.Popen("\"%s\" %s %s" % (prog, options or "", format or ""),  # noqa: E501
-                            shell=True, stdin=subprocess.PIPE, stdout=target)
-    proc.stdin.write(bytes_encode(graph))
-    proc.stdin.close()
-    proc.wait()
+    proc = subprocess.Popen(
+        "\"%s\" %s %s" % (prog, options or "", format or ""),
+        shell=True, stdin=subprocess.PIPE, stdout=target,
+        stderr=subprocess.PIPE
+    )
+    _, stderr = proc.communicate(bytes_encode(graph))
+    if proc.returncode != 0:
+        raise OSError(
+            "GraphViz call failed (is it installed?):\n" +
+            plain_str(stderr)
+        )
     try:
         target.close()
     except Exception:
@@ -657,7 +743,7 @@
             if conf.prog.display == conf.prog._default:
                 os.startfile(target.name)
             else:
-                with ContextManagerSubprocess("do_graph()", conf.prog.display):
+                with ContextManagerSubprocess(conf.prog.display):
                     subprocess.Popen([conf.prog.display, target.name])
 
 
@@ -805,7 +891,10 @@
 
 @conf.commands.register
 def corrupt_bytes(s, p=0.01, n=None):
-    """Corrupt a given percentage or number of bytes from a string"""
+    """
+    Corrupt a given percentage (at least one byte) or number of bytes
+    from a string
+    """
     s = array.array("B", bytes_encode(s))
     s_len = len(s)
     if n is None:
@@ -817,7 +906,10 @@
 
 @conf.commands.register
 def corrupt_bits(s, p=0.01, n=None):
-    """Flip a given percentage or number of bits from a string"""
+    """
+    Flip a given percentage (at least one bit) or number of bits
+    from a string
+    """
     s = array.array("B", bytes_encode(s))
     s_len = len(s) * 8
     if n is None:
@@ -835,16 +927,15 @@
 def wrpcap(filename, pkt, *args, **kargs):
     """Write a list of packets to a pcap file
 
-filename: the name of the file to write packets to, or an open,
-          writable file-like object. The file descriptor will be
-          closed at the end of the call, so do not use an object you
-          do not want to close (e.g., running wrpcap(sys.stdout, [])
-          in interactive mode will crash Scapy).
-gz: set to 1 to save a gzipped capture
-linktype: force linktype value
-endianness: "<" or ">", force endianness
-sync: do not bufferize writes to the capture file
-
+    :param filename: the name of the file to write packets to, or an open,
+        writable file-like object. The file descriptor will be
+        closed at the end of the call, so do not use an object you
+        do not want to close (e.g., running wrpcap(sys.stdout, [])
+        in interactive mode will crash Scapy).
+    :param gz: set to 1 to save a gzipped capture
+    :param linktype: force linktype value
+    :param endianness: "<" or ">", force endianness
+    :param sync: do not bufferize writes to the capture file
     """
     with PcapWriter(filename, *args, **kargs) as fdesc:
         fdesc.write(pkt)
@@ -854,8 +945,7 @@
 def rdpcap(filename, count=-1):
     """Read a pcap or pcapng file and return a packet list
 
-count: read only <count> packets
-
+    :param count: read only <count> packets
     """
     with PcapReader(filename) as fdesc:
         return fdesc.read_all(count=count)
@@ -881,6 +971,10 @@
         """
         i = cls.__new__(cls, cls.__name__, cls.__bases__, cls.__dict__)
         filename, fdesc, magic = cls.open(filename)
+        if not magic:
+            raise Scapy_Exception(
+                "No data could be read!"
+            )
         try:
             i.__init__(filename, fdesc, magic)
         except Scapy_Exception:
@@ -918,7 +1012,6 @@
 class RawPcapReader(six.with_metaclass(PcapReader_metaclass)):
     """A stateful pcap reader. Each packet is returned as a string"""
 
-    read_allowed_exceptions = ()  # emulate SuperSocket
     nonblocking_socket = True
     PacketMetadata = collections.namedtuple("PacketMetadata",
                                             ["sec", "usec", "wirelen", "caplen"])  # noqa: E501
@@ -949,6 +1042,7 @@
             self.endian + "HHIIII", hdr
         )
         self.linktype = linktype
+        self.snaplen = snaplen
 
     def __iter__(self):
         return self
@@ -1032,6 +1126,9 @@
             self.LLcls = conf.l2types[self.linktype]
         except KeyError:
             warning("PcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype, self.linktype))  # noqa: E501
+            if conf.raw_layer is None:
+                # conf.raw_layer is set on import
+                import scapy.packet  # noqa: F401
             self.LLcls = conf.raw_layer
 
     def read_packet(self, size=MTU):
@@ -1049,9 +1146,12 @@
                 from scapy.sendrecv import debug
                 debug.crashed_on = (self.LLcls, s)
                 raise
+            if conf.raw_layer is None:
+                # conf.raw_layer is set on import
+                import scapy.packet  # noqa: F401
             p = conf.raw_layer(s)
         power = Decimal(10) ** Decimal(-9 if self.nano else -6)
-        p.time = Decimal(pkt_info.sec + power * pkt_info.usec)
+        p.time = EDecimal(pkt_info.sec + power * pkt_info.usec)
         p.wirelen = pkt_info.wirelen
         return p
 
@@ -1065,8 +1165,8 @@
 
 
 class RawPcapNgReader(RawPcapReader):
-    """A stateful pcapng reader. Each packet is returned as a
-    string.
+    """A stateful pcapng reader. Each packet is returned as
+    bytes.
 
     """
 
@@ -1081,6 +1181,9 @@
         self.f = fdesc
         # A list of (linktype, snaplen, tsresol); will be populated by IDBs.
         self.interfaces = []
+        self.default_options = {
+            "tsresol": 1000000
+        }
         self.blocktypes = {
             1: self.read_block_idb,
             2: self.read_block_pkt,
@@ -1099,6 +1202,12 @@
             self.endian = "<"
         else:
             raise Scapy_Exception("Not a pcapng capture file (bad magic)")
+        self.f.read(12)
+        blocklen = struct.unpack("!I", blocklen)[0]
+        # Read default options
+        self.default_options = self.read_options(
+            self.f.read(blocklen - 24)
+        )
         try:
             self.f.seek(0)
         except Exception:
@@ -1125,6 +1234,7 @@
                 if (blocklen,) != struct.unpack(self.endian + 'I',
                                                 self.f.read(4)):
                     warning("PcapNg: Invalid pcapng block (bad blocklen)")
+                    raise EOFError
             except struct.error:
                 raise EOFError
             res = self.blocktypes.get(blocktype,
@@ -1132,10 +1242,9 @@
             if res is not None:
                 return res
 
-    def read_block_idb(self, block, _):
-        """Interface Description Block"""
-        options = block[16:]
-        tsresol = 1000000
+    def read_options(self, options):
+        """Section Header Block"""
+        opts = self.default_options.copy()
         while len(options) >= 4:
             code, length = struct.unpack(self.endian + "HH", options[:4])
             # PCAP Next Generation (pcapng) Capture File Format
@@ -1143,7 +1252,9 @@
             # http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi?url=https://raw.githubusercontent.com/pcapng/pcapng/master/draft-tuexen-opsawg-pcapng.xml&modeAsFormat=html/ascii&type=ascii#rfc.section.4.2
             if code == 9 and length == 1 and len(options) >= 5:
                 tsresol = orb(options[4])
-                tsresol = (2 if tsresol & 128 else 10) ** (tsresol & 127)
+                opts["tsresol"] = (2 if tsresol & 128 else 10) ** (
+                    tsresol & 127
+                )
             if code == 0:
                 if length != 0:
                     warning("PcapNg: invalid option length %d for end-of-option" % length)  # noqa: E501
@@ -1151,8 +1262,13 @@
             if length % 4:
                 length += (4 - (length % 4))
             options = options[4 + length:]
+        return opts
+
+    def read_block_idb(self, block, _):
+        """Interface Description Block"""
+        options = self.read_options(block[16:])
         self.interfaces.append(struct.unpack(self.endian + "HxxI", block[:8]) +
-                               (tsresol,))
+                               (options["tsresol"],))
 
     def read_block_epb(self, block, size):
         """Enhanced Packet Block"""
@@ -1215,9 +1331,12 @@
         except Exception:
             if conf.debug_dissector:
                 raise
+            if conf.raw_layer is None:
+                # conf.raw_layer is set on import
+                import scapy.packet  # noqa: F401
             p = conf.raw_layer(s)
         if tshigh is not None:
-            p.time = float((tshigh << 32) + tslow) / tsresol
+            p.time = EDecimal((tshigh << 32) + tslow) / tsresol
         p.wirelen = wirelen
         return p
 
@@ -1234,21 +1353,24 @@
     """A stream PCAP writer with more control than wrpcap()"""
 
     def __init__(self, filename, linktype=None, gz=False, endianness="",
-                 append=False, sync=False, nano=False):
+                 append=False, sync=False, nano=False, snaplen=MTU):
         """
-filename:   the name of the file to write packets to, or an open,
+        :param filename: the name of the file to write packets to, or an open,
             writable file-like object.
-linktype:   force linktype to a given value. If None, linktype is taken
-            from the first writer packet
-gz:         compress the capture on the fly
-endianness: force an endianness (little:"<", big:">"). Default is native
-append:     append packets to the capture file instead of truncating it
-sync:       do not bufferize writes to the capture file
-nano:       use nanosecond-precision (requires libpcap >= 1.5.0)
+        :param linktype: force linktype to a given value. If None, linktype is
+            taken from the first writer packet
+        :param gz: compress the capture on the fly
+        :param endianness: force an endianness (little:"<", big:">").
+            Default is native
+        :param append: append packets to the capture file instead of
+            truncating it
+        :param sync: do not bufferize writes to the capture file
+        :param nano: use nanosecond-precision (requires libpcap >= 1.5.0)
 
         """
 
         self.linktype = linktype
+        self.snaplen = snaplen
         self.header_present = 0
         self.append = append
         self.gz = gz
@@ -1282,7 +1404,7 @@
                 return
 
         self.f.write(struct.pack(self.endian + "IHHIIII", 0xa1b23c4d if self.nano else 0xa1b2c3d4,  # noqa: E501
-                                 2, 4, 0, 0, MTU, self.linktype))
+                                 2, 4, 0, 0, self.snaplen, self.linktype))
         self.f.flush()
 
     def write(self, pkt):
@@ -1291,7 +1413,7 @@
 
         :param pkt: Packet(s) to write (one record for each Packet), or raw
                     bytes to write (as one record).
-        :type pkt: iterable[Packet], Packet or bytes
+        :type pkt: iterable[scapy.packet.Packet], scapy.packet.Packet or bytes
         """
         if isinstance(pkt, bytes):
             if not self.header_present:
@@ -1301,12 +1423,26 @@
             # Import here to avoid a circular dependency
             from scapy.plist import SndRcvList
             if isinstance(pkt, SndRcvList):
-                pkt = (p for t in pkt for p in t)
+                def _iter(pkt=pkt):
+                    for s, r in pkt:
+                        if s.sent_time:
+                            s.time = s.sent_time
+                        yield s
+                        yield r
+                pkt = _iter()
             else:
                 pkt = pkt.__iter__()
             for p in pkt:
+
                 if not self.header_present:
                     self._write_header(p)
+
+                if self.linktype != conf.l2types.get(type(p), None):
+                    warning("Inconsistent linktypes detected!"
+                            " The resulting PCAP file might contain"
+                            " invalid packets."
+                            )
+
                 self._write_packet(p)
 
     def _write_packet(self, packet, sec=None, usec=None, caplen=None,
@@ -1330,7 +1466,7 @@
         :param wirelen: The length of the packet on the wire. If not
                         specified, uses ``caplen``.
         :type wirelen: int
-        :returns: None
+        :return: None
         :rtype: None
         """
         if caplen is None:
@@ -1392,7 +1528,7 @@
         Writes a single packet to the pcap file.
 
         :param packet: Packet, or bytes for a single packet
-        :type packet: Packet or bytes
+        :type packet: scapy.packet.Packet or bytes
         :param sec: time the packet was captured, in seconds since epoch. If
                     not supplied, defaults to now.
         :type sec: int or long
@@ -1409,7 +1545,7 @@
                         specified, tries ``packet.wirelen``, otherwise uses
                         ``caplen``.
         :type wirelen: int
-        :returns: None
+        :return: None
         :rtype: None
         """
         if hasattr(packet, "time"):
@@ -1434,16 +1570,23 @@
 
 
 @conf.commands.register
-def import_hexcap():
+def import_hexcap(input_string=None):
     """Imports a tcpdump like hexadecimal view
 
     e.g: exported via hexdump() or tcpdump or wireshark's "export as hex"
+
+    :param input_string: String containing the hexdump input to parse. If None,
+        read from standard input.
     """
     re_extract_hexcap = re.compile(r"^((0x)?[0-9a-fA-F]{2,}[ :\t]{,3}|) *(([0-9a-fA-F]{2} {,2}){,16})")  # noqa: E501
     p = ""
     try:
+        if input_string:
+            input_function = six.StringIO(input_string).readline
+        else:
+            input_function = input
         while True:
-            line = input().strip()
+            line = input_function().strip()
             if not line:
                 break
             try:
@@ -1502,9 +1645,10 @@
 
 
 @conf.commands.register
-def tcpdump(pktlist, dump=False, getfd=False, args=None,
+def tcpdump(pktlist=None, dump=False, getfd=False, args=None, flt=None,
             prog=None, getproc=False, quiet=False, use_tempfile=None,
-            read_stdin_opts=None, linktype=None, wait=True):
+            read_stdin_opts=None, linktype=None, wait=True,
+            _suppress=False):
     """Run tcpdump or tshark on a list of packets.
 
     When using ``tcpdump`` on OSX (``prog == conf.prog.tcpdump``), this uses a
@@ -1525,77 +1669,80 @@
     This can be overridden with ``read_stdin_opts``. This has no effect when
     ``use_tempfile=True``, or otherwise reading packets from a regular file.
 
-pktlist: a Packet instance, a PacketList instance or a list of Packet
-         instances. Can also be a filename (as a string), an open
-         file-like object that must be a file format readable by
-         tshark (Pcap, PcapNg, etc.) or None (to sniff)
-
-dump:    when set to True, returns a string instead of displaying it.
-getfd:   when set to True, returns a file-like object to read data
-         from tcpdump or tshark from.
-getproc: when set to True, the subprocess.Popen object is returned
-args:    arguments (as a list) to pass to tshark (example for tshark:
-         args=["-T", "json"]).
-prog:    program to use (defaults to tcpdump, will work with tshark)
-quiet:   when set to True, the process stderr is discarded
-use_tempfile: When set to True, always use a temporary file to store packets.
-              When set to False, pipe packets through stdin.
-              When set to None (default), only use a temporary file with
-              ``tcpdump`` on OSX.
-read_stdin_opts: When set, a list of arguments needed to capture from stdin.
-                 Otherwise, attempts to guess.
-linktype: A custom DLT value or name, to overwrite the default values.
-wait: If True (default), waits for the process to terminate before returning
-      to Scapy. If False, the process will be detached to the background. If
-      dump, getproc or getfd is True, these have the same effect as
-      ``wait=False``.
-
-Examples:
-
->>> tcpdump([IP()/TCP(), IP()/UDP()])
-reading from file -, link-type RAW (Raw IP)
-16:46:00.474515 IP 127.0.0.1.20 > 127.0.0.1.80: Flags [S], seq 0, win 8192, length 0  # noqa: E501
-16:46:00.475019 IP 127.0.0.1.53 > 127.0.0.1.53: [|domain]
-
->>> tcpdump([IP()/TCP(), IP()/UDP()], prog=conf.prog.tshark)
-  1   0.000000    127.0.0.1 -> 127.0.0.1    TCP 40 20->80 [SYN] Seq=0 Win=8192 Len=0  # noqa: E501
-  2   0.000459    127.0.0.1 -> 127.0.0.1    UDP 28 53->53 Len=0
-
-To get a JSON representation of a tshark-parsed PacketList(), one can:
->>> import json, pprint
->>> json_data = json.load(tcpdump(IP(src="217.25.178.5", dst="45.33.32.156"),
-...                               prog=conf.prog.tshark, args=["-T", "json"],
-...                               getfd=True))
->>> pprint.pprint(json_data)
-[{u'_index': u'packets-2016-12-23',
-  u'_score': None,
-  u'_source': {u'layers': {u'frame': {u'frame.cap_len': u'20',
-                                      u'frame.encap_type': u'7',
-[...]
-                                      u'frame.time_relative': u'0.000000000'},
-                           u'ip': {u'ip.addr': u'45.33.32.156',
-                                   u'ip.checksum': u'0x0000a20d',
-[...]
-                                   u'ip.ttl': u'64',
-                                   u'ip.version': u'4'},
-                           u'raw': u'Raw packet data'}},
-  u'_type': u'pcap_file'}]
->>> json_data[0]['_source']['layers']['ip']['ip.ttl']
-u'64'
+    :param pktlist: a Packet instance, a PacketList instance or a list of
+        Packet instances. Can also be a filename (as a string), an open
+        file-like object that must be a file format readable by
+        tshark (Pcap, PcapNg, etc.) or None (to sniff)
+    :param flt: a filter to use with tcpdump
+    :param dump:    when set to True, returns a string instead of displaying it.
+    :param getfd:   when set to True, returns a file-like object to read data
+        from tcpdump or tshark from.
+    :param getproc: when set to True, the subprocess.Popen object is returned
+    :param args:    arguments (as a list) to pass to tshark (example for tshark:
+        args=["-T", "json"]).
+    :param prog:    program to use (defaults to tcpdump, will work with tshark)
+    :param quiet:   when set to True, the process stderr is discarded
+    :param use_tempfile: When set to True, always use a temporary file to store
+        packets.
+        When set to False, pipe packets through stdin.
+        When set to None (default), only use a temporary file with
+        ``tcpdump`` on OSX.
+    :param read_stdin_opts: When set, a list of arguments needed to capture
+        from stdin. Otherwise, attempts to guess.
+    :param linktype: A custom DLT value or name, to overwrite the default
+        values.
+    :param wait: If True (default), waits for the process to terminate before
+        returning to Scapy. If False, the process will be detached to the
+        background. If dump, getproc or getfd is True, these have the same
+        effect as ``wait=False``.
+
+    Examples::
+
+        >>> tcpdump([IP()/TCP(), IP()/UDP()])
+        reading from file -, link-type RAW (Raw IP)
+        16:46:00.474515 IP 127.0.0.1.20 > 127.0.0.1.80: Flags [S], seq 0, win 8192, length 0  # noqa: E501
+        16:46:00.475019 IP 127.0.0.1.53 > 127.0.0.1.53: [|domain]
+
+        >>> tcpdump([IP()/TCP(), IP()/UDP()], prog=conf.prog.tshark)
+          1   0.000000    127.0.0.1 -> 127.0.0.1    TCP 40 20->80 [SYN] Seq=0 Win=8192 Len=0  # noqa: E501
+          2   0.000459    127.0.0.1 -> 127.0.0.1    UDP 28 53->53 Len=0
+
+    To get a JSON representation of a tshark-parsed PacketList(), one can::
+
+        >>> import json, pprint
+        >>> json_data = json.load(tcpdump(IP(src="217.25.178.5",
+        ...                                  dst="45.33.32.156"),
+        ...                               prog=conf.prog.tshark,
+        ...                               args=["-T", "json"],
+        ...                               getfd=True))
+        >>> pprint.pprint(json_data)
+        [{u'_index': u'packets-2016-12-23',
+          u'_score': None,
+          u'_source': {u'layers': {u'frame': {u'frame.cap_len': u'20',
+                                              u'frame.encap_type': u'7',
+        [...]
+                                              },
+                                   u'ip': {u'ip.addr': u'45.33.32.156',
+                                           u'ip.checksum': u'0x0000a20d',
+        [...]
+                                           u'ip.ttl': u'64',
+                                           u'ip.version': u'4'},
+                                   u'raw': u'Raw packet data'}},
+          u'_type': u'pcap_file'}]
+        >>> json_data[0]['_source']['layers']['ip']['ip.ttl']
+        u'64'
     """
     getfd = getfd or getproc
     if prog is None:
+        if not conf.prog.tcpdump:
+            raise Scapy_Exception(
+                "tcpdump is not available"
+            )
         prog = [conf.prog.tcpdump]
-        _prog_name = "windump()" if WINDOWS else "tcpdump()"
     elif isinstance(prog, six.string_types):
-        _prog_name = "{}()".format(prog)
         prog = [prog]
     else:
         raise ValueError("prog must be a string")
-    from scapy.arch.common import TCPDUMP
-    if prog[0] == conf.prog.tcpdump and not TCPDUMP:
-        message = "tcpdump is not available. Cannot use tcpdump() !"
-        raise Scapy_Exception(message)
 
     if linktype is not None:
         # Tcpdump does not support integers in -y (yet)
@@ -1628,8 +1775,15 @@
         # Make a copy of args
         args = list(args)
 
+    if flt is not None:
+        # Check the validity of the filter
+        from scapy.arch.common import compile_filter
+        compile_filter(flt)
+        args.append(flt)
+
     stdout = subprocess.PIPE if dump or getfd else None
     stderr = open(os.devnull) if quiet else None
+    proc = None
 
     if use_tempfile is None:
         # Apple's tcpdump cannot read from stdin, see:
@@ -1648,7 +1802,7 @@
 
     if pktlist is None:
         # sniff
-        with ContextManagerSubprocess(_prog_name, prog[0]):
+        with ContextManagerSubprocess(prog[0], suppress=_suppress):
             proc = subprocess.Popen(
                 prog + args,
                 stdout=stdout,
@@ -1656,7 +1810,7 @@
             )
     elif isinstance(pktlist, six.string_types):
         # file
-        with ContextManagerSubprocess(_prog_name, prog[0]):
+        with ContextManagerSubprocess(prog[0], suppress=_suppress):
             proc = subprocess.Popen(
                 prog + ["-r", pktlist] + args,
                 stdout=stdout,
@@ -1670,7 +1824,7 @@
             wrpcap(tmpfile, pktlist, linktype=linktype)
         else:
             tmpfile.close()
-        with ContextManagerSubprocess(_prog_name, prog[0]):
+        with ContextManagerSubprocess(prog[0], suppress=_suppress):
             proc = subprocess.Popen(
                 prog + ["-r", tmpfile.name] + args,
                 stdout=stdout,
@@ -1678,21 +1832,28 @@
             )
     else:
         # pass the packet stream
-        with ContextManagerSubprocess(_prog_name, prog[0]):
+        with ContextManagerSubprocess(prog[0], suppress=_suppress):
             proc = subprocess.Popen(
                 prog + read_stdin_opts + args,
                 stdin=subprocess.PIPE,
                 stdout=stdout,
                 stderr=stderr,
             )
+            if proc is None:
+                # An error has occurred
+                return
         try:
             proc.stdin.writelines(iter(lambda: pktlist.read(1048576), b""))
         except AttributeError:
             wrpcap(proc.stdin, pktlist, linktype=linktype)
         except UnboundLocalError:
-            raise IOError("%s died unexpectedly !" % prog)
+            # The error was handled by ContextManagerSubprocess
+            pass
         else:
             proc.stdin.close()
+    if proc is None:
+        # An error has occurred
+        return
     if dump:
         return b"".join(iter(lambda: proc.stdout.read(1048576), b""))
     if getproc:
@@ -1708,7 +1869,7 @@
     """Run hexedit on a list of packets, then return the edited packets."""
     f = get_temp_file()
     wrpcap(f, pktlist)
-    with ContextManagerSubprocess("hexedit()", conf.prog.hexedit):
+    with ContextManagerSubprocess(conf.prog.hexedit):
         subprocess.call([conf.prog.hexedit, f])
     pktlist = rdpcap(f)
     os.unlink(f)
@@ -1811,7 +1972,7 @@
     return rt
 
 
-def __make_table(yfmtfunc, fmtfunc, endline, data, fxyz, sortx=None, sorty=None, seplinefunc=None):  # noqa: E501
+def __make_table(yfmtfunc, fmtfunc, endline, data, fxyz, sortx=None, sorty=None, seplinefunc=None, dump=False):  # noqa: E501
     """Core function of the make_table suite, which generates the table"""
     vx = {}
     vy = {}
@@ -1852,39 +2013,49 @@
             except Exception:
                 vyk.sort()
 
+    s = ""
     if seplinefunc:
         sepline = seplinefunc(tmp_len, [vx[x] for x in vxk])
-        print(sepline)
+        s += sepline + "\n"
 
     fmt = yfmtfunc(tmp_len)
-    print(fmt % "", end=' ')
+    s += fmt % ""
+    s += ' '
     for x in vxk:
         vxf[x] = fmtfunc(vx[x])
-        print(vxf[x] % x, end=' ')
-    print(endline)
+        s += vxf[x] % x
+        s += ' '
+    s += endline + "\n"
     if seplinefunc:
-        print(sepline)
+        s += sepline + "\n"
     for y in vyk:
-        print(fmt % y, end=' ')
+        s += fmt % y
+        s += ' '
         for x in vxk:
-            print(vxf[x] % vz.get((x, y), "-"), end=' ')
-        print(endline)
+            s += vxf[x] % vz.get((x, y), "-")
+            s += ' '
+        s += endline + "\n"
     if seplinefunc:
-        print(sepline)
+        s += sepline + "\n"
+
+    if dump:
+        return s
+    else:
+        print(s, end="")
 
 
 def make_table(*args, **kargs):
-    __make_table(lambda l: "%%-%is" % l, lambda l: "%%-%is" % l, "", *args, **kargs)  # noqa: E501
+    return __make_table(lambda l: "%%-%is" % l, lambda l: "%%-%is" % l, "", *args, **kargs)  # noqa: E501
 
 
 def make_lined_table(*args, **kargs):
-    __make_table(lambda l: "%%-%is |" % l, lambda l: "%%-%is |" % l, "",
-                 seplinefunc=lambda a, x: "+".join('-' * (y + 2) for y in [a - 1] + x + [-2]),  # noqa: E501
-                 *args, **kargs)
+    return __make_table(lambda l: "%%-%is |" % l, lambda l: "%%-%is |" % l, "",
+                        seplinefunc=lambda a, x: "+".join('-' * (y + 2) for y in [a - 1] + x + [-2]),  # noqa: E501
+                        *args, **kargs)
 
 
 def make_tex_table(*args, **kargs):
-    __make_table(lambda l: "%s", lambda l: "& %s", "\\\\", seplinefunc=lambda a, x: "\\hline", *args, **kargs)  # noqa: E501
+    return __make_table(lambda l: "%s", lambda l: "& %s", "\\\\", seplinefunc=lambda a, x: "\\hline", *args, **kargs)  # noqa: E501
 
 ####################
 #   WHOIS CLIENT   #
@@ -1946,3 +2117,28 @@
 
     def stop(self):
         self._stopped.set()
+
+
+class SingleConversationSocket(object):
+    def __init__(self, o):
+        self._inner = o
+        self._tx_mutex = threading.RLock()
+
+    @property
+    def __dict__(self):
+        return self._inner.__dict__
+
+    def __getattr__(self, name):
+        return getattr(self._inner, name)
+
+    def sr1(self, *args, **kargs):
+        with self._tx_mutex:
+            return self._inner.sr1(*args, **kargs)
+
+    def sr(self, *args, **kargs):
+        with self._tx_mutex:
+            return self._inner.sr(*args, **kargs)
+
+    def send(self, x):
+        with self._tx_mutex:
+            return self._inner.send(x)

scapy-2.4.3.tar.gz/scapy/utils6.py -> scapy-2.4.4.tar.gz/scapy/utils6.py Changed

@@ -18,7 +18,6 @@
 import re
 
 from scapy.config import conf
-import scapy.consts
 from scapy.base_classes import Gen
 from scapy.data import IPV6_ADDR_GLOBAL, IPV6_ADDR_LINKLOCAL, \
     IPV6_ADDR_SITELOCAL, IPV6_ADDR_LOOPBACK, IPV6_ADDR_UNICAST,\
@@ -68,7 +67,7 @@
         cset = (x for x in laddr if x[1] == IPV6_ADDR_SITELOCAL)
     elif in6_ismaddr(addr):
         if in6_ismnladdr(addr):
-            cset = [('::1', 16, scapy.consts.LOOPBACK_INTERFACE)]
+            cset = [('::1', 16, conf.loopback_name)]
         elif in6_ismgladdr(addr):
             cset = (x for x in laddr if x[1] == IPV6_ADDR_GLOBAL)
         elif in6_ismlladdr(addr):
@@ -406,12 +405,12 @@
     value (for possible future use). Input and output values are provided in
     a "printable" format as depicted below.
 
-    ex:
-    >>> in6_getRandomizedIfaceId('20b:93ff:feeb:2d3')
-    ('4c61:76ff:f46a:a5f3', 'd006:d540:db11:b092')
-    >>> in6_getRandomizedIfaceId('20b:93ff:feeb:2d3',
-                                 previous='d006:d540:db11:b092')
-    ('fe97:46fe:9871:bd38', 'eeed:d79c:2e3f:62e')
+    ex::
+        >>> in6_getRandomizedIfaceId('20b:93ff:feeb:2d3')
+        ('4c61:76ff:f46a:a5f3', 'd006:d540:db11:b092')
+        >>> in6_getRandomizedIfaceId('20b:93ff:feeb:2d3',
+                                     previous='d006:d540:db11:b092')
+        ('fe97:46fe:9871:bd38', 'eeed:d79c:2e3f:62e')
     """
 
     s = b""
@@ -525,7 +524,7 @@
 def in6_iseui64(x):
     """
     Return True if provided address has an interface identifier part
-    created in modified EUI-64 format (meaning it matches *::*:*ff:fe*:*).
+    created in modified EUI-64 format (meaning it matches ``*::*:*ff:fe*:*``).
     Otherwise, False is returned. Address must be passed in printable
     format.
     """
@@ -873,14 +872,14 @@
     def __iter__(self):
         self._parse()
 
-        def rec(n, l):
+        def rec(n, li):
             sep = ':' if n and n % 2 == 0 else ''
             if n == 16:
-                return l
+                return li
             return rec(n + 1, [y + sep + '%.2x' % i
                                # faster than '%s%s%.2x' % (y, sep, i)
                                for i in range(*self.parsed[n])
-                               for y in l])
+                               for y in li])
 
         return (in6_ptop(addr) for addr in iter(rec(0, [''])))
 
@@ -898,7 +897,9 @@
         return str(other) == str(self)
 
     def __ne__(self, other):
-        return str(other) != str(self)
+        return not self == other
+
+    __hash__ = None
 
     def __repr__(self):
         return "Net6(%r)" % self.repr

scapy-2.4.3.tar.gz/scapy/volatile.py -> scapy-2.4.4.tar.gz/scapy/volatile.py Changed

@@ -92,6 +92,12 @@
             return False
         return x == y
 
+    def __ne__(self, other):
+        # Python 2.7 compat
+        return not self == other
+
+    __hash__ = None
+
     def __getattr__(self, attr):
         if attr in ["__setstate__", "__getstate__"]:
             raise AttributeError(attr)
@@ -117,17 +123,8 @@
     pass
 
 
-class RandNum(RandField):
-    """Instances evaluate to random integers in selected range"""
-    min = 0
-    max = 0
-
-    def __init__(self, min, max):
-        self.min = min
-        self.max = max
-
-    def _fix(self):
-        return random.randrange(self.min, self.max + 1)
+class _RandNumeral(RandField):
+    """Implements integer management in RandField"""
 
     def __int__(self):
         return int(self._fix())
@@ -167,12 +164,6 @@
     def __le__(self, other):
         return self._fix() <= other
 
-    def __eq__(self, other):
-        return self._fix() == other
-
-    def __ne__(self, other):
-        return self._fix() != other
-
     def __ge__(self, other):
         return self._fix() >= other
 
@@ -198,6 +189,19 @@
         return other | self._fix()
 
 
+class RandNum(_RandNumeral):
+    """Instances evaluate to random integers in selected range"""
+    min = 0
+    max = 0
+
+    def __init__(self, min, max):
+        self.min = min
+        self.max = max
+
+    def _fix(self):
+        return random.randrange(self.min, self.max + 1)
+
+
 class RandFloat(RandNum):
     def _fix(self):
         return random.uniform(self.min, self.max)
@@ -208,7 +212,7 @@
         return struct.unpack("!f", bytes(RandBin(4)))[0]
 
 
-class RandNumGamma(RandNum):
+class RandNumGamma(_RandNumeral):
     def __init__(self, alpha, beta):
         self.alpha = alpha
         self.beta = beta
@@ -217,7 +221,7 @@
         return int(round(random.gammavariate(self.alpha, self.beta)))
 
 
-class RandNumGauss(RandNum):
+class RandNumGauss(_RandNumeral):
     def __init__(self, mu, sigma):
         self.mu = mu
         self.sigma = sigma
@@ -226,7 +230,7 @@
         return int(round(random.gauss(self.mu, self.sigma)))
 
 
-class RandNumExpo(RandNum):
+class RandNumExpo(_RandNumeral):
     def __init__(self, lambd, base=0):
         self.lambd = lambd
         self.base = base
@@ -240,6 +244,7 @@
 
     def __init__(self, min, max, seed=None):
         self.seq = RandomEnumeration(min, max, seed)
+        super(RandEnum, self).__init__(min, max)
 
     def _fix(self):
         return next(self.seq)
@@ -330,7 +335,7 @@
 
     def __init__(self, enum, seed=None):
         self.enum = list(enum)
-        self.seq = RandomEnumeration(0, len(self.enum) - 1, seed)
+        RandEnum.__init__(self, 0, len(self.enum) - 1, seed)
 
     def _fix(self):
         return self.enum[next(self.seq)]
@@ -340,7 +345,7 @@
     def __init__(self, *args):
         if not args:
             raise TypeError("RandChoice needs at least one choice")
-        self._choice = args
+        self._choice = list(args)
 
     def _fix(self):
         return random.choice(self._choice)
@@ -386,6 +391,7 @@
 
 class RandIP(RandString):
     def __init__(self, iptemplate="0.0.0.0/0"):
+        RandString.__init__(self)
         self.ip = Net(iptemplate)
 
     def _fix(self):
@@ -394,6 +400,7 @@
 
 class RandMAC(RandString):
     def __init__(self, template="*"):
+        RandString.__init__(self)
         template += ":*:*:*:*:*"
         template = template.split(":")
         self.mac = ()
@@ -413,6 +420,7 @@
 
 class RandIP6(RandString):
     def __init__(self, ip6template="**"):
+        RandString.__init__(self)
         self.tmpl = ip6template
         self.sp = self.tmpl.split(":")
         for i, v in enumerate(self.sp):
@@ -466,6 +474,7 @@
 
 class RandOID(RandString):
     def __init__(self, fmt=None, depth=RandNumExpo(0.1), idnum=RandNumExpo(0.01)):  # noqa: E501
+        RandString.__init__(self)
         self.ori_fmt = fmt
         if fmt is not None:
             fmt = fmt.split(".")
@@ -504,8 +513,25 @@
         self._regexp = regexp
         self._lambda = lambda_
 
+    special_sets = {
+        "[:alnum:]": "[a-zA-Z0-9]",
+        "[:alpha:]": "[a-zA-Z]",
+        "[:ascii:]": "[\x00-\x7F]",
+        "[:blank:]": "[ \t]",
+        "[:cntrl:]": "[\x00-\x1F\x7F]",
+        "[:digit:]": "[0-9]",
+        "[:graph:]": "[\x21-\x7E]",
+        "[:lower:]": "[a-z]",
+        "[:print:]": "[\x20-\x7E]",
+        "[:punct:]": "[!\"\\#$%&'()*+,\\-./:;<=>?@\\[\\\\\\]^_{|}~]",
+        "[:space:]": "[ \t\r\n\v\f]",
+        "[:upper:]": "[A-Z]",
+        "[:word:]": "[A-Za-z0-9_]",
+        "[:xdigit:]": "[A-Fa-f0-9]",
+    }
+
     @staticmethod
-    def choice_expand(s):  # XXX does not support special sets like (ex ':alnum:')  # noqa: E501
+    def choice_expand(s):
         m = ""
         invert = s and s[0] == "^"
         while True:
@@ -571,10 +597,13 @@
         index = []
         current = stack
         i = 0
-        ln = len(self._regexp)
+        regexp = self._regexp
+        for k, v in self.special_sets.items():
+            regexp = regexp.replace(k, v)
+        ln = len(regexp)
         interp = True
         while i < ln:
-            c = self._regexp[i]
+            c = regexp[i]
             i += 1
 
             if c == '(':
@@ -623,7 +652,7 @@
                     current.append(e)
                 interp = True
             elif c == '\\':
-                c = self._regexp[i]
+                c = regexp[i]
                 if c == "s":
                     c = RandChoice(" ", "\t")
                 elif c in "0123456789":
@@ -680,7 +709,7 @@
         for i in sing.copy():
             if not mn <= i <= mx:
                 sing.remove(i)
-        self._choice = list(sing)
+        super(RandSingNum, self).__init__(*sing)
         self._choice.sort()
 
 
@@ -726,7 +755,7 @@
 
 class RandSingString(RandSingularity):
     def __init__(self):
-        self._choice = ["",
+        choices_list = ["",
                         "%x",
                         "%%",
                         "%s",
@@ -780,6 +809,7 @@
                         r"\\myserver\share",
                         "foo.exe:",
                         "foo.exe\\", ]
+        super(RandSingString, self).__init__(*choices_list)
 
     def __str__(self):
         return str(self._fix())
@@ -930,9 +960,11 @@
 # Automatic timestamp
 
 
-class AutoTime(VolatileValue):
-    def __init__(self, base=None):
-        if base is None:
+class AutoTime(_RandNumeral):
+    def __init__(self, base=None, diff=None):
+        if diff is not None:
+            self.diff = diff
+        elif base is None:
             self.diff = 0
         else:
             self.diff = time.time() - base
@@ -948,7 +980,7 @@
 
 class ZuluTime(AutoTime):
     def __init__(self, diff=0):
-        self.diff = diff
+        super(ZuluTime, self).__init__(diff=diff)
 
     def _fix(self):
         return time.strftime("%y%m%d%H%M%SZ",
@@ -957,7 +989,7 @@
 
 class GeneralizedTime(AutoTime):
     def __init__(self, diff=0):
-        self.diff = diff
+        super(GeneralizedTime, self).__init__(diff=diff)
 
     def _fix(self):
         return time.strftime("%Y%m%d%H%M%SZ",

scapy-2.4.3.tar.gz/setup.cfg -> scapy-2.4.4.tar.gz/setup.cfg Changed

scapy-2.4.3.tar.gz/setup.py -> scapy-2.4.4.tar.gz/setup.py Changed

@@ -14,13 +14,17 @@
 
 def get_long_description():
     """Extract description from README.md, for PyPI's usage"""
+    def process_ignore_tags(buffer):
+        return "\n".join(
+            x for x in buffer.split("\n") if "" not in x
+        )
     try:
         fpath = os.path.join(os.path.dirname(__file__), "README.md")
         with io.open(fpath, encoding="utf-8") as f:
             readme = f.read()
             desc = readme.partition("")[2]
             desc = desc.partition("")[0]
-            return desc.strip()
+            return process_ignore_tags(desc.strip())
     except IOError:
         return None
 
@@ -50,6 +54,11 @@
             'pyx',
             'cryptography>=2.0',
             'matplotlib'
+        ],
+        'docs': [
+            'sphinx>=2.2.0',
+            'sphinx_rtd_theme>=0.4.3',
+            'tox>=3.0.0'
         ]
     },
     # We use __file__ in scapy/__init__.py, therefore Scapy isn't zip safe
@@ -86,6 +95,7 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Security",
         "Topic :: System :: Networking",
         "Topic :: System :: Networking :: Monitoring",

scapy-2.4.3.tar.gz/test/answering_machines.uts -> scapy-2.4.4.tar.gz/test/answering_machines.uts Changed

scapy-2.4.3.tar.gz/test/benchmark/dissection_and_build.py -> scapy-2.4.4.tar.gz/test/benchmark/dissection_and_build.py Changed

scapy-2.4.3.tar.gz/test/bluetooth.uts -> scapy-2.4.4.tar.gz/test/bluetooth.uts Changed

scapy-2.4.3.tar.gz/test/bpf.uts -> scapy-2.4.4.tar.gz/test/bpf.uts Changed

@@ -16,9 +16,9 @@
 
 get_if_raw_hwaddr(conf.iface)
 
-= Get the packed MAC address of LOOPBACK_NAME
+= Get the packed MAC address of conf.loopback_name
 
-get_if_raw_hwaddr(LOOPBACK_NAME) == (ARPHDR_LOOPBACK, b'\x00'*6) 
+get_if_raw_hwaddr(conf.loopback_name) == (ARPHDR_LOOPBACK, b'\x00'*6) 
 
 
 ############
@@ -119,21 +119,6 @@
 s.set_nonblock(set_flag=False)
 s.close()
 
-= L2bpfListenSocket - recv as nonblocking
-~ needs_root
-
-s = L2bpfListenSocket()
-s.set_nonblock(set_flag=True)
-
-def test_nonblock_recv(s):
-    for i in range(1, 100):
-        a = s.recv()
-        if not a:
-            return True
-    return False
-
-assert test_nonblock_recv(s)
-
 = L2bpfListenSocket - get_*()
 ~ needs_root
 
@@ -160,6 +145,18 @@
 issubclass(guessed, Packet)
 s.close()
 
+= L2bpfListenSocket - read failure
+~ needs_root
+
+import mock
+
+@mock.patch("scapy.arch.bpf.supersocket.os.read")
+def _test_osread(osread):
+    osread.side_effect = OSError()
+    s = L2bpfListenSocket()
+    assert s.recv_raw() == (None, None, None)
+
+_test_osread()
 
 = L2bpfSocket - nonblock_recv()
 ~ needs_root
@@ -179,5 +176,5 @@
 s.send(IP(dst="8.8.8.8")/ICMP())
                               
 s = L3bpfSocket()             
-s.assigned_interface = LOOPBACK_NAME
+s.assigned_interface = conf.loopback_name
 s.send(IP(dst="8.8.8.8")/ICMP())

scapy-2.4.3.tar.gz/test/can.uts -> scapy-2.4.4.tar.gz/test/can.uts Changed

@@ -15,7 +15,7 @@
 
 random.seed()
 
-load_layer("can")
+load_layer("can", globals_dict=globals())
 
 = Build a packet
 
@@ -418,6 +418,39 @@
 ########
 + CAN Signals
 
+= Test invalid fields_desc
+
+class testFrame1(SignalPacket):
+    fields_desc = [
+        ByteField("sig0", 0),
+        SignalField("sig1", default=0, start=7, size=6, fmt=">B")
+    ]
+
+passed = False
+
+try:
+    testFrame1(b"\xff\xff")
+except Scapy_Exception:
+    passed = True
+
+assert passed
+
+= Test invalid fields_desc with ConditionalField
+
+class testFrame1(SignalPacket):
+    fields_desc = [
+        ConditionalField(ByteField("sig0", 0), lambda x: True),
+        SignalField("sig1", default=0, start=7, size=6, fmt=">B")
+    ]
+
+passed = False
+try:
+    testFrame1(b"\xff\xff")
+except Scapy_Exception:
+    passed = True
+
+assert passed
+
 = Motorola byte order (Big Endian) dissect test
 
 class testFrame1(SignalPacket):
@@ -722,6 +755,126 @@
 assert bytes(pkt) == b'\x1d\x28\x80\x1c\x0f\x23\xe0'
 assert len(pkt) == 7
 
+= Muxed Packet with mixed endianness fields build test
+
+class testFrame3(SignalPacket):
+    fields_desc = [
+        SignalField("myMuxer", default=0, start=53, size=3, fmt="<B"),
+        ConditionalField(SignalField("muxSig5", default=0, start=22, size=7, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig6", default=0, start=32, size=9, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig7", default=0, start=2, size=8, fmt=">B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig8", default=0, start=3, size=3, fmt="<B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig9", default=0, start=41, size=7, fmt="<B"), lambda p: p.myMuxer == 1)
+    ]
+
+pkt = testFrame3()
+
+pkt.myMuxer = 0x0
+pkt.muxSig5 = 0x72
+pkt.muxSig6 = 0x10f
+pkt.muxSig7 = 0xA5
+pkt.muxSig8 = 0x03
+pkt.muxSig9 = 0x11
+
+assert bytes(pkt) == b'\x1d\x28\x00\x00\x00\x00\x00'
+assert len(pkt) == 7
+
+pkt.myMuxer = 0x1
+
+assert bytes(pkt) == b'\x00\x00\x80\x1c\x0f\x23\x20'
+assert len(pkt) == 7
+
+= Muxed Packet build test
+
+class testFrame3(SignalPacket):
+    fields_desc = [
+        SignalField("myMuxer", default=0, start=0, size=8, fmt="<B"),
+        ConditionalField(SignalField("muxSig5", default=0, start=8, size=8, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig6", default=0, start=8, size=16, fmt="<B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig7", default=0, start=16, size=8, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig8", default=0, start=24, size=8, fmt="<B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig9", default=0, start=32, size=8, fmt="<B"), lambda p: p.myMuxer == 0)
+    ]
+
+pkt = testFrame3(b'\x01\xff\xff\xff\xff\xff\xff')
+
+assert pkt.myMuxer == 0x1
+assert pkt.muxSig5 == 0xff
+assert pkt.muxSig7 == 0xff
+
+pkt = testFrame3(b'\x00\xff\xff\xff\xff\xff\xff')
+
+assert pkt.myMuxer == 0x0
+assert pkt.muxSig6 == 0xffff
+assert pkt.muxSig8 == 0xff
+assert pkt.muxSig9 == 0xff
+
+pkt = testFrame3()
+pkt.myMuxer = 0x1
+pkt.muxSig5 = 0xaa
+pkt.muxSig7 = 0xaa
+
+assert bytes(pkt) == b'\x01\xaa\xaa'
+assert len(pkt) == 3
+
+pkt = testFrame3()
+pkt.myMuxer = 0x0
+pkt.muxSig5 = 0xaa
+pkt.muxSig6 = 0xbb
+pkt.muxSig7 = 0xaa
+pkt.muxSig8 = 0xbb
+pkt.muxSig9 = 0xbb
+
+assert bytes(pkt) == b'\x00\xbb\x00\xbb\xbb'
+assert len(pkt) == 5
+
+= SignalHeader Muxed Packet build test
+
+conf.contribs['CAN']['swap-bytes'] = False
+
+class testFrame3(SignalPacket):
+    fields_desc = [
+        SignalField("myMuxer", default=0, start=0, size=8, fmt="<B"),
+        ConditionalField(SignalField("muxSig5", default=0, start=8, size=8, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig6", default=0, start=8, size=16, fmt="<B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig7", default=0, start=16, size=8, fmt="<B"), lambda p: p.myMuxer == 1),
+        ConditionalField(SignalField("muxSig8", default=0, start=24, size=8, fmt="<B"), lambda p: p.myMuxer == 0),
+        ConditionalField(SignalField("muxSig9", default=0, start=32, size=8, fmt="<B"), lambda p: p.myMuxer == 0)
+    ]
+
+bind_layers(SignalHeader, testFrame3, identifier=0x123)
+
+pkt = SignalHeader(b'\x00\x00\x01#\x00\x00\x00\x00\x01\xff\xff\xff\xff\xff\xff')
+
+assert pkt.myMuxer == 0x1
+assert pkt.muxSig5 == 0xff
+assert pkt.muxSig7 == 0xff
+
+pkt = SignalHeader(b'\x00\x00\x01#\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff')
+
+assert pkt.myMuxer == 0x0
+assert pkt.muxSig6 == 0xffff
+assert pkt.muxSig8 == 0xff
+assert pkt.muxSig9 == 0xff
+
+pkt = SignalHeader()/testFrame3()
+pkt.myMuxer = 0x1
+pkt.muxSig5 = 0xaa
+pkt.muxSig7 = 0xaa
+
+assert bytes(pkt) == b'\x00\x00\x01#\x03\x00\x00\x00\x01\xaa\xaa'
+assert len(pkt) == 8 + 3
+
+pkt = SignalHeader()/testFrame3()
+pkt.myMuxer = 0x0
+pkt.muxSig5 = 0xaa
+pkt.muxSig6 = 0xbb
+pkt.muxSig7 = 0xaa
+pkt.muxSig8 = 0xbb
+pkt.muxSig9 = 0xbb
+
+assert bytes(pkt) == b'\x00\x00\x01#\x05\x00\x00\x00\x00\xbb\x00\xbb\xbb'
+assert len(pkt) == 8 + 5
 
 = Intel byte order (Little Endian) SignalPacket dissect test
 
@@ -939,6 +1092,28 @@
 assert pkt.muxSig8 == 30
 assert pkt.muxSig9 == 1700
 
+= Packet with mixed endianness fields dissect test, mixed field order and scaling
+
+class testFrame3(SignalPacket):
+    fields_desc = [
+        SignalField("myMuxer", default=0, start=53, size=3, scaling=0.1, fmt="<B"),
+        SignalField("muxSig9", default=0, start=41, size=7, scaling=100, fmt="<B"),
+        SignalField("muxSig6", default=0, start=32, size=9, scaling=2, fmt="<B"),
+        SignalField("muxSig7", default=0, start=2, size=8, scaling=0.5, fmt=">B"),
+        SignalField("muxSig8", default=0, start=3, size=3, scaling=10, fmt="<B"),
+        SignalField("muxSig5", default=0, start=22, size=7, scaling=0.01, fmt="<B"),
+    ]
+
+pkt = testFrame3(b'\x1d\x28\x80\x1c\x0f\x23\xe0')
+assert len(pkt) == 7
+assert pkt.myMuxer == 0.7
+assert pkt.muxSig5 == 1.14
+assert pkt.muxSig6 == 0x10f << 1
+assert pkt.muxSig7 == 82.5
+assert pkt.muxSig8 == 30
+assert pkt.muxSig9 == 1700
+
+
 
 = Packet with mixed endianness fields dissect test, mixed field order and scaling and offset

scapy-2.4.3.tar.gz/test/cert.uts -> scapy-2.4.4.tar.gz/test/cert.uts Changed

scapy-2.4.3.tar.gz/test/configs/bsd.utsc -> scapy-2.4.4.tar.gz/test/configs/bsd.utsc Changed

scapy-2.4.3.tar.gz/test/configs/linux.utsc -> scapy-2.4.4.tar.gz/test/configs/linux.utsc Changed

scapy-2.4.3.tar.gz/test/configs/solaris.utsc -> scapy-2.4.4.tar.gz/test/configs/solaris.utsc Changed

scapy-2.4.3.tar.gz/test/configs/windows.utsc -> scapy-2.4.4.tar.gz/test/configs/windows.utsc Changed

scapy-2.4.3.tar.gz/test/configs/windows2.utsc -> scapy-2.4.4.tar.gz/test/configs/windows2.utsc Changed

scapy-2.4.3.tar.gz/test/contrib/altbeacon.uts -> scapy-2.4.4.tar.gz/test/contrib/altbeacon.uts Changed

scapy-2.4.3.tar.gz/test/contrib/automotive/bmw/enet.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/bmw/enet.uts Changed

scapy-2.4.3.tar.gz/test/contrib/automotive/ccp.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/ccp.uts Changed

@@ -1,6 +1,87 @@
 % Regression tests for the CCP layer
 
-# More information at http://www.secdev.org/projects/UTscapy/
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import scapy.modules.six as six
+from subprocess import call
+from scapy.consts import LINUX
+
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+
+= Initialize a virtual CAN interface
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+= Import CANSocket
+
+from scapy.contrib.cansocket_python_can import *
+
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+print("CAN sockets should work now")
+
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, bitrate=250000, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, bitrate=250000, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, bitrate=250000, timeout=0.01)
+
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
 
 
 ############
@@ -9,8 +90,7 @@
 + Basic operations
 
 = Load module
-
-load_contrib("automotive.ccp")
+load_contrib("automotive.ccp", globals_dict=globals())
 
 = Build CRO CONNECT
 
@@ -873,56 +953,24 @@
 assert dto.hashret() == cro.hashret()
 
 + Tests on a virtual CAN-Bus
-~ needs_root linux
-
-= Load modules
-~ needs_root linux conf
-import can
-from subprocess import call
-import time
-
-conf.contribs['CANSocket'] = {'use-python-can': True}
-load_contrib("cansocket")
-
-iface0 = "vcan0"
-
-= Initialize a virtual CAN interface
-~ needs_root linux conf
-if 0 != call("cansend %s 000#" % iface0, shell=True):
-    # vcan0 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
-        raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface0, shell=True):
-        print("add %s failed: Maybe it was already up?" % iface0)
-    if 0 != call("sudo ip link set dev %s up" % iface0, shell=True):
-        raise Exception("could not bring up %s" % iface0)
-
-if 0 != call("cansend %s 000#" % iface0, shell=True):
-    raise Exception("cansend doesn't work")
-
-print("CAN should work now")
 
 = CAN Socket sr1 with dto.ansers(cro) == True
-~ needs_root linux
-
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000), basecls=CCP)
-sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-
-def ecu():
-    pkts = sock2.sniff(count=1, timeout=1)
-    if len(pkts) == 1:
-        cro = CRO(pkts[0].data)
-        assert cro.cmd == 0x22
-        assert cro.data == b"\x10\x11\x12\x10\x11\x12"
-        sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x00\x53\x02\x34\x00\x20\x06'))
 
-
-thread = threading.Thread(target=ecu)
-thread.start()
-time.sleep(0.1)
-
-dto = sock1.sr1(CCP(identifier=0x700)/CRO(ctr=0x53)/PROGRAM_6(data=b"\x10\x11\x12\x10\x11\x12"), timeout=1)
-thread.join()
+with new_can_socket0() as sock1, new_can_socket0() as sock2:
+    sock1.basecls = CCP
+    started = threading.Event()
+    def ecu():
+        pkts = sock2.sniff(count=1, timeout=1, started_callback=started.set)
+        if len(pkts) == 1:
+            cro = CRO(pkts[0].data)
+            assert cro.cmd == 0x22
+            assert cro.data == b"\x10\x11\x12\x10\x11\x12"
+            sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x00\x53\x02\x34\x00\x20\x06'))
+    thread = threading.Thread(target=ecu)
+    thread.start()
+    started.wait(timeout=5)
+    dto = sock1.sr1(CCP(identifier=0x700)/CRO(ctr=0x53)/PROGRAM_6(data=b"\x10\x11\x12\x10\x11\x12"), timeout=1)
+    thread.join(timeout=5)
 
 assert dto.ctr == 83
 assert dto.packet_id == 0xff
@@ -931,61 +979,46 @@
 assert dto.MTA0_extension == 2
 assert dto.MTA0_address == 0x34002006
 
-sock1.close()
-sock2.close()
-
-
 = CAN Socket sr1 with dto.ansers(cro) == False
-~ needs_root linux
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000), basecls=CCP)
-sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-
-def ecu():
-    pkts = sock2.sniff(count=1, timeout=1)
-    if len(pkts) == 1:
-        cro = CRO(pkts[0].data)
-        assert cro.cmd == 0x22
-        assert cro.data == b"\x10\x11\x12\x10\x11\x12"
-        sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x00\x55\x02\x34\x00\x20\x06'))
-
-
-thread = threading.Thread(target=ecu)
-thread.start()
-time.sleep(0.1)
-gotTimeout = False
-try:
+with new_can_socket0() as sock1, new_can_socket0() as sock2:
+    sock1.basecls = CCP
+    started = threading.Event()
+    def ecu():
+        pkts = sock2.sniff(count=1, timeout=1, started_callback=started.set)
+        if len(pkts) == 1:
+            cro = CRO(pkts[0].data)
+            assert cro.cmd == 0x22
+            assert cro.data == b"\x10\x11\x12\x10\x11\x12"
+            sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x00\x55\x02\x34\x00\x20\x06'))
+    thread = threading.Thread(target=ecu)
+    thread.start()
+    started.wait(timeout=5)
+    gotTimeout = False
     dto = sock1.sr1(CCP(identifier=0x700)/CRO(ctr=0x54)/PROGRAM_6(data=b"\x10\x11\x12\x10\x11\x12"), timeout=1)
-except CANSocketTimeoutElapsed as e:
-    gotTimeout = True
-
-assert gotTimeout
-thread.join()
-
-sock1.close()
-sock2.close()
+    print(dto)
+    if dto is None:
+        gotTimeout = True
+    assert gotTimeout
+    thread.join(timeout=5)
 
 = CAN Socket sr1 with error code
-~ needs_root linux
-
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000), basecls=CCP)
-sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-
-def ecu():
-    pkts = sock2.sniff(count=1, timeout=1)
-    if len(pkts) == 1:
-        cro = CRO(pkts[0].data)
-        assert cro.cmd == 0x22
-        assert cro.data == b"\x10\x11\x12\x10\x11\x12"
-        sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x01\x55\xff\xff\xff\xff\xff'))
-
 
-thread = threading.Thread(target=ecu)
-thread.start()
-time.sleep(0.1)
-
-dto = sock1.sr1(CCP(identifier=0x700)/CRO(ctr=0x55)/PROGRAM_6(data=b"\x10\x11\x12\x10\x11\x12"), timeout=1)
-thread.join()
+with new_can_socket0() as sock1, new_can_socket0() as sock2:
+    sock1.basecls = CCP
+    started = threading.Event()
+    def ecu():
+        pkts = sock2.sniff(count=1, timeout=1, started_callback=started.set)
+        if len(pkts) == 1:
+            cro = CRO(pkts[0].data)
+            assert cro.cmd == 0x22
+            assert cro.data == b"\x10\x11\x12\x10\x11\x12"
+            sock2.send(CCP(b'\x00\x00\x07\x00\x08\x00\x00\x00\xff\x01\x55\xff\xff\xff\xff\xff'))
+    thread = threading.Thread(target=ecu)
+    thread.start()
+    started.wait(timeout=5)
+    dto = sock1.sr1(CCP(identifier=0x700)/CRO(ctr=0x55)/PROGRAM_6(data=b"\x10\x11\x12\x10\x11\x12"), timeout=1)
+    thread.join(timeout=5)
 
 assert dto.ctr == 85
 assert dto.packet_id == 0xff
@@ -994,5 +1027,13 @@
 assert dto.MTA0_extension == 0xff
 assert dto.MTA0_address == 0xffffffff
 
-sock1.close()
-sock2.close()
\ No newline at end of file
++ Cleanup
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.4.tar.gz/test/contrib/automotive/ecu.uts Added

@@ -0,0 +1,232 @@
+% Regression tests for the ECU utility
+
+# More information at http://www.secdev.org/projects/UTscapy/
+
+############
+############
+
++ Setup
+~ conf command
+
+= Load modules
+load_contrib("isotp", globals_dict=globals())
+load_contrib("automotive.uds", globals_dict=globals())
+load_contrib("automotive.gm.gmlan", globals_dict=globals())
+load_layer("can", globals_dict=globals())
+conf.contribs["CAN"]["swap-bytes"] = True
+
+= Load ECU module
+
+load_contrib("automotive.ecu", globals_dict=globals())
+
++ Basic checks
+
+= Check default init parameters
+
+ecu = ECU()
+assert ecu.current_session == 1
+assert ecu.current_security_level == 0
+assert ecu.communication_control == 0
+
+= Check init parameters
+
+ecu = ECU(init_session=5, init_security_level=4, init_communication_control=2)
+assert ecu.current_session == 5
+assert ecu.current_security_level == 4
+assert ecu.communication_control == 2
+
+= Check reset
+
+ecu = ECU(init_session=5, init_security_level=4, init_communication_control=2)
+ecu.reset()
+assert ecu.current_session == 1
+assert ecu.current_security_level == 0
+assert ecu.communication_control == 0
+
++ Simple operations
+
+= Log all commands applied to an ECU
+~ docs
+* This example shows the logging mechanism of an ECU object.
+* The log of an ECU is a dictionary of applied UDS commands.
+* The key for this dictionary the UDS service name. The value consists of a list
+* of tuples, containing a timestamp and a log value
+
+msgs = [UDS(service=16) / UDS_DSC(diagnosticSessionType=3),  # no_docs
+        UDS(service=16) / UDS_DSC(diagnosticSessionType=4),  # no_docs
+        UDS(service=16) / UDS_DSC(diagnosticSessionType=5),  # no_docs
+        UDS(service=16) / UDS_DSC(diagnosticSessionType=6),  # no_docs
+        UDS(service=16) / UDS_DSC(diagnosticSessionType=2)]  # no_docs
+
+ecu = ECU(verbose=False, store_supported_responses=False)
+ecu.update(PacketList(msgs))
+print(ecu.log)
+assert len(ecu.log["DiagnosticSessionControl"]) == 5  # no_docs
+timestamp, value = ecu.log["DiagnosticSessionControl"][0]
+assert timestamp > 0  # no_docs
+assert value == "extendedDiagnosticSession"  # no_docs
+assert ecu.log["DiagnosticSessionControl"][-1][1] == "programmingSession"  # no_docs
+
+
+= Trace all commands applied to an ECU
+~ docs
+* This example shows the trace mechanism of an ECU object.
+* Traces of the current state of the ECU object and the received message are
+* print on stdout. Some messages, depending on the protocol, will change the
+* internal state of the ECU.
+
+msgs = [UDS(service=16) / UDS_DSC(diagnosticSessionType=3),  # no_docs
+        UDS(service=80) / UDS_DSCPR(diagnosticSessionType=3, sessionParameterRecord=b'\\x002\\x01\\xf4')]  # no_docs
+
+ecu = ECU(verbose=True, logging=False, store_supported_responses=False)
+ecu.update(PacketList(msgs))
+print(ecu.current_session)
+assert ecu.current_session == 3  # no_docs
+assert ecu.current_security_level == 0  # no_docs
+assert ecu.communication_control == 0  # no_docs
+
+
+= Generate supported responses of an ECU
+~ docs
+* This example shows a mechanism to clone a real world ECU by analyzing a list of Packets.
+
+msgs = [UDS(service=16) / UDS_DSC(diagnosticSessionType=3),  # no_docs
+        UDS(service=80) / UDS_DSCPR(diagnosticSessionType=3, sessionParameterRecord=b'\\x002\\x01\\xf4'),  # no_docs
+        UDS(service=16) / UDS_DSC(diagnosticSessionType=4)]  # no_docs
+
+ecu = ECU(verbose=False, logging=False, store_supported_responses=True)
+ecu.update(PacketList(msgs))
+supported_responses = ecu.supported_responses
+unanswered_packets = ecu.unanswered_packets
+print(supported_responses)
+print(unanswered_packets)
+assert ecu.current_session == 3  # no_docs
+assert ecu.current_security_level == 0  # no_docs
+assert ecu.communication_control == 0  # no_docs
+assert len(supported_responses) == 1  # no_docs
+assert len(unanswered_packets) == 1  # no_docs
+response = supported_responses[0]  # no_docs
+assert response.in_correct_session(1)  # no_docs
+assert response.has_security_access(0)  # no_docs
+assert response.responses[-1].service == 80  # no_docs
+assert unanswered_packets[0].diagnosticSessionType == 4  # no_docs
+
+
++ Advanced checks
+
+= Analyze multiple UDS messages
+~ docs
+* This example shows how to load ``UDS`` messages from a ``.pcap`` file containing ``CAN`` messages
+* A ``PcapReader`` object is used as socket and an ``ISOTPSession`` parses ``CAN`` frames to ``ISOTP`` frames
+* which are then casted to ``UDS`` objects through the ``basecls`` parameter
+
+with PcapReader("test/contrib/automotive/ecu_trace.pcap") as sock:
+     udsmsgs = sniff(session=ISOTPSession, session_kwargs={"use_ext_addr":False, "basecls":UDS}, count=50, opened_socket=sock)
+
+assert len(udsmsgs) == 50  # no_docs
+
+ecu = ECU()
+ecu.update(udsmsgs)
+print(ecu.log)
+print(ecu.supported_responses)
+response = ecu.supported_responses[0]  # no_docs
+assert response.in_correct_session(1)  # no_docs
+assert response.has_security_access(0)  # no_docs
+assert response.responses[0].service == 80  # no_docs
+assert response.responses[0].diagnosticSessionType == 3  # no_docs
+response = ecu.supported_responses[1]  # no_docs
+assert response.in_correct_session(3)  # no_docs
+assert response.has_security_access(0)  # no_docs
+assert response.responses[0].service == 80  # no_docs
+assert response.responses[0].diagnosticSessionType == 2  # no_docs
+response = ecu.supported_responses[4]  # no_docs
+assert response.in_correct_session(2)  # no_docs
+assert response.has_security_access(18)  # no_docs
+assert response.responses[0].service == 110  # no_docs
+assert response.responses[0].dataIdentifier == 61786  # no_docs
+assert len(ecu.log["TransferData"]) == 2
+
+
+= Analyze on the fly with ECUSession
+~ docs
+* This example shows the usage of a ECUSession in sniff. An ISOTPSocket or any
+* socket like object which returns entire messages of the right protocol can be used.
+* A ``ECUSession`` is used as supersession in an ``ISOTPSession``. To obtain the ``ECU`` object from a ``ECUSession``,
+* the ``ECUSession`` has to be created outside of sniff.
+
+session = ECUSession()
+
+with PcapReader("test/contrib/automotive/ecu_trace.pcap") as sock:
+     udsmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "use_ext_addr":False, "basecls":UDS}, count=50, opened_socket=sock)
+
+assert len(udsmsgs) == 50  # no_docs
+
+ecu = session.ecu
+print(ecu.log)
+print(ecu.supported_responses)
+response = ecu.supported_responses[0]  # no_docs
+assert response.in_correct_session(1)  # no_docs
+assert response.has_security_access(0)  # no_docs
+assert response.responses[0].service == 80  # no_docs
+assert response.responses[0].diagnosticSessionType == 3  # no_docs
+response = ecu.supported_responses[1]  # no_docs
+assert response.in_correct_session(3)  # no_docs
+assert response.has_security_access(0)  # no_docs
+assert response.responses[0].service == 80  # no_docs
+assert response.responses[0].diagnosticSessionType == 2  # no_docs
+response = ecu.supported_responses[4]  # no_docs
+assert response.in_correct_session(2)  # no_docs
+assert response.has_security_access(18)  # no_docs
+assert response.responses[0].service == 110  # no_docs
+assert response.responses[0].dataIdentifier == 61786  # no_docs
+assert len(ecu.log["TransferData"]) == 2  # no_docs
+
+
+= Analyze on the fly with ECUSession GMLAN1
+
+session = ECUSession()
+
+with CandumpReader("test/contrib/automotive/gmlan_trace.candump") as sock:
+    gmlanmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "did":[0x241, 0x641, 0x101], "basecls":GMLAN}, count=2, opened_socket=sock)
+    ecu = session.ecu
+    print("Check 1 after change to diagnostic mode")
+    assert len(ecu.supported_responses) == 1
+    assert ecu.current_session == 3
+    assert ecu.current_security_level == 0
+    gmlanmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "did":[0x241, 0x641, 0x101], "basecls":GMLAN}, count=8, opened_socket=sock)
+    ecu = session.ecu
+    print("Check 2 after some more messages were read")
+    assert len(ecu.supported_responses) == 4
+    assert ecu.current_session == 3
+    assert ecu.current_security_level == 0
+    gmlanmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "did":[0x241, 0x641, 0x101], "basecls":GMLAN}, count=10, opened_socket=sock)
+    ecu = session.ecu
+    print("Check 3 after change to programming mode (bootloader)")
+    assert len(ecu.supported_responses) == 5
+    assert ecu.current_session == 2
+    assert ecu.current_security_level == 0
+    gmlanmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "did":[0x241, 0x641, 0x101], "basecls":GMLAN}, count=16, opened_socket=sock)
+    ecu = session.ecu
+    print("Check 4 after gaining security access")
+    assert len(ecu.supported_responses) == 7
+    assert ecu.current_session == 2
+    assert ecu.current_security_level == 2
+
+= Analyze on the fly with ECUSession GMLAN logging test
+
+session = ECUSession(verbose=False, store_supported_responses=False)
+
+with CandumpReader("test/contrib/automotive/gmlan_trace.candump") as sock:
+     gmlanmsgs = sniff(session=ISOTPSession, session_kwargs={"supersession": session, "did":[0x241, 0x641, 0x101], "basecls":GMLAN}, count=200, opened_socket=sock)
+
+ecu = session.ecu
+assert len(ecu.supported_responses) == 0
+
+assert len([m for m in gmlanmsgs if m.sprintf("%GMLAN.service%") == "TransferData"]) == len(ecu.log["TransferData"])
+assert len([m for m in gmlanmsgs if m.sprintf("%GMLAN.service%") == "RequestDownload"]) == len(ecu.log["RequestDownload"])
+assert len([m for m in gmlanmsgs if m.sprintf("%GMLAN.service%") == "ReadDataByIdentifier"]) == len(ecu.log["ReadDataByIdentifier"])
+
+assert len(ecu.log["SecurityAccess"]) == 2
+assert len(ecu.log["SecurityAccessPositiveResponse"]) == 2
+
+assert ecu.log["TransferData"][-1][1][0] == "downloadAndExecuteOrExecute"

scapy-2.4.4.tar.gz/test/contrib/automotive/ecu_am.uts Added

@@ -0,0 +1,555 @@
+% Regression tests for ECU_am
+
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import subprocess, sys
+import scapy.modules.six as six
+from subprocess import call
+from scapy.consts import LINUX
+
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+# function to exit when the can-isotp kernel module is not available
+ISOTP_KERNEL_MODULE_AVAILABLE = False
+def exit_if_no_isotp_module():
+    if not ISOTP_KERNEL_MODULE_AVAILABLE:
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
+        warning("Can't test ISOTP native socket because kernel module is not loaded")
+        exit(0)
+
+
+= Initialize a virtual CAN interface
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+= Import CANSocket
+
+from scapy.contrib.cansocket_python_can import *
+
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+print("CAN sockets should work now")
+
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, bitrate=250000, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, bitrate=250000, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, bitrate=250000, timeout=0.01)
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
+
+
+= Check if can-isotp and can-utils are installed on this system
+~ linux
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
+
+
++ Syntax check
+
+= Import isotp
+
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
+
+load_contrib("isotp", globals_dict=globals())
+
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
+
+############
+############
++ Load general modules
+
+= Load contribution layer
+
+load_contrib("automotive.uds", globals_dict=globals())
+load_contrib("automotive.ecu", globals_dict=globals())
+
+print("Set delay to lower utilization")
+conf.contribs['ECU_am']['send_delay'] = 0.004
+
++ Simulator tests
+
+= Simple check with RDBI and Negative Response
+drain_bus(iface0)
+
+example_responses = \
+    [ECUResponse(session=1, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=0x1234) / Raw(b"deadbeef"))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=UDS, verbose=False)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 60, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS()/UDS_RDBI(identifiers=[0x123]), timeout=1, verbose=False)
+        assert resp.negativeResponseCode == 0x10
+        assert resp.requestServiceId == 34
+        resp = tester.sr1(UDS(service=0x22), timeout=1, verbose=False)
+        assert resp.negativeResponseCode == 0x10
+        assert resp.requestServiceId == 34
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[0x1234]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 0x1234
+        assert resp.load == b"deadbeef"
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with different Sessions
+drain_bus(iface0)
+
+example_responses = \
+    [ECUResponse(session=2, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=2) / Raw(b"deadbeef1")),
+     ECUResponse(session=range(3,5), security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=3) / Raw(b"deadbeef2")),
+     ECUResponse(session=[5,6,7], security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=5) / Raw(b"deadbeef3")),
+     ECUResponse(session=lambda x: 8 < x <= 10, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=9) / Raw(b"deadbeef4"))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 60, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS()/UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.negativeResponseCode == 0x10
+        assert resp.requestServiceId == 34
+        answering_machine.ecu_state.current_session = 2
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 2
+        assert resp.load == b"deadbeef1"
+        answering_machine.ecu_state.current_session = 4
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 3
+        assert resp.load == b"deadbeef2"
+        answering_machine.ecu_state.current_session = 6
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 5
+        assert resp.load == b"deadbeef3"
+        answering_machine.ecu_state.current_session = 9
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 9
+        assert resp.load == b"deadbeef4"
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with different Sessions and diagnosticSessionControl
+drain_bus(iface0)
+
+example_responses = \
+    [ECUResponse(session=2, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=2) / Raw(b"deadbeef1")),
+     ECUResponse(session=range(3,5), security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=3) / Raw(b"deadbeef2")),
+     ECUResponse(session=[5,6,7], security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=5) / Raw(b"deadbeef3")),
+     ECUResponse(session=lambda x: 8 < x <= 10, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=9) / Raw(b"deadbeef4")),
+     ECUResponse(session=range(0,8), security_level=lambda x: x==0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=1, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=2, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=3, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=4, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=5, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=6, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=7, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(0,8), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=8, sessionParameterRecord=b"dead")),
+     ECUResponse(session=range(8,10), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=9, sessionParameterRecord=b"dead1")),
+     ECUResponse(session=range(8,10), security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=9, sessionParameterRecord=b"dead2")),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 60, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS()/UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.negativeResponseCode == 0x10
+        assert resp.requestServiceId == 34
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=2), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 2
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 2
+        assert resp.load == b"deadbeef1"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=4), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 4
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 3
+        assert resp.load == b"deadbeef2"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=6), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 6
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 5
+        assert resp.load == b"deadbeef3"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=8), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 8
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_DSC(diagnosticSessionType=9), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 9
+        assert resp.sessionParameterRecord == b"dead1"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 9
+        assert resp.load == b"deadbeef4"
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with different Sessions and diagnosticSessionControl and answers hook
+drain_bus(iface0)
+
+def custom_answers(resp, req):
+    if req.service + 0x40 != resp.service:
+        return False
+    if hasattr(req, "diagnosticSessionType"):
+        if 0 < req.diagnosticSessionType <= 8:
+            resp.diagnosticSessionType = req.diagnosticSessionType
+            return resp.answers(req)
+    return False
+
+example_responses = \
+    [ECUResponse(session=2,                     security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=2) / Raw(b"deadbeef1")),
+     ECUResponse(session=range(3,5),            security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=3) / Raw(b"deadbeef2")),
+     ECUResponse(session=[5,6,7],               security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=5) / Raw(b"deadbeef3")),
+     ECUResponse(session=lambda x: 8 < x <= 10, security_level=0, responses=UDS() / UDS_RDBIPR(dataIdentifier=9) / Raw(b"deadbeef4")),
+     ECUResponse(session=range(0,8),            security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=1, sessionParameterRecord=b"dead"), answers=custom_answers),
+     ECUResponse(session=range(8,10),           security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=9, sessionParameterRecord=b"dead1")),
+     ECUResponse(session=range(8,10),           security_level=0, responses=UDS() / UDS_DSCPR(diagnosticSessionType=9, sessionParameterRecord=b"dead2")),
+     ECUResponse(session=range(0,255),          security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses,
+                               main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 60, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS()/UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.negativeResponseCode == 0x10
+        assert resp.requestServiceId == 34
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=2), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 2
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 2
+        assert resp.load == b"deadbeef1"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=4), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 4
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 3
+        assert resp.load == b"deadbeef2"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=6), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 6
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 5
+        assert resp.load == b"deadbeef3"
+        resp = tester.sr1(UDS()/UDS_DSC(diagnosticSessionType=8), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 8
+        assert resp.sessionParameterRecord == b"dead"
+        resp = tester.sr1(UDS() / UDS_DSC(diagnosticSessionType=9), timeout=1, verbose=False)
+        assert resp.service == 0x50
+        assert resp.diagnosticSessionType == 9
+        assert resp.sessionParameterRecord == b"dead1"
+        resp = tester.sr1(UDS() / UDS_RDBI(identifiers=[2, 3, 5, 9]), timeout=1, verbose=False)
+        assert resp.service == 0x62
+        assert resp.dataIdentifier == 9
+        assert resp.load == b"deadbeef4"
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with security access and answers hook
+drain_bus(iface0)
+
+security_seed = b"abcd"
+
+def custom_answers(resp, req):
+    global security_seed
+    if req.service + 0x40 != resp.service or req.service != 0x27:
+        return False
+    if req.securityAccessType == 1:
+        resp.securitySeed = security_seed
+        return resp.answers(req)
+    elif req.securityAccessType == 2:
+        return resp.answers(req) and req.securityKey == security_seed + security_seed
+    return False
+
+example_responses = \
+    [ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_SAPR(securityAccessType=1, securitySeed=b"1234"), answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_SAPR(securityAccessType=2), answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x35, requestServiceId=0x27)),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses,
+                               main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 10, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=1, verbose=False)
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed), timeout=1, verbose=False)
+        assert resp.service == 0x7f
+        assert resp.negativeResponseCode == 0x35
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=1, verbose=False)
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed+resp.securitySeed), timeout=1, verbose=False)
+        assert resp.service == 0x67
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with security access and answers hook and request-correctly-received message
+drain_bus(iface0)
+
+security_seed = b"abcd"
+
+def custom_answers(resp, req):
+    global security_seed
+    if req.service + 0x40 != resp.service or req.service != 0x27:
+        return False
+    if req.securityAccessType == 1:
+        resp.securitySeed = security_seed
+        return resp.answers(req)
+    elif req.securityAccessType == 2:
+        return resp.answers(req) and req.securityKey == security_seed + security_seed
+    return False
+
+example_responses = \
+    [ECUResponse(session=range(0,255), security_level=0, responses=[UDS()/UDS_NR(negativeResponseCode=0x78, requestServiceId=0x27), UDS() / UDS_SAPR(securityAccessType=1, securitySeed=b"1234")], answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_SAPR(securityAccessType=2), answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x35, requestServiceId=0x27)),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))]
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses,
+                               main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout': 10, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=2, verbose=False)
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed), timeout=2, verbose=False)
+        assert resp.service == 0x7f
+        assert resp.negativeResponseCode == 0x35
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=2, verbose=False)
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed+resp.securitySeed), timeout=2, verbose=False)
+        assert resp.service == 0x67
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+= Simple check with security access and answers hook and request-correctly-received message 2
+drain_bus(iface0)
+
+security_seed = b"abcd"
+
+def custom_answers(resp, req):
+    global security_seed
+    if req.service + 0x40 != resp.service or req.service != 0x27:
+        return False
+    if req.securityAccessType == 1:
+        resp.securitySeed = security_seed
+        return resp.answers(req)
+    elif req.securityAccessType == 2:
+        return resp.answers(req) and req.securityKey == security_seed + security_seed
+    return False
+
+example_responses = \
+    [ECUResponse(session=range(0,255), security_level=0, responses=[UDS()/UDS_NR(negativeResponseCode=0x78, requestServiceId=0x27), UDS() / UDS_SAPR(securityAccessType=1, securitySeed=b"1234")], answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_SAPR(securityAccessType=2), answers=custom_answers),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x35, requestServiceId=0x27)),
+     ECUResponse(session=range(0,255), security_level=0, responses=UDS() / UDS_NR(negativeResponseCode=0x7f, requestServiceId=0x10))]
+
+conf.contribs['UDS']['treat-response-pending-as-answer'] = True
+
+success = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x700, did=0x600, basecls=UDS) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x600, did=0x700, basecls=UDS) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses,
+                               main_socket=ecu, basecls=UDS)
+    sim = threading.Thread(target=answering_machine, kwargs={'timeout':5, 'stop_filter': lambda p: p.service==0xff})
+    sim.start()
+    time.sleep(0.1)
+    try:
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=1, verbose=False)
+        assert resp.service == 0x7f
+        assert resp.negativeResponseCode == 0x78
+        resp = tester.sniff(timeout=2, count=1, verbose=False)[0]
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed), timeout=3, verbose=False)
+        assert resp.service == 0x7f
+        assert resp.negativeResponseCode == 0x35
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=1), timeout=1, verbose=False)
+        assert resp.service == 0x7f
+        assert resp.negativeResponseCode == 0x78
+        resp = tester.sniff(timeout=2, count=1, verbose=False)[0]
+        assert resp.service == 0x67
+        assert resp.securitySeed == b"abcd"
+        resp = tester.sr1(UDS() / UDS_SA(securityAccessType=2, securityKey=resp.securitySeed+resp.securitySeed), timeout=1, verbose=False)
+        assert resp.service == 0x67
+        success = True
+    except Exception as ex:
+        print(ex)
+    finally:
+        tester.send(UDS(service=0xff))
+        sim.join(timeout=10)
+
+assert success
+
+conf.contribs['UDS']['treat-response-pending-as-answer'] = False
+
++ Cleanup
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.4.tar.gz/test/contrib/automotive/ecu_trace.pcap Added

scapy-2.4.4.tar.gz/test/contrib/automotive/enumerator.uts Added

@@ -0,0 +1,153 @@
+% Regression tests for enumerators
+
++ Load general modules
+
+= Load contribution layer
+
+from scapy.contrib.automotive.enumerator import *
+from scapy.contrib.automotive.uds import *
+
+
++ Basic checks
+= Enumerator basecls checks
+
+pkts = [
+    Enumerator.ScanResult("s1", UDS(b"\x20abcd"), UDS(b"\x60abcd")),
+    Enumerator.ScanResult("s2", UDS(b"\x20abcd"), None),
+    Enumerator.ScanResult("s1", UDS(b"\x21abcd"), UDS(b"\x7fabcd")),
+    Enumerator.ScanResult("s2", UDS(b"\x21abcd"), UDS(b"\x61abcd")),
+]
+
+pkts[0].req.sent_time = 1.0
+pkts[1].req.sent_time = 2.0
+pkts[2].req.sent_time = 3.0
+pkts[3].req.sent_time = 4.0
+
+
+pkts[0].resp.time = 1.9
+pkts[2].resp.time = 3.1
+pkts[3].resp.time = 4.5
+
+
+e = Enumerator(None)
+e.results = pkts
+
+
+= Enumerator not completed check
+
+assert e.completed == False
+
+
+= Enumerator stats check
+
+e.update_stats()
+assert e.stats["answered"] == 3
+assert e.stats["unanswered"] == 1
+assert round(e.stats["answertime_max"], 1) == 0.9
+assert round(e.stats["answertime_min"], 1) == 0.1
+assert round(e.stats["answertime_avg"], 1) == 0.5
+assert e.stats["negative_resps"] == 1
+
+
+= Enumerator filtered results
+
+assert len(e.filtered_results) == 3
+assert e.filtered_results[0] == pkts[0]
+assert e.filtered_results[1] == pkts[2]
+
+
+= Enumerator scanned states
+
+assert len(e.scanned_states) == 2
+assert {"s1", "s2"} == e.scanned_states
+
+= Enumerator show
+
+def show_negative_response_details(self, dump=False):
+    pass
+
+
+def get_table_entry(tup):
+    state, req, res = tup
+    label = Enumerator.get_label(res)
+    return state, "0x%02x: %s" % (req.service, req.sprintf("%UDS.service%")), label
+
+e.show_negative_response_details = show_negative_response_details
+e.get_table_entry = get_table_entry
+
+e.show(filtered=False)
+
+dump = e.show(dump=True, filtered=False)
+assert "NegativeResponse" in dump
+assert "PositiveResponse" in dump
+assert "PR:" in dump
+assert "NR:" in dump
+assert "s1" in dump
+assert "s2" in dump
+assert "Times between request and response:\tMIN: 0.100000\tMAX: 0.900000\tAVG: 0.500000" in dump
+
+
+= Enumerator get_label
+
+assert Enumerator.get_label(pkts[0].resp) == "PR: PositiveResponse"
+assert Enumerator.get_label(pkts[1].resp) == "Timeout"
+assert Enumerator.get_label(pkts[2].resp) == "NR: NegativeResponse"
+assert Enumerator.get_label(pkts[3].resp, lambda: "positive") == "positive"
+assert Enumerator.get_label(pkts[3].resp, lambda: "positive" + hex(pkts[3].req.service)) == "positive" + "0x21"
+
+= Enumerator completed
+
+e.state_completed["s1"] = True
+e.state_completed["s2"] = True
+
+assert e.completed
+
++ Graph tests
+
+= Basic test
+
+g = Graph()
+g.add_edge("1", "1")
+g.add_edge("1", "2")
+g.add_edge("2", "3")
+g.add_edge("3", "4")
+g.add_edge("4", "4")
+
+assert "1" in g.nodes
+assert "2" in g.nodes
+assert "3" in g.nodes
+assert "4" in g.nodes
+assert len(g.nodes) == 4
+assert g.dijsktra(g, "1", "4") == ["1", "2", "3", "4"]
+
+= Shortest path test
+
+g = Graph()
+g.add_edge("1", "1")
+g.add_edge("1", "2")
+g.add_edge("2", "3")
+g.add_edge("3", "4")
+g.add_edge("4", "4")
+
+assert g.dijsktra(g, "1", "4") == ["1", "2", "3", "4"]
+
+g.add_edge("1", "4")
+
+assert g.dijsktra(g, "1", "4") == ["1", "4"]
+
+g.add_edge("3", "5")
+g.add_edge("5", "6")
+
+print(g.dijsktra(g, "1", "6"))
+
+assert g.dijsktra(g, "1", "6") == ["1", "2", "3", "5", "6"] or g.dijsktra(g, "1", "6") == ['1', '4', '3', '5', '6']
+
+g.add_edge("2", "5")
+
+print(g.dijsktra(g, "1", "6"))
+
+assert g.dijsktra(g, "1", "6") == ["1", "2", "5", "6"]
+
+g.add_edge("4", "6")
+
+assert g.dijsktra(g, "1", "6") == ["1", "4", "6"]

scapy-2.4.3.tar.gz/test/contrib/automotive/gm/gmlan.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/gm/gmlan.uts Changed

@@ -7,15 +7,14 @@
 
 + Configuration of scapy
 = Load gmlan layer
-~ conf command
-
-load_contrib('automotive.gm.gmlan')
+~ conf
+load_contrib("automotive.ecu", globals_dict=globals())
+load_contrib("automotive.gm.gmlan", globals_dict=globals())
 
 + Basic Packet Tests()
 = Set GMLAN ECU AddressingScheme
 
 conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 2
-
 assert conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] == 2
 
 = Craft Packet
@@ -24,7 +23,7 @@
 x.service == 0x52
 
 = Craft VIN Packet
-x = GMLAN(b'\x5a\x90'+ raw("WOOOJBF35W1042000"))
+x = GMLAN(b'\x5a\x90'+ raw(b"WOOOJBF35W1042000"))
 x.load == b'WOOOJBF35W1042000'
 x.dataIdentifier == 0x90
 
@@ -34,9 +33,10 @@
 x.memorySize == 0x4422
 
 = Test Packet GMLAN_RMBAPR with ECU AddressingScheme2
-x = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22')
-x.memoryAddress == 0x1122
-x.dataRecord == b'\x44\x22'
+y = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22')
+y.memoryAddress == 0x1122
+y.dataRecord == b'\x44\x22'
+y.answers(x) == True
 
 = Craft Packet with ECU AddressingScheme2
 x = GMLAN() / GMLAN_RMBA(b'\x11\x22\x44\x22')
@@ -50,9 +50,10 @@
 x.memorySize == 0x2211
 
 = Test Packet GMLAN_RMBAPR with ECU AddressingScheme3
-x = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22\x11')
-x.memoryAddress == 0x112244
-x.dataRecord == b'\x22\x11'
+y = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22\x11')
+y.memoryAddress == 0x112244
+y.dataRecord == b'\x22\x11'
+y.answers(x) == True
 
 = Craft Packet with ECU AddressingScheme3
 x = GMLAN() / GMLAN_RMBA(b'\x11\x22\x44\x22\x11')
@@ -66,9 +67,10 @@
 x.memorySize == 0x1100
 
 = Test Packet GMLAN_RMBAPR with ECU AddressingScheme4
-x = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22\x11\x00')
-x.memoryAddress == 0x11224422
-x.dataRecord == b'\x11\x00'
+y = GMLAN()/GMLAN_RMBAPR(b'\x11\x22\x44\x22\x11\x00')
+y.memoryAddress == 0x11224422
+y.dataRecord == b'\x11\x00'
+y.answers(x) == True
 
 = Craft Packet with ECU AddressingScheme4
 x = GMLAN() / GMLAN_RMBA(b'\x11\x22\x44\x22\x11\x00')
@@ -103,18 +105,18 @@
 x.memorySize == 0x8150011
 
 = Craft Packet for RFRD1
-x = GMLAN(b'\x12\x01')
-x.service == 0x12
-x.subfunction == 1
+a = GMLAN(b'\x12\x01')
+a.service == 0x12
+a.subfunction == 1
 
 = Craft Packet for RFRD2
-x = GMLAN(b'\x12\x02\x01\x02\x03\x04')
-x.service == 0x12
-x.subfunction == 2
-x.dtc.failureRecordNumber == 1
-x.dtc.DTCHighByte == 2
-x.dtc.DTCLowByte == 3
-x.dtc.DTCFailureType == 4
+b = GMLAN(b'\x12\x02\x01\x02\x03\x04')
+b.service == 0x12
+b.subfunction == 2
+b.dtc.failureRecordNumber == 1
+b.dtc.DTCHighByte == 2
+b.dtc.DTCLowByte == 3
+b.dtc.DTCFailureType == 4
 
 = Craft Packet for RFRDPR_RFRI
 x = GMLAN(b'\x52\x01\x00\x01\x02\x03\x04')
@@ -125,6 +127,7 @@
 x.dtcs[0].DTCHighByte == 2
 x.dtcs[0].DTCLowByte == 3
 x.dtcs[0].DTCFailureType == 4
+x.answers(a) == True
 
 = Craft Packet for RFRDPR_RFRI
 x = GMLAN(b'\x52\x01\x00\x01\x02\x03\x04\x01\x02\x03\x04\x01\x02\x03\x04\x01\x02\x03\x04')
@@ -147,6 +150,7 @@
 x.dtcs[3].DTCHighByte == 2
 x.dtcs[3].DTCLowByte == 3
 x.dtcs[3].DTCFailureType == 4
+x.answers(a) == True
 
 = Craft Packet for RFRDPR_RFRP
 x = GMLAN(b'\x52\x02\x01\x02\x03\x04deadbeef')
@@ -158,6 +162,7 @@
 x.dtc.DTCFailureType == 4
 x.show()
 x.load == b'deadbeef'
+x.answers(b) == True
 
 
 = Craft Packet for RDBI
@@ -166,10 +171,12 @@
 x.dataIdentifier == 0x11
 
 = Craft Packet for RDBIPR
-x = GMLAN(b'\x5A\x11deadbeef')
-x.service == 0x5A
-x.dataIdentifier == 0x11
-x.load == b'deadbeef'
+y = GMLAN(b'\x5A\x11deadbeef')
+y.service == 0x5A
+y.dataIdentifier == 0x11
+y.load == b'deadbeef'
+y.answers(x) == True
+
 
 = Craft Packet for RDBPI
 x = GMLAN(b'\x22\x11\x11\x22\x22\x33\x33\x44\x44\x55\x55\x66\x66\x77\x77\x88\x88\x99\x99')
@@ -185,10 +192,11 @@
 x.identifiers[8] == 0x9999
 
 = Craft Packet for RDBPIPR
-x = GMLAN(b'\x62\x00\x11deadbeef')
-x.service == 0x62
-x.parameterIdentifier == 0x11
-x.load == b'deadbeef'
+y = GMLAN(b'\x62\x11\x11deadbeef')
+y.service == 0x62
+y.parameterIdentifier == 0x1111
+y.load == b'deadbeef'
+y.answers(x) == True
 
 = Craft Packet for GMLAN_RDBPKTI1
 x = GMLAN(b'\xAA\x01deadbeef')
@@ -218,26 +226,33 @@
 assert b"\xaa\x01de" == bytes(x)
 
 = Craft Packet for GMLAN_SA1
-x = GMLAN(b'\x27\x01')
-x.service == 0x27
-x.subfunction == 1
+a = GMLAN(b'\x27\x01')
+a.service == 0x27
+a.subfunction == 1
 
 = Craft Packet for GMLAN_SA2
-x = GMLAN(b'\x27\x02\xde\xad')
-x.service == 0x27
-x.subfunction == 2
-x.securityKey == 0xdead
+b = GMLAN(b'\x27\x02\xde\xad')
+b.service == 0x27
+b.subfunction == 2
+b.securityKey == 0xdead
 
 = Craft Packet for GMLAN_SAPR1
 x = GMLAN(b'\x67\x02')
 x.service == 0x67
 x.subfunction == 2
+x.answers(b)
+
+ecu = ECU()
+ecu.update(x)
+assert ecu.current_security_level == 2
+
 
 = Craft Packet for GMLAN_SAPR2
 x = GMLAN(b'\x67\x01\xde\xad')
 x.service == 0x67
 x.subfunction == 1
 x.securitySeed == 0xdead
+x.answers(a)
 
 = Craft Packet for GMLAN_DDM
 x = GMLAN(b'\x2c\x02dead')
@@ -246,9 +261,10 @@
 x.PIDData == b'dead'
 
 = Craft Packet for GMLAN_DDMPR
-x = GMLAN(b'\x6c\x02dead')
-x.service == 0x6c
-x.DPIDIdentifier == 2
+y = GMLAN(b'\x6c\x02dead')
+y.service == 0x6c
+y.DPIDIdentifier == 2
+y.answers(x)
 
 = Craft Packet for GMLAN_DPBA1
 conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 2
@@ -275,9 +291,10 @@
 x.memorySize == 0x33
 
 = Craft Packet for GMLAN_DPBAPR
-x = GMLAN(b'\x6D\x02\x02')
-x.service == 0x6d
-x.parameterIdentifier == 0x202
+y = GMLAN(b'\x6D\x02\x02')
+y.service == 0x6d
+y.parameterIdentifier == 0x202
+y.answers(x)
 
 = Craft Packet for GMLAN_RD1
 conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 2
@@ -331,9 +348,10 @@
 x.dataRecord == b'deadbeef'
 
 = Craft Packet for WDBIPR
-x = GMLAN(b'\x7b\x11')
-x.service == 0x7b
-x.dataIdentifier == 0x11
+y = GMLAN(b'\x7b\x11')
+y.service == 0x7b
+y.dataIdentifier == 0x11
+y.answers(x)
 
 = Craft Packet for RPSPR
 x = GMLAN(b'\xe2\x11')
@@ -387,6 +405,22 @@
 x = GMLAN(b'\x7f\x10\x00\x11\x22')
 assert x.answers(y)
 
+= Set treat-response-pending-as-answer
+conf.contribs['GMLAN']['treat-response-pending-as-answer'] = False
+assert conf.contribs['GMLAN']['treat-response-pending-as-answer'] == False
+
+= Check response-pending is not considered as answer
+y = GMLAN(b'\x10deadbeef')
+x = GMLAN(b'\x7f\x10\x78\x11\x22')
+assert not x.answers(y)
+
+= Check response-pending is considered as answer
+conf.contribs['GMLAN']['treat-response-pending-as-answer'] = True
+assert conf.contribs['GMLAN']['treat-response-pending-as-answer'] == True
+y = GMLAN(b'\x10deadbeef')
+x = GMLAN(b'\x7f\x10\x78\x11\x22')
+assert x.answers(y)
+
 = Check hashret 1
 print(y.hashret())
 print(x.hashret())
@@ -395,9 +429,25 @@
 
 = Check answers 2
 y = GMLAN()/GMLAN_SA(subfunction=1)
-x = GMLAN()/GMLAN_SAPR()
+x = GMLAN()/GMLAN_SAPR(subfunction=1)
 assert x.answers(y)
 
 = Check hashret 2
 y.hashret() == x.hashret()
 
+= Check modifies ecu state
+ecu = ECU()
+ecu.update(GMLAN(service="InitiateDiagnosticOperationPositiveResponse"))
+assert ecu.current_session == 3
+ecu.update(GMLAN(service="ReturnToNormalOperationPositiveResponse"))
+assert ecu.current_session == 1
+ecu.update(GMLAN(service="ProgrammingModePositiveResponse"))
+assert ecu.current_session == 2
+ecu.update(GMLAN(service="DisableNormalCommunicationPositiveResponse"))
+assert ecu.communication_control == 1
+ecu.update(GMLAN(service="ReturnToNormalOperationPositiveResponse"))
+assert ecu.current_session == 1
+assert ecu.communication_control == 0
+
+
+

scapy-2.4.4.tar.gz/test/contrib/automotive/gm/gmlanutils.uts Added

@@ -0,0 +1,1313 @@
+% Regression tests for gmlanutil
+
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import subprocess, sys
+import scapy.modules.six as six
+from subprocess import call
+from scapy.consts import LINUX
+
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+# function to exit when the can-isotp kernel module is not available
+ISOTP_KERNEL_MODULE_AVAILABLE = False
+def exit_if_no_isotp_module():
+    if not ISOTP_KERNEL_MODULE_AVAILABLE:
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
+        warning("Can't test ISOTP native socket because kernel module is not loaded")
+        exit(0)
+
+
+= Initialize a virtual CAN interface
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+= Import CANSocket
+
+from scapy.contrib.cansocket_python_can import *
+
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface, timeout=0.01)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+print("CAN sockets should work now")
+
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, timeout=0.001)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, timeout=0.001)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, timeout=0.001)
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
+
+= Check if can-isotp and can-utils are installed on this system
+~ linux
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
+
+
++ Syntax check
+
+= Import isotp
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
+
+load_contrib("isotp", globals_dict=globals())
+
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
+
+############
+############
++ Load general modules
+
+= Load contribution layer
+
+load_contrib("automotive.gm.gmlan", globals_dict=globals())
+load_contrib("automotive.gm.gmlanutils", globals_dict=globals())
+
+##############################################################################
++ GMLAN_RequestDownload Tests
+##############################################################################
+= Positive, immediate positive response
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_RD(memorySize=4)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= Negative, immediate negative response
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        nr = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x22)
+        isotpsock2.send(nr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == False
+
+thread.join(timeout=5)
+
+= Negative, timeout
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == False
+
+############################ Response pending
+= Positive, after response pending
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pending = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        isotpsock2.send(pending)
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == True
+
+thread.join(timeout=5)
+
+= Positive, hold response pending for several messages
+tout = 0.8
+repeats = 4
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        for i in range(repeats):
+            isotpsock2.send(ack)
+            time.sleep(tout)
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    starttime = time.time() # may be inaccurate -> on some systems only seconds precision
+    result = GMLAN_RequestDownload(isotpsock, 4, timeout=repeats*tout+0.5)
+    assert result
+    endtime = time.time()
+    assert (endtime - starttime) >= tout * (repeats - 1)
+
+thread.join(timeout=5)
+
+= Negative, negative response after response pending
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pending = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        isotpsock2.send(pending)
+        nr = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x22)
+        isotpsock2.send(nr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == False
+
+thread.join(timeout=5)
+
+= Negative, timeout after response pending
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pending = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        isotpsock2.send(pending)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=0.3) == False
+
+thread.join(timeout=5)
+
+= Positive, pending message from different service interferes while pending
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pending = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        isotpsock2.send(pending)
+        wrongservice = GMLAN()/GMLAN_NR(requestServiceId=0x36, returnCode=0x78)
+        isotpsock2.send(wrongservice)
+        isotpsock2.send(pending)
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == True
+
+thread.join(timeout=5)
+
+= Positive, negative response from different service interferes while pending
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pending = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x78)
+        isotpsock2.send(pending)
+        wrongservice = GMLAN()/GMLAN_NR(requestServiceId=0x36, returnCode=0x22)
+        isotpsock2.send(wrongservice)
+        isotpsock2.send(pending)
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1) == True
+
+thread.join(timeout=5)
+
+################### RETRY
+= Positive, first: immediate negative response, retry: Positive
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # negative
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_RD(memorySize=4)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        nr = GMLAN()/GMLAN_NR(requestServiceId=0x34, returnCode=0x22)
+        # positive retry
+        print("retry")
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(nr))
+        pkt = GMLAN()/GMLAN_RD(memorySize=4)
+        print(requ)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x74"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_RequestDownload(isotpsock, 4, timeout=1, retry=1) == True
+    assert ecusimSuccessfullyExecuted == True
+
+thread.join(timeout=5)
+
+
+##############################################################################
++ GMLAN_TransferData Tests
+##############################################################################
+= Positive, short payload, scheme = 4
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000000,
+                                 dataRecord=payload)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x40000000, payload, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= Positive, short payload, scheme = 3
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 3
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x400000,
+                                 dataRecord=payload)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x400000, payload, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= Positive, short payload, scheme = 2
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 2
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted = True
+    with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        time.sleep(0)
+        requ = isotpsock2.sniff(count=1, timeout=2, started_callback=started.set)
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x4000, dataRecord=payload)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x4000, payload, timeout=2) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= Negative, short payload
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        nr = GMLAN() / GMLAN_NR(requestServiceId=0x36, returnCode=0x22)
+        isotpsock2.send(nr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x40000000, payload, timeout=1) == False
+
+thread.join(timeout=5)
+
+= Negative, timeout
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x4000, payload, timeout=1) == False
+
+= Positive, long payload
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000000,
+                                 dataRecord=payload*2)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        # second package with inscreased address
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000010,
+                                 dataRecord=payload * 2)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x40000000, payload*4, maxmsglen=16, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+#
+= Positive, first part of payload succeeds, second pending, then fails, retry succeeds
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x76"
+        # second package with inscreased address
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pending = GMLAN() / GMLAN_NR(requestServiceId=0x36, returnCode=0x78)
+        isotpsock2.send(pending)
+        time.sleep(0.1)
+        nr = GMLAN() / GMLAN_NR(requestServiceId=0x36, returnCode=0x22)
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(nr))
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x40000000, payload*4, maxmsglen=16, timeout=1, retry=1) == True
+
+thread.join(timeout=5)
+
+############
+= Positive, maxmsglen length check -> message is split automatically
+* TODO: This test causes an error in ISOTPSoftSockets
+
+exit_if_no_isotp_module()
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+sim_started = threading.Event()
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=3, started_callback=sim_started.set)
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000000,
+                                 dataRecord=payload*511+payload[:1])
+        if len(requ) == 0 or bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+            return
+        ack = b"\x76"
+        # second package with inscreased address
+        requ = isotpsock2.sniff(count=1, timeout=3, started_callback=lambda: isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000FF9,
+                                 dataRecord=payload[1:])
+        if len(requ) == 0 or bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+            return
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.name = "ECUSimulator" + thread.name
+thread.start()
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    sim_started.wait(timeout=5)
+    assert GMLAN_TransferData(isotpsock, 0x40000000, payload*512, maxmsglen=0x1000000, timeout=8) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+############ Address boundary checks
+= Positive, highest possible address for scheme
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 2**32 - 1, payload, timeout=1) == True
+
+thread.join(timeout=5)
+
+= Negative, invalid address (too large for addressing scheme)
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 2**32, payload, timeout=1) == False
+
+thread.join(timeout=5)
+
+= Positive, address zero
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, 0x00, payload, timeout=1) == True
+
+thread.join(timeout=5)
+
+= Negative, negative address
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferData(isotpsock, -1, payload, timeout=1) == False
+
+thread.join(timeout=5)
+
+############################################
++ GMLAN_TransferPayload Tests
+############################################
+= Positive, short payload
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_RD(memorySize=len(payload))
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x74"
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_TD(startingAddress=0x40000000,
+                                 dataRecord=payload)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x76"
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_TransferPayload(isotpsock, 0x40000000, payload, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+############################################
++ GMLAN_GetSecurityAccess Tests
+############################################
+= KeyFunction
+keyfunc = lambda seed : seed - 0x1FBE
+
+= Positive scenario, level 1, tests if keyfunction applied properly
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_SA(subfunction=1)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pkt = GMLAN()/GMLAN_SA(subfunction=2, securityKey=0xbeef)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+            nr = GMLAN() / GMLAN_NR(requestServiceId=0x27, returnCode=0x35)
+            isotpsock2.send(nr)
+        else:
+            pr = GMLAN()/GMLAN_SAPR(subfunction=2)
+            isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= Positive scenario, level 3
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_SA(subfunction=3)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=3, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pkt = GMLAN()/GMLAN_SA(subfunction=4, securityKey=0xbeef)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+            nr = GMLAN() / GMLAN_NR(requestServiceId=0x27, returnCode=0x35)
+            isotpsock2.send(nr)
+        else:
+            pr = GMLAN()/GMLAN_SAPR(subfunction=4)
+            isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=3, timeout=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+= Negative scenario, invalid password
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN()/GMLAN_SA(subfunction=1)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pkt = GMLAN()/GMLAN_SA(subfunction=2, securityKey=0xbabe)
+        if bytes(requ[0]) != bytes(pkt):
+            nr = GMLAN() / GMLAN_NR(requestServiceId=0x27, returnCode=0x35)
+            isotpsock2.send(nr)
+        else:
+            ecusimSuccessfullyExecuted = False
+            pr = GMLAN()/GMLAN_SAPR(subfunction=2)
+            isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= invalid level (not an odd number)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=2, timeout=1) == False
+
+= zero seed
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0x0000)
+        isotpsock2.send(seedmsg)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1) == True
+
+thread.join(timeout=5)
+
+############### retry
+= Positive scenario, request timeout, retry works
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # timeout
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=3)
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pkt = GMLAN()/GMLAN_SA(subfunction=2, securityKey=0xbeef)
+        pr = GMLAN()/GMLAN_SAPR(subfunction=2)
+        isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1, retry=1) == True
+
+thread.join(timeout=5)
+
+= Positive scenario, keysend timeout, retry works
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # timeout
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        # retry from start
+        requ = isotpsock2.sniff(count=1, timeout=3)
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pr = GMLAN()/GMLAN_SAPR(subfunction=2)
+        isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1, retry=1) == True
+
+thread.join(timeout=5)
+
+
+= Positive scenario, request error, retry works
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        nr = GMLAN() / GMLAN_NR(requestServiceId=0x27, returnCode=0x37)
+        # wait for request
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(nr))
+        seedmsg = GMLAN()/GMLAN_SAPR(subfunction=1, securitySeed=0xdead)
+        # wait for key
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(seedmsg))
+        pkt = GMLAN()/GMLAN_SA(subfunction=2, securityKey=0xbeef)
+        pr = GMLAN()/GMLAN_SAPR(subfunction=2)
+        isotpsock2.send(pr)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_GetSecurityAccess(isotpsock, keyfunc, level=1, timeout=1, retry=1) == True
+
+thread.join(timeout=5)
+
+
+##############################################################################
++ GMLAN_InitDiagnostics Tests
+##############################################################################
+= sequence of the correct messages
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN(b"\xa2")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_PM(subfunction=0x1)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN(b"\xe5")
+        # InitiateProgramming enableProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_PM(subfunction=0x3)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+= sequence of the correct messages, disablenormalcommunication as broadcast
+* TODO: This test errors if executed with ISOTPSoftSockets
+
+exit_if_no_isotp_module()
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2, \
+        new_can_socket(iface0) as broadcastrcv:
+        print("DisableNormalCommunication")
+        requ = broadcastrcv.sniff(count=1, timeout=2, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        print(requ)
+        assert len(requ) >= 1
+        if bytes(requ[0].data) != b"\xfe\x01" + bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        print("ReportProgrammedState")
+        requ = isotpsock2.sniff(count=1, timeout=2)
+        pkt = GMLAN(b"\xa2")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        print("ProgrammingMode requestProgramming")
+        requ = isotpsock2.sniff(count=1, timeout=2, started_callback=lambda: isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_PM(subfunction=0x1)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN(b"\xe5")
+        print("InitiateProgramming enableProgramming")
+        requ = isotpsock2.sniff(count=1, timeout=2, started_callback=lambda: isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_PM(subfunction=0x3)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, broadcastsocket=GMLAN_BroadcastSocket(new_can_socket(iface0)), timeout=8, verbose=1) == True
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+######## timeout
+= timeout DisableNormalCommunication
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+= timeout ReportProgrammedState
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN(b"\xa2")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+= timeout ProgrammingMode requestProgramming
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN(b"\xa2")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        pkt = GMLAN() / GMLAN_PM(subfunction=0x1)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+###### negative respone
+= timeout DisableNormalCommunication
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN(b"\x28")
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x28, returnCode=0x12)
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+###### retry tests
+= sequence of the correct messages, retry set 
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN(b"\xe5")
+        # InitiateProgramming enableProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=0) == True
+
+thread.join(timeout=5)
+
+
+= negative response, make sure no retries are made
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x28, returnCode=0x12)
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        if len(requ) != 0:
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=0) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+= first fail at DisableNormalCommunication, then sequence of the correct messages
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x28, returnCode=0x12)
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN(b"\xe5")
+        # InitiateProgramming enableProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=1) == True
+
+thread.join(timeout=5)
+
+= first fail at ReportProgrammedState, then sequence of the correct messages
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x68"
+        # Fail
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0xA2, returnCode=0x12)
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN(b"\xe5")
+        # InitiateProgramming enableProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=1) == True
+
+thread.join(timeout=5)
+
+= first fail at ProgrammingMode requestProgramming, then sequence of the correct messages
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # Fail
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0xA5, returnCode=0x12)
+        # DisableNormalCommunication
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = b"\x68"
+        # ReportProgrammedState
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN()/GMLAN_RPSPR(programmedState=0)
+        # ProgrammingMode requestProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN(b"\xe5")
+        isotpsock2.send(ack)
+        # InitiateProgramming enableProgramming
+        requ = isotpsock2.sniff(count=1, timeout=1)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=1) == True
+
+thread.join(timeout=5)
+
+= fail twice
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x28, returnCode=0x12)
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x28, returnCode=0x12)
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        if len(requ) != 0:
+            ecusimSuccessfullyExecuted = False
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_InitDiagnostics(isotpsock, timeout=1, verbose=1, retry=1) == False
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+##############################################################################
++ GMLAN_ReadMemoryByAddress Tests
+##############################################################################
+= Positive, short length, scheme = 4
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+ecusimSuccessfullyExecuted = True
+started = threading.Event()
+def ecusim():
+    global ecusimSuccessfullyExecuted
+    ecusimSuccessfullyExecuted= True
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        pkt = GMLAN() / GMLAN_RMBA(memoryAddress=0x0, memorySize=0x8)
+        if bytes(requ[0]) != bytes(pkt):
+            ecusimSuccessfullyExecuted = False
+        ack = GMLAN() / GMLAN_RMBAPR(memoryAddress=0x0, dataRecord=payload)
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_ReadMemoryByAddress(isotpsock, 0x0, 0x8, timeout=1) == payload
+
+thread.join(timeout=5)
+assert ecusimSuccessfullyExecuted == True
+
+
+= Negative, negative response
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x23, returnCode=0x31)
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_ReadMemoryByAddress(isotpsock, 0x0, 0x8, timeout=1) is None
+
+thread.join(timeout=5)
+
+= Negative, timeout
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_ReadMemoryByAddress(isotpsock, 0x0, 0x8, timeout=1) is None
+
+###### RETRY
+= Positive, negative response, retry succeeds
+conf.contribs['GMLAN']['GMLAN_ECU_AddressingScheme'] = 4
+payload = b"\x00\x11\x22\x33\x44\x55\x66\x77"
+started = threading.Event()
+def ecusim():
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242, basecls=GMLAN) as isotpsock2:
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=started.set)
+        ack = GMLAN() / GMLAN_NR(requestServiceId=0x23, returnCode=0x31)
+        requ = isotpsock2.sniff(count=1, timeout=1, started_callback=lambda:isotpsock2.send(ack))
+        ack = GMLAN() / GMLAN_RMBAPR(memoryAddress=0x0, dataRecord=payload)
+        isotpsock2.send(ack)
+
+thread = threading.Thread(target=ecusim)
+thread.start()
+started.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x242, did=0x642, basecls=GMLAN) as isotpsock:
+    assert GMLAN_ReadMemoryByAddress(isotpsock, 0x0, 0x8, timeout=1, retry=1) == payload
+
+thread.join(timeout=5)
+
++ Cleanup
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.4.tar.gz/test/contrib/automotive/gmlan_trace.candump Added

@@ -0,0 +1,1087 @@
+(0.297000) vcan2 12A#122010FF00001080
+(2.713000) vcan2 1E1#00000400000000
+(7.647000) vcan2 0F1#B10000400000
+(10.240000) vcan2 135#0400000200000000
+(12.778000) vcan2 1F3#000000
+(15.153000) vcan2 451#000000000000
+(17.670000) vcan2 0F1#8D0000400000
+(20.251000) vcan2 137#0000000030000000
+(22.741000) vcan2 3F1#00FF5F0C00FF0100
+(27.657000) vcan2 0F1#990000400000
+(30.210000) vcan2 139#0000000000000000
+(32.718000) vcan2 1E1#000004000104F0
+(35.159000) vcan2 451#000000000000
+(37.676000) vcan2 0F1#A50000400000
+(40.144000) vcan2 1F3#404000
+(42.773000) vcan2 32A#0000000000000000
+(50.172000) vcan2 0F1#B10000400000
+(52.666000) vcan2 451#000000000000
+(57.674000) vcan2 0F1#8D0000400000
+(60.231000) vcan2 1E1#000004000208E0
+(67.675000) vcan2 0F1#990000400000
+(70.316000) vcan2 1F1#050A000008000070
+(72.627000) vcan2 1F3#808000
+(75.172000) vcan2 451#000000000000
+(77.694000) vcan2 0F1#A50000400000
+(80.201000) vcan2 3C9#0766000000000000
+(87.680000) vcan2 0F1#B10000400000
+(90.180000) vcan2 160#1C2A2E8703
+(92.751000) vcan2 1E1#00000400030CD0
+(95.236000) vcan2 451#000000000000
+(97.704000) vcan2 0F1#8D0000400000
+(100.345000) vcan2 12A#122010FF00001090
+(102.640000) vcan2 1F3#C0C000
+(107.691000) vcan2 0F1#990000400000
+(110.282000) vcan2 135#0400000200000000
+(112.861000) vcan2 451#000000000000
+(117.698000) vcan2 0F1#A50000400000
+(120.295000) vcan2 137#0000000030000000
+(122.762000) vcan2 1E1#00000400000000
+(127.700000) vcan2 0F1#B10000400000
+(130.256000) vcan2 139#0000000000000000
+(132.649000) vcan2 1F3#000000
+(135.202000) vcan2 451#000000000000
+(137.724000) vcan2 0F1#8D0000400000
+(140.325000) vcan2 32A#0000000000000000
+(147.710000) vcan2 0F1#990000400000
+(150.282000) vcan2 1E1#000004000104F0
+(152.717000) vcan2 451#000000000000
+(157.713000) vcan2 0F1#A50000400000
+(160.167000) vcan2 1F3#404000
+(167.718000) vcan2 0F1#B10000400000
+(170.359000) vcan2 1F1#050A000008000070
+(172.715000) vcan2 451#000000000000
+(177.723000) vcan2 0F1#8D0000400000
+(180.284000) vcan2 1E1#000004000208E0
+(182.747000) vcan2 3C9#0766000000000000
+(187.724000) vcan2 0F1#990000400000
+(190.227000) vcan2 160#1C2A2E8703
+(192.710000) vcan2 1F3#808000
+(195.262000) vcan2 451#000000000000
+(197.745000) vcan2 0F1#A50000400000
+(200.434000) vcan2 12A#122010FF000010A0
+(207.736000) vcan2 0F1#B10000400000
+(210.325000) vcan2 135#0400000200000000
+(212.973000) vcan2 1E1#00000400030CD0
+(215.240000) vcan2 451#000000000000
+(217.757000) vcan2 0F1#8D0000400000
+(220.337000) vcan2 137#0000000030000000
+(222.688000) vcan2 1F3#C0C000
+(227.744000) vcan2 0F1#990000400000
+(230.299000) vcan2 139#0000000000000000
+(232.737000) vcan2 451#000000000000
+(237.749000) vcan2 0F1#A50000400000
+(240.366000) vcan2 1E1#00000400000000
+(242.874000) vcan2 32A#0000000000000000
+(247.752000) vcan2 0F1#B10000400000
+(250.253000) vcan2 1F3#000000
+(252.755000) vcan2 451#000000000000
+(257.761000) vcan2 0F1#8D0000400000
+(267.758000) vcan2 0F1#990000400000
+(270.235000) vcan2 120#000160F100
+(272.822000) vcan2 1E1#000004000104F0
+(275.403000) vcan2 1F1#050A000008000070
+(277.777000) vcan2 0F1#A50000400000
+(280.218000) vcan2 1F3#404000
+(282.789000) vcan2 3C9#0766000000000000
+(285.355000) vcan2 3F1#00FF5F0C00FF0100
+(287.784000) vcan2 0F1#B10000400000
+(290.287000) vcan2 140#000A00
+(292.793000) vcan2 160#1C2A2E8703
+(295.316000) vcan2 451#000000000000
+(297.791000) vcan2 0F1#8D0000400000
+(300.442000) vcan2 12A#122010FF000010B0
+(302.836000) vcan2 1E1#000004000208E0
+(305.271000) vcan2 4C5#0000000000
+(307.792000) vcan2 0F1#990000400000
+(310.368000) vcan2 135#0400000200000000
+(312.911000) vcan2 1F3#808000
+(315.282000) vcan2 451#000000000000
+(317.798000) vcan2 0F1#A50000400000
+(320.381000) vcan2 137#0000000030000000
+(322.782000) vcan2 4E1#4843373933343934
+(325.284000) vcan2 4E9#112000000300
+(327.801000) vcan2 0F1#B10000400000
+(330.342000) vcan2 139#0000000000000000
+(332.845000) vcan2 1E1#00000400030CD0
+(335.287000) vcan2 451#000000000000
+(337.810000) vcan2 0F1#8D0000400000
+(340.313000) vcan2 1F3#C0C000
+(342.881000) vcan2 32A#0000000000000000
+(345.348000) vcan2 514#304C444436453733
+(347.809000) vcan2 0F1#990000400000
+(350.319000) vcan2 451#000000000000
+(352.862000) vcan2 52A#000037373737
+(355.297000) vcan2 530#00000000
+(357.810000) vcan2 0F1#A50000400000
+(360.368000) vcan2 1E1#00000400000000
+(367.801000) vcan2 0F1#B10000400000
+(370.447000) vcan2 1F1#050A000008000070
+(372.756000) vcan2 1F3#000000
+(375.307000) vcan2 451#000000000000
+(377.826000) vcan2 0F1#8D0000400000
+(380.325000) vcan2 3C9#0766000000000000
+(387.813000) vcan2 0F1#990000400000
+(390.330000) vcan2 160#1C2A2E8703
+(392.923000) vcan2 1E1#000004000104F0
+(395.407000) vcan2 451#000000000000
+(397.832000) vcan2 0F1#A50000400000
+(400.473000) vcan2 12A#122010FF00001080
+(402.769000) vcan2 1F3#404000
+(407.821000) vcan2 0F1#B10000400000
+(410.410000) vcan2 135#0400000200000000
+(412.991000) vcan2 451#000000000000
+(417.830000) vcan2 0F1#8D0000400000
+(420.423000) vcan2 137#0000000030000000
+(422.886000) vcan2 1E1#000004000208E0
+(427.831000) vcan2 0F1#990000400000
+(430.386000) vcan2 139#0000000000000000
+(432.781000) vcan2 1F3#808000
+(435.329000) vcan2 451#000000000000
+(437.848000) vcan2 0F1#A50000400000
+(440.451000) vcan2 32A#0000000000000000
+(447.837000) vcan2 0F1#B10000400000
+(450.406000) vcan2 1E1#00000400030CD0
+(452.861000) vcan2 451#000000000000
+(457.844000) vcan2 0F1#8D0000400000
+(460.297000) vcan2 1F3#C0C000
+(467.846000) vcan2 0F1#990000400000
+(470.486000) vcan2 1F1#050A000008000070
+(472.845000) vcan2 451#000000000000
+(477.851000) vcan2 0F1#A50000400000
+(480.421000) vcan2 1E1#00000400000000
+(482.876000) vcan2 3C9#0766000000000000
+(487.856000) vcan2 0F1#B10000400000
+(490.356000) vcan2 160#1C2A2E8703
+(492.839000) vcan2 1F3#000000
+(495.388000) vcan2 451#000000000000
+(497.878000) vcan2 0F1#8D0000400000
+(500.557000) vcan2 12A#122010FF00001090
+(507.864000) vcan2 0F1#990000400000
+(510.454000) vcan2 135#0400000200000000
+(513.101000) vcan2 1E1#000004000104F0
+(515.366000) vcan2 451#000000000000
+(517.884000) vcan2 0F1#A50000400000
+(520.467000) vcan2 137#0000000030000000
+(522.820000) vcan2 1F3#404000
+(525.461000) vcan2 3F1#00FF5F0C00FF0100
+(527.887000) vcan2 0F1#B10000400000
+(530.428000) vcan2 139#0000000000000000
+(532.871000) vcan2 451#000000000000
+(537.880000) vcan2 0F1#8D0000400000
+(540.487000) vcan2 1E1#000004000208E0
+(542.986000) vcan2 32A#0000000000000000
+(547.879000) vcan2 0F1#990000400000
+(550.352000) vcan2 1F3#808000
+(552.889000) vcan2 451#000000000000
+(557.886000) vcan2 0F1#A50000400000
+(567.890000) vcan2 0F1#B10000400000
+(570.451000) vcan2 1E1#00000400030CD0
+(573.035000) vcan2 1F1#050A000008000070
+(575.390000) vcan2 451#000000000000
+(577.913000) vcan2 0F1#8D0000400000
+(580.346000) vcan2 1F3#C0C000
+(582.916000) vcan2 3C9#0766000000000000
+(587.900000) vcan2 0F1#990000400000
+(590.399000) vcan2 160#1C2A2E8703
+(592.903000) vcan2 451#000000000000
+(597.905000) vcan2 0F1#A50000400000
+(600.546000) vcan2 12A#122010FF000010A0
+(602.971000) vcan2 1E1#00000400000000
+(607.908000) vcan2 0F1#B10000400000
+(610.497000) vcan2 135#0400000200000000
+(613.037000) vcan2 1F3#000000
+(615.408000) vcan2 451#000000000000
+(617.929000) vcan2 0F1#8D0000400000
+(620.510000) vcan2 137#0000000030000000
+(627.914000) vcan2 0F1#990000400000
+(630.471000) vcan2 139#0000000000000000
+(632.976000) vcan2 1E1#000004000104F0
+(635.419000) vcan2 451#000000000000
+(637.933000) vcan2 0F1#A50000400000
+(640.442000) vcan2 1F3#404000
+(642.993000) vcan2 32A#0000000000000000
+(647.924000) vcan2 0F1#B10000400000
+(650.479000) vcan2 451#000000000000
+(657.935000) vcan2 0F1#8D0000400000
+(660.492000) vcan2 1E1#000004000208E0
+(667.933000) vcan2 0F1#990000400000
+(670.572000) vcan2 1F1#050A000008000070
+(672.882000) vcan2 1F3#808000
+(675.435000) vcan2 451#000000000000
+(677.952000) vcan2 0F1#A50000400000
+(680.456000) vcan2 3C9#0766000000000000
+(687.845000) vcan2 0F1#B10000400000
+(690.354000) vcan2 160#1C2A2E8703
+(692.944000) vcan2 1E1#00000400030CD0
+(695.431000) vcan2 451#000000000000
+(697.866000) vcan2 0F1#8D0000400000
+(700.508000) vcan2 12A#122010FF000010B0
+(702.801000) vcan2 1F3#C0C000
+(707.853000) vcan2 0F1#990000400000
+(710.442000) vcan2 135#0400000200000000
+(713.024000) vcan2 451#000000000000
+(717.854000) vcan2 0F1#A50000400000
+(720.455000) vcan2 137#0000000030000000
+(722.925000) vcan2 1E1#00000400000000
+(727.859000) vcan2 0F1#B10000400000
+(730.416000) vcan2 139#0000000000000000
+(732.814000) vcan2 1F3#000000
+(735.363000) vcan2 451#000000000000
+(737.884000) vcan2 0F1#8D0000400000
+(740.472000) vcan2 32A#0000000000000000
+(747.871000) vcan2 0F1#990000400000
+(750.462000) vcan2 1E1#000004000104F0
+(752.896000) vcan2 451#000000000000
+(757.874000) vcan2 0F1#A50000400000
+(760.325000) vcan2 1F3#404000
+(767.881000) vcan2 0F1#B10000400000
+(770.516000) vcan2 1F1#050A000008000070
+(772.967000) vcan2 3F1#00FF5F0C00FF0100
+(775.376000) vcan2 451#000000000000
+(777.902000) vcan2 0F1#8D0000400000
+(780.445000) vcan2 1E1#000004000208E0
+(782.904000) vcan2 3C9#0766000000000000
+(785.374000) vcan2 4C5#0000000000
+(787.901000) vcan2 0F1#990000400000
+(790.398000) vcan2 160#1C2A2E8703
+(792.864000) vcan2 1F3#808000
+(795.413000) vcan2 451#000000000000
+(797.906000) vcan2 0F1#A50000400000
+(800.582000) vcan2 12A#122010FF00001080
+(807.893000) vcan2 0F1#B10000400000
+(810.486000) vcan2 135#0400000200000000
+(813.130000) vcan2 1E1#00000400030CD0
+(815.401000) vcan2 451#000000000000
+(817.916000) vcan2 0F1#8D0000400000
+(820.501000) vcan2 137#0000000030000000
+(822.852000) vcan2 1F3#C0C000
+(827.903000) vcan2 0F1#990000400000
+(830.456000) vcan2 139#0000000000000000
+(832.901000) vcan2 451#000000000000
+(837.910000) vcan2 0F1#A50000400000
+(840.521000) vcan2 1E1#00000400000000
+(843.016000) vcan2 32A#0000000000000000
+(847.913000) vcan2 0F1#B10000400000
+(850.386000) vcan2 1F3#000000
+(852.913000) vcan2 451#000000000000
+(857.922000) vcan2 0F1#8D0000400000
+(867.922000) vcan2 0F1#990000400000
+(870.484000) vcan2 1E1#000004000104F0
+(873.063000) vcan2 1F1#050A000008000070
+(875.416000) vcan2 451#000000000000
+(877.939000) vcan2 0F1#A50000400000
+(880.379000) vcan2 1F3#404000
+(882.948000) vcan2 3C9#0766000000000000
+(887.930000) vcan2 0F1#B10000400000
+(890.404000) vcan2 160#1C2A2E8703
+(893.001000) vcan2 451#000000000000
+(897.935000) vcan2 0F1#8D0000400000
+(900.573000) vcan2 12A#122010FF00001090
+(902.998000) vcan2 1E1#000004000208E0
+(907.936000) vcan2 0F1#990000400000
+(910.530000) vcan2 135#0400000200000000
+(913.067000) vcan2 1F3#808000
+(915.442000) vcan2 451#000000000000
+(917.958000) vcan2 0F1#A50000400000
+(920.541000) vcan2 137#0000000030000000
+(927.948000) vcan2 0F1#B10000400000
+(930.500000) vcan2 139#0000000000000000
+(933.007000) vcan2 1E1#00000400030CD0
+(935.450000) vcan2 451#000000000000
+(937.969000) vcan2 0F1#8D0000400000
+(940.467000) vcan2 1F3#C0C000
+(943.036000) vcan2 32A#0000000000000000
+(947.956000) vcan2 0F1#990000400000
+(950.546000) vcan2 451#000000000000
+(957.961000) vcan2 0F1#A50000400000
+(960.529000) vcan2 1E1#00000400000000
+(967.966000) vcan2 0F1#B10000400000
+(970.607000) vcan2 1F1#050A000008000070
+(972.916000) vcan2 1F3#000000
+(975.464000) vcan2 451#000000000000
+(977.987000) vcan2 0F1#8D0000400000
+(980.490000) vcan2 3C9#0766000000000000
+(987.970000) vcan2 0F1#990000400000
+(990.471000) vcan2 160#1C2A2E8703
+(993.044000) vcan2 1E1#000004000104F0
+(995.528000) vcan2 451#000000000000
+(997.991000) vcan2 0F1#A50000400000
+(1000.634000) vcan2 12A#122010FF000010A0
+(1002.932000) vcan2 1F3#404000
+(1007.982000) vcan2 0F1#B10000400000
+(1010.571000) vcan2 135#0400000200000000
+(1013.153000) vcan2 451#000000000000
+(1017.991000) vcan2 0F1#8D0000400000
+(1020.584000) vcan2 137#0000000030000000
+(1023.048000) vcan2 1E1#000004000208E0
+(1025.579000) vcan2 3F1#00FF5F0C00FF0100
+(1028.004000) vcan2 0F1#990000400000
+(1030.546000) vcan2 139#0000000000000000
+(1032.939000) vcan2 1F3#808000
+(1035.492000) vcan2 451#000000000000
+(1038.009000) vcan2 0F1#A50000400000
+(1040.601000) vcan2 32A#0000000000000000
+(1048.000000) vcan2 0F1#B10000400000
+(1050.563000) vcan2 1E1#00000400030CD0
+(1052.999000) vcan2 451#000000000000
+(1058.007000) vcan2 0F1#8D0000400000
+(1060.456000) vcan2 1F3#C0C000
+(1068.008000) vcan2 0F1#990000400000
+(1070.651000) vcan2 1F1#050A000008000070
+(1073.006000) vcan2 451#000000000000
+(1078.009000) vcan2 0F1#A50000400000
+(1080.580000) vcan2 1E1#00000400000000
+(1083.037000) vcan2 3C9#0766000000000000
+(1088.014000) vcan2 0F1#B10000400000
+(1090.523000) vcan2 160#1C2A2E8703
+(1093.010000) vcan2 1F3#000000
+(1095.576000) vcan2 451#000000000000
+(1098.039000) vcan2 0F1#8D0000400000
+(1100.702000) vcan2 12A#122010FF000010B0
+(1108.026000) vcan2 0F1#990000400000
+(1110.615000) vcan2 135#0400000200000000
+(1113.264000) vcan2 1E1#000004000104F0
+(1115.529000) vcan2 451#000000000000
+(1118.043000) vcan2 0F1#A50000400000
+(1120.628000) vcan2 137#0000000030000000
+(1122.977000) vcan2 1F3#404000
+(1128.035000) vcan2 0F1#B10000400000
+(1130.591000) vcan2 139#0000000000000000
+(1133.028000) vcan2 451#000000000000
+(1138.044000) vcan2 0F1#8D0000400000
+(1140.656000) vcan2 1E1#000004000208E0
+(1143.099000) vcan2 32A#0000000000000000
+(1148.043000) vcan2 0F1#990000400000
+(1150.579000) vcan2 1F3#808000
+(1153.058000) vcan2 451#000000000000
+(1158.048000) vcan2 0F1#A50000400000
+(1168.049000) vcan2 0F1#B10000400000
+(1170.612000) vcan2 1E1#00000400030CD0
+(1173.197000) vcan2 1F1#050A000008000070
+(1175.551000) vcan2 451#000000000000
+(1178.072000) vcan2 0F1#8D0000400000
+(1180.509000) vcan2 1F3#C0C000
+(1183.081000) vcan2 3C9#0766000000000000
+(1188.059000) vcan2 0F1#990000400000
+(1190.562000) vcan2 160#1C2A2E8703
+(1193.088000) vcan2 451#000000000000
+(1198.064000) vcan2 0F1#A50000400000
+(1200.723000) vcan2 12A#122010FF00001080
+(1203.132000) vcan2 1E1#00000400000000
+(1208.069000) vcan2 0F1#B10000400000
+(1210.658000) vcan2 135#0400000200000000
+(1213.199000) vcan2 1F3#000000
+(1215.573000) vcan2 451#000000000000
+(1218.092000) vcan2 0F1#8D0000400000
+(1220.671000) vcan2 137#0000000030000000
+(1228.079000) vcan2 0F1#990000400000
+(1230.632000) vcan2 139#0000000000000000
+(1233.137000) vcan2 1E1#000004000104F0
+(1235.577000) vcan2 451#000000000000
+(1238.096000) vcan2 0F1#A50000400000
+(1240.595000) vcan2 1F3#404000
+(1243.173000) vcan2 32A#0000000000000000
+(1248.087000) vcan2 0F1#B10000400000
+(1250.626000) vcan2 451#000000000000
+(1258.092000) vcan2 0F1#8D0000400000
+(1260.653000) vcan2 1E1#000004000208E0
+(1268.092000) vcan2 0F1#990000400000
+(1270.736000) vcan2 1F1#050A000008000070
+(1273.047000) vcan2 1F3#808000
+(1275.686000) vcan2 3F1#00FF5F0C00FF0100
+(1278.113000) vcan2 0F1#A50000400000
+(1280.617000) vcan2 3C9#0766000000000000
+(1283.096000) vcan2 451#000000000000
+(1285.591000) vcan2 4C5#0000000000
+(1288.117000) vcan2 0F1#B10000400000
+(1290.646000) vcan2 140#000A00
+(1293.077000) vcan2 160#1C2A2E8703
+(1295.739000) vcan2 1E1#00000400030CD0
+(1298.130000) vcan2 0F1#8D0000400000
+(1300.817000) vcan2 12A#122010FF00001090
+(1303.058000) vcan2 1F3#C0C000
+(1305.610000) vcan2 451#000000000000
+(1308.127000) vcan2 0F1#990000400000
+(1310.700000) vcan2 135#0400000200000000
+(1313.286000) vcan2 4E9#112000000300
+(1315.631000) vcan2 52A#000037373737
+(1318.130000) vcan2 0F1#A50000400000
+(1320.714000) vcan2 137#0000000030000000
+(1323.183000) vcan2 1E1#00000400000000
+(1325.616000) vcan2 451#000000000000
+(1328.134000) vcan2 0F1#B10000400000
+(1330.677000) vcan2 139#0000000000000000
+(1333.072000) vcan2 1F3#000000
+(1335.623000) vcan2 4E1#4843373933343934
+(1338.143000) vcan2 0F1#8D0000400000
+(1340.738000) vcan2 32A#0000000000000000
+(1343.157000) vcan2 451#000000000000
+(1345.663000) vcan2 514#304C444436453733
+(1348.140000) vcan2 0F1#990000400000
+(1350.699000) vcan2 1E1#000004000104F0
+(1353.136000) vcan2 451#000000000000
+(1355.630000) vcan2 530#00000000
+(1358.145000) vcan2 0F1#A50000400000
+(1360.586000) vcan2 1F3#404000
+(1368.136000) vcan2 0F1#B10000400000
+(1370.775000) vcan2 1F1#050A000008000070
+(1373.134000) vcan2 451#000000000000
+(1378.147000) vcan2 0F1#8D0000400000
+(1380.704000) vcan2 1E1#000004000208E0
+(1383.165000) vcan2 3C9#0766000000000000
+(1388.146000) vcan2 0F1#990000400000
+(1390.663000) vcan2 160#1C2A2E8703
+(1393.146000) vcan2 1F3#808000
+(1395.695000) vcan2 451#000000000000
+(1398.165000) vcan2 0F1#A50000400000
+(1400.854000) vcan2 12A#122010FF000010A0
+(1408.155000) vcan2 0F1#B10000400000
+(1410.747000) vcan2 135#0400000200000000
+(1413.388000) vcan2 1E1#00000400030CD0
+(1415.655000) vcan2 451#000000000000
+(1418.177000) vcan2 0F1#8D0000400000
+(1420.758000) vcan2 137#0000000030000000
+(1423.111000) vcan2 1F3#C0C000
+(1428.164000) vcan2 0F1#990000400000
+(1430.719000) vcan2 139#0000000000000000
+(1433.160000) vcan2 451#000000000000
+(1438.167000) vcan2 0F1#A50000400000
+(1440.790000) vcan2 1E1#00000400000000
+(1443.245000) vcan2 32A#0000000000000000
+(1448.170000) vcan2 0F1#B10000400000
+(1450.663000) vcan2 1F3#000000
+(1453.188000) vcan2 451#000000000000
+(1458.178000) vcan2 0F1#8D0000400000
+(1468.181000) vcan2 0F1#990000400000
+(1470.742000) vcan2 1E1#000004000104F0
+(1473.326000) vcan2 1F1#050A000008000070
+(1475.679000) vcan2 451#000000000000
+(1478.198000) vcan2 0F1#A50000400000
+(1480.637000) vcan2 1F3#404000
+(1483.205000) vcan2 3C9#0766000000000000
+(1488.189000) vcan2 0F1#B10000400000
+(1490.692000) vcan2 160#1C2A2E8703
+(1493.216000) vcan2 451#000000000000
+(1498.198000) vcan2 0F1#8D0000400000
+(1500.845000) vcan2 12A#122010FF000010B0
+(1503.256000) vcan2 1E1#000004000208E0
+(1508.199000) vcan2 0F1#990000400000
+(1510.788000) vcan2 135#0400000200000000
+(1513.326000) vcan2 1F3#808000
+(1515.699000) vcan2 451#000000000000
+(1518.216000) vcan2 0F1#A50000400000
+(1520.801000) vcan2 137#0000000030000000
+(1523.291000) vcan2 3F1#00FF5F0C00FF0100
+(1528.203000) vcan2 0F1#B10000400000
+(1530.762000) vcan2 139#0000000000000000
+(1533.266000) vcan2 1E1#00000400030CD0
+(1535.709000) vcan2 451#000000000000
+(1538.228000) vcan2 0F1#8D0000400000
+(1540.716000) vcan2 1F3#C0C000
+(1543.283000) vcan2 32A#0000000000000000
+(1548.213000) vcan2 0F1#990000400000
+(1550.717000) vcan2 451#000000000000
+(1558.220000) vcan2 0F1#A50000400000
+(1560.787000) vcan2 1E1#00000400000000
+(1568.225000) vcan2 0F1#B10000400000
+(1570.862000) vcan2 1F1#050A000008000070
+(1573.173000) vcan2 1F3#000000
+(1575.727000) vcan2 451#000000000000
+(1578.246000) vcan2 0F1#8D0000400000
+(1580.747000) vcan2 3C9#0766000000000000
+(1588.233000) vcan2 0F1#990000400000
+(1590.736000) vcan2 160#1C2A2E8703
+(1593.307000) vcan2 1E1#000004000104F0
+(1595.790000) vcan2 451#000000000000
+(1598.250000) vcan2 0F1#A50000400000
+(1600.901000) vcan2 12A#122010FF00001080
+(1603.190000) vcan2 1F3#404000
+(1608.241000) vcan2 0F1#B10000400000
+(1610.830000) vcan2 135#0400000200000000
+(1613.411000) vcan2 451#000000000000
+(1618.247000) vcan2 0F1#8D0000400000
+(1620.843000) vcan2 137#0000000030000000
+(1623.306000) vcan2 1E1#000004000208E0
+(1628.246000) vcan2 0F1#990000400000
+(1630.806000) vcan2 139#0000000000000000
+(1633.201000) vcan2 1F3#808000
+(1635.752000) vcan2 451#000000000000
+(1638.268000) vcan2 0F1#A50000400000
+(1640.871000) vcan2 32A#0000000000000000
+(1648.258000) vcan2 0F1#B10000400000
+(1650.842000) vcan2 1E1#00000400030CD0
+(1653.275000) vcan2 451#000000000000
+(1658.267000) vcan2 0F1#8D0000400000
+(1660.715000) vcan2 1F3#C0C000
+(1668.268000) vcan2 0F1#990000400000
+(1670.905000) vcan2 1F1#050A000008000070
+(1673.261000) vcan2 451#000000000000
+(1678.271000) vcan2 0F1#A50000400000
+(1680.840000) vcan2 1E1#00000400000000
+(1683.292000) vcan2 3C9#0766000000000000
+(1688.376000) vcan2 0F1#B10000400000
+(1690.883000) vcan2 160#1C2A2E8703
+(1693.367000) vcan2 1F3#000000
+(1695.918000) vcan2 451#000000000000
+(1698.397000) vcan2 0F1#8D0000400000
+(1701.083000) vcan2 12A#122010FF00001090
+(1708.382000) vcan2 0F1#990000400000
+(1710.973000) vcan2 135#0400000200000000
+(1713.621000) vcan2 1E1#000004000104F0
+(1715.888000) vcan2 451#000000000000
+(1718.401000) vcan2 0F1#A50000400000
+(1720.990000) vcan2 137#0000000030000000
+(1723.341000) vcan2 1F3#404000
+(1728.392000) vcan2 0F1#B10000400000
+(1730.945000) vcan2 139#0000000000000000
+(1733.391000) vcan2 451#000000000000
+(1738.403000) vcan2 0F1#8D0000400000
+(1741.008000) vcan2 1E1#000004000208E0
+(1743.509000) vcan2 32A#0000000000000000
+(1748.402000) vcan2 0F1#990000400000
+(1750.873000) vcan2 1F3#808000
+(1753.404000) vcan2 451#000000000000
+(1758.407000) vcan2 0F1#A50000400000
+(1768.411000) vcan2 0F1#B10000400000
+(1770.971000) vcan2 1E1#00000400030CD0
+(1773.552000) vcan2 1F1#050A000008000070
+(1775.999000) vcan2 3F1#00FF5F0C00FF0100
+(1778.432000) vcan2 0F1#8D0000400000
+(1780.868000) vcan2 1F3#C0C000
+(1783.437000) vcan2 3C9#0766000000000000
+(1785.910000) vcan2 451#000000000000
+(1788.432000) vcan2 0F1#990000400000
+(1790.923000) vcan2 160#1C2A2E8703
+(1793.426000) vcan2 4C5#0000000000
+(1798.421000) vcan2 0F1#A50000400000
+(1801.080000) vcan2 12A#122010FF000010A0
+(1803.491000) vcan2 1E1#00000400000000
+(1805.927000) vcan2 451#000000000000
+(1808.440000) vcan2 0F1#B10000400000
+(1811.019000) vcan2 135#0400000200000000
+(1813.556000) vcan2 1F3#000000
+(1818.435000) vcan2 0F1#8D0000400000
+(1821.030000) vcan2 137#0000000030000000
+(1823.429000) vcan2 451#000000000000
+(1828.436000) vcan2 0F1#990000400000
+(1830.989000) vcan2 139#0000000000000000
+(1833.496000) vcan2 1E1#000004000104F0
+(1835.940000) vcan2 451#000000000000
+(1838.455000) vcan2 0F1#A50000400000
+(1840.952000) vcan2 1F3#404000
+(1843.520000) vcan2 32A#0000000000000000
+(1848.446000) vcan2 0F1#B10000400000
+(1850.959000) vcan2 451#000000000000
+(1858.455000) vcan2 0F1#8D0000400000
+(1861.012000) vcan2 1E1#000004000208E0
+(1868.453000) vcan2 0F1#990000400000
+(1871.095000) vcan2 1F1#050A000008000070
+(1873.404000) vcan2 1F3#808000
+(1875.951000) vcan2 451#000000000000
+(1878.471000) vcan2 0F1#A50000400000
+(1880.978000) vcan2 3C9#0766000000000000
+(1888.459000) vcan2 0F1#B10000400000
+(1890.969000) vcan2 160#1C2A2E8703
+(1893.558000) vcan2 1E1#00000400030CD0
+(1896.043000) vcan2 451#000000000000
+(1898.482000) vcan2 0F1#8D0000400000
+(1901.156000) vcan2 12A#122010FF000010B0
+(1903.433000) vcan2 1F3#C0C000
+(1908.470000) vcan2 0F1#990000400000
+(1911.059000) vcan2 135#0400000200000000
+(1913.640000) vcan2 451#000000000000
+(1918.475000) vcan2 0F1#A50000400000
+(1921.074000) vcan2 137#0000000030000000
+(1923.541000) vcan2 1E1#00000400000000
+(1928.480000) vcan2 0F1#B10000400000
+(1931.035000) vcan2 139#0000000000000000
+(1933.426000) vcan2 1F3#000000
+(1935.980000) vcan2 451#000000000000
+(1938.501000) vcan2 0F1#8D0000400000
+(1941.064000) vcan2 32A#0000000000000000
+(1948.490000) vcan2 0F1#990000400000
+(1951.139000) vcan2 1E1#000004000104F0
+(1953.496000) vcan2 451#000000000000
+(1958.493000) vcan2 0F1#A50000400000
+(1960.946000) vcan2 1F3#404000
+(1968.497000) vcan2 0F1#B10000400000
+(1971.139000) vcan2 1F1#050A000008000070
+(1973.494000) vcan2 451#000000000000
+(1978.502000) vcan2 0F1#8D0000400000
+(1979.724000) vcan2 101#FE021002FE021002
+(1981.067000) vcan2 1E1#000004000208E0
+(1983.526000) vcan2 3C9#0766000000000000
+(1988.502000) vcan2 0F1#990000400000
+(1990.982000) vcan2 160#1C2A2E8703
+(1993.485000) vcan2 1F3#808000
+(1996.114000) vcan2 451#000000000000
+(1998.523000) vcan2 0F1#A50000400000
+(2001.229000) vcan2 12A#122010FF00001080
+(2003.522000) vcan2 641#01501A3186418231
+(2008.515000) vcan2 0F1#B10000400000
+(2011.104000) vcan2 135#0400000200000000
+(2013.751000) vcan2 1E1#00000400030CD0
+(2016.019000) vcan2 451#000000000000
+(2018.536000) vcan2 0F1#8D0000400000
+(2021.117000) vcan2 137#0000000030000000
+(2023.467000) vcan2 1F3#C0C000
+(2026.110000) vcan2 3F1#00FF5F0C00FF0100
+(2028.537000) vcan2 0F1#990000400000
+(2031.078000) vcan2 139#0000000000000000
+(2033.518000) vcan2 451#000000000000
+(2038.528000) vcan2 0F1#A50000400000
+(2041.141000) vcan2 1E1#00000400000000
+(2043.639000) vcan2 32A#0000000000000000
+(2048.531000) vcan2 0F1#B10000400000
+(2051.010000) vcan2 1F3#000000
+(2053.536000) vcan2 451#000000000000
+(2058.540000) vcan2 0F1#8D0000400000
+(2060.444000) vcan2 101#FE021002FE021002
+(2068.538000) vcan2 0F1#990000400000
+(2071.103000) vcan2 1E1#000004000104F0
+(2073.684000) vcan2 1F1#050A000008000070
+(2076.037000) vcan2 451#000000000000
+(2078.557000) vcan2 0F1#A50000400000
+(2080.998000) vcan2 1F3#404000
+(2083.567000) vcan2 3C9#0766000000000000
+(2086.057000) vcan2 641#01501A3186418231
+(2088.568000) vcan2 0F1#B10000400000
+(2091.021000) vcan2 160#1C2A2E8703
+(2093.569000) vcan2 451#000000000000
+(2098.557000) vcan2 0F1#8D0000400000
+(2101.208000) vcan2 12A#122010FF00001090
+(2103.615000) vcan2 1E1#000004000208E0
+(2108.558000) vcan2 0F1#990000400000
+(2111.147000) vcan2 135#0400000200000000
+(2113.688000) vcan2 1F3#808000
+(2116.062000) vcan2 451#000000000000
+(2118.575000) vcan2 0F1#A50000400000
+(2121.160000) vcan2 137#0000000030000000
+(2128.566000) vcan2 0F1#B10000400000
+(2131.121000) vcan2 139#0000000000000000
+(2133.624000) vcan2 1E1#00000400030CD0
+(2136.064000) vcan2 451#000000000000
+(2138.589000) vcan2 0F1#8D0000400000
+(2141.062000) vcan2 1F3#C0C000
+(2143.298000) vcan2 101#FE012803FE012800
+(2143.658000) vcan2 32A#0000000000000000
+(2148.575000) vcan2 0F1#990000400000
+(2151.090000) vcan2 641#01681A3186418231
+(2207.192000) vcan2 101#FE01A203FE01A200
+(2221.098000) vcan2 641#02E2003186418231
+(2278.067000) vcan2 101#FE02A501FE02A501
+(2291.161000) vcan2 641#01E5003186418231
+(2347.941000) vcan2 101#FE02A503FE02A503
+(2605.377000) vcan2 241#0227013186418253
+(2611.267000) vcan2 641#046701D6C6418231
+(2625.512000) vcan2 101#FE013E4000604D40
+(2681.230000) vcan2 241#0427021238418253
+(2691.229000) vcan2 641#026702D6C6418231
+(2697.126000) vcan2 241#021AB01230000000
+(2701.230000) vcan2 641#035AB040C0000000
+(2707.008000) vcan2 241#021AC04030000000
+(2711.254000) vcan2 641#065AC000C0000000
+(2716.999000) vcan2 241#021ACB00C0000000
+(2721.211000) vcan2 641#065ACB00C0000000
+(2727.009000) vcan2 241#021ACC00C0000000
+(2731.221000) vcan2 641#065ACC00C0000000
+(2737.004000) vcan2 241#021AD000C0000000
+(2741.228000) vcan2 641#045AD04740000000
+(2803.759000) vcan2 241#0634000000139453
+(2811.253000) vcan2 641#037F3478446FC831
+(3366.134000) vcan2 641#0174
+(3422.745000) vcan2 101#FE013E4000604D40
+(3426.673000) vcan2 241#10333600FEDF15CD
+(3426.871000) vcan2 641#300001
+(3427.103000) vcan2 241#2106000000000000
+(3431.863000) vcan2 241#22F7000000000000
+(3436.861000) vcan2 241#2323000000000000
+(3441.860000) vcan2 241#2434000000000000
+(3446.862000) vcan2 241#259D000000000000
+(3451.857000) vcan2 241#2636000000000000
+(3456.861000) vcan2 241#2764000000000000
+(3457.041000) vcan2 641#0176
+(3465.541000) vcan2 101#FE013E4000604D40
+(3469.528000) vcan2 241#10333600FEDF1438
+(3469.725000) vcan2 641#300001
+(3469.954000) vcan2 241#2164000000000000
+(3474.854000) vcan2 241#223D000000000000
+(3479.860000) vcan2 241#23F6000000000000
+(3484.857000) vcan2 241#2463000000000000
+(3489.859000) vcan2 241#25CA000000000000
+(3494.858000) vcan2 241#2677000000000000
+(3499.864000) vcan2 241#2738000000000000
+(3500.044000) vcan2 641#0176
+(3508.546000) vcan2 101#FE013E4000604D40
+(3512.531000) vcan2 241#10333600FEDF15A0
+(3512.728000) vcan2 641#300001
+(3512.962000) vcan2 241#2167000000000000
+(3517.859000) vcan2 241#2256000000000000
+(3522.855000) vcan2 241#2394000000000000
+(3527.858000) vcan2 241#248F000000000000
+(3532.862000) vcan2 241#25C5000000000000
+(3537.866000) vcan2 241#26E2000000000000
+(3542.863000) vcan2 241#2791000000000000
+(3543.044000) vcan2 641#0176
+(3551.415000) vcan2 101#FE013E4000604D40
+(3555.419000) vcan2 241#10333600FEDF12FD
+(3555.617000) vcan2 641#300001
+(3555.845000) vcan2 241#21E0000000000000
+(3560.854000) vcan2 241#2213000000000000
+(3565.854000) vcan2 241#235B000000000000
+(3570.854000) vcan2 241#2484000000000000
+(3575.859000) vcan2 241#25D0000000000000
+(3580.857000) vcan2 241#260F000000000000
+(3585.856000) vcan2 241#27CF000000000000
+(3586.037000) vcan2 641#0176
+(3594.290000) vcan2 101#FE013E4000604D40
+(3598.280000) vcan2 241#10333600FEDF110E
+(3598.478000) vcan2 641#300001
+(3598.716000) vcan2 241#2108000000000000
+(3603.857000) vcan2 241#2267000000000000
+(3608.861000) vcan2 241#2308000000000000
+(3613.865000) vcan2 241#2400000000000000
+(3618.860000) vcan2 241#2504000000000000
+(3623.862000) vcan2 241#2647000000000000
+(3628.860000) vcan2 241#2780000000000000
+(3629.038000) vcan2 641#0176
+(3637.295000) vcan2 101#FE013E4000604D40
+(3641.287000) vcan2 241#10333600FEDF14BF
+(3641.483000) vcan2 641#300001
+(3641.713000) vcan2 241#21A6000000000000
+(3646.853000) vcan2 241#2238000000000000
+(3651.852000) vcan2 241#2320000000000000
+(3656.856000) vcan2 241#2410000000000000
+(3661.851000) vcan2 241#2566000000000000
+(3666.849000) vcan2 241#26C8000000000000
+(3671.853000) vcan2 241#2713000000000000
+(3672.031000) vcan2 641#0176
+(3680.174000) vcan2 101#FE013E4000604D40
+(3684.167000) vcan2 241#10333600FEDF12D0
+(3684.361000) vcan2 641#300001
+(3684.590000) vcan2 241#2139000000000000
+(3688.860000) vcan2 241#22AB000000000000
+(3693.859000) vcan2 241#2390000000000000
+(3698.861000) vcan2 241#24EB000000000000
+(3703.861000) vcan2 241#25B7000000000000
+(3708.860000) vcan2 241#26C9000000000000
+(3713.860000) vcan2 241#2731000000000000
+(3714.038000) vcan2 641#0176
+(3722.181000) vcan2 101#FE013E4000604D40
+(3726.173000) vcan2 241#10333600FEDF113B
+(3726.371000) vcan2 641#300001
+(3726.609000) vcan2 241#2147000000000000
+(3730.861000) vcan2 241#2280000000000000
+(3735.867000) vcan2 241#2300000000000000
+(3740.858000) vcan2 241#2434000000000000
+(3745.866000) vcan2 241#2505000000000000
+(3750.867000) vcan2 241#2674000000000000
+(3755.863000) vcan2 241#2706000000000000
+(3756.041000) vcan2 641#0176
+(3765.049000) vcan2 101#FE013E4000604D40
+(3769.048000) vcan2 241#10333600FEDF11EF
+(3769.247000) vcan2 641#300001
+(3769.476000) vcan2 241#2196000000000000
+(3773.854000) vcan2 241#2249000000000000
+(3778.854000) vcan2 241#2324000000000000
+(3783.855000) vcan2 241#24FC000000000000
+(3788.859000) vcan2 241#255B000000000000
+(3793.853000) vcan2 241#26E3000000000000
+(3798.856000) vcan2 241#2712000000000000
+(3799.039000) vcan2 641#0176
+(3807.976000) vcan2 101#FE013E4000604D40
+(3811.973000) vcan2 241#10333600FEDF1276
+(3812.170000) vcan2 641#300001
+(3812.398000) vcan2 241#214F000000000000
+(3816.859000) vcan2 241#220D000000000000
+(3821.859000) vcan2 241#2344000000000000
+(3826.854000) vcan2 241#2466000000000000
+(3831.856000) vcan2 241#25AA000000000000
+(3836.858000) vcan2 241#2694000000000000
+(3841.853000) vcan2 241#2722000000000000
+(3842.032000) vcan2 641#0176
+(3850.799000) vcan2 101#FE013E4000604D40
+(3854.793000) vcan2 241#10333600FEDF10E1
+(3854.989000) vcan2 641#300001
+(3855.223000) vcan2 241#21FF000000000000
+(3859.860000) vcan2 241#2205000000000000
+(3864.856000) vcan2 241#2359000000000000
+(3869.850000) vcan2 241#242C000000000000
+(3874.861000) vcan2 241#2500000000000000
+(3879.859000) vcan2 241#26C8000000000000
+(3884.858000) vcan2 241#2700000000000000
+(3885.037000) vcan2 641#0176
+(3893.804000) vcan2 101#FE013E4000604D40
+(3897.682000) vcan2 241#10333600FEDF12A3
+(3897.880000) vcan2 641#300001
+(3898.114000) vcan2 241#218F000000000000
+(3902.850000) vcan2 241#2298000000000000
+(3907.847000) vcan2 241#2342000000000000
+(3912.855000) vcan2 241#24BB000000000000
+(3917.850000) vcan2 241#252A000000000000
+(3922.854000) vcan2 241#263F000000000000
+(3927.850000) vcan2 241#271E000000000000
+(3928.030000) vcan2 641#0176
+(3936.681000) vcan2 101#FE013E4000604D40
+(3940.673000) vcan2 241#10333600FEDF132A
+(3940.871000) vcan2 641#300001
+(3941.101000) vcan2 241#216B000000000000
+(3945.853000) vcan2 241#22B5000000000000
+(3950.848000) vcan2 241#2359000000000000
+(3955.850000) vcan2 241#2488000000000000
+(3960.854000) vcan2 241#2530000000000000
+(3965.851000) vcan2 241#2674000000000000
+(3970.855000) vcan2 241#27EB000000000000
+(3971.035000) vcan2 641#0176
+(3979.552000) vcan2 101#FE013E4000604D40
+(3983.536000) vcan2 241#101F3600FEDF1627
+(3983.734000) vcan2 641#300001
+(3983.960000) vcan2 241#214D5A4C2B2C2D36
+(3988.864000) vcan2 241#223035FFFFFFFFFF
+(3993.871000) vcan2 241#23FFFFFFFFFFFFFF
+(3998.855000) vcan2 241#24FFFFFFFF8A2977
+(3999.035000) vcan2 641#0176
+(4007.559000) vcan2 101#FE013E4000604D40
+(4011.544000) vcan2 241#10333600FEDF102D
+(4011.741000) vcan2 641#300001
+(4011.978000) vcan2 241#2100000000000000
+(4016.856000) vcan2 241#2280000000000000
+(4021.856000) vcan2 241#2305000000000000
+(4026.851000) vcan2 241#247F000000000000
+(4031.857000) vcan2 241#25FD000000000000
+(4036.853000) vcan2 241#26B5000000000000
+(4041.856000) vcan2 241#27FE000000000000
+(4042.036000) vcan2 641#0176
+(4050.438000) vcan2 101#FE013E4000604D40
+(4054.441000) vcan2 241#10333600FEDF15FA
+(4054.638000) vcan2 641#300001
+(4054.864000) vcan2 241#21B8000000000000
+(4059.845000) vcan2 241#22A6000000000000
+(4064.847000) vcan2 241#232E000000000000
+(4069.844000) vcan2 241#24CC000000000000
+(4074.848000) vcan2 241#255E000000000000
+(4079.850000) vcan2 241#26FF000000000000
+(4084.847000) vcan2 241#2763000000000000
+(4085.026000) vcan2 641#0176
+(4093.303000) vcan2 101#FE013E4000604D40
+(4097.299000) vcan2 241#10333600FEDF1087
+(4097.495000) vcan2 641#300001
+(4097.735000) vcan2 241#215F000000000000
+(4102.850000) vcan2 241#2280000000000000
+(4107.848000) vcan2 241#2300000000000000
+(4112.848000) vcan2 241#24EA000000000000
+(4117.849000) vcan2 241#2500000000000000
+(4122.855000) vcan2 241#2608000000000000
+(4127.846000) vcan2 241#2700000000000000
+(4128.027000) vcan2 641#0176
+(4136.304000) vcan2 101#FE013E4000604D40
+(4140.292000) vcan2 241#10333600FEDF14EC
+(4140.488000) vcan2 641#300001
+(4140.720000) vcan2 241#21DF000000000000
+(4145.842000) vcan2 241#222A000000000000
+(4150.847000) vcan2 241#2365000000000000
+(4155.841000) vcan2 241#2426000000000000
+(4160.840000) vcan2 241#25E9000000000000
+(4165.846000) vcan2 241#2616000000000000
+(4170.846000) vcan2 241#27CA000000000000
+(4171.024000) vcan2 641#0176
+(4179.149000) vcan2 101#FE013E4000604D40
+(4183.177000) vcan2 241#10333600FEDF10B4
+(4183.373000) vcan2 641#300001
+(4183.611000) vcan2 241#2101000000000000
+(4187.849000) vcan2 241#2200000000000000
+(4192.844000) vcan2 241#23C5000000000000
+(4197.846000) vcan2 241#2477000000000000
+(4202.838000) vcan2 241#25CE000000000000
+(4207.847000) vcan2 241#266E000000000000
+(4212.843000) vcan2 241#270B000000000000
+(4213.021000) vcan2 641#0176
+(4221.190000) vcan2 101#FE013E4000604D40
+(4225.168000) vcan2 241#10333600FEDF1573
+(4225.366000) vcan2 641#300001
+(4225.600000) vcan2 241#21AF000000000000
+(4229.842000) vcan2 241#222F000000000000
+(4234.842000) vcan2 241#23FF000000000000
+(4239.843000) vcan2 241#241A000000000000
+(4244.841000) vcan2 241#2566000000000000
+(4249.842000) vcan2 241#2605000000000000
+(4254.842000) vcan2 241#27A0000000000000
+(4255.022000) vcan2 641#0176
+(4263.058000) vcan2 101#FE013E4000604D40
+(4267.039000) vcan2 241#10333600FEDF1465
+(4267.238000) vcan2 641#300001
+(4267.469000) vcan2 241#219F000000000000
+(4271.837000) vcan2 241#2206000000000000
+(4276.835000) vcan2 241#2390000000000000
+(4281.838000) vcan2 241#241F000000000000
+(4286.840000) vcan2 241#2555000000000000
+(4291.838000) vcan2 241#26FA000000000000
+(4296.841000) vcan2 241#274F000000000000
+(4297.021000) vcan2 641#0176
+(4305.977000) vcan2 101#FE013E4000604D40
+(4309.970000) vcan2 241#10333600FEDF1195
+(4310.167000) vcan2 641#300001
+(4310.397000) vcan2 241#217E000000000000
+(4314.834000) vcan2 241#2268000000000000
+(4319.840000) vcan2 241#23C2000000000000
+(4324.837000) vcan2 241#2400000000000000
+(4329.837000) vcan2 241#2518000000000000
+(4334.831000) vcan2 241#26AF000000000000
+(4339.842000) vcan2 241#27AF000000000000
+(4340.023000) vcan2 641#0176
+(4348.978000) vcan2 101#FE013E4000604D40
+(4352.800000) vcan2 241#10333600FEDF1249
+(4352.996000) vcan2 641#300001
+(4353.224000) vcan2 241#210F000000000000
+(4357.833000) vcan2 241#22F6000000000000
+(4362.837000) vcan2 241#2377000000000000
+(4367.835000) vcan2 241#24AA000000000000
+(4372.832000) vcan2 241#25D6000000000000
+(4377.834000) vcan2 241#2627000000000000
+(4382.841000) vcan2 241#27E7000000000000
+(4383.020000) vcan2 641#0176
+(4391.803000) vcan2 101#FE013E4000604D40
+(4395.793000) vcan2 241#10333600FEDF11C2
+(4395.993000) vcan2 641#300001
+(4396.229000) vcan2 241#21AF000000000000
+(4400.833000) vcan2 241#224C000000000000
+(4405.834000) vcan2 241#237F000000000000
+(4410.832000) vcan2 241#246F000000000000
+(4415.833000) vcan2 241#2589000000000000
+(4420.839000) vcan2 241#2615000000000000
+(4425.835000) vcan2 241#27D4000000000000
+(4426.015000) vcan2 641#0176
+(4434.698000) vcan2 101#FE013E4000604D40
+(4438.674000) vcan2 241#10333600FEDF1168
+(4438.872000) vcan2 641#300001
+(4439.108000) vcan2 241#2140000000000000
+(4443.840000) vcan2 241#2246000000000000
+(4448.833000) vcan2 241#2370000000000000
+(4453.829000) vcan2 241#248E000000000000
+(4458.835000) vcan2 241#2572000000000000
+(4463.828000) vcan2 241#26B2000000000000
+(4468.832000) vcan2 241#2763000000000000
+(4469.012000) vcan2 641#0176
+(4477.677000) vcan2 101#FE013E4000604D40
+(4481.547000) vcan2 241#10333600FEDF1492
+(4481.743000) vcan2 641#300001
+(4481.973000) vcan2 241#21CA000000000000
+(4486.829000) vcan2 241#22D5000000000000
+(4491.830000) vcan2 241#23D2000000000000
+(4496.828000) vcan2 241#2433000000000000
+(4501.828000) vcan2 241#25ED000000000000
+(4506.833000) vcan2 241#26F0000000000000
+(4511.833000) vcan2 241#27D3000000000000
+(4512.013000) vcan2 641#0176
+(4520.554000) vcan2 101#FE013E4000604D40
+(4524.546000) vcan2 241#10333600FEDF1546
+(4524.744000) vcan2 641#300001
+(4524.974000) vcan2 241#2154000000000000
+(4529.830000) vcan2 241#2245000000000000
+(4534.826000) vcan2 241#23D6000000000000
+(4539.829000) vcan2 241#240C000000000000
+(4544.829000) vcan2 241#2536000000000000
+(4549.828000) vcan2 241#2690000000000000
+(4554.828000) vcan2 241#279C000000000000
+(4555.010000) vcan2 641#0176
+(4563.430000) vcan2 101#FE013E4000604D40
+(4567.415000) vcan2 241#10333600FEDF121C
+(4567.614000) vcan2 641#300001
+(4567.843000) vcan2 241#21EC000000000000
+(4572.823000) vcan2 241#225D000000000000
+(4577.835000) vcan2 241#233F000000000000
+(4582.824000) vcan2 241#2474000000000000
+(4587.822000) vcan2 241#25A9000000000000
+(4592.826000) vcan2 241#2672000000000000
+(4597.827000) vcan2 241#277F000000000000
+(4598.007000) vcan2 641#0176
+(4606.357000) vcan2 101#FE013E4000604D40
+(4610.302000) vcan2 241#10333600FEDF1000
+(4610.529000) vcan2 641#300001
+(4610.767000) vcan2 241#21E0000000000000
+(4615.832000) vcan2 241#2202000000000000
+(4620.830000) vcan2 241#2324000000000000
+(4625.833000) vcan2 241#2406000000000000
+(4630.833000) vcan2 241#2540000000000000
+(4635.833000) vcan2 241#260D000000000000
+(4640.826000) vcan2 241#2725000000000000
+(4641.004000) vcan2 641#0176
+(4649.300000) vcan2 101#FE013E4000604D40
+(4653.290000) vcan2 241#10333600FEDF1519
+(4653.486000) vcan2 641#300001
+(4653.718000) vcan2 241#219B000000000000
+(4658.821000) vcan2 241#222D000000000000
+(4663.827000) vcan2 241#230A000000000000
+(4668.831000) vcan2 241#24A0000000000000
+(4673.828000) vcan2 241#25F5000000000000
+(4678.822000) vcan2 241#2695000000000000
+(4683.813000) vcan2 241#27CC000000000000
+(4683.994000) vcan2 641#0176
+(4692.166000) vcan2 101#FE013E4000604D40
+(4696.170000) vcan2 241#10333600FEDF1384
+(4696.368000) vcan2 641#300001
+(4696.602000) vcan2 241#21D4000000000000
+(4701.807000) vcan2 241#2262000000000000
+(4706.807000) vcan2 241#2327000000000000
+(4711.809000) vcan2 241#2466000000000000
+(4716.816000) vcan2 241#25B3000000000000
+(4721.810000) vcan2 241#2646000000000000
+(4726.816000) vcan2 241#27FE000000000000
+(4726.994000) vcan2 641#0176
+(4735.157000) vcan2 101#FE013E4000604D40
+(4739.155000) vcan2 241#10333600FEDF13B1
+(4739.351000) vcan2 641#300001
+(4739.585000) vcan2 241#21FD000000000000
+(4744.809000) vcan2 241#225A000000000000
+(4749.806000) vcan2 241#23BA000000000000
+(4754.810000) vcan2 241#2466000000000000
+(4759.805000) vcan2 241#2500000000000000
+(4764.809000) vcan2 241#26A9000000000000
+(4769.815000) vcan2 241#27D9000000000000
+(4769.997000) vcan2 641#0176
+(4778.044000) vcan2 101#FE013E4000604D40
+(4782.034000) vcan2 241#10333600FEDF13DE
+(4782.232000) vcan2 641#300001
+(4782.466000) vcan2 241#21FF000000000000
+(4786.804000) vcan2 241#22D9000000000000
+(4791.805000) vcan2 241#2382000000000000
+(4796.803000) vcan2 241#2454000000000000
+(4801.807000) vcan2 241#25E4000000000000
+(4806.800000) vcan2 241#2661000000000000
+(4811.810000) vcan2 241#276F000000000000
+(4811.990000) vcan2 641#0176
+(4820.963000) vcan2 101#FE013E4000604D40
+(4824.963000) vcan2 241#10333600FEDF140B
+(4825.161000) vcan2 641#300001
+(4825.391000) vcan2 241#2157000000000000
+(4829.805000) vcan2 241#228A000000000000
+(4834.803000) vcan2 241#2333000000000000
+(4839.804000) vcan2 241#2444000000000000
+(4844.802000) vcan2 241#2520000000000000
+(4849.801000) vcan2 241#268B000000000000
+(4854.805000) vcan2 241#279A000000000000
+(4854.983000) vcan2 641#0176
+(4863.795000) vcan2 101#FE013E4000604D40
+(4867.772000) vcan2 241#10333600FEDF1357
+(4867.971000) vcan2 641#300001
+(4868.198000) vcan2 241#21DE000000000000
+(4872.808000) vcan2 241#228F000000000000
+(4877.802000) vcan2 241#23F2000000000000
+(4882.801000) vcan2 241#24EA000000000000
+(4887.801000) vcan2 241#2551000000000000
+(4892.801000) vcan2 241#26C9000000000000
+(4897.806000) vcan2 241#2732000000000000
+(4897.986000) vcan2 641#0176
+(4906.796000) vcan2 101#FE013E4000604D40
+(4910.781000) vcan2 241#10333600FEDF105A
+(4910.976000) vcan2 641#300001
+(4911.212000) vcan2 241#2101000000000000
+(4915.815000) vcan2 241#2200000000000000
+(4920.801000) vcan2 241#230A000000000000
+(4925.808000) vcan2 241#2406000000000000
+(4930.812000) vcan2 241#25EC000000000000
+(4935.812000) vcan2 241#2600000000000000
+(4940.803000) vcan2 241#27CB000000000000
+(4940.982000) vcan2 641#0176
+(4951.645000) vcan2 241#063680FEDF100001

scapy-2.4.3.tar.gz/test/contrib/automotive/obd/obd.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/obd/obd.uts Changed

@@ -9,9 +9,7 @@
 + Basic operations
 
 = Load module
-
-load_contrib("automotive.obd.obd")
-
+load_contrib("automotive.obd.obd", globals_dict=globals())
 
 = Check if positive response answers
 
@@ -30,6 +28,20 @@
 res = OBD(b'\x7f\x01\x11')
 assert res.answers(req)
 
+= Check if negative response request_correctly_received_response_pending answers not
+
+req = OBD(b'\x01\x2f')
+res = OBD(b'\x7f\x01\x78')
+assert not res.answers(req)
+
+= Check if negative response request_correctly_received_response_pending answers
+
+conf.contribs['OBD']['treat-response-pending-as-answer'] = True
+
+req = OBD(b'\x01\x2f')
+res = OBD(b'\x7f\x01\x78')
+assert res.answers(req)
+
 
 = Check hashret
 
@@ -41,6 +53,7 @@
 req = OBD(b'\x40')
 res = OBD(b'\x7F\x40\x11')
 assert req.hashret() == res.hashret()
+assert res.answers(req)
 
 
 = Check hashret for Service 0x51
@@ -48,6 +61,7 @@
 req = OBD(b'\x51')
 res = OBD(b'\x7F\x51\x11')
 assert req.hashret() == res.hashret()
+assert res.answers(req)
 
 
 = Check dissecting a request for Service 01 PID 00
@@ -159,20 +173,27 @@
 
 = Check dissecting a response for Service 06 MID 00
 
+r = OBD(b'\x06\x00')
 p = OBD(b'\x46\x00\x00\x00\x00\x00')
 assert p.service == 0x46
 assert p.data_records[0].mid == 0x00
 assert p.data_records[0].supported_mids == ""
-
+assert p.answers(r)
 
 = Check dissecting a response for Service 06 MID 00 and MID 20
 
+r = OBD(b'\x06\x20\x00')
 p = OBD(b'\x46\x00\x01\x02\x03\x04\x20\x01\x02\x03\x04')
 assert p.service == 0x46
 assert p.data_records[0].mid == 0x00
 assert p.data_records[0].supported_mids == "MID1E+MID18+MID17+MID0F+MID08"
 assert p.data_records[1].mid == 0x20
 assert p.data_records[1].supported_mids == "MID3E+MID38+MID37+MID2F+MID28"
+assert p.answers(r)
+r = OBD(b'\x06\x20\x00\x40\x60')
+assert p.answers(r)
+r = OBD(b'\x06\x20')
+assert not p.answers(r)
 
 
 = Check dissecting a response for Service 06 MID 00, 20, 40, 60, 80, A0
@@ -192,7 +213,8 @@
 assert p.data_records[5].mid == 0xA0
 assert p.data_records[5].supported_mids == "MIDBE+MIDB8+MIDB7+MIDAF+MIDA8"
 assert len(p.data_records) == 6
-
+r = OBD(b'\x06\x00\x20\x40\x60\x80\xA0')
+assert p.answers(r)
 
 = Check dissecting a response for Service 06 MID 01
 
@@ -223,6 +245,12 @@
 assert "Counts" in p.data_records[2].__repr__()
 assert "150 counts" in p.data_records[2].__repr__()
 assert len(p.data_records) == 3
+r = OBD(b'\x06\x01')
+assert p.answers(r)
+r = OBD(b'\x06\x01\x01\x01')
+assert p.answers(r)
+r = OBD(b'\x06\x01\x02')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 06 MID 21
@@ -239,7 +267,8 @@
 assert "Percent" in p.data_records[0].__repr__()
 assert "0 %" in p.data_records[0].__repr__()
 assert len(p.data_records) == 1
-
+r = OBD(b'\x06\x21')
+assert p.answers(r)
 
 = Check dissecting a request for Service 09 IID 00
 
@@ -295,6 +324,9 @@
 assert p.data_records[0].turbocharger_a_turbine_outlet_temperature == \
        round((0x4455 * 0.1) - 40, 3)
 
+r = OBD(b'\x01\x75')
+assert p.answers(r)
+
 
 = Check dissecting a response for Service 01 PID 00 and PID 20
 
@@ -305,6 +337,8 @@
 assert p.data_records[1].pid == 0x20
 assert p.data_records[1].supported_pids == "PID21"
 assert len(p.data_records) == 2
+r = OBD(b'\x01\x00\x20')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 01 PID 05,01,15,0C,03
@@ -325,6 +359,14 @@
 assert p.data_records[4].fuel_system2 == 0
 assert len(p.data_records) == 5
 
+r = OBD(b'\x01\x05\x01\x15\x0c\x03')
+assert p.answers(r)
+r = OBD(b'\x01\x05\x01\x15')
+assert not p.answers(r)
+r = OBD(b'\x01\x02')
+assert not p.answers(r)
+
+
 p = OBD(b'\x41\x00\xBF\xBF\xA8\x91\x20\x80\x00\x00\x00')
 p.show()
 assert p.service == 0x41
@@ -333,6 +375,9 @@
 assert p.data_records[1].pid == 0x20
 assert p.data_records[1].supported_pids == "PID21"
 assert len(p.data_records) == 2
+r = OBD(b'\x01\x00\x20')
+assert p.answers(r)
+
 
 
 = Check dissecting a response for Service 01 PID 78
@@ -349,6 +394,8 @@
 assert p.data_records[0].sensor2 == 1707.7
 assert p.data_records[0].sensor3 == 1759.1
 assert p.data_records[0].sensor4 == 1810.5
+r = OBD(b'\x01\x78')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 01 PID 7F
@@ -366,6 +413,9 @@
 assert p.data_records[0].total == 0xFFFFFFFFFFFFFFFF
 assert p.data_records[0].total_idle == 0x0102030405060708
 assert p.data_records[0].total_with_pto_active == 0x0011223344556677
+r = OBD(b'\x01\x7f')
+assert p.answers(r)
+
 
 
 = Check dissecting a response for Service 01 PID 89
@@ -374,6 +424,8 @@
 assert p.service == 0x41
 assert p.data_records[0].pid == 0x89
 assert p.data_records[0].data == b'ABCDEFGHIKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP'
+r = OBD(b'\x01\x89')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 02 PID 75
@@ -393,6 +445,8 @@
        round((0x2233 * 0.1) - 40, 3)
 assert p.data_records[0].turbocharger_a_turbine_outlet_temperature == \
        round((0x4455 * 0.1) - 40, 3)
+r = OBD(b'\x02\x75')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 02 PID 78
@@ -411,6 +465,8 @@
 assert p.data_records[0].sensor3 == 1759.1
 assert p.data_records[0].sensor4 == 1810.5
 
+r = OBD(b'\x02\x78')
+assert p.answers(r)
 
 = Check dissecting a response for Service 02 PID 7F
 
@@ -429,6 +485,9 @@
 assert p.data_records[0].total_idle == 0x0102030405060708
 assert p.data_records[0].total_with_pto_active == 0x0011223344556677
 
+r = OBD(b'\x02\x7F')
+assert p.answers(r)
+
 
 = Check dissecting a response for Service 02 PID 89
 
@@ -438,6 +497,8 @@
 assert p.data_records[0].frame_no == 0x01
 assert p.data_records[0].data == b'ABCDEFGHIKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP'
 
+r = OBD(b'\x02\x89')
+assert p.answers(r)
 
 = Check dissecting a response for Service 02 PID 0C, 05, 04
 
@@ -453,6 +514,9 @@
 assert p.data_records[2].frame_no == 0x0
 assert p.data_records[2].data == 0.0
 
+r = OBD(b'\x02\x0c\x00\x04\x00\x05\x00')
+r.show()
+assert p.answers(r)
 
 = Check dissecting a response for Service 03
 
@@ -466,6 +530,8 @@
 assert bytes(p.dtcs[4]) == b'\x03\x57'
 assert bytes(p.dtcs[5]) == b'\x0a\x24'
 
+r = OBD(b'\x03')
+assert p.answers(r)
 
 = Check dissecting a response for Service 07
 
@@ -479,6 +545,9 @@
 assert bytes(p.dtcs[4]) == b'\x03\x57'
 assert bytes(p.dtcs[5]) == b'\x0a\x24'
 
+r = OBD(b'\x07')
+assert p.answers(r)
+
 
 = Check dissecting a response for Service 08 Tid 00
 
@@ -486,6 +555,8 @@
 assert p.service == 0x48
 assert p.data_records[0].tid == 0x00
 assert p.data_records[0].supported_tids == "TID1E+TID1A+TID18+TID17+TID12+TID0F+TID0A+TID08+TID02"
+r = OBD(b'\x08\x00')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 08 Tid 01
@@ -498,6 +569,8 @@
 assert p.data_records[0].data_c == 0.17
 assert p.data_records[0].data_d == 1.275
 assert p.data_records[0].data_e == 0.5
+r = OBD(b'\x08\x01')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 08 Tid 05
@@ -510,7 +583,8 @@
 assert p.data_records[0].data_c == 0.172
 assert p.data_records[0].data_d == 1.02
 assert p.data_records[0].data_e == 0.5
-
+r = OBD(b'\x08\x05')
+assert p.answers(r)
 
 = Check dissecting a response for Service 08 Tid 09
 
@@ -522,6 +596,8 @@
 assert p.data_records[0].data_c == 0.16
 assert p.data_records[0].data_d == 1.04
 assert p.data_records[0].data_e == 0.48
+r = OBD(b'\x08\x09')
+assert p.answers(r)
 
 
 = Check dissecting a response for Service 09 IID 00
@@ -530,7 +606,8 @@
 assert p.service == 0x49
 assert p.data_records[0].iid == 0x00
 assert p.data_records[0].supported_iids == "IID1E+IID1A+IID18+IID17+IID12+IID0F+IID0A+IID08+IID02"
-
+r = OBD(b'\x09\x00')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 02 with one VIN
 
@@ -539,7 +616,8 @@
 assert p.data_records[0].iid == 0x02
 assert p.data_records[0].count == 0x01
 assert p.data_records[0].vehicle_identification_numbers[0] == b'W0L000051T2123456'
-
+r = OBD(b'\x09\x02')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 02 with two VINs
 
@@ -549,7 +627,8 @@
 assert p.data_records[0].count == 0x02
 assert p.data_records[0].vehicle_identification_numbers[0] == b'W0L000051T2123456'
 assert p.data_records[0].vehicle_identification_numbers[1] == b'W0L000051T2123456'
-
+r = OBD(b'\x09\x02')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 04 with one CID
 
@@ -558,7 +637,8 @@
 assert p.data_records[0].iid == 0x04
 assert p.data_records[0].count == 0x01
 assert p.data_records[0].calibration_identifications[0] == b'ABCDEFGHIJKLMNOP'
-
+r = OBD(b'\x09\x04')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 04 with two CID
 
@@ -568,7 +648,8 @@
 assert p.data_records[0].count == 0x02
 assert p.data_records[0].calibration_identifications[0] == b'ABCDEFGHIJKLMNOP'
 assert p.data_records[0].calibration_identifications[1] == b'ABCDEFGHIJKLMNOP'
-
+r = OBD(b'\x09\x04')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 06
 
@@ -578,7 +659,8 @@
 assert p.data_records[0].count == 0x02
 assert p.data_records[0].calibration_verification_numbers[0] == b'ABCD'
 assert p.data_records[0].calibration_verification_numbers[1] == b'EFGH'
-
+r = OBD(b'\x09\x06')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 08
 
@@ -595,7 +677,8 @@
 assert p.data_records[0].data[6] == 7
 assert p.data_records[0].data[7] == 8
 assert p.data_records[0].data[8] == 65535
-
+r = OBD(b'\x09\x08')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 0A
 
@@ -604,7 +687,8 @@
 assert p.data_records[0].iid == 0x0A
 assert p.data_records[0].count == 0x01
 assert p.data_records[0].ecu_names[0] == b'ECM\x00-Engine Control\x00'
-
+r = OBD(b'\x09\x0a')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 0B
 
@@ -617,7 +701,8 @@
 assert p.data_records[0].data[2] == 3
 assert p.data_records[0].data[3] == 4
 assert p.data_records[0].data[4] == 65535
-
+r = OBD(b'\x09\x0b')
+assert p.answers(r)
 
 = Check dissecting a response for Service 09 IID 02 and IID 04
 
@@ -629,7 +714,8 @@
 assert p.data_records[1].iid == 0x04
 assert p.data_records[1].count == 0x01
 assert p.data_records[1].calibration_identifications[0] == b'ABCDEFGHIJKLMNOP'
-
+r = OBD(b'\x09\x02\x04')
+assert p.answers(r)
 
 b = bytes(p)
 assert b[0:1] == b'\x49'
@@ -792,6 +878,8 @@
 assert b[1:2] == b'\x02'
 assert b[2:4] == b'\x00\x00'
 assert b[4:6] == b'\x13\x01'
+r = OBD(b'\x03')
+assert p.answers(r)
 
 
 = Check building a default response for Service 03
@@ -802,7 +890,8 @@
 assert b[0:1] == b'\x43'
 assert b[1:2] == b'\x00'
 assert p.dtcs == []
-
+r = OBD(b'\x03')
+assert p.answers(r)
 
 = Check building a response for Service 07
 
@@ -811,7 +900,8 @@
 assert b[0:1] == b'\x47'
 assert b[1:2] == b'\x01'
 assert b[2:4] == b'\x45\x10'
-
+r = OBD(b'\x07')
+assert p.answers(r)
 
 = Check building a default response for Service 07
 
@@ -821,7 +911,8 @@
 assert b[0:1] == b'\x47'
 assert b[1:2] == b'\x00'
 assert p.dtcs == []
-
+r = OBD(b'\x07')
+assert p.answers(r)
 
 = Check building a response for Service 0A
 
@@ -832,7 +923,8 @@
 assert b[2:4] == b'\x00\x00'
 assert b[4:6] == b'\x97\x82'
 assert b[6:8] == b'\x00\x00'
-
+r = OBD(b'\x0a')
+assert p.answers(r)
 
 = Check building a default response for Service 0A
 
@@ -842,30 +934,34 @@
 assert b[0:1] == b'\x4A'
 assert b[1:2] == b'\x00'
 assert p.dtcs == []
-
+r = OBD(b'\x0a')
+assert p.answers(r)
 
 = Check building a response for Service 09 IID 00
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID00(b'ABCD'))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID00(b'ABCD'))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x00'
 assert b[2:] == b'ABCD'
-
+r = OBD(b'\x09\x00')
+assert p.answers(r)
 
 = Check building a response for Service 09 IID 02 with one VIN
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID02(vehicle_identification_numbers=b'W0L000051T2123456'))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID02(vehicle_identification_numbers=b'W0L000051T2123456'))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x02'
 assert b[2:3] == b'\x01'
 assert b[3:] == b'W0L000051T2123456'
 
+r = OBD(b'\x09\x02')
+assert p.answers(r)
 
 = Check building a response for Service 09 IID 02 with two VINs
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID02(vehicle_identification_numbers=[b'W0L000051T2123456', b'W0L000051T2123456']))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID02(vehicle_identification_numbers=[b'W0L000051T2123456', b'W0L000051T2123456']))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x02'
@@ -873,20 +969,26 @@
 assert b[3:20] == b'W0L000051T2123456'
 assert b[20:] == b'W0L000051T2123456'
 
+r = OBD(b'\x09\x02')
+assert p.answers(r)
+
 
 = Check building a response for Service 09 IID 04 with one CID
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID04(calibration_identifications=b'ABCDEFGHIJKLMNOP'))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID04(calibration_identifications=b'ABCDEFGHIJKLMNOP'))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x04'
 assert b[2:3] == b'\x01'
 assert b[3:] == b'ABCDEFGHIJKLMNOP'
 
+r = OBD(b'\x09\x04')
+assert p.answers(r)
+
 
 = Check building a response for Service 09 IID 04 with two CID
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID04(calibration_identifications=[b'ABCDEFGHIJKLMNOP', b'ABCDEFGHIJKLMNOP']))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID04(calibration_identifications=[b'ABCDEFGHIJKLMNOP', b'ABCDEFGHIJKLMNOP']))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x04'
@@ -894,20 +996,26 @@
 assert b[3:19] == b'ABCDEFGHIJKLMNOP'
 assert b[19:] == b'ABCDEFGHIJKLMNOP'
 
+r = OBD(b'\x09\x04')
+assert p.answers(r)
+
 
 = Check building a response for Service 09 IID 0A
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=OBD_S09_PR_Record()/OBD_IID0A(ecu_names=b'ABCDEFGHIJKLMNOPQRST'))
+p = OBD(service=0x49)/OBD_S09_PR(data_records=OBD_S09_PR_Record()/OBD_IID0A(ecu_names=b'ABCDEFGHIJKLMNOPQRST'))
 b = bytes(p)
 assert b[0:1] == b'\x49'
 assert b[1:2] == b'\x0A'
 assert b[2:3] == b'\x01'
 assert b[3:] == b'ABCDEFGHIJKLMNOPQRST'
 
+r = OBD(b'\x09\x0a')
+assert p.answers(r)
+
 
 = Check building a response for Service 09 IID 02 and IID 04
 
-p = OBD(service=0x49)/OBD_S02_PR(data_records=[
+p = OBD(service=0x49)/OBD_S09_PR(data_records=[
     OBD_S09_PR_Record()/OBD_IID02(vehicle_identification_numbers=b'ABCDEFGHIJKLMNOPQ'),
     OBD_S09_PR_Record()/OBD_IID04(calibration_identifications=b'ABCDEFGHIJKLMNOP')
 ])
@@ -918,4 +1026,8 @@
 assert b[3:20] == b'ABCDEFGHIJKLMNOPQ'
 assert b[20:21] == b'\x04'
 assert b[21:22] == b'\x01'
-assert b[22:] == b'ABCDEFGHIJKLMNOP'
\ No newline at end of file
+assert b[22:] == b'ABCDEFGHIJKLMNOP'
+
+r = OBD(b'\x09\x02\x04')
+assert p.answers(r)
+

scapy-2.4.4.tar.gz/test/contrib/automotive/obd/scanner.uts Added

@@ -0,0 +1,331 @@
+% Regression tests for obd_scan
+
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import subprocess, sys
+import scapy.modules.six as six
+from subprocess import call
+from scapy.consts import LINUX
+
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+# function to exit when the can-isotp kernel module is not available
+ISOTP_KERNEL_MODULE_AVAILABLE = False
+def exit_if_no_isotp_module():
+    if not ISOTP_KERNEL_MODULE_AVAILABLE:
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
+        warning("Can't test ISOTP native socket because kernel module is not loaded")
+        exit(0)
+
+
+= Initialize a virtual CAN interface
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+= Import CANSocket
+
+from scapy.contrib.cansocket_python_can import *
+
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, bitrate=250000, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, bitrate=250000, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, bitrate=250000, timeout=0.01)
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
+
+
+= Check if can-isotp and can-utils are installed on this system
+~ linux
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
+
+
++ Syntax check
+
+= Import isotp
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
+
+load_contrib("isotp", globals_dict=globals())
+
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
+
+############
+############
++ Load general modules
+
+= Load contribution layer
+load_contrib("automotive.obd.obd", globals_dict=globals())
+
++ Load OBD_scan
+= imports
+
+from subprocess import call
+
+load_contrib("automotive.obd.scanner", globals_dict=globals())
+load_contrib("automotive.ecu", globals_dict=globals())
+
+print("Set delay to lower utilization")
+conf.contribs['ECU_am']['send_delay'] = 0.004
+
+= Create answers
+
+responses = [
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=0)/OBD_PID00(supported_pids=3191777299)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=1)/OBD_PID01(mil=0, dtc_count=0, reserved1=0, continuous_tests_ready=0, reserved2=0, continuous_tests_supported=7, once_per_trip_tests_supported=225, once_per_trip_tests_ready=0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=11)/OBD_PID0B(data=44)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=12)/OBD_PID0C(data=857.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=13)/OBD_PID0D(data=0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=14)/OBD_PID0E(data=3.5)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=15)/OBD_PID0F(data=22.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=17)/OBD_PID11(data=14.51)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=19)/OBD_PID13(sensors_present=3)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=21)/OBD_PID15(outputVoltage=1.275, trim=99.219)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=28)/OBD_PID1C(data=6)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=3)/OBD_PID03(fuel_system1=2, fuel_system2=0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=31)/OBD_PID1F(data=13)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=32)/OBD_PID20(supported_pids=2684465153)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=33)/OBD_PID21(data=0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=35)/OBD_PID23(data=24910)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=4)/OBD_PID04(data=9.804)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=48)/OBD_PID30(data=19)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=49)/OBD_PID31(data=3587)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=5)/OBD_PID05(data=41.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=51)/OBD_PID33(data=97)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=52)/OBD_PID34(equivalence_ratio=1.001, current=128.004)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=6)/OBD_PID06(data=0.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=64)/OBD_PID40(supported_pids=244352000)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=69)/OBD_PID45(data=3.922)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=7)/OBD_PID07(data=-0.781)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=70)/OBD_PID46(data=20.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=71)/OBD_PID47(data=12.549)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=73)/OBD_PID49(data=5.49)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=76)/OBD_PID4C(data=3.922)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=81)/OBD_PID51(data=1)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=65)/OBD_S01_PR(data_records=[OBD_S01_PR_Record(pid=86)/OBD_PID56(bank1=0.0)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=67)/OBD_S03_PR(count=0)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=0)/OBD_MID00(supported_mids=3221225473)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=1)/OBD_MIDXX(standardized_test_id=131, unit_and_scaling_id=4, test_value=0.0, min_limit=0.0, max_limit=1.0),OBD_S06_PR_Record(mid=1)/OBD_MIDXX(standardized_test_id=138, unit_and_scaling_id=132, test_value=0.996, min_limit=-32.768, max_limit=1.06),OBD_S06_PR_Record(mid=1)/OBD_MIDXX(standardized_test_id=139, unit_and_scaling_id=132, test_value=0.996, min_limit=0.94, max_limit=32.767)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=128)/OBD_MID80(supported_mids=1)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=160)/OBD_MIDA0(supported_mids=4160749568)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=161)/OBD_MIDXX(standardized_test_id=12, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=65535)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=162)/OBD_MIDXX(standardized_test_id=12, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=65535),OBD_S06_PR_Record(mid=162)/OBD_MIDXX(standardized_test_id=11, unit_and_scaling_id=36, test_value=2, min_limit=0, max_limit=65535)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=163)/OBD_MIDXX(standardized_test_id=12, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=65535),OBD_S06_PR_Record(mid=163)/OBD_MIDXX(standardized_test_id=11, unit_and_scaling_id=36, test_value=1, min_limit=0, max_limit=65535)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=164)/OBD_MIDXX(standardized_test_id=12, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=65535),OBD_S06_PR_Record(mid=164)/OBD_MIDXX(standardized_test_id=11, unit_and_scaling_id=36, test_value=1, min_limit=0, max_limit=65535)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=165)/OBD_MIDXX(standardized_test_id=12, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=65535),OBD_S06_PR_Record(mid=165)/OBD_MIDXX(standardized_test_id=11, unit_and_scaling_id=36, test_value=1, min_limit=0, max_limit=65535)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=2)/OBD_MIDXX(standardized_test_id=145, unit_and_scaling_id=177, test_value=3944, min_limit=900, max_limit=65534),OBD_S06_PR_Record(mid=2)/OBD_MIDXX(standardized_test_id=149, unit_and_scaling_id=10, test_value=764.696, min_limit=719.556, max_limit=7995.27),OBD_S06_PR_Record(mid=2)/OBD_MIDXX(standardized_test_id=150, unit_and_scaling_id=10, test_value=115.412, min_limit=0.0, max_limit=179.95)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=32)/OBD_MID20(supported_mids=2147485697)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=33)/OBD_MIDXX(standardized_test_id=132, unit_and_scaling_id=3, test_value=2.63, min_limit=1.0, max_limit=655.35)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=128, unit_and_scaling_id=28, test_value=32.42, min_limit=10.0, max_limit=655.35),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=129, unit_and_scaling_id=28, test_value=25.41, min_limit=10.0, max_limit=655.35),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=130, unit_and_scaling_id=28, test_value=0.21, min_limit=0.0, max_limit=10.0),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=131, unit_and_scaling_id=28, test_value=0.0, min_limit=0.0, max_limit=10.0),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=132, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=3),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=133, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=3),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=134, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=3),OBD_S06_PR_Record(mid=53)/OBD_MIDXX(standardized_test_id=135, unit_and_scaling_id=36, test_value=0, min_limit=0, max_limit=3)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=64)/OBD_MID40(supported_mids=3221225473)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=65)/OBD_MIDXX(standardized_test_id=133, unit_and_scaling_id=22, test_value=720.0, min_limit=700.0, max_limit=6513.5)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=66)/OBD_MIDXX(standardized_test_id=144, unit_and_scaling_id=20, test_value=401, min_limit=0, max_limit=800)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=70)/OBD_S06_PR(data_records=[OBD_S06_PR_Record(mid=96)/OBD_MID60(supported_mids=1)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=71)/OBD_S07_PR(count=0)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=0)/OBD_IID00(supported_iids=1430405120)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=10)/OBD_IID0A(ecu_names=[b'ECM\x00-EngineControl\x00\x00'], count=1)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=15)/Raw(load=b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00HM0876')])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=18)/Raw(load=b'\x01\x00\xd5')])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=2)/OBD_IID02(vehicle_identification_numbers=[b'WDD1xxxxxxxxxxx11'], count=1)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=4)/OBD_IID04(calibration_identifications=[b'282xxxxxxx300044', b'00090xxxxxx00031'], count=2)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=6)/OBD_IID06(calibration_verification_numbers=[b'\xf9\x10\xb9\xfb', b'&6"e'], count=2)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=73)/OBD_S09_PR(data_records=[OBD_S09_PR_Record(iid=8)/OBD_IID08(data=[9, 189, 8, 9, 0, 0, 8, 9, 0, 0, 22, 9, 0, 0, 0, 0, 8, 9, 0, 0], count=20)])),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=127)/OBD_NR(request_service_id=1, response_code=49)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=127)/OBD_NR(request_service_id=10, response_code=49)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=127)/OBD_NR(request_service_id=6, response_code=49)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=127)/OBD_NR(request_service_id=8, response_code=17)),
+    ECUResponse(session=range(0, 255), security_level=0, responses=OBD(service=127)/OBD_NR(request_service_id=9, response_code=49))]
+
+
++ Simulate scanner
+
+= Run scanner with real world responses short scan
+
+exit_if_no_isotp_module()
+
+drain_bus(iface0)
+
+with new_can_socket0() as isocan_ecu, ISOTPSocket(isocan_ecu, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu:
+    answering_machine = ECU_am(supported_responses=responses, main_socket=ecu, basecls=OBD)
+    sim = threading.Thread(target=answering_machine, kwargs={"timeout": 60, "stop_filter": lambda x: bytes(x) == b"\xff\xff\xff"})
+    sim.start()
+    try:
+        with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e0, 0x7e8, basecls=OBD, padding=True) as socket:
+            s = OBD_Scanner(socket, full_scan=False)
+            s.scan()
+            socket.send(b"\xff\xff\xff")
+    finally:
+        sim.join(timeout=10)
+
+assert len(s.enumerators) == 8
+assert s.enumerators[0].__class__ == OBD_S01_Enumerator
+assert s.enumerators[1].__class__ == OBD_S02_Enumerator
+assert s.enumerators[2].__class__ == OBD_S06_Enumerator
+assert s.enumerators[3].__class__ == OBD_S08_Enumerator
+assert s.enumerators[4].__class__ == OBD_S09_Enumerator
+assert s.enumerators[5].__class__ == OBD_S03_Enumerator
+assert s.enumerators[6].__class__ == OBD_S07_Enumerator
+assert s.enumerators[7].__class__ == OBD_S0A_Enumerator
+
+assert len(s.enumerators[0].results) == 33   # 32 pos resps + 1 NR
+assert len([r for _, _, r in s.enumerators[0].results if r is not None and r.service == 0x7f]) == 1
+assert len(s.enumerators[1].results) == 1    # 1 NR
+assert len([r for _, _, r in s.enumerators[1].results if r is not None and r.service == 0x7f]) == 1
+assert len(s.enumerators[2].results) == 18   # 17 pos resps + 1 NR
+assert len([r for _, _, r in s.enumerators[2].results if r is not None and r.service == 0x7f]) == 1
+assert len(s.enumerators[3].results) == 1    # 1 NR
+assert len([r for _, _, r in s.enumerators[3].results if r is not None and r.service == 0x7f]) == 1
+assert len(s.enumerators[4].results) == 9    # 8 pos resps + 1 NR
+assert len([r for _, _, r in s.enumerators[4].results if r is not None and r.service == 0x7f]) == 1
+assert len(s.enumerators[5].results) == 1    # 1 PR
+assert len(s.enumerators[6].results) == 1    # 1 PR
+assert len(s.enumerators[7].results) == 1    # 1 PR
+
+
+= Run scanner with real world responses full scan
+
+exit_if_no_isotp_module()
+
+drain_bus(iface0)
+
+with new_can_socket0() as isocan_ecu, ISOTPSocket(isocan_ecu, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu:
+    answering_machine = ECU_am(supported_responses=responses, main_socket=ecu, basecls=OBD)
+    sim = threading.Thread(target=answering_machine, kwargs={"timeout": 60, "stop_filter": lambda x: bytes(x) == b"\xff\xff\xff"})
+    sim.start()
+    try:
+        with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e0, 0x7e8, basecls=OBD, padding=True) as socket:
+            s = OBD_Scanner(socket, full_scan=True)
+            s.scan()
+            socket.send(b"\xff\xff\xff")
+    finally:
+        sim.join(timeout=10)
+
+assert len(s.enumerators) == 8
+assert s.enumerators[0].__class__ == OBD_S01_Enumerator
+assert s.enumerators[1].__class__ == OBD_S02_Enumerator
+assert s.enumerators[2].__class__ == OBD_S06_Enumerator
+assert s.enumerators[3].__class__ == OBD_S08_Enumerator
+assert s.enumerators[4].__class__ == OBD_S09_Enumerator
+assert s.enumerators[5].__class__ == OBD_S03_Enumerator
+assert s.enumerators[6].__class__ == OBD_S07_Enumerator
+assert s.enumerators[7].__class__ == OBD_S0A_Enumerator
+
+assert len(s.enumerators[0].results) == 0x100   # 32 pos resps + 1 NR
+assert len([r for _, _, r in s.enumerators[0].results if r is not None and r.service == 0x7f]) == 0x100 - 32
+assert len(s.enumerators[1].results) == 0x100
+assert len([r for _, _, r in s.enumerators[1].results if r is not None and r.service == 0x7f]) == 0x100
+assert len(s.enumerators[2].results) == 0x100   # 17 pos resps
+assert len([r for _, _, r in s.enumerators[2].results if r is not None and r.service == 0x7f]) == 0x100 - 17
+assert len(s.enumerators[3].results) == 0x100
+assert len([r for _, _, r in s.enumerators[3].results if r is not None and r.service == 0x7f]) == 0x100
+assert len(s.enumerators[4].results) == 0x100    # 8 pos resps
+assert len([r for _, _, r in s.enumerators[4].results if r is not None and r.service == 0x7f]) == 0x100 - 8
+assert len(s.enumerators[5].results) == 1    # 1 PR
+assert len(s.enumerators[6].results) == 1    # 1 PR
+assert len(s.enumerators[7].results) == 1    # 1 PR
+
+
+= Run scanner only for Service 01 real world responses
+
+exit_if_no_isotp_module()
+
+drain_bus(iface0)
+
+with new_can_socket0() as isocan_ecu, ISOTPSocket(isocan_ecu, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu:
+    answering_machine = ECU_am(supported_responses=responses, main_socket=ecu, basecls=OBD)
+    sim = threading.Thread(target=answering_machine, kwargs={"timeout": 60, "stop_filter": lambda x: bytes(x) == b"\xff\xff\xff"})
+    sim.start()
+    try:
+        with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e0, 0x7e8, basecls=OBD, padding=True) as socket:
+            s = OBD_Scanner(socket, enumerators=[OBD_S01_Enumerator], full_scan=False)
+            s.scan()
+            socket.send(b"\xff\xff\xff")
+    finally:
+        sim.join(timeout=10)
+
+assert len(s.enumerators) == 1
+assert s.enumerators[0].__class__ == OBD_S01_Enumerator
+
+assert len(s.enumerators[0].results) == 33   # 32 pos resps + 1 NR
+assert len([r for _, _, r in s.enumerators[0].results if r is not None and r.service == 0x7f]) == 1
+
+
++ Cleanup
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.3.tar.gz/test/contrib/automotive/someip.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/someip.uts Changed

@@ -29,186 +29,65 @@
 ##########
 
 
-+ Test MessageId
++ Basic operations
 
 = Load module
+load_contrib("automotive.someip", globals_dict=globals())
 
-load_contrib("automotive.someip")
-import binascii
-
-= Check MessageId with method_id
-
-p = SOMEIP().msg_id
-p.srv_id = 0x1111
-p.method_id = 0x0222
-p.event_id = 0x0333
-
-p.sub_id = 0
-
-assert(struct.unpack("!H", bytes(p)[:2])[0] == 0x1111)
-
-assert((struct.unpack("!B", bytes(p)[2:3])[0] & 0x80) == 0x00)
-
-assert((struct.unpack("!H", bytes(p)[2:4])[0] & ~0x8000) == 0x0222)
-
-assert(bytes(p) == b"\x11\x11\x02\x22")
-
-del(p)
-
-= Dissect MessageId with method_id
-
-
-p = SOMEIP(b'\x22\x22\x03\x33')
-
-assert(p.msg_id.srv_id == 0x2222)
-
-assert(p.msg_id.method_id == 0x0333)
-
-assert(p.msg_id.sub_id == 0)
-
-del(p)
-
-= Build MessageId with event_id
-
-p = SOMEIP().msg_id
-p.srv_id = 0x1111
-p.method_id = 0x0222
-p.event_id = 0x0333
-p.sub_id = 1
-
-assert(struct.unpack("!H", bytes(p)[:2])[0] == 0x1111)
-
-assert((struct.unpack("!B", bytes(p)[2:3])[0] & 0x80) == 0x80)
-
-assert((struct.unpack("!H", bytes(p)[2:4])[0] & ~0x8000) == 0x0333)
-
-assert(bytes(p) == b"\x11\x11\x83\x33")
-
-del(p)
-
-= Dissect MessageId with event_id
-
-p = SOMEIP(b'\x33\x33\x82\x22')
-
-assert(p.msg_id.srv_id == 0x3333)
-
-assert(p.msg_id.event_id == 0x0222)
-
-assert(p.msg_id.sub_id == 1)
-
-del(p)
-
-+ Test RequestId
-
-= Request Id
-
-p = SOMEIP().req_id
-p.client_id = 0x1111
-p.session_id = 0x2222
-
-assert(struct.unpack("!H", bytes(p)[:2])[0] == 0x1111)
-
-assert(struct.unpack("!H", bytes(p)[2:4])[0] == 0x2222)
-
-assert(bytes(p) == b"\x11\x11\x22\x22")
-
-del(p)
-
-= Dissect RequestId
-
-method_id = b'\x22\x22\x03\x33'
-pktLen = b'\x11\x11\x11\x11'
-reqId = b'\x22\x22\x33\x33'
-p = SOMEIP(method_id + pktLen + reqId)
-
-assert(p.req_id.client_id == 0x2222)
-
-assert(p.req_id.session_id == 0x3333)
-
-del(p)
-
-+ Test SOMEIP
-
-= Check SomeIp
++ SOME/IP operation
 
+= Basic build
 p = SOMEIP()
-pstr = binascii.hexlify(bytes(p))
-binstr = binascii.hexlify(b"\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00")
-assert(pstr == binstr)
-
-p.payload = Raw(binascii.unhexlify("DEADBEEF"))
 pstr = bytes(p)
-binstr = b"\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x01\x01\x00\x00\xde\xad\xbe\xef"
+binstr = b"\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00"
 assert(pstr == binstr)
 
-p.payload = Raw('')
+= Build with empty payload
+p.payload = Raw(b"")
 pstr = bytes(p)
 binstr = b"\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00"
 assert(pstr == binstr)
 
-del(p)
-
-= Dissect SomeIP packet
-
-p = SOMEIP(
-    b"\x11\x11\x81\x11\x00\x00\x00\x04\x33\x33\x44\x44\x02\x03\x04\x05")
-
-assert(p.msg_id.srv_id == 0x1111)
-
-assert(p.msg_id.event_id == 0x0111)
-
-assert(p.req_id.client_id == 0x3333)
+= Build with non-empty payload
+p.payload = Raw(b"\xde\xad\xbe\xef")
+pstr = bytes(p)
+binstr = b"\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x01\x01\x00\x00\xde\xad\xbe\xef"
+assert(pstr == binstr)
 
-assert(p.req_id.session_id == 0x4444)
+= Dissect EVENT_ID packet
+p = SOMEIP(b"\x11\x11\x81\x11\x00\x00\x00\x04\x33\x33\x44\x44\x02\x03\x04\x05")
 
+assert(p.srv_id == 0x1111)
+assert(p.sub_id == 0x1)
+assert(p.method_id == None)
+assert(p.event_id == 0x0111)
+assert(p.client_id == 0x3333)
+assert(p.session_id == 0x4444)
 assert(p.proto_ver == 0x02)
-
 assert(p.iface_ver == 0x03)
-
 assert(p.msg_type == 0x04)
-
 assert(p.retcode == 0x05)
 
-del(p)
-
-+ Test SOMEIP_SubPackages
+= Dissect METHOD_ID packet
+p = SOMEIP(b"\x11\x11\x01\x11\x00\x00\x00\x04\x33\x33\x44\x44\x02\x03\x04\x05")
 
-= Check MessageId subpackage
-
-p = SOMEIP()
-p.msg_id.srv_id = 0x1111
-p.msg_id.method_id = 0x0222
-p.msg_id.event_id = 0x0333
-
-p.msg_id.sub_id = 0
-pstr = bytes(p)
-binstr = b"\x11\x11\x02\x22\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00"
-assert(pstr == binstr)
-
-p.msg_id.sub_id = 1
-pstr = bytes(p)
-binstr = b"\x11\x11\x83\x33\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00"
-assert(pstr == binstr)
-
-del(p)
-
-= Check RequestId subpackage
-
-p = SOMEIP()
-p.req_id.client_id = 0x1111
-p.req_id.session_id = 0x2222
-
-pstr = bytes(p)
-binstr = b"\x00\x00\x00\x00\x00\x00\x00\x08\x11\x11\x22\x22\x01\x01\x00\x00"
-assert(pstr == binstr)
+assert(p.srv_id == 0x1111)
+assert(p.sub_id == 0x0)
+assert(p.method_id == 0x0111)
+assert(p.event_id == None)
+assert(p.client_id == 0x3333)
+assert(p.session_id == 0x4444)
+assert(p.proto_ver == 0x02)
+assert(p.iface_ver == 0x03)
+assert(p.msg_type == 0x04)
+assert(p.retcode == 0x05)
 
-+ Test SOMEIP_TP
++ SOME/IP-TP operation
 
-= Check TP
+= Build TP
 p = SOMEIP()
 p.msg_type = 0x20
 
-
 pstr = bytes(p)
 print(pstr)
 binstr = b'\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x01\x01\x20\x00\x00\x00\x00\x00'
@@ -224,9 +103,7 @@
 binstr = b'\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x01\x01\x00\x00'
 assert(pstr == binstr)
 
-
 = Dissect TP
-
 p = SOMEIP(b'\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x01\x01\x21\x00\x00\x00\x00\x01')
 
 assert(p.msg_type == 0x21)
@@ -239,10 +116,7 @@
 binstr = b"\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x01\x01\x00\x00"
 assert(pstr == binstr)
 
-+ Test SOMEIP-TP
-
 = Build TP fragmented
-
 p = SOMEIP()
 p.msg_type = 0x20
 p.add_payload(Raw("A"*1400))
@@ -254,4 +128,596 @@
 assert(f[0].payload == Raw("A"*1392))
 assert(f[1].payload == Raw("A"*8))
 assert(f[0].more_seg == 1)
-assert(f[1].more_seg == 0)
\ No newline at end of file
+assert(f[1].more_seg == 0)
+
++ SD Entry Service
+
+= Check packet length on empty build
+p = SDEntry_Service()
+assert(len(bytes(p)) == SDENTRY_OVERALL_LEN)
+
+= Build 1
+p = SDEntry_Service(type = SDENTRY_TYPE_SRV_OFFERSERVICE,
+				    index_1 = 0x11, index_2 = 0x22, srv_id = 0x3333,
+					inst_id = 0x4444, major_ver = 0x55,
+					ttl = 0x666666, minor_ver = 0xdeadbeef)
+p_str = bytes(p)
+bin_str = b"\x01\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\xde\xad\xbe\xef"
+assert(p_str == bin_str)
+assert(len(p_str) == SDENTRY_OVERALL_LEN)
+
+= Build 2
+p = SDEntry_Service(n_opt_1 = 0xf1, n_opt_2 = 0xf2)
+p_str = bytes(p)
+bin_str = b"\x00\x00\x00\x12\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+assert(p_str == bin_str)
+assert(len(p_str) == SDENTRY_OVERALL_LEN)
+
+= Dissect
+p = SDEntry_Service(
+    b"\x01\x22\x33\x00\x44\x44\x55\x55\x66\x77\x77\x77\xde\xad\xbe\xef")
+assert(p.type == SDENTRY_TYPE_SRV_OFFERSERVICE)
+assert(p.index_1 == 0x22)
+assert(p.index_2 == 0x33)
+assert(p.srv_id == 0x4444)
+assert(p.inst_id == 0x5555)
+assert(p.major_ver == 0x66)
+assert(p.ttl == 0x777777)
+assert(p.minor_ver == 0xdeadbeef)
+
++ SD Entry Eventgroup
+
+= Check packet length on empty build
+p = SDEntry_EventGroup()
+assert(len(bytes(p)) == SDENTRY_OVERALL_LEN)
+
+= Build
+p = SDEntry_EventGroup(index_1 = 0x11, index_2 = 0x22, srv_id = 0x3333,
+			           inst_id = 0x4444, major_ver = 0x55, ttl = 0x666666,
+					   cnt = 0x7, eventgroup_id = 0x8888)
+p_str = bytes(p)
+bin_str = b"\x06\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\x00\x07\x88\x88"
+assert(p_str == bin_str)
+assert(len(bytes(p)) == SDENTRY_OVERALL_LEN)
+
+= Dissect
+p = SDEntry_EventGroup(
+    b"\x06\x11\x22\x00\x33\x33\x44\x44\x55\x66\x66\x66\x00\x07\x88\x88")
+assert(p.index_1 == 0x11)
+assert(p.index_2 == 0x22)
+assert(p.srv_id == 0x3333)
+assert(p.inst_id == 0x4444)
+assert(p.major_ver == 0x55)
+assert(p.ttl == 0x666666)
+assert(p.cnt == 0x7)
+assert(p.eventgroup_id == 0x8888)
+
++ SD Flags
+
+= Build and check flags
+p = SD()
+p.set_flag("REBOOT", 1)
+assert(p.flags == 0x80)
+
+p.set_flag("REBOOT", 0)
+assert(p.flags == 0x00)
+
+p.set_flag("UNICAST", 1)
+assert(p.flags == 0x40)
+
+p.set_flag("UNICAST", 0)
+assert(p.flags == 0x00)
+
+p.set_flag("REBOOT", 1)
+p.set_flag("UNICAST", 1)
+assert(p.flags == 0xc0)
+
++ SD Get SOME/IP Packet
+
+= Build empty
+p = SOMEIP() / SD()
+assert(len(bytes(p)) == SOMEIP._OVERALL_LEN_NOPAYLOAD + 12)
+
+= Verify constants against spec TR_SOMEIP_00250
+assert(SD.SOMEIP_MSGID_SRVID == 0xffff)
+assert(SD.SOMEIP_MSGID_SUBID == 0x1)
+assert(SD.SOMEIP_MSGID_EVENTID == 0x0100)
+assert(SD.SOMEIP_CLIENT_ID == 0x0000)
+assert(SD.SOMEIP_MINIMUM_SESSION_ID == 0x0001)
+assert(SD.SOMEIP_PROTO_VER == 0x01)
+assert(SD.SOMEIP_IFACE_VER == 0x01)
+assert(SD.SOMEIP_MSG_TYPE == 0x02)
+assert(SD.SOMEIP_RETCODE == 0x00)
+
+= check that values are bound
+assert(p[SOMEIP].srv_id == SD.SOMEIP_MSGID_SRVID)
+assert(p[SOMEIP].sub_id == SD.SOMEIP_MSGID_SUBID)
+assert(p[SOMEIP].event_id == SD.SOMEIP_MSGID_EVENTID)
+assert(p[SOMEIP].client_id == SD.SOMEIP_CLIENT_ID)
+assert(p[SOMEIP].session_id != 0x0000)
+assert(p[SOMEIP].session_id >= SD.SOMEIP_MINIMUM_SESSION_ID)
+assert(p[SOMEIP].proto_ver == SD.SOMEIP_PROTO_VER)
+assert(p[SOMEIP].iface_ver == SD.SOMEIP_IFACE_VER)
+assert(p[SOMEIP].msg_type == SD.SOMEIP_MSG_TYPE)
+assert(p[SOMEIP].retcode == SD.SOMEIP_RETCODE)
+
+# FIXME: Service Discovery messages shell be transported over UDP
+# (TR_SOMEIP_00248)
+# FIXME: The port 30490 (UDP and TCP as well) shall be only used for SOME/IP-SD
+# and not used for applications communicating over SOME/IP (TR_SOMEIP_00020)
+
++ SD
+
+= Check length of package without entries nor options
+p = SD()
+assert(len(bytes(p)) == 12)
+
+= Check entries to array and size check
+p.set_entryArray([SDEntry_Service(), SDEntry_EventGroup()])
+assert(struct.unpack("!L", bytes(p)[4:8])[0] == 32)
+
+p.set_entryArray([])
+assert(struct.unpack("!L", bytes(p)[4:8])[0] == 0)
+
+= Check Options to array and size check
+p.set_optionArray([SDOption_IP4_EndPoint(), SDOption_IP4_EndPoint()])
+assert(struct.unpack("!L", bytes(p)[8:12])[0] == 24)
+
+p.set_optionArray([])
+assert(struct.unpack("!L", bytes(p)[8:12])[0] == 0)
+
+= Check Entries & Options to array and size check
+p.set_entryArray([SDEntry_Service(), SDEntry_EventGroup()])
+p.set_optionArray([SDOption_IP4_EndPoint(), SDOption_IP4_EndPoint()])
+
+assert(struct.unpack("!L", bytes(p)[4:8])[0] == 32)
+assert(struct.unpack("!L", bytes(p)[40:44])[0] == 24)
+
+
++ Git issue 2348: SOME/IP-SD Entry-Array is broken by building it from RAW
+
+= Single SD entry
+# offer service
+ea1 = SDEntry_Service()
+ea1.type = 1
+ea1.srv_id = 0x1234
+ea1.inst_id = 0x5678
+ea1.ttl = 0x333333
+
+# subscribe eventgroup
+ea2 = SDEntry_EventGroup()
+ea2.type = 0x6
+ea2.srv_id = 0x8765
+ea2.inst_id = 0x4321
+ea2.ttl = 0x222222
+ea2.eventgroup_id = 0x1357
+
+sd1 = SD()
+sd1.set_entryArray([ea1])
+# this is computed on build, but we need it sooner for the assert()
+sd1.len_entry_array = 16
+sd1.len_option_array = 0
+
+assert(sd1.show(dump=True) == SD(sd1.build()).show(dump=True))
+
+= Double SD entry
+sd2 = SD()
+sd2.set_entryArray([ea2,ea1])
+# this is computed on build, but we need it sooner for the assert()
+sd2.len_entry_array = 32
+sd2.len_option_array = 0
+
+assert(sd2.show(dump=True) == SD(sd2.build()).show(dump=True))
+
+= Flipped double SD entry
+# flip the order
+sd2.set_entryArray([ea1,ea2])
+assert(sd2.show(dump=True) == SD(sd2.build()).show(dump=True))
+
+
+
+
+
++ SD Options (individual)
+= Verifying constants against spec
+assert(SDOPTION_CFG_TYPE == 0x01)
+assert(SDOPTION_LOADBALANCE_TYPE == 0x02)
+assert(SDOPTION_LOADBALANCE_LEN == 0x05)
+assert(SDOPTION_IP4_ENDPOINT_TYPE == 0x04)
+assert(SDOPTION_IP4_ENDPOINT_LEN == 0x0009)
+assert(SDOPTION_IP4_MCAST_TYPE == 0x14)
+assert(SDOPTION_IP4_MCAST_LEN == 0x0009)
+assert(SDOPTION_IP4_SDENDPOINT_TYPE == 0x24)
+assert(SDOPTION_IP4_SDENDPOINT_LEN == 0x0009)
+assert(SDOPTION_IP6_ENDPOINT_TYPE == 0x06)
+assert(SDOPTION_IP6_ENDPOINT_LEN == 0x0015)
+assert(SDOPTION_IP6_MCAST_TYPE == 0x16)
+assert(SDOPTION_IP6_MCAST_LEN == 0x0015)
+assert(SDOPTION_IP6_SDENDPOINT_TYPE == 0x26)
+assert(SDOPTION_IP6_SDENDPOINT_LEN == 0x0015)
+
+### SDOption_Config
+= SDOption_Config: Verify make_string() method from dict
+data = { "hello": "world" }
+out = SDOption_Config.make_string(data)
+assert(out == b"\x0bhello=world\x00")
+
+= SDOption_Config: Verify make_string() method from list
+data = [
+	("x", "y"),
+	("abc", "def"),
+	("123", "456")
+]
+out = SDOption_Config.make_string(data)
+assert(out == b"\x03x=y\x07abc=def\x07123=456\x00")
+
+= SDOption_Config: Build and dissect empty
+opt = SDOption_Config()
+optraw = opt.build()
+assert(optraw == b"\x00\x02\x01\x00\x00")
+
+opt = SDOption_Config(optraw)
+assert(opt.len == 0x2)
+assert(opt.type == SDOPTION_CFG_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.cfg_str == b"\x00")
+
+= SDOption_Config: Build and dissect spec example
+tststr = b"\x05abc=x\x07def=123\x00"
+opt = SDOption_Config(cfg_str=tststr)
+optraw = opt.build()
+assert(optraw == b"\x00\x10\x01\x00" + tststr)
+
+opt = SDOption_Config(optraw)
+assert(opt.len == 0x10)
+assert(opt.type == SDOPTION_CFG_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.cfg_str == tststr)
+
+= SDOption_Config: Build and dissect fully populated
+tststr = b"abcdefghijklmnopqrstuvwxyz"
+opt = SDOption_Config(len=0x1234, type=0x56, res_hdr=0x78, cfg_str=tststr)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78" + tststr)
+
+opt = SDOption_Config(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.cfg_str == tststr)
+
+
+### SDOption_LoadBalance
+= SDOption_LoadBalance: Build and dissect empty
+opt = SDOption_LoadBalance()
+optraw = opt.build()
+assert(optraw == b"\x00\x05\x02\x00\x00\x00\x00\x00")
+
+opt = SDOption_LoadBalance(optraw)
+assert(opt.len == SDOPTION_LOADBALANCE_LEN)
+assert(opt.type == SDOPTION_LOADBALANCE_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.priority == 0x0)
+assert(opt.weight == 0x0)
+
+= SDOption_LoadBalance: Build and dissect example
+opt = SDOption_LoadBalance(priority=0x1234, weight=0x5678)
+optraw = opt.build()
+assert(optraw == b"\x00\x05\x02\x00\x12\x34\x56\x78")
+
+opt = SDOption_LoadBalance(optraw)
+assert(opt.len == SDOPTION_LOADBALANCE_LEN)
+assert(opt.type == SDOPTION_LOADBALANCE_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.priority == 0x1234)
+assert(opt.weight == 0x5678)
+
+= SDOption_LoadBalance: Build and dissect fully populated
+opt = SDOption_LoadBalance(len=0x1234, type=0x56, res_hdr=0x78, priority=0x9abc, weight=0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78\x9a\xbc\xde\xf0")
+
+opt = SDOption_LoadBalance(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.priority == 0x9abc)
+assert(opt.weight == 0xdef0)
+
+
+### SDOption_IP4_EndPoint
+= SDOption_IP4_EndPoint: Build and dissect empty
+opt = SDOption_IP4_EndPoint()
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x04\x00\x00\x00\x00\x00\x00\x11\x00\x00")
+
+opt = SDOption_IP4_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP4_ENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP4_ENDPOINT_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "0.0.0.0")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP4_EndPoint: Build and dissect example
+opt = SDOption_IP4_EndPoint(addr = "192.168.123.45", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x04\x00\xc0\xa8\x7b\x2d\x00\x06\x12\x34")
+
+opt = SDOption_IP4_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP4_ENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP4_ENDPOINT_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "192.168.123.45")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP4_EndPoint: Build and dissect fully populated
+opt = SDOption_IP4_EndPoint(len=0x1234, type=0x56, res_hdr=0x78, addr = "11.22.33.44", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78\x0b\x16\x21\x2c\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP4_EndPoint(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "11.22.33.44")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+
+### SDOption_IP4_Multicast
+= SDOption_IP4_Multicast: Build and dissect empty
+opt = SDOption_IP4_Multicast()
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x14\x00\x00\x00\x00\x00\x00\x11\x00\x00")
+
+opt = SDOption_IP4_Multicast(optraw)
+assert(opt.len == SDOPTION_IP4_MCAST_LEN)
+assert(opt.type == SDOPTION_IP4_MCAST_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "0.0.0.0")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP4_Multicast: Build and dissect example
+opt = SDOption_IP4_Multicast(addr = "192.168.123.45", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x14\x00\xc0\xa8\x7b\x2d\x00\x06\x12\x34")
+
+opt = SDOption_IP4_Multicast(optraw)
+assert(opt.len == SDOPTION_IP4_MCAST_LEN)
+assert(opt.type == SDOPTION_IP4_MCAST_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "192.168.123.45")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP4_Multicast: Build and dissect fully populated
+opt = SDOption_IP4_Multicast(len=0x1234, type=0x56, res_hdr=0x78, addr = "11.22.33.44", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78\x0b\x16\x21\x2c\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP4_Multicast(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "11.22.33.44")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+
+### SDOption_IP4_SD_EndPoint
+= SDOption_IP4_SD_EndPoint: Build and dissect empty
+opt = SDOption_IP4_SD_EndPoint()
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x24\x00\x00\x00\x00\x00\x00\x11\x00\x00")
+
+opt = SDOption_IP4_SD_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP4_SDENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP4_SDENDPOINT_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "0.0.0.0")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP4_SD_EndPoint: Build and dissect example
+opt = SDOption_IP4_SD_EndPoint(addr = "192.168.123.45", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x09\x24\x00\xc0\xa8\x7b\x2d\x00\x06\x12\x34")
+
+opt = SDOption_IP4_SD_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP4_SDENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP4_SDENDPOINT_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "192.168.123.45")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP4_SD_EndPoint: Build and dissect fully populated
+opt = SDOption_IP4_SD_EndPoint(len=0x1234, type=0x56, res_hdr=0x78, addr = "11.22.33.44", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78\x0b\x16\x21\x2c\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP4_SD_EndPoint(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "11.22.33.44")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+### SDOption_IP6_EndPoint
+= SDOption_IP6_EndPoint: Build and dissect empty
+opt = SDOption_IP6_EndPoint()
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x06\x00" + b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + b"\x00\x11\x00\x00")
+
+opt = SDOption_IP6_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP6_ENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP6_ENDPOINT_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "::")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP6_EndPoint: Build and dissect example
+opt = SDOption_IP6_EndPoint(addr = "2001:cdba::3257:9652", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x06\x00" + b"\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52" + b"\x00\x06\x12\x34")
+
+opt = SDOption_IP6_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP6_ENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP6_ENDPOINT_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "2001:cdba::3257:9652")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP6_EndPoint: Build and dissect fully populated
+opt = SDOption_IP6_EndPoint(len=0x1234, type=0x56, res_hdr=0x78, addr = "1234:5678:9abc:def0:0fed:cba9:8765:4321", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78" + b"\x12\x34\x56\x78\x9a\xbc\xde\xf0\x0f\xed\xcb\xa9\x87\x65\x43\x21" + b"\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP6_EndPoint(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "1234:5678:9abc:def0:fed:cba9:8765:4321")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+
+### SDOption_IP6_Multicast
+= SDOption_IP6_Multicast: Build and dissect empty
+opt = SDOption_IP6_Multicast()
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x16\x00" + b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + b"\x00\x11\x00\x00")
+
+opt = SDOption_IP6_Multicast(optraw)
+assert(opt.len == SDOPTION_IP6_MCAST_LEN)
+assert(opt.type == SDOPTION_IP6_MCAST_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "::")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP6_Multicast: Build and dissect example
+opt = SDOption_IP6_Multicast(addr = "2001:cdba::3257:9652", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x16\x00" + b"\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52" + b"\x00\x06\x12\x34")
+
+opt = SDOption_IP6_Multicast(optraw)
+assert(opt.len == SDOPTION_IP6_MCAST_LEN)
+assert(opt.type == SDOPTION_IP6_MCAST_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "2001:cdba::3257:9652")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP6_Multicast: Build and dissect fully populated
+opt = SDOption_IP6_Multicast(len=0x1234, type=0x56, res_hdr=0x78, addr = "1234:5678:9abc:def0:0fed:cba9:8765:4321", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78" + b"\x12\x34\x56\x78\x9a\xbc\xde\xf0\x0f\xed\xcb\xa9\x87\x65\x43\x21" + b"\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP6_Multicast(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "1234:5678:9abc:def0:fed:cba9:8765:4321")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+
+### SDOption_IP6_SD_EndPoint
+= SDOption_IP6_SD_EndPoint: Build and dissect empty
+opt = SDOption_IP6_SD_EndPoint()
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x26\x00" + b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + b"\x00\x11\x00\x00")
+
+opt = SDOption_IP6_SD_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP6_SDENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP6_SDENDPOINT_TYPE)
+assert(opt.res_hdr == 0x0)
+assert(opt.addr == "::")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x11)
+assert(opt.port == 0x0)
+
+
+= SDOption_IP6_SD_EndPoint: Build and dissect example
+opt = SDOption_IP6_SD_EndPoint(addr = "2001:cdba::3257:9652", l4_proto = "TCP", port = 0x1234)
+optraw = opt.build()
+assert(optraw == b"\x00\x15\x26\x00" + b"\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52" + b"\x00\x06\x12\x34")
+
+opt = SDOption_IP6_SD_EndPoint(optraw)
+assert(opt.len == SDOPTION_IP6_SDENDPOINT_LEN)
+assert(opt.type == SDOPTION_IP6_SDENDPOINT_TYPE)
+assert(opt.res_hdr == 0x00)
+assert(opt.addr == "2001:cdba::3257:9652")
+assert(opt.res_tail == 0x0)
+assert(opt.l4_proto == 0x06)
+assert(opt.port == 0x1234)
+
+= SDOption_IP6_SD_EndPoint: Build and dissect fully populated
+opt = SDOption_IP6_SD_EndPoint(len=0x1234, type=0x56, res_hdr=0x78, addr = "1234:5678:9abc:def0:0fed:cba9:8765:4321", res_tail = 0x9a, l4_proto = 0xbc, port = 0xdef0)
+optraw = opt.build()
+assert(optraw == b"\x12\x34\x56\x78" + b"\x12\x34\x56\x78\x9a\xbc\xde\xf0\x0f\xed\xcb\xa9\x87\x65\x43\x21" + b"\x9a\xbc\xde\xf0")
+
+opt = SDOption_IP6_SD_EndPoint(optraw)
+assert(opt.len == 0x1234)
+assert(opt.type == 0x56)
+assert(opt.res_hdr == 0x78)
+assert(opt.addr == "1234:5678:9abc:def0:fed:cba9:8765:4321")
+assert(opt.res_tail == 0x9a)
+assert(opt.l4_proto == 0xbc)
+assert(opt.port == 0xdef0)
+
+= verify building and parsing of multiple SDOptions
+def _opts_check(opts):
+	optslen = sum([len(o) for o in opts])
+	sd = SD()
+	sd.set_optionArray(opts)
+	sd.len_entry_array = 0
+	sd.len_option_array = optslen
+	sd.show()
+	SD(sd.build()).show()
+	assert(sd.show(dump=True) == SD(sd.build()).show(dump=True))
+
+# options are built and reparsed, to make sure all is calculated
+opts = [
+	SDOption_Config(SDOption_Config(cfg_str="hello world").build()),
+	SDOption_LoadBalance(SDOption_LoadBalance().build()),
+	SDOption_IP4_EndPoint(SDOption_IP4_EndPoint().build()),
+	SDOption_IP4_Multicast(SDOption_IP4_Multicast().build()),
+	SDOption_IP4_SD_EndPoint(SDOption_IP4_SD_EndPoint().build()),
+	SDOption_IP6_EndPoint(SDOption_IP6_EndPoint().build()),
+	SDOption_IP6_Multicast(SDOption_IP6_Multicast().build()),
+	SDOption_IP6_SD_EndPoint(SDOption_IP6_SD_EndPoint().build()),
+]
+_opts_check(opts[0:0])
+_opts_check(opts[0:2])
+_opts_check(opts)
+_opts_check(opts[::-1])
+_opts_check(opts + opts[::-1])
+

scapy-2.4.3.tar.gz/test/contrib/automotive/uds.uts -> scapy-2.4.4.tar.gz/test/contrib/automotive/uds.uts Changed

@@ -9,8 +9,8 @@
 + Basic operations
 
 = Load module
-
-load_contrib("automotive.uds")
+load_contrib("automotive.uds", globals_dict=globals())
+load_contrib("automotive.ecu", globals_dict=globals())
 
 = Check if positive response answers
 
@@ -60,13 +60,49 @@
 assert dscpr.service == 0x50
 assert dscpr.diagnosticSessionType == 0x02
 
+assert not dscpr.answers(dsc)
+
 = Check UDS_DSCPR
 
-dscpr = UDS()/UDS_DSCPR(b'\x02beef')
+dscpr = UDS()/UDS_DSCPR(b'\x01beef')
 assert dscpr.service == 0x50
-assert dscpr.diagnosticSessionType == 0x02
+assert dscpr.diagnosticSessionType == 0x01
 assert dscpr.sessionParameterRecord == b"beef"
 
+assert dscpr.answers(dsc)
+
+= Check UDS_DSC
+
+dsc = UDS()/UDS_DSC(b'\x01')
+assert dsc.service == 0x10
+assert dsc.diagnosticSessionType == 0x01
+
+= Check UDS_DSCPR
+
+dscpr = UDS()/UDS_DSCPR(b'\x01beef')
+assert dscpr.service == 0x50
+assert dscpr.diagnosticSessionType == 0x01
+assert dscpr.sessionParameterRecord == b"beef"
+
+assert dscpr.answers(dsc)
+
+= Check UDS_DSC modifies ecu state
+
+dsc = UDS()/UDS_DSC(b'\x09')
+assert dsc.service == 0x10
+assert dsc.diagnosticSessionType == 0x09
+
+= Check UDS_DSCPR modifies ecu state
+
+dscpr = UDS()/UDS_DSCPR(b'\x09beef')
+assert dscpr.service == 0x50
+assert dscpr.diagnosticSessionType == 0x09
+assert dscpr.sessionParameterRecord == b"beef"
+
+ecu = ECU()
+ecu.update(dscpr)
+assert ecu.current_session == 9
+
 = Check UDS_ER
 
 er = UDS(b'\x11\x01')
@@ -85,6 +121,8 @@
 assert erpr.service == 0x51
 assert erpr.resetType == 0x01
 
+assert erpr.answers(er)
+
 = Check UDS_ERPR
 
 erpr = UDS(b'\x51\x04\x10')
@@ -92,6 +130,24 @@
 assert erpr.resetType == 0x04
 assert erpr.powerDownTime == 0x10
 
+= Check UDS_ERPR modifies ecu state
+
+erpr = UDS(b'\x51\x04\x10')
+assert erpr.service == 0x51
+assert erpr.resetType == 0x04
+assert erpr.powerDownTime == 0x10
+
+ecu = ECU()
+ecu.current_security_level = 5
+ecu.current_session = 3
+ecu.communication_control = 4
+
+ecu.update(erpr)
+
+assert ecu.current_session == 1
+assert ecu.current_security_level == 0
+assert ecu.communication_control == 0
+
 = Check UDS_SA
 
 sa = UDS(b'\x27\x00c0ffee')
@@ -99,6 +155,14 @@
 assert sa.securityAccessType == 0x0
 assert sa.securityKey == b'c0ffee'
 
+= Check UDS_SAPR
+
+sapr = UDS(b'\x67\x00')
+assert sapr.service == 0x67
+assert sapr.securityAccessType == 0x0
+
+assert sapr.answers(sa)
+
 = Check UDS_SA
 
 sa = UDS(b'\x27\x01c0ffee')
@@ -113,11 +177,40 @@
 assert sapr.securityAccessType == 0x1
 assert sapr.securitySeed == b'c0ffee'
 
+assert sapr.answers(sa)
+
+= Check UDS_SA
+
+sa = UDS(b'\x27\x00c0ffee')
+assert sa.service == 0x27
+assert sa.securityAccessType == 0x0
+assert sa.securityKey == b'c0ffee'
+
+
+= Check UDS_SAPR modifies ecu state
+
+sapr = UDS(b'\x67\x06')
+assert sapr.service == 0x67
+assert sapr.securityAccessType == 0x6
+
+ecu = ECU()
+ecu.update(sapr)
+assert ecu.current_security_level == 6
+
+= Check UDS_SA
+
+sa = UDS(b'\x27\x01c0ffee')
+assert sa.service == 0x27
+assert sa.securityAccessType == 0x1
+assert sa.securityAccessDataRecord == b'c0ffee'
+
 = Check UDS_SAPR
 
-sapr = UDS(b'\x67\x00')
+sapr = UDS(b'\x67\x01c0ffee')
 assert sapr.service == 0x67
-assert sapr.securityAccessType == 0x0
+assert sapr.securityAccessType == 0x1
+assert sapr.securitySeed == b'c0ffee'
+
 
 = Check UDS_CC
 
@@ -134,6 +227,18 @@
 assert ccpr.service == 0x68
 assert ccpr.controlType == 0x1
 
+assert ccpr.answers(cc)
+
+= Check UDS_CCPR modifies ecu state
+
+ccpr = UDS(b'\x68\x01')
+assert ccpr.service == 0x68
+assert ccpr.controlType == 0x1
+
+ecu = ECU()
+ecu.update(ccpr)
+assert ecu.communication_control == 1
+
 = Check UDS_TP
 
 tp = UDS(b'\x3E\x01')
@@ -146,12 +251,22 @@
 assert tppr.service == 0x7e
 assert tppr.zeroSubFunction == 0x1
 
+assert tppr.answers(tp)
+
 = Check UDS_ATP
 
 atp = UDS(b'\x83\x01')
 assert atp.service == 0x83
 assert atp.timingParameterAccessType == 0x1
 
+= Check UDS_ATPPR
+
+atppr = UDS(b'\xc3\x01')
+assert atppr.service == 0xc3
+assert atppr.timingParameterAccessType == 0x1
+
+assert atppr.answers(atp)
+
 = Check UDS_ATP
 
 atp = UDS(b'\x83\x04coffee')
@@ -161,12 +276,6 @@
 
 = Check UDS_ATPPR
 
-atppr = UDS(b'\xc3\x01')
-assert atppr.service == 0xc3
-assert atppr.timingParameterAccessType == 0x1
-
-= Check UDS_ATPPR
-
 atppr = UDS(b'\xc3\x03coffee')
 assert atppr.service == 0xc3
 assert atppr.timingParameterAccessType == 0x3
@@ -184,6 +293,8 @@
 assert sdtpr.service == 0xC4
 assert sdtpr.securityDataResponseRecord == b'coffee'
 
+assert sdtpr.answers(sdt)
+
 = Check UDS_CDTCS
 
 cdtcs = UDS(b'\x85\x00coffee')
@@ -197,6 +308,8 @@
 assert cdtcspr.service == 0xC5
 assert cdtcspr.DTCSettingType == 0
 
+assert cdtcspr.answers(cdtcs)
+
 = Check UDS_ROE
 
 roe = UDS(b'\x86\x00\x10coffee')
@@ -214,6 +327,8 @@
 assert roepr.eventWindowTime == 16
 assert roepr.eventTypeRecord == b'coffee'
 
+assert roepr.answers(roe)
+
 = Check UDS_LC
 
 lc = UDS(b'\x87\x01\x02')
@@ -221,6 +336,14 @@
 assert lc.linkControlType == 0x01
 assert lc.baudrateIdentifier == 0x02
 
+= Check UDS_LCPR
+
+lcpr = UDS(b'\xC7\x01')
+assert lcpr.service == 0xC7
+assert lcpr.linkControlType == 0x01
+
+assert lcpr.answers(lc)
+
 = Check UDS_LC
 
 lc = UDS(b'\x87\x02\x02\x03\x04')
@@ -230,12 +353,6 @@
 assert lc.baudrateMiddleByte == 0x03
 assert lc.baudrateLowByte == 0x04
 
-= Check UDS_LCPR
-
-lcpr = UDS(b'\xC7\x01')
-assert lcpr.service == 0xC7
-assert lcpr.linkControlType == 0x01
-
 = Check UDS_RDBI
 
 rdbi = UDS(b'\x22\x01\x02')
@@ -273,6 +390,8 @@
 assert rdbipr.dataIdentifier == 0x0102
 assert rdbipr.load == b'dieselgate'
 
+assert rdbipr.answers(rdbi)
+
 = Check UDS_RMBA
 
 rmba = UDS(b'\x23\x11\x02\x02')
@@ -315,6 +434,8 @@
 assert rmbapr.service == 0x63
 assert rmbapr.dataRecord == b'muchData'
 
+assert rmbapr.answers(rmba)
+
 = Check UDS_RSDBI
 
 rsdbi = UDS(b'\x24\x12\x34')
@@ -329,6 +450,8 @@
 assert rsdbipr.scalingByte == 255
 assert rsdbipr.dataRecord == b'muchData'
 
+assert rsdbipr.answers(rsdbi)
+
 = Check UDS_RSDBPI
 
 rsdbpi = UDS(b'\x2a\x12\x34coffee')
@@ -344,20 +467,33 @@
 assert rsdbpipr.periodicDataIdentifier == 255
 assert rsdbpipr.dataRecord == b'\x12\x34'
 
+assert not rsdbpipr.answers(rsdbpi)
+
+= Check UDS_RSDBPIPR
+
+rsdbpipr = UDS(b'\x6a\x34\x12\x34')
+assert rsdbpipr.service == 0x6a
+assert rsdbpipr.periodicDataIdentifier == 0x34
+assert rsdbpipr.dataRecord == b'\x12\x34'
+
+assert rsdbpipr.answers(rsdbpi)
+
 = Check UDS_DDDI
 
 dddi = UDS(b'\x2c\x12coffee')
 assert dddi.service == 0x2c
-assert dddi.definitionMode == 0x12
+assert dddi.subFunction == 0x12
 assert dddi.dataRecord == b'coffee'
 
 = Check UDS_DDDIPR
 
 dddipr = UDS(b'\x6c\x12\x44\x55')
 assert dddipr.service == 0x6c
-assert dddipr.definitionMode == 0x12
+assert dddipr.subFunction == 0x12
 assert dddipr.dynamicallyDefinedDataIdentifier == 0x4455
 
+assert dddipr.answers(dddi)
+
 = Check UDS_WDBI
 
 wdbi = UDS(b'\x2e\x01\x02dieselgate')
@@ -373,11 +509,26 @@
 assert wdbi.load == b'dieselgate'
 assert bytes(wdbi) == b'\x2e\x01\x02dieselgate'
 
+= Check UDS_WDBI
+
+wdbi = UDS(b'\x2e\x01\x02dieselgate')
+assert wdbi.service == 0x2e
+assert wdbi.dataIdentifier == 0x0102
+assert wdbi.load == b'dieselgate'
+
+wdbi = UDS(b'\x2e\x02\x02benzingate')
+assert wdbi.service == 0x2e
+assert wdbi.dataIdentifier == 0x0202
+assert wdbi.load == b'benzingate'
+
+
 = Check UDS_WDBIPR
 
-wdbipr = UDS(b'\x6e\x01\x02')
+wdbipr = UDS(b'\x6e\x02\x02')
 assert wdbipr.service == 0x6e
-assert wdbipr.dataIdentifier == 0x0102
+assert wdbipr.dataIdentifier == 0x0202
+
+assert wdbipr.answers(wdbi)
 
 = Check UDS_WMBA
 
@@ -389,6 +540,17 @@
 assert wmba.memorySize1 == 2
 assert wmba.dataRecord == b'muchData'
 
+= Check UDS_WMBAPR
+
+wmbapr = UDS(b'\x7d\x11\x02\x02')
+assert wmbapr.service == 0x7d
+assert wmbapr.memorySizeLen == 1
+assert wmbapr.memoryAddressLen == 1
+assert wmbapr.memoryAddress1 == 2
+assert wmbapr.memorySize1 == 2
+
+assert wmbapr.answers(wmba)
+
 = Check UDS_WMBA
 
 wmba = UDS(b'\x3d\x22\x02\x02\x03\x03muchData')
@@ -399,6 +561,17 @@
 assert wmba.memorySize2 == 0x303
 assert wmba.dataRecord == b'muchData'
 
+= Check UDS_WMBAPR
+
+wmbapr = UDS(b'\x7d\x22\x02\x02\x03\x03')
+assert wmbapr.service == 0x7d
+assert wmbapr.memorySizeLen == 2
+assert wmbapr.memoryAddressLen == 2
+assert wmbapr.memoryAddress2 == 0x202
+assert wmbapr.memorySize2 == 0x303
+
+assert wmbapr.answers(wmba)
+
 = Check UDS_WMBA
 
 wmba = UDS(b'\x3d\x33\x02\x02\x02\x03\x03\x03muchData')
@@ -421,24 +594,6 @@
 
 = Check UDS_WMBAPR
 
-wmbapr = UDS(b'\x7d\x11\x02\x02')
-assert wmbapr.service == 0x7d
-assert wmbapr.memorySizeLen == 1
-assert wmbapr.memoryAddressLen == 1
-assert wmbapr.memoryAddress1 == 2
-assert wmbapr.memorySize1 == 2
-
-= Check UDS_WMBAPR
-
-wmbapr = UDS(b'\x7d\x22\x02\x02\x03\x03')
-assert wmbapr.service == 0x7d
-assert wmbapr.memorySizeLen == 2
-assert wmbapr.memoryAddressLen == 2
-assert wmbapr.memoryAddress2 == 0x202
-assert wmbapr.memorySize2 == 0x303
-
-= Check UDS_WMBAPR
-
 wmbapr = UDS(b'\x7d\x33\x02\x02\x02\x03\x03\x03')
 assert wmbapr.service == 0x7d
 assert wmbapr.memorySizeLen == 3
@@ -446,6 +601,8 @@
 assert wmbapr.memoryAddress3 == 0x20202
 assert wmbapr.memorySize3 == 0x30303
 
+assert not wmbapr.answers(wmba)
+
 = Check UDS_WMBAPR
 
 wmbapr = UDS(b'\x7d\x44\x02\x02\x02\x02\x03\x03\x03\x03')
@@ -455,6 +612,8 @@
 assert wmbapr.memoryAddress4 == 0x2020202
 assert wmbapr.memorySize4 == 0x3030303
 
+assert wmbapr.answers(wmba)
+
 = Check UDS_CDTCI
 
 cdtci = UDS(b'\x14\x44\x02\x03')
@@ -476,6 +635,17 @@
 assert rdtci.reportType == 0x01
 assert rdtci.DTCStatusMask == 0xff
 
+= Check UDS_RDTCIPR
+
+rdtcipr = UDS(b'\x59\x01\xff\xee\xdd\xaa')
+assert rdtcipr.service == 0x59
+assert rdtcipr.reportType == 1
+assert rdtcipr.DTCStatusAvailabilityMask == 0xff
+assert rdtcipr.DTCFormatIdentifier == 0xee
+assert rdtcipr.DTCCount == 0xddaa
+
+assert rdtcipr.answers(rdtci)
+
 = Check UDS_RDTCI
 
 rdtci = UDS(b'\x19\x02\xff')
@@ -583,14 +753,6 @@
 assert rdtci.DTCLowByte == 0xdd
 assert rdtci.DTCExtendedDataRecordNumber == 0xaa
 
-= Check UDS_RDTCIPR
-
-rdtcipr = UDS(b'\x59\x01\xff\xee\xdd\xaa')
-assert rdtcipr.service == 0x59
-assert rdtcipr.reportType == 1
-assert rdtcipr.DTCStatusAvailabilityMask == 0xff
-assert rdtcipr.DTCFormatIdentifier == 0xee
-assert rdtcipr.DTCCount == 0xddaa
 
 = Check UDS_RDTCIPR
 
@@ -600,6 +762,8 @@
 assert rdtcipr.DTCStatusAvailabilityMask == 0xff
 assert rdtcipr.DTCAndStatusRecord == b'\xee\xdd\xaa'
 
+assert not rdtcipr.answers(rdtci)
+
 = Check UDS_RDTCIPR
 
 rdtcipr = UDS(b'\x59\x03\xff\xee\xdd\xaa')
@@ -615,6 +779,15 @@
 assert rc.routineIdentifier == 0xffee
 assert rc.routineControlOptionRecord == b'\xdd\xaa'
 
+= Check UDS_RC
+
+rc = UDS(b'\x31\x03\xff\xee\xdd\xaa')
+assert rc.service == 0x31
+assert rc.routineControlType == 3
+assert rc.routineIdentifier == 0xffee
+assert rc.routineControlOptionRecord == b'\xdd\xaa'
+
+
 = Check UDS_RCPR
 
 rcpr = UDS(b'\x71\x03\xff\xee\xdd\xaa')
@@ -633,6 +806,7 @@
 assert rd.memoryAddress1 == 2
 assert rd.memorySize1 == 2
 
+
 = Check UDS_RD
 
 rd = UDS(b'\x34\xaa\x22\x02\x02\x03\x03')
@@ -663,15 +837,17 @@
 assert rd.memoryAddress4 == 0x2020202
 assert rd.memorySize4 == 0x3030303
 
+
 = Check UDS_RDPR
 
-rdpr = UDS(b'\x74\xaa\x44\x02\x02\x02\x02\x03\x03\x03\x03')
+rdpr = UDS(b'\x74\x40\x02\x02\x02\x02\x03\x03\x03\x03')
 assert rdpr.service == 0x74
-assert rdpr.routineControlType == 0xaa
 assert rdpr.memorySizeLen == 4
-assert rdpr.memoryAddressLen == 4
+assert rdpr.reserved == 0
 assert rdpr.maxNumberOfBlockLength == b'\x02\x02\x02\x02\x03\x03\x03\x03'
 
+assert rdpr.answers(rd)
+
 = Check UDS_RU
 
 ru = UDS(b'\x35\xaa\x11\x02\x02')
@@ -692,6 +868,7 @@
 assert ru.memoryAddress2 == 0x202
 assert ru.memorySize2 == 0x303
 
+
 = Check UDS_RU
 
 ru = UDS(b'\x35\xaa\x33\x02\x02\x02\x03\x03\x03')
@@ -702,6 +879,7 @@
 assert ru.memoryAddress3 == 0x20202
 assert ru.memorySize3 == 0x30303
 
+
 = Check UDS_RU
 
 ru = UDS(b'\x35\xaa\x44\x02\x02\x02\x02\x03\x03\x03\x03')
@@ -712,15 +890,24 @@
 assert ru.memoryAddress4 == 0x2020202
 assert ru.memorySize4 == 0x3030303
 
+
 = Check UDS_RUPR
 
-rupr = UDS(b'\x75\xaa\x44\x02\x02\x02\x02\x03\x03\x03\x03')
+rupr = UDS(b'\x75\x40\x02\x02\x02\x02\x03\x03\x03\x03')
 assert rupr.service == 0x75
-assert rupr.routineControlType == 0xaa
 assert rupr.memorySizeLen == 4
-assert rupr.memoryAddressLen == 4
+assert rupr.reserved == 0
 assert rupr.maxNumberOfBlockLength == b'\x02\x02\x02\x02\x03\x03\x03\x03'
 
+assert rupr.answers(ru)
+
+= Check UDS_TD
+
+td = UDS(b'\x36\xaapayload')
+assert td.service == 0x36
+assert td.blockSequenceCounter == 0xaa
+assert td.transferRequestParameterRecord == b'payload'
+
 = Check UDS_TD
 
 td = UDS(b'\x36\xaapayload')
@@ -735,6 +922,8 @@
 assert tdpr.blockSequenceCounter == 0xaa
 assert tdpr.transferResponseParameterRecord == b'payload'
 
+assert tdpr.answers(td)
+
 = Check UDS_RTE
 
 rte = UDS(b'\x37payload')
@@ -747,6 +936,8 @@
 assert rtepr.service == 0x77
 assert rtepr.transferResponseParameterRecord == b'payload'
 
+assert rtepr.answers(rte)
+
 = Check UDS_IOCBI
 
 iocbi = UDS(b'\x2f\x23\x34\xffcoffee')
@@ -755,7 +946,6 @@
 assert iocbi.controlOptionRecord == 255
 assert iocbi.controlEnableMaskRecord == b'coffee'
 
-
 = Check UDS_NRC
 
 nrc = UDS(b'\x7f\x22\x33')

scapy-2.4.4.tar.gz/test/contrib/automotive/uds_utils.uts Added

@@ -0,0 +1,214 @@
+% Regression tests for uds_utils
+
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import subprocess, sys
+import scapy.modules.six as six
+from subprocess import call
+from scapy.consts import LINUX
+
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+# function to exit when the can-isotp kernel module is not available
+ISOTP_KERNEL_MODULE_AVAILABLE = False
+def exit_if_no_isotp_module():
+    if not ISOTP_KERNEL_MODULE_AVAILABLE:
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
+        warning("Can't test ISOTP native socket because kernel module is not loaded")
+        exit(0)
+
+
+= Initialize a virtual CAN interface
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+= Import CANSocket
+
+from scapy.contrib.cansocket_python_can import *
+
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+print("CAN sockets should work now")
+
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, bitrate=250000, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, bitrate=250000, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, bitrate=250000, timeout=0.01)
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
+
+
+= Check if can-isotp and can-utils are installed on this system
+~ linux
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
+
+
++ Syntax check
+
+= Import isotp
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
+
+load_contrib("isotp", globals_dict=globals())
+
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
+
+############
+############
++ Load general modules
+
+= Load contribution layer
+load_contrib("automotive.uds", globals_dict=globals())
+
+= Test Session Enumerator
+drain_bus(iface0)
+drain_bus(iface1)
+
+packet = ISOTP('Request')
+succ = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x241, did=0x641, basecls=UDS) as sendSock, \
+     new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x641, did=0x241, basecls=UDS) as recvSock:
+    def answer(pkt):
+        pkt.service = pkt.service + 0x40
+        recvSock.send(pkt)
+    def sniffer():
+        global sniffed, succ
+        sniffed = 0
+        pkts = recvSock.sniff(timeout=10, prn=answer)
+        sniffed = len(pkts)
+        succ = True
+    threadSniffer = threading.Thread(target=sniffer)
+    threadSniffer.start()
+    sessions = UDS_SessionEnumerator(sendSock, session_range=range(3))
+    threadSniffer.join()
+
+assert sniffed == 3*2
+assert succ
+
+
+= Test Service Enumerator
+drain_bus(iface0)
+drain_bus(iface1)
+
+packet = ISOTP('Request')
+succ = False
+
+with new_can_socket0() as isocan1, ISOTPSocket(isocan1, sid=0x241, did=0x641, basecls=UDS) as sendSock, \
+     new_can_socket0() as isocan2, ISOTPSocket(isocan2, sid=0x641, did=0x241, basecls=UDS) as recvSock:
+    def answer(pkt):
+        pkt.service = pkt.service + 0x40
+        if pkt.service == 0x7f:
+            pkt = UDS()/UDS_NR(requestServiceId=0x3f)
+        recvSock.send(pkt)
+    def sniffer():
+        global sniffed, succ
+        sniffed = 0
+        pkts = recvSock.sniff(timeout=10, prn=answer)
+        sniffed = len(pkts)
+        succ = True
+    threadSniffer = threading.Thread(target=sniffer)
+    threadSniffer.start()
+    services = UDS_ServiceEnumerator(sendSock)
+    threadSniffer.join()
+
+assert sniffed == 128
+assert succ
+
+
+= Test getTableEntry
+a = ('DefaultSession', UDS()/UDS_SAPR())
+b = ('ProgrammingSession', UDS()/UDS_NR(requestServiceId=0x10, negativeResponseCode=0x13))
+c = ('ExtendedDiagnosticSession', UDS()/UDS_IOCBI())
+
+res_a = getTableEntry(a)
+res_b = getTableEntry(b)
+res_c = getTableEntry(c)
+
+print(res_a)
+print(res_b)
+print(res_c)
+#make_lined_table([a, b, c], getTableEntry)
+
+assert res_a == ('DefaultSession', '0x27: SecurityAccess', 'PositiveResponse')
+assert res_b == ('ProgrammingSession', '0x10: DiagnosticSessionControl', 'incorrectMessageLengthOrInvalidFormat')
+assert res_c == ('ExtendedDiagnosticSession', '0x2f: InputOutputControlByIdentifier', 'PositiveResponse')
+
++ Cleanup
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.4.tar.gz/test/contrib/bfd.uts Added

scapy-2.4.4.tar.gz/test/contrib/cansocket.uts Added

@@ -0,0 +1,296 @@
+% Regression tests for compatibility between NativeCANSocket and PythonCANSocket
+~ python3_only not_pypy vcan_socket needs_root linux
+
+# More information at http://www.secdev.org/projects/UTscapy/
+
+
+############
+############
++ Configuration of CAN virtual sockets
+~ conf
+
+= Load module
+load_layer("can", globals_dict=globals())
+from scapy.contrib.cansocket_python_can import PythonCANSocket
+from scapy.contrib.cansocket_native import NativeCANSocket
+
+conf.contribs['CAN'] = {'swap-bytes': False}
+
+= Setup string for vcan
+bashCommand = "/bin/bash -c 'sudo modprobe vcan; sudo ip link add name vcan0 type vcan; sudo ip link set dev vcan0 up'"
+
+= Load os
+import os
+import threading
+from subprocess import call
+
+= Setup vcan0
+
+assert 0 == os.system(bashCommand)
+
+= Define common used functions
+
+send_done = threading.Event()
+
+def sender(sock, msg):
+    if not hasattr(msg, "__iter__"):
+        msg = [msg]
+    for m in msg:
+        sock.send(m)
+    send_done.set()
+
++ Basic Socket Tests
+
+= NativeCANSocket send recv small packet
+
+sock1 = NativeCANSocket(bustype='socketcan', channel='vcan0')
+sock2 = NativeCANSocket(bustype='socketcan', channel='vcan0')
+
+thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'), ))
+thread.start()
+send_done.wait(timeout=1)
+rx = sock1.recv()
+sock1.close()
+sock2.close()
+thread.join(timeout=5)
+
+assert rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
+
+= NativeCANSocket send recv small packet test with
+
+with NativeCANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+        NativeCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'),))
+    thread.start()
+    send_done.wait(timeout=1)
+    rx = sock1.recv()
+    thread.join(timeout=5)
+
+assert rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
+
+= PythonCANSocket send recv small packet
+
+sock1 = PythonCANSocket(bustype='socketcan', channel='vcan0')
+sock2 = PythonCANSocket(bustype='socketcan', channel='vcan0')
+
+thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'), ))
+thread.start()
+send_done.wait(timeout=1)
+rx = sock1.recv()
+sock1.close()
+sock2.close()
+thread.join(timeout=5)
+
+assert rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
+
+= PythonCANSocket send recv small packet test with
+
+with PythonCANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+        PythonCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'),))
+    thread.start()
+    send_done.wait(timeout=1)
+    rx = sock1.recv()
+    thread.join(timeout=5)
+
+assert rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
+
+= NativeCANSocket send recv swapped
+
+conf.contribs['CAN']['swap-bytes'] = True
+
+with NativeCANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+        NativeCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    time.sleep(0)
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),))
+    rx = sock1.sniff(count=1, timeout=1, started_callback=thread.start)
+    assert len(rx) == 1
+    assert rx[0] == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread.join(timeout=5)
+
+conf.contribs['CAN']['swap-bytes'] = False
+
+= PythonCANSocket send recv swapped
+
+conf.contribs['CAN']['swap-bytes'] = True
+
+with PythonCANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+        PythonCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),))
+    rx = sock1.sniff(count=1, timeout=1, started_callback=thread.start)
+    assert rx[0] == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread.join(timeout=5)
+
+conf.contribs['CAN']['swap-bytes'] = False
+
+= NativeCANSocket sniff with filtermask 0x7ff
+
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with NativeCANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}]) as sock1, \
+        NativeCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
+    assert len(packets) == 3
+    thread.join(timeout=5)
+
+= PythonCANSocket sniff with filtermask 0x7ff
+
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with PythonCANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}]) as sock1, \
+        PythonCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
+    assert len(packets) == 3
+    thread.join(timeout=5)
+
+= NativeCANSocket sniff with multiple filters
+
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x400, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x500, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x600, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x7ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with NativeCANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}, {'can_id': 0x400, 'can_mask': 0x7ff}, {'can_id': 0x600, 'can_mask': 0x7ff}, {'can_id': 0x7ff, 'can_mask': 0x7ff}]) as sock1, \
+        NativeCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
+    assert len(packets) == 4
+    thread.join(timeout=5)
+
+= PythonCANSocket sniff with multiple filters
+
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x400, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x500, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x600, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x7ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with PythonCANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}, {'can_id': 0x400, 'can_mask': 0x7ff}, {'can_id': 0x600, 'can_mask': 0x7ff}, {'can_id': 0x7ff, 'can_mask': 0x7ff}]) as sock1, \
+        PythonCANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
+    assert len(packets) == 4
+    thread.join(timeout=5)
+
++ bridge and sniff tests
+
+= Setup vcan1 interface
+
+bashCommand = "/bin/bash -c 'sudo ip link add name vcan1 type vcan; sudo ip link set dev vcan1 up'"
+assert 0 == os.system(bashCommand)
+
+= NativeCANSocket bridge and sniff setup vcan1 package forwarding
+
+sock0 = NativeCANSocket(bustype='socketcan', channel='vcan0')
+sock1 = NativeCANSocket(bustype='socketcan', channel='vcan1')
+
+def senderVCan0():
+    sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10030000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10040000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+
+bridgeStarted = threading.Event()
+def bridge():
+    global bridgeStarted
+    bSock0 = NativeCANSocket(
+        bustype='socketcan', channel='vcan0',
+                                bitrate=250000)
+    bSock1 = NativeCANSocket(
+        bustype='socketcan', channel='vcan1',
+                                bitrate=250000)
+    def pnr(pkt):
+        return pkt
+    bSock0.timeout = 0.01
+    bSock1.timeout = 0.01
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.5, started_callback=bridgeStarted.set)
+    bSock0.close()
+    bSock1.close()
+
+threadBridge = threading.Thread(target=bridge)
+threadBridge.start()
+threadSender = threading.Thread(target=senderVCan0)
+bridgeStarted.wait()
+
+packetsVCan1 = sock1.sniff(timeout=0.5, started_callback=threadSender.start)
+assert len(packetsVCan1) == 6
+
+sock1.close()
+sock0.close()
+
+threadBridge.join()
+threadSender.join()
+
+= PythonCANSocket bridge and sniff setup vcan1 package forwarding
+
+sock0 = PythonCANSocket(bustype='socketcan', channel='vcan0')
+sock1 = PythonCANSocket(bustype='socketcan', channel='vcan1')
+
+def senderVCan0():
+    sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10030000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10040000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+    sock0.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
+
+bridgeStarted = threading.Event()
+def bridge():
+    global bridgeStarted
+    bSock0 = PythonCANSocket(
+        bustype='socketcan', channel='vcan0',
+                                bitrate=250000)
+    bSock1 = PythonCANSocket(
+        bustype='socketcan', channel='vcan1',
+                                bitrate=250000)
+    def pnr(pkt):
+        return pkt
+    bSock0.timeout = 0.01
+    bSock1.timeout = 0.01
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.5, started_callback=bridgeStarted.set)
+    bSock0.close()
+    bSock1.close()
+
+threadBridge = threading.Thread(target=bridge)
+threadBridge.start()
+threadSender = threading.Thread(target=senderVCan0)
+bridgeStarted.wait()
+
+packetsVCan1 = sock1.sniff(timeout=0.5, started_callback=threadSender.start)
+assert len(packetsVCan1) == 6
+
+sock1.close()
+sock0.close()
+
+threadBridge.join()
+threadSender.join()
+
+
++ Cleanup
+
+= Delete vcan interfaces
+
+if 0 != call(["sudo", "ip" ,"link", "delete", "vcan0"]):
+        raise Exception("vcan0 could not be deleted")
+
+if 0 != call(["sudo", "ip" ,"link", "delete", "vcan1"]):
+        raise Exception("vcan1 could not be deleted")

scapy-2.4.3.tar.gz/test/contrib/cansocket_native.uts -> scapy-2.4.4.tar.gz/test/contrib/cansocket_native.uts Changed

@@ -1,5 +1,5 @@
 % Regression tests for nativecansocket
-~ python3_only vcan_socket needs_root linux
+~ python3_only not_pypy vcan_socket needs_root linux
 
 # More information at http://www.secdev.org/projects/UTscapy/
 
@@ -7,50 +7,40 @@
 ############
 ############
 + Configuration of CAN virtual sockets
+~ conf
 
 = Load module
-~ conf command needs_root linux
-
-load_layer("can")
+load_layer("can", globals_dict=globals())
 conf.contribs['CANSocket'] = {'use-python-can': False}
 from scapy.contrib.cansocket_native import *
 conf.contribs['CAN'] = {'swap-bytes': False}
 
 
 = Setup string for vcan
-~ conf command
-    bashCommand = "/bin/bash -c 'sudo modprobe vcan; sudo ip link add name vcan0 type vcan; sudo ip link set dev vcan0 up'"
+bashCommand = "/bin/bash -c 'sudo modprobe vcan; sudo ip link add name vcan0 type vcan; sudo ip link set dev vcan0 up'"
 
 = Load os
-~ conf command needs_root linux
-
 import os
 import threading
 from time import sleep
+from subprocess import call
 
 = Setup vcan0
-~ conf command needs_root linux
-
 0 == os.system(bashCommand)
 
 + Basic Packet Tests()
 = CAN Packet init
-
-
 canframe = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 bytes(canframe) == b'\x00\x00\x07\xff\x08\x00\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08'
 
 + Basic Socket Tests()
 = CAN Socket Init
-
-
-sock1 = CANSocket(iface="vcan0")
+sock1 = CANSocket(channel="vcan0")
 
 = CAN Socket send recv small packet
-
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x7ff,length=1,data=b'\x01'))
     sock2.close()
 
@@ -58,14 +48,12 @@
 thread.start()
 rx = sock1.recv()
 rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
-thread.join()
+thread.join(timeout=5)
 
 = CAN Socket send recv
-
-
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.close()
 
@@ -73,14 +61,12 @@
 thread.start()
 rx = sock1.recv()
 rx == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread.join()
+thread.join(timeout=5)
 
 = CAN Socket basecls test
-
-
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.close()
 
@@ -90,92 +76,84 @@
 rx = sock1.recv()
 rx == Raw(bytes(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')))
 sock1.basecls = CAN
-thread.join()
+thread.join(timeout=5)
 
 + Advanced Socket Tests()
 = CAN Socket sr1
-
-
 tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 
 = CAN Socket sr1 init time
-
-
 tx.sent_time == None
 
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(tx)
     sock2.close()
 
 thread = threading.Thread(target=sender)
 thread.start()
 rx = None
-rx = sock1.sr1(tx)
+rx = sock1.sr1(tx, verbose=False)
 rx == tx
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = CAN Socket sr1 time check
+assert tx.sent_time < rx.time and rx.time > 0
 
-
-tx.sent_time < rx.time and rx.time > 0
-
-= srcan
-
-
+= sr can
 tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 
-= srcan check init time
-
-
+= sr can check init time
 assert tx.sent_time == None
 
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(tx)
     sock2.close()
 
+sock1 = CANSocket(channel="vcan0")
 thread = threading.Thread(target=sender)
 thread.start()
 rx = None
-rx = srcan(tx, "vcan0", timeout=1)
+rx = sock1.sr(tx, timeout=1, verbose=False)
 rx = rx[0][0][1]
-tx == rx
-thread.join()
+assert tx == rx
+thread.join(timeout=5)
 
 = srcan check init time basecls
 
 
 def sender():
     sleep(0.1)
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(tx)
     sock2.close()
 
+sock1 = CANSocket(channel="vcan0", basecls=Raw)
 thread = threading.Thread(target=sender)
 thread.start()
 rx = None
-rx = srcan(tx, "vcan0", timeout=1, basecls=Raw)
+rx = sock1.sr(tx, timeout=1, verbose=False)
 rx = rx[0][0][1]
-Raw(bytes(tx)) == rx
-thread.join()
+assert Raw(bytes(tx)) == rx
+thread.join(timeout=5)
 
-= srcan check rx and tx
+= sr can check rx and tx
 
 
-tx.sent_time > 0 and rx.time > 0 and tx.sent_time < rx.time
+assert tx.sent_time > 0 and rx.time > 0 and tx.sent_time < rx.time
 
 = sniff with filtermask 0x7ff
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -185,19 +163,19 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 3
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with filtermask 0x700
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x700}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x700}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x212, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x2ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -207,19 +185,19 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 4
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with filtermask 0x0ff
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x0ff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x0ff}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x301, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -229,19 +207,19 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 4
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with multiple filters
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}, {'can_id': 0x400, 'can_mask': 0x7ff}, {'can_id': 0x600, 'can_mask': 0x7ff},  {'can_id': 0x7ff, 'can_mask': 0x7ff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}, {'can_id': 0x400, 'can_mask': 0x7ff}, {'can_id': 0x600, 'can_mask': 0x7ff},  {'can_id': 0x7ff, 'can_mask': 0x7ff}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x400, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -252,19 +230,19 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 4
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with filtermask 0x7ff and inverse filter
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x200 | CAN_INV_FILTER, 'can_mask': 0x7ff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x200 | CAN_INV_FILTER, 'can_mask': 0x7ff}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -274,19 +252,19 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 2
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with filtermask 0x1FFFFFFF
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x10000000, 'can_mask': 0x1fffffff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x10000000, 'can_mask': 0x1fffffff}])
 
 def sender():
-    sock2 = CANSocket(iface="vcan0")
+    sock2 = CANSocket(channel="vcan0")
     sock2.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
     sock2.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -296,20 +274,20 @@
     sock2.close()
 
 thread = threading.Thread(target=sender)
-packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
 len(packets) == 2
 
 sock1.close()
-thread.join()
+thread.join(timeout=5)
 
 = sniff with filtermask 0x1FFFFFFF and inverse filter
 
 
-sock1 = CANSocket(iface='vcan0', can_filters=[{'can_id': 0x10000000 | CAN_INV_FILTER, 'can_mask': 0x1fffffff}])
+sock1 = CANSocket(channel='vcan0', can_filters=[{'can_id': 0x10000000 | CAN_INV_FILTER, 'can_mask': 0x1fffffff}])
 
 if six.PY3:
     thread = threading.Thread(target=sender)
-    packets = sock1.sniff(timeout=0.2, started_callback=thread.start)
+    packets = sock1.sniff(timeout=0.2, started_callback=thread.start, verbose=False)
     len(packets) == 4
 
 sock1.close()
@@ -317,21 +295,21 @@
 = CAN Socket sr1 with receive own messages
 
 
-sock1 = CANSocket(iface="vcan0", receive_own_messages=True)
+sock1 = CANSocket(channel="vcan0", receive_own_messages=True)
 tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 rx = None
-rx = sock1.sr1(tx)
+rx = sock1.sr1(tx, verbose=False)
 tx == rx
 tx.sent_time < rx.time and tx == rx and rx.time > 0
 
 sock1.close()
 
-= srcan
-
+= sr can
 
+sock1 = CANSocket(channel="vcan0", receive_own_messages=True)
 tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 rx = None
-rx = srcan(tx, iface="vcan0", receive_own_messages=True, timeout=1)
+rx = sock1.sr(tx, timeout=1, verbose=False)
 tx == rx[0][0][1]
 
 + bridge and sniff tests
@@ -342,8 +320,8 @@
 bashCommand = "/bin/bash -c 'sudo ip link add name vcan1 type vcan; sudo ip link set dev vcan1 up'"
 0 == os.system(bashCommand)
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1')
 
 def senderVCan0():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -357,25 +335,25 @@
 
 def bridge():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface='vcan1')
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel='vcan1')
     def pnr(pkt):
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan0)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan1 = sock1.sniff(timeout=0.2, started_callback=threadSender.start)
+packetsVCan1 = sock1.sniff(timeout=0.2, started_callback=threadSender.start, verbose=False)
 len(packetsVCan1) == 6
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 sock1.close()
 sock0.close()
@@ -383,8 +361,8 @@
 = bridge and sniff setup vcan0 package forwarding
 
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1')
 
 def senderVCan1():
     sock1.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x04\x05\x06'))
@@ -396,34 +374,34 @@
 
 def bridge():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface='vcan1')
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel='vcan1')
     def pnr(pkt):
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan1)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan0 = sock0.sniff(timeout=0.2, started_callback=threadSender.start)
+packetsVCan0 = sock0.sniff(timeout=0.2, started_callback=threadSender.start, verbose=False)
 len(packetsVCan0) == 4
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan0 vcan1 package forwarding both directions
 
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1')
 
 def senderBothVCans():
     sock0.send(CAN(flags='extended', identifier=0x25, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -441,12 +419,12 @@
 
 def bridge():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface='vcan1')
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel='vcan1')
     def pnr(pkt):
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -454,10 +432,10 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderBothVCans)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan0 = sock0.sniff(timeout=0.1, count=6, started_callback=threadSender.start)
-packetsVCan1 = sock1.sniff(timeout=0.1)
+packetsVCan0 = sock0.sniff(timeout=0.1, count=6, started_callback=threadSender.start, verbose=False)
+packetsVCan1 = sock1.sniff(timeout=0.1, verbose=False)
 
 len(packetsVCan0) == 4
 len(packetsVCan1) == 6
@@ -465,14 +443,14 @@
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan1 package change
 
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
 
 def senderVCan0():
     sleep(0.1)
@@ -487,14 +465,14 @@
 
 def bridgeWithPackageChangeVCan0ToVCan1():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -502,22 +480,22 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan0)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan1 = sock1.sniff(timeout=0.2,  started_callback=threadSender.start)
+packetsVCan1 = sock1.sniff(timeout=0.2,  started_callback=threadSender.start, verbose=False)
 len(packetsVCan1) == 6
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan0 package change
 
 
-sock0 = CANSocket(iface='vcan0',  can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0',  can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
+sock1 = CANSocket(channel='vcan1')
 
 def senderVCan1():
     sleep(0.1)
@@ -530,14 +508,14 @@
 
 def bridgeWithPackageChangeVCan1ToVCan0():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -545,22 +523,22 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan1)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan0 = sock0.sniff(timeout=0.2,  started_callback=threadSender.start)
+packetsVCan0 = sock0.sniff(timeout=0.2,  started_callback=threadSender.start, verbose=False)
 len(packetsVCan0) == 4
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan0 and vcan1 package change in both directions
 
 
-sock0 = CANSocket(iface='vcan0',  can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
-sock1 = CANSocket(iface='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
+sock0 = CANSocket(channel='vcan0',  can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
+sock1 = CANSocket(channel='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
 
 def senderBothVCans():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -578,14 +556,14 @@
 
 def bridgeWithPackageChangeBothDirections():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -593,25 +571,25 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderBothVCans)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 threadSender.start()
 
-packetsVCan0 = sock0.sniff(timeout=0.1)
-packetsVCan1 = sock1.sniff(timeout=0.1)
+packetsVCan0 = sock0.sniff(timeout=0.1, verbose=False)
+packetsVCan1 = sock1.sniff(timeout=0.1, verbose=False)
 len(packetsVCan0) == 4
 len(packetsVCan1) == 6
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan0 package remove
 
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1')
 
 def senderVCan0():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -625,8 +603,8 @@
 
 def bridgeWithRemovePackageFromVCan0ToVCan1():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnr(pkt):
         if(pkt.identifier == 0x10020000):
             pkt = None
@@ -634,7 +612,7 @@
             pkt = pkt
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -642,24 +620,24 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan0)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
 threadSender.start()
 
-packetsVCan1 = sock1.sniff(timeout=0.2)
+packetsVCan1 = sock1.sniff(timeout=0.2, verbose=False)
 len(packetsVCan1) == 5
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan1 package remove
 
 
-sock0 = CANSocket(iface='vcan0')
-sock1 = CANSocket(iface='vcan1')
+sock0 = CANSocket(channel='vcan0')
+sock1 = CANSocket(channel='vcan1')
 
 def senderVCan1():
     sock1.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x04\x05\x06'))
@@ -671,8 +649,8 @@
 
 def bridgeWithRemovePackageFromVCan1ToVCan0():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnr(pkt):
         if(pkt.identifier == 0x10050000):
             pkt = None
@@ -680,31 +658,31 @@
             pkt = pkt
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm21=pnr, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm21=pnr, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
 threadBridge = threading.Thread(target=bridgeWithRemovePackageFromVCan1ToVCan0)
 threadBridge.start()
 threadSender = threading.Thread(target=senderVCan1)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
 threadSender.start()
 
-packetsVCan0 = sock0.sniff(timeout=0.2)
+packetsVCan0 = sock0.sniff(timeout=0.2, verbose=False)
 len(packetsVCan0) == 3
 
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 =bridge and sniff setup vcan0 and vcan1 package remove both directions
 
 
-sock0 = CANSocket(iface="vcan0")
-sock1 = CANSocket(iface="vcan1")
+sock0 = CANSocket(channel="vcan0")
+sock1 = CANSocket(channel="vcan1")
 
 def senderBothVCans():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -722,8 +700,8 @@
 
 def bridgeWithRemovePackageInBothDirections():
     global bridgeStarted
-    bSock0 = CANSocket(iface="vcan0")
-    bSock1 = CANSocket(iface="vcan1")
+    bSock0 = CANSocket(channel="vcan0")
+    bSock1 = CANSocket(channel="vcan1")
     def pnrA(pkt):
         if(pkt.identifier == 0x10020000):
             pkt = None
@@ -737,7 +715,7 @@
             pkt = pkt
         return pkt
     bridgeStarted.set()
-    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnrA, xfrm21=pnrB, timeout=0.2)
+    bridge_and_sniff(if1=bSock0, if2=bSock1, xfrm12=pnrA, xfrm21=pnrB, timeout=0.2, verbose=False)
     bSock0.close()
     bSock1.close()
 
@@ -745,10 +723,10 @@
 threadBridge.start()
 threadSender = threading.Thread(target=senderBothVCans)
 
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
-packetsVCan0 = sock0.sniff(timeout=0.1, started_callback=threadSender.start)
-packetsVCan1 = sock1.sniff(timeout=0.1)
+packetsVCan0 = sock0.sniff(timeout=0.1, started_callback=threadSender.start, verbose=False)
+packetsVCan1 = sock1.sniff(timeout=0.1, verbose=False)
 
 len(packetsVCan0) == 3
 len(packetsVCan1) == 5
@@ -756,5 +734,13 @@
 sock0.close()
 sock1.close()
 
-threadSender.join()
-threadBridge.join()
\ No newline at end of file
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
+
+= Delete vcan interfaces
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan0"]):
+        raise Exception("vcan0 could not be deleted")
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan1"]):
+        raise Exception("vcan1 could not be deleted")

scapy-2.4.3.tar.gz/test/contrib/cansocket_python_can.uts -> scapy-2.4.4.tar.gz/test/contrib/cansocket_python_can.uts Changed

@@ -9,13 +9,12 @@
 + Configuration of CAN virtual sockets
 
 = Load module
-~ conf command
-
+~ conf
+ 
 conf.contribs['CAN'] = {'swap-bytes': False}
-load_layer("can")
+load_layer("can", globals_dict=globals())
 conf.contribs['CANSocket'] = {'use-python-can': True}
 from scapy.contrib.cansocket_python_can import *
-import can
 
 = Setup string for vcan
 ~ conf command
@@ -26,12 +25,24 @@
 
 import os
 import threading
+from subprocess import call
 
 = Setup vcan0
 ~ conf command
 
 0 == os.system(bashCommand)
 
+= Define common used functions
+
+send_done = threading.Event()
+
+def sender(sock, msg):
+    if not hasattr(msg, "__iter__"):
+        msg = [msg]
+    for m in msg:
+        sock.send(m)
+    send_done.set()
+
 + Basic Packet Tests()
 = CAN Packet init
 
@@ -41,273 +52,203 @@
 + Basic Socket Tests()
 = CAN Socket Init
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
+sock1 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1.close()
+del sock1
+sock1 = None
 
 = CAN Socket send recv small packet
 
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x7ff,length=1,data=b'\x01'))
-    sock2.close()
+sock1 = CANSocket(bustype='socketcan', channel='vcan0')
+sock2 = CANSocket(bustype='socketcan', channel='vcan0')
 
-thread = threading.Thread(target=sender)
+thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'), ))
 thread.start()
-
+send_done.wait(timeout=1)
+send_done.clear()
 rx = sock1.recv()
-rx.show()
-bytes(rx)
+sock1.close()
+sock2.close()
+
 rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
 
+= CAN Socket send recv small packet test with
 
-= CAN Socket send recv ISOTP_Packet
+with CANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+    CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=1,data=b'\x01'),))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    rx = sock1.recv()
 
-from scapy.contrib.isotp import ISOTPHeader, ISOTP_FF
+rx == CAN(identifier=0x7ff,length=1,data=b'\x01')
 
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    pkt = ISOTPHeader(identifier=0x7ff)/ISOTP_FF(message_size=100, data=b'abcdef')
-    pkt.show()
-    sock2.send(pkt)
-    sock2.close()
 
-thread = threading.Thread(target=sender)
-thread.start()
+= CAN Socket send recv ISOTP_Packet
 
-rx = sock1.recv()
-rx.show()
-bytes(rx)
-rx == CAN(identifier=0x7ff,length=8,data=b'\x10\x64abcdef')
+from scapy.contrib.isotp import ISOTPHeader, ISOTP_FF
+
+with CANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+    CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, ISOTPHeader(identifier=0x7ff)/ISOTP_FF(message_size=100, data=b'abcdef'),))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    rx = sock1.recv()
+    rx == CAN(identifier=0x7ff,length=8,data=b'\x10\x64abcdef')
 
 
 = CAN Socket basecls test
 
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-sock1.basecls = Raw
-thread = threading.Thread(target=sender)
-thread.start()
-rx = sock1.recv()
-rx == Raw(bytes(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')))
-sock1.basecls = CAN
+with CANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+    CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),))
+    thread.start()
+    sock1.basecls = Raw
+    send_done.wait(timeout=1)
+    send_done.clear()
+    rx = sock1.recv()
+    rx == Raw(bytes(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')))
 
 = CAN Socket send recv
 
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-thread.start()
-
-rx = sock1.recv()
-rx == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-
-sock1.close()
+with CANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+    CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),))
+    thread.start()
+    sock1.basecls = CAN
+    send_done.wait(timeout=1)
+    send_done.clear()
+    rx = sock1.recv()
+    rx == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 
 = CAN Socket send recv swapped
 
 conf.contribs['CAN']['swap-bytes'] = True
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
 
-thread = threading.Thread(target=sender)
-thread.start()
-
-rx = sock1.recv()
-print(rx)
-rx.show()
-rx == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+with CANSocket(bustype='socketcan', channel='vcan0') as sock1, \
+    CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),))
+    thread.start()
+    sock1.basecls = CAN
+    send_done.wait(timeout=1)
+    send_done.clear()
+    rx = sock1.recv()
+    rx == CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
 
-sock1.close()
-thread.join(10)
 conf.contribs['CAN']['swap-bytes'] = False
 
 = sniff with filtermask 0x7ff
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
 
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 3
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    assert len(packets) == 3
 
-sock1.close()
 
 = sniff with filtermask 0x700
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, can_filters=[{'can_id': 0x200, 'can_mask': 0x700}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x212, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x2ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x1ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x2aa, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 4
-
-sock1.close()
+msgs = [CAN(identifier=0x212, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x2ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x1ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x2aa, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x700}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    assert len(packets) == 4
 
 = sniff with filtermask 0x0ff
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, can_filters=[{'can_id': 0x200, 'can_mask': 0xff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x301, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x1ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 4
-
-sock1.close()
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x301, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x1ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0xff}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    len(packets) == 4
 
 = sniff with multiple filters
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000,
-                                          can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff},
-                                                     {'can_id': 0x400, 'can_mask': 0x7ff},
-                                                     {'can_id': 0x600, 'can_mask': 0x7ff},
-                                                     {'can_id': 0x7ff, 'can_mask': 0x7ff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x400, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x500, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x600, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x7ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 4
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x400, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x500, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x600, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x700, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x7ff, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
+
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}, {'can_id': 0x400, 'can_mask': 0x7ff}, {'can_id': 0x600, 'can_mask': 0x7ff}, {'can_id': 0x7ff, 'can_mask': 0x7ff}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    assert len(packets) == 4
 
-sock1.close()
-
-= sniff with filtermask 0x7ff and inverse filter
-
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000,
-                                          can_filters=[{'can_id': 0x200 | CAN_INV_FILTER, 'can_mask': 0x7ff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
+= sniff with filtermask 0x7ff
 
-thread = threading.Thread(target=sender)
+msgs = [CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x300, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x100, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
 
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 2
 
-sock1.close()
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x200, 'can_mask': 0x7ff}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    assert len(packets) == 4
 
 = sniff with filtermask 0x1FFFFFFF
 
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000,
-                                          can_filters=[{'can_id': 0x10000000, 'can_mask': 0x1fffffff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10030000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10040000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 2
-
-sock1.close()
-
-= sniff with filtermask 0x1FFFFFFF and inverse filter
-
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000,
-                                          can_filters=[{'can_id': 0x10000000 | CAN_INV_FILTER, 'can_mask': 0x1fffffff}]))
-
-def sender():
-    sock2 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-    sock2.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10030000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10040000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.send(CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
-    sock2.close()
-
-thread = threading.Thread(target=sender)
-
-packets = sock1.sniff(timeout=0.1, started_callback=thread.start)
-len(packets) == 4
-
-sock1.close()
-
-= CAN Socket sr1 with receive own messages
-
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, receive_own_messages=True))
-tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-rx = None
-rx = sock1.sr1(tx)
-tx == rx
-#this test can be enabled after issue #1199 is fixed
-#tx.sent_time < rx.time and tx == rx and rx.time > 0
-
-sock1.close()
-
-= srcan
+msgs = [CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(flags='extended', identifier=0x10020000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(flags='extended', identifier=0x10030000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(flags='extended', identifier=0x10040000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'),
+    CAN(flags='extended', identifier=0x10000000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')]
 
-tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-rx = None
-rx = srcan(tx, iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, receive_own_messages=True), timeout=1)
-tx == rx[0][0][1]
-
-= srcan basecls
-
-tx = CAN(identifier=0x7ff,length=8,data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-rx = None
-rx = srcan(tx, iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000, receive_own_messages=True), timeout=1, basecls=Raw)
-Raw(bytes(tx)) == rx[0][0][1]
+with CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x10000000, 'can_mask': 0x1fffffff}]) as sock1, \
+        CANSocket(bustype='socketcan', channel='vcan0') as sock2:
+    thread = threading.Thread(target=sender, args=(sock2, msgs,))
+    thread.start()
+    send_done.wait(timeout=1)
+    send_done.clear()
+    packets = sock1.sniff(timeout=0.1)
+    assert len(packets) == 2
 
 
 + bridge and sniff tests
@@ -316,8 +257,8 @@
 bashCommand = "/bin/bash -c 'sudo ip link add name vcan1 type vcan; sudo ip link set dev vcan1 up'"
 0 == os.system(bashCommand)
 
-sock0 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan1', bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 def senderVCan0():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -331,11 +272,11 @@
 def bridge():
     global bridgeStarted
     bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
+        bustype='socketcan', channel='vcan0',
+                                bitrate=250000)
     bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+        bustype='socketcan', channel='vcan1',
+                                bitrate=250000)
     def pnr(pkt):
         return pkt
     bSock0.timeout = 0.01
@@ -349,8 +290,8 @@
 threadSender = threading.Thread(target=senderVCan0)
 bridgeStarted.wait()
 
-packetsVCan1 = sock1.sniff(timeout=0.3, started_callback=threadSender.start)
-len(packetsVCan1) == 6
+packetsVCan1 = sock1.sniff(timeout=0.5, started_callback=threadSender.start)
+assert len(packetsVCan1) == 6
 
 sock1.close()
 sock0.close()
@@ -360,8 +301,8 @@
 
 = bridge and sniff setup vcan0 package forwarding
 
-sock0 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan0', bitrate=250000))
-sock1 = CANSocket(iface=can.interface.Bus(bustype='socketcan', channel='vcan1', bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 def senderVCan1():
     sock1.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x04\x05\x06'))
@@ -372,12 +313,8 @@
 bridgeStarted = threading.Event()
 def bridge():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         return pkt
     bSock0.timeout = 0.01
@@ -402,12 +339,8 @@
 
 =bridge and sniff setup vcan0 vcan1 package forwarding both directions
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 
 def senderBothVCans():
@@ -425,12 +358,8 @@
 bridgeStarted = threading.Event()
 def bridge():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         return pkt
     bSock0.timeout = 0.01
@@ -457,12 +386,8 @@
 
 =bridge and sniff setup vcan1 package change
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000, can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}]))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
 
 def senderVCan0():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -475,12 +400,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithPackageChangeVCan0ToVCan1():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
@@ -507,12 +428,8 @@
 
 =bridge and sniff setup vcan0 package change
 
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000, can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}]))
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
+sock0 = CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
 
 def senderVCan1():
     sock1.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x04\x05\x06'))
@@ -523,12 +440,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithPackageChangeVCan1ToVCan0():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
@@ -555,12 +468,8 @@
 
 =bridge and sniff setup vcan0 and vcan1 package change in both directions
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000, can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}]))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000, can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}]))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
+sock1 = CANSocket(bustype='socketcan', channel='vcan1', can_filters=[{'can_id': 0x10010000, 'can_mask': 0x1fffffff}])
 
 def senderBothVCans():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -577,12 +486,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithPackageChangeBothDirections():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         pkt.data = b'\x08\x07\x06\x05\x04\x03\x02\x01'
         pkt.identifier = 0x10010000
@@ -611,12 +516,8 @@
 
 =bridge and sniff setup vcan0 package remove
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 def senderVCan0():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -629,12 +530,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithRemovePackageFromVCan0ToVCan1():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         if(pkt.identifier == 0x10020000):
             pkt = None
@@ -664,12 +561,8 @@
 
 =bridge and sniff setup vcan1 package remove
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 def senderVCan1():
     sock1.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x04\x05\x06'))
@@ -680,12 +573,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithRemovePackageFromVCan1ToVCan0():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnr(pkt):
         if(pkt.identifier == 0x10050000):
             pkt = None
@@ -716,12 +605,8 @@
 
 =bridge and sniff setup vcan0 and vcan1 package remove both directions
 
-sock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-sock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+sock0 = CANSocket(bustype='socketcan', channel='vcan0')
+sock1 = CANSocket(bustype='socketcan', channel='vcan1')
 
 def senderBothVCans():
     sock0.send(CAN(flags='extended', identifier=0x10010000, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08'))
@@ -738,12 +623,8 @@
 bridgeStarted = threading.Event()
 def bridgeWithRemovePackageInBothDirections():
     global bridgeStarted
-    bSock0 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan0',
-                                bitrate=250000))
-    bSock1 = CANSocket(
-        iface=can.interface.Bus(bustype='socketcan', channel='vcan1',
-                                bitrate=250000))
+    bSock0 = CANSocket(bustype='socketcan', channel='vcan0')
+    bSock1 = CANSocket(bustype='socketcan', channel='vcan1')
     def pnrA(pkt):
         if(pkt.identifier == 0x10020000):
             pkt = None
@@ -776,3 +657,11 @@
 sock0.close()
 sock1.close()
 
+= Delete vcan interfaces
+~ needs_root linux vcan_socket
+
+if 0 != call(["sudo", "ip" ,"link", "delete", "vcan0"]):
+        raise Exception("vcan0 could not be deleted")
+
+if 0 != call(["sudo", "ip" ,"link", "delete", "vcan1"]):
+        raise Exception("vcan1 could not be deleted")

scapy-2.4.3.tar.gz/test/contrib/cdp.uts -> scapy-2.4.4.tar.gz/test/contrib/cdp.uts Changed

@@ -8,6 +8,7 @@
 = CDPv2 - Dissection (1)
 s = b'\x02\xb4\x8c\xfa\x00\x01\x00\x0cmyswitch\x00\x02\x00\x11\x00\x00\x00\x01\x01\x01\xcc\x00\x04\xc0\xa8\x00\xfd\x00\x03\x00\x13FastEthernet0/1\x00\x04\x00\x08\x00\x00\x00(\x00\x05\x01\x14Cisco Internetwork Operating System Software \nIOS (tm) C2950 Software (C2950-I6K2L2Q4-M), Version 12.1(22)EA14, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\nCopyright (c) 1986-2010 by cisco Systems, Inc.\nCompiled Tue 26-Oct-10 10:35 by nburra\x00\x06\x00\x15cisco WS-C2950-12\x00\x08\x00$\x00\x00\x0c\x01\x12\x00\x00\x00\x00\xff\xff\xff\xff\x01\x02!\xff\x00\x00\x00\x00\x00\x00\x00\x0b\xbe\x18\x9a@\xff\x00\x00\x00\t\x00\x0cMYDOMAIN\x00\n\x00\x06\x00\x01\x00\x0b\x00\x05\x01\x00\x0e\x00\x07\x01\x00\n\x00\x12\x00\x05\x00\x00\x13\x00\x05\x00\x00\x16\x00\x11\x00\x00\x00\x01\x01\x01\xcc\x00\x04\xc0\xa8\x00\xfd'
 cdpv2 = CDPv2_HDR(s)
+assert(len(cdpv2) == 450)
 assert(cdpv2.vers == 2)
 assert(cdpv2.ttl == 180)
 assert(cdpv2.cksum == 0x8cfa)
@@ -69,3 +70,14 @@
 cdpv2.cksum = None
 s2 = s[:2] + b"\xf3\xf1" + s[4:]
 assert raw(cdpv2) == s2
+
+= CDPv2 - Complex Packet
+
+r = b'\x01\x00\x0c\xcc\xcc\xcc\x11"3DUf\x01\x80\xaa\xaa\x03\x00\x00\x0c \x00\x02\xb4uV\x00\x01\x00\nRouter\x00\x05\x00\x04\x00\x06\x00\x04\x00\x02\x00\x11\x00\x00\x00\x02\x01\x01\xcc\x00\x04\xc0\xa8\x01e\x00\x03\x00\x18GigabitEthernet0/0/1\x00\x04\x00\x08\x00\x00\x00A\x00\x07\x00\t\x14\x00\x00\x00\x18\x00\t\x00\x04\x00\x0b\x00\x05\x01\x00\x16\x00\x11\x00\x00\x00\x01\x01\x01\xcc\x00\x04\xc0\xa8\x01e'
+p = Dot3(r)
+assert CDPMsgPortID in p and CDPMsgIPPrefix in p
+
+= CDPChecksum - packet with odd length
+
+pkt = CDPv2_HDR(vers=2, ttl=180, msg='123')
+assert len(pkt) == 7

scapy-2.4.4.tar.gz/test/contrib/concox.uts Added

scapy-2.4.3.tar.gz/test/contrib/dce_rpc.uts -> scapy-2.4.4.tar.gz/test/contrib/dce_rpc.uts Changed

@@ -11,19 +11,19 @@
 
 = Little Endian IntField getfield
 f = EndiannessField(IntField('f', 0), lambda p: '<')
-f.getfield(None, bytearray.fromhex('0102030405')) == (b'\x05', 0x04030201)
+f.getfield(None, hex_bytes('0102030405')) == (b'\x05', 0x04030201)
 
 = Little Endian IntField addfield
 f = EndiannessField(IntField('f', 0), lambda p: '<')
-f.addfield(None, b'\x01', 0x05040302) == bytearray.fromhex('0102030405')
+f.addfield(None, b'\x01', 0x05040302) == hex_bytes('0102030405')
 
 = Big Endian IntField getfield
 f = EndiannessField(IntField('f', 0), lambda p: '>')
-f.getfield(None, bytearray.fromhex('0102030405')) == (b'\x05', 0x01020304)
+f.getfield(None, hex_bytes('0102030405')) == (b'\x05', 0x01020304)
 
 = Big Endian IntField addfield
 f = EndiannessField(IntField('f', 0), lambda p: '>')
-f.addfield(None, b'\x01', 0x02030405) == bytearray.fromhex('0102030405')
+f.addfield(None, b'\x01', 0x02030405) == hex_bytes('0102030405')
 
 = Little Endian StrField getfield
 f = EndiannessField(StrField('f', 0), lambda p: '<')
@@ -64,13 +64,13 @@
 + Check DCE/RPC layer
 
 = DCE/RPC default values
-bytes(DceRpc()) == bytearray.fromhex('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000ffffffff000000000000')
+bytes(DceRpc()) == hex_bytes('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000ffffffff000000000000')
 
 = DCE/RPC payload length computation
-bytes(DceRpc() / b'\x00\x01\x02\x03') == bytearray.fromhex('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000ffffffff00040000000000010203')
+bytes(DceRpc() / b'\x00\x01\x02\x03') == hex_bytes('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000ffffffff00040000000000010203')
 
 = DCE/RPC Guess payload class fallback with no possible payload
-p = DceRpc(bytearray.fromhex('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000000010203'))
+p = DceRpc(hex_bytes('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000000010203'))
 p.payload.__class__ == conf.raw_layer
 
 = DCE/RPC Guess payload class to a registered heuristic payload
@@ -86,16 +86,16 @@
       return False
 
 DceRpcPayload.register_possible_payload(DummyPayload)
-p = DceRpc(bytearray.fromhex('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000001020304'))
+p = DceRpc(hex_bytes('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000001020304'))
 p.payload.__class__ == DummyPayload
 
 = DCE/RPC Guess payload class fallback with possible payload classes
-p = DceRpc(bytearray.fromhex('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000000010203'))
+p = DceRpc(hex_bytes('04000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00040000000000010203'))
 p.payload.__class__ == conf.raw_layer
 
 = DCE/RPC little-endian build
-bytes(DceRpc(type='response', endianness='little', opnum=3) / b'\x00\x01\x02\x03') == bytearray.fromhex('04020000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000300ffffffff04000000000000010203')
+bytes(DceRpc(type='response', endianness='little', opnum=3) / b'\x00\x01\x02\x03') == hex_bytes('04020000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000300ffffffff04000000000000010203')
 
 = DCE/RPC little-endian dissection
-p = DceRpc(bytearray.fromhex('04020000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000300ffffffff04000000000000010203'))
+p = DceRpc(hex_bytes('04020000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000300ffffffff04000000000000010203'))
 p.type == 2 and p.opnum == 3 and p.frag_len == 4

scapy-2.4.4.tar.gz/test/contrib/erspan.uts Added

@@ -0,0 +1,44 @@
+% ERSPAN
+
++ ERSPAN I
+= Build & dissect ERSPAN 1
+
+pkt = GRE()/ERSPAN_I()/Ether()
+pkt = GRE(bytes(pkt))
+assert ERSPAN in pkt
+assert pkt.proto == 0x88be
+assert pkt.seqnum_present == 0
+
++ ERSPAN II
+= Build ERSPAN II
+
+pkt = GRE()/ERSPAN_II()/Ether(src="11:11:11:11:11:11", dst="ff:ff:ff:ff:ff:ff")
+b = bytes(pkt)
+assert b == b'\x10\x00\x88\xbe\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\x11\x11\x11\x11\x11\x11\x90\x00'
+
+= Dissect ERSPAN II
+
+pkt = GRE(b)
+assert pkt[GRE].proto == 0x88be
+assert pkt[GRE].seqnum_present == 1
+assert pkt[GRE][ERSPAN].ver == 0
+assert pkt[Ether].src == "11:11:11:11:11:11"
+
++ ERSPAN III
+= Build & dissect ERSPAN III with platform specific
+
+pkt = GRE()/ERSPAN_III()/ERSPAN_PlatformSpecific()/Ether()
+pkt = GRE(bytes(pkt))
+assert pkt[GRE].proto == 0x22eb
+assert pkt[ERSPAN_III].o == 1
+assert ERSPAN_PlatformSpecific in pkt
+assert Ether in pkt
+
+= Build & dissect ERSPAN III without platform specific
+pkt = GRE()/ERSPAN_III()/Ether()
+pkt = GRE(bytes(pkt))
+assert pkt[GRE].proto == 0x22eb
+assert pkt[ERSPAN_III].o == 0
+assert ERSPAN_PlatformSpecific not in pkt
+assert Ether in pkt
+

scapy-2.4.4.tar.gz/test/contrib/exposure_notification.uts Added

@@ -0,0 +1,59 @@
+% Exposure Notification System tests
+#
+# Type the following command to launch start the tests:
+# $ test/run_tests -P "load_contrib('exposure_notification')" -t test/contrib/exposure_notification.uts
+
++ ENS tests
+
+= Setup
+
+def next_eir(p):
+   return EIR_Hdr(p[Padding].load)
+
+= Presence check
+
+Exposure_Notification_Frame
+
+= Raw payload copied from BluetoothExplorer.app
+
+d = hex_bytes('17df1d67405e3395470e62ca4fda6a9303687b31')
+p = Exposure_Notification_Frame(d)
+
+assert p.identifier == hex_bytes('17df1d67405e3395470e62ca4fda6a93')
+assert p.metadata == hex_bytes('03687b31')
+
+= Raw captured payload
+
+d = hex_bytes('02011a03036ffd17166ffde23f352fa09307a85d4194912443180d484dc151')
+p = EIR_Hdr(d)
+
+# First is a flags header
+assert EIR_Flags in p
+
+# Then the 16-bit Service Class ID
+p = next_eir(p)
+assert p[EIR_CompleteList16BitServiceUUIDs].svc_uuids == [
+    EXPOSURE_NOTIFICATION_UUID]
+
+# Then the ENS
+p = next_eir(p)
+assert p[EIR_ServiceData16BitUUID].svc_uuid == EXPOSURE_NOTIFICATION_UUID
+assert p[Exposure_Notification_Frame].identifier == hex_bytes(
+    'e23f352fa09307a85d4194912443180d')
+assert p[Exposure_Notification_Frame].metadata == hex_bytes('484dc151')
+
+# Rebuild the payload.
+p2 = p[Exposure_Notification_Frame].build_eir()
+
+# Our captured payload was from a mobile phone, but build_eir presumes that
+# we're broadcasting as an non-connectable, LE-only beacon. We need to adjust
+# these flags to match the captured packet.
+p2[0] = EIR_Hdr() / EIR_Flags(flags=[
+    'general_disc_mode', 'simul_le_br_edr_ctrl', 'simul_le_br_edr_host'])
+
+# Ensure we didn't mutate LowEnergyBeaconHelper.base_eir just then.
+assert LowEnergyBeaconHelper.base_eir[0][EIR_Flags].flags == [
+    'general_disc_mode', 'br_edr_not_supported']
+
+# Assemble all packet bytes
+assert b''.join(map(raw, p2)) == d

scapy-2.4.3.tar.gz/test/contrib/geneve.uts -> scapy-2.4.4.tar.gz/test/contrib/geneve.uts Changed

scapy-2.4.3.tar.gz/test/contrib/gtp.uts -> scapy-2.4.4.tar.gz/test/contrib/gtp.uts Changed

@@ -16,6 +16,27 @@
 a = GTPHeader(raw(GTP_U_Header()/GTPErrorIndication()))
 assert isinstance(a, GTP_U_Header)
 
+= GTP_U_Header with PDU Session Container
+
+a = GTPHeader(raw(GTP_U_Header()/GTPPDUSessionContainer(QFI=3)))
+assert isinstance(a, GTP_U_Header)
+assert a[GTP_U_Header].E == 1 and a[GTP_U_Header].next_ex == 0x85
+assert a[GTPPDUSessionContainer].ExtHdrLen == 1
+assert a[GTPPDUSessionContainer].P == 0 and a[GTPPDUSessionContainer].R == 0
+assert a[GTPPDUSessionContainer].QFI == 3
+assert a[GTPPDUSessionContainer].NextExtHdr == 0
+
+= GTP_U_Header with PDU Session Container with QFI/PPI
+
+a = GTPHeader(raw(GTP_U_Header()/GTPPDUSessionContainer(type=1, QFI=3, P=1, PPI=6)))
+assert isinstance(a, GTP_U_Header)
+assert a[GTP_U_Header].E == 1 and a[GTP_U_Header].next_ex == 0x85
+assert a[GTPPDUSessionContainer].ExtHdrLen == 2
+assert a[GTPPDUSessionContainer].P == 1 and a[GTPPDUSessionContainer].R == 0
+assert a[GTPPDUSessionContainer].QFI == 3 and a[GTPPDUSessionContainer].PPI == 6
+assert a[GTPPDUSessionContainer].NextExtHdr == 0
+assert a[GTPPDUSessionContainer].type == 1
+
 = GTP_U_Header sub layers
 
 a = IPv6(raw(IPv6()/UDP()/GTP_U_Header()/IPv6()))
@@ -31,17 +52,29 @@
 a = IP(raw(IP()/UDP()/GTP_U_Header()/PPP()))
 assert isinstance(a[GTP_U_Header].payload, PPP)
 
+= GTPPDUSessionContainer(), dissect
+h = "fa163e7da573fa163e43f8e708004500008400000000fd119f520a0a05010a0a0502086808680070000034ff006000000010fa163e85020044000000000045000054cd4e000040015a440a0a08020a0a370100001aca0046000142cff45e00000000e2ed0c0000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637"
+gtp = Ether(hex_bytes(h))
+gtp[GTP_U_Header].ExtHdrLen == 2 and gtp[GTP_U_Header].extraPadding == b'\x00\x00\x00\x00' and gtp[GTP_U_Header][IP].src == '10.10.8.2' and gtp[GTP_U_Header][IP][ICMP].type == 0
+
+= GTPEchoResponse matches GTPEchoRequest by seq
+req = GTPHeader(seq=12345)/GTPEchoRequest()
+res = GTPHeader(seq=12345)/GTPEchoResponse()
+assert req.hashret() == res.hashret()
+assert res.answers(req)
+
 = GTPCreatePDPContextRequest(), basic instantiation
-gtp = IP(src="127.0.0.1")/UDP(dport=2123)/GTPHeader(teid=2807)/GTPCreatePDPContextRequest()
+gtp = IP(src="127.0.0.1", dst="127.0.0.1")/UDP(dport=2123, sport=2123)/GTPHeader(teid=2807)/GTPCreatePDPContextRequest()
 gtp.dport == 2123 and gtp.teid == 2807 and len(gtp.IE_list) == 5
 
 = GTPCreatePDPContextRequest(), basic dissection
-~ random_weird_py3
 random.seed(0x2807)
 rg = raw(gtp)
-print(rg)
-assert rg in [b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007\x1a\xc30\x10\x00'\x00\x00\n\xf7\x10\xd6\xd2\xf6\xd8\x14\x0b\x85\x00\x04\xa3\xad\x98\xfa\x85\x00\x04F\\`\xd6\x87\x00\x0fBCD5lPP8N2u8h9l",
-              b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007\xd3\xf20\x10\x00'\x00\x00\n\xf7\x107m\xaeV\x14\x08\x85\x00\x04\x83\x92K\xa3\x85\x00\x04\xb7\xb2\xff\xd0\x87\x00\x0foTrnmM9erqfhqpV"]
+rg
+assert rg in [
+    b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007\x99\xce0\x10\x00'\x00\x00\n\xf7\x10\x12\x05\xf7(\x14\x0b\x85\x00\x04\xb7\xd0\xbf \x85\x00\x04\xe2\xb8\x88\x19\x87\x00\x0ffOTLcIukpXKxV0Z",
+    b"E\x00\x00K\x00\x01\x00\x00@\x11|\x9f\x7f\x00\x00\x01\x7f\x00\x00\x01\x08K\x08K\x007n\xb20\x10\x00'\x00\x00\n\xf7\x10\x91\x9f\xbc\xaa\x14\x07\x85\x00\x04<\x7f\x87\x14\x85\x00\x04\xbcU\x14\xcb\x87\x00\x0f9Co27Fbj65eKHyQ",
+]
 
 = GTPV1UpdatePDPContextRequest(), dissect
 h = "3333333333332222222222228100a38408004588006800000000fd1134820a2a00010a2a00024aa5084b005408bb32120044ed99aea9386f0000100000530514058500040a2a00018500040a2a000187000c0213921f739680fe74f2ffff94000130970001019800080112f41004d204d29900024000b6000101"
@@ -222,15 +255,37 @@
     length=29, Protocol_Configuration=b'\x80\xc0#\x06\x01\x01\x00\x06\x00\x00\x80!\x10\x01\x01\x00\x10\x81\x06\x00\x00\x00\x00\x83\x06\x00\x00\x00\x00')
 ie.ietype == 132 and ie.Protocol_Configuration == b'\x80\xc0#\x06\x01\x01\x00\x06\x00\x00\x80!\x10\x01\x01\x00\x10\x81\x06\x00\x00\x00\x00\x83\x06\x00\x00\x00\x00'
 
-= IE_GSNAddress(), dissect
+= IE_GSNAddress(), simple build/dissect IPv4
+r = raw(IE_GSNAddress(length=4, ipv4_address='10.42.0.1'))
+assert r == b'\x85\x00\x04\x0a\x2a\x00\x01'
+ie = IE_GSNAddress(r)
+ie.ietype == 133 and ie.ipv4_address == '10.42.0.1'
+
+= IE_GSNAddress(), simple build/dissect IPv6
+r = raw(IE_GSNAddress(length=16, ipv6_address='fd01:1::1'))
+assert r == b'\x85\x00\x10\xfd\x01\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01'
+ie = IE_GSNAddress(r)
+ie.ietype == 133 and ie.ipv6_address == 'fd01:1::1'
+
+= IE_GSNAddress(), dissect IPv4
 h = "3333333333332222222222228100838408004588005400000000fd1182850a2a00010a2a0002084b084b00406b463213003031146413c18000000180109181ba027fcf701a8c8500040a2a00018500040a2a000187000f0213921f7396d1fe7482ffff004a00f7a71e0a"
 gtp = Ether(hex_bytes(h))
 ie = gtp.IE_list[3]
-ie.ietype == 133 and ie.address == '10.42.0.1'
+ie.ietype == 133 and ie.ipv4_address == '10.42.0.1'
+
+= IE_GSNAddress(), dissect IPv6
+h = "33333333333322222222222286dd60000000002c1140fd010001000000000000000000000001fd01000100000000000000000000000208680868002ce2e9321a001c000000000000000010000004d2850010fd010001000000000000000000000001"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[1]
+ie.ietype == 133 and ie.ipv6_address == 'fd01:1::1'
+
+= IE_GSNAddress(), basic instantiation IPv4
+ie = IE_GSNAddress(length=4, ipv4_address='10.42.0.1')
+ie.ietype == 133 and ie.ipv4_address == '10.42.0.1'
 
-= IE_GSNAddress(), basic instantiation
-ie = IE_GSNAddress(address='10.42.0.1')
-ie.ietype == 133 and ie.address == '10.42.0.1'
+= IE_GSNAddress(), basic instantiation IPv6
+ie = IE_GSNAddress(length=16, ipv6_address='fd01:1::1')
+ie.ietype == 133 and ie.ipv6_address == 'fd01:1::1'
 
 = IE_MSInternationalNumber(), dissect
 h = "333333333333222222222222810083840800458800c300000000fc1184e50a2a00010a2a00024a4d084b00af41993210009f79504a3e048e00000202081132547600000332f42004d27b0ffc10a692773d1158da9e2214051a0a00800002f1218300070661616161616184001d80c02306010100060000802110010100108106000000008306000000008500040a2a00018500040a2a00018600079111111111111187000d0213621f73967373741affff0094000120970001029800080032f42004d204d299000240009a0008111111111111000081182fb2"

scapy-2.4.3.tar.gz/test/contrib/gtp_v2.uts -> scapy-2.4.4.tar.gz/test/contrib/gtp_v2.uts Changed

@@ -43,6 +43,7 @@
 = IE_IMSI, basic instantiation
 ie = IE_IMSI(ietype='IMSI', length=8, IMSI='2080112345670000')
 ie.ietype == 1 and ie.IMSI == b'2080112345670000'
+assert bytes(ie) == b'\x01\x00\x08\x00\x02\x08\x112Tv\x00\x00'
 
 = IE_Cause, dissection
 h = "3333333333332222222222228100838408004588004a00000000fd1193160a2a00010a2a0002084b824600366a744823002a45e679235ea151000200020010005d001800490001006c0200020010005700090081000010927f000002558d3b69"
@@ -52,17 +53,17 @@
 
 = IE_Cause, basic instantiation
 ie = IE_Cause(
-    ietype='Cause', length=2, Cause='Request Accepted', PCE=1, BCE=0, CS=0)
+    ietype='Cause', length=2, Cause='Request accepted', PCE=1, BCE=0, CS=0)
 ie.ietype == 2 and ie.Cause == 16 and ie.PCE == 1 and ie.BCE == 0 and ie.CS == 0
 
 = IE_Cause, basic instantiation 2
 ie = IE_Cause(
-    ietype='Cause', length=2, Cause='Request Accepted', PCE=0, BCE=1, CS=0)
+    ietype='Cause', length=2, Cause='Request accepted', PCE=0, BCE=1, CS=0)
 ie.ietype == 2 and ie.Cause == 16 and ie.PCE == 0 and ie.BCE == 1 and ie.CS == 0
 
 = IE_Cause, basic instantiation 3
 ie = IE_Cause(
-    ietype='Cause', length=2, Cause='Request Accepted', PCE=0, BCE=0, CS=1)
+    ietype='Cause', length=2, Cause='Request accepted', PCE=0, BCE=0, CS=1)
 ie.ietype == 2 and ie.Cause == 16 and ie.PCE == 0 and ie.BCE == 0 and ie.CS == 1
 
 = IE_RecoveryRestart, dissection
@@ -85,6 +86,7 @@
 = IE_APN, basic instantiation
 ie = IE_APN(ietype='APN', length=26, APN='aaaaaaaaaaaaaaaaaaaaaaaaa')
 ie.ietype == 71 and ie.APN == b'aaaaaaaaaaaaaaaaaaaaaaaaa'
+assert bytes(ie) == b'G\x00\x1a\x00\x19aaaaaaaaaaaaaaaaaaaaaaaaa'
 
 = IE_AMBR, dissection
 h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
@@ -107,25 +109,25 @@
 ie = IE_EPSBearerID(ietype='EPS Bearer ID', length=1, EBI=50)
 ie.ietype == 73 and ie.EBI == 50
 
-= IE_IPv4, dissection
+= IE_IP_Address, dissection
 h = "3333333333332222222222228100838408004580006d00000000f31180d20a2a00010a2a0002084b85930059e49a4823004d84530d5a4cdee2000200020010004c00060011111111111149000100b248000800000061a8000249f07f000100005d00130049000100da0200020010005e00040039004f454a0004007f00000436f73a63"
 gtp = Ether(hex_bytes(h))
 ie = gtp.IE_list[6]
 ie.address == '127.0.0.4'
 
-= IE_IPv4, basic instantiation
-ie = IE_IPv4(ietype='IPv4', length=4, address='127.0.0.4')
+= IE_IP_Address, basic instantiation
+ie = IE_IP_Address(ietype='IP Address', length=4, address='127.0.0.4')
 ie.ietype == 74 and ie.address == '127.0.0.4'
 
 = IE_MEI, dissection
-h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
+h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b00080071655774980786ff56000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
 gtp = Ether(hex_bytes(h))
 ie = gtp.IE_list[1]
-ie.MEI == 123456
+ie.MEI == b"17567547897068"
 
 = IE_MEI, basic instantiation
-ie = IE_MEI(ietype='MEI', length=1, MEI=123456)
-ie.ietype == 75 and ie.MEI == 123456
+ie = IE_MEI(ietype='MEI', length=1, MEI=175675478970685)
+ie.ietype == 75 and ie.MEI == 175675478970685
 
 = IE_MSISDN, dissection
 h = "3333333333332222222222228100838408004580006d00000000f31180d20a2a00010a2a0002084b85930059e49a4823004d55819f6500ede7000200020010004c000600111111111111490001003248000800000061a8000249f07f000100005d001300490001000b0200020010005e00040039004f454a0004007f00000436f73a63"
@@ -136,9 +138,10 @@
 = IE_MSISDN, basic instantiation
 ie = IE_MSISDN(ietype='MSISDN', length=6, digits='111111111111')
 ie.ietype == 76 and ie.digits == b'111111111111'
+assert bytes(ie) == b'L\x00\x06\x00\x11\x11\x11\x11\x11\x11'
 
 = IE_Indication, dissection
-h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
+h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b00080071655774980786ff56000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
 gtp = Ether(hex_bytes(h))
 ie = gtp.IE_list[10]
 ie.DAF == 0 and ie.DTF == 0 and ie.PS == 1 and ie.CCRSI == 0 and ie.CPRAI == 0 and ie.PPON == 0 and ie.CLII == 0 and ie.CPSR == 0
@@ -162,6 +165,47 @@
                    PCO_DNS_Server_IPv4(type='DNS Server IPv4 Address Request', length=4, address='10.42.0.3')])
 ie.Extension == 1 and ie.PPP == 3 and ie.Protocols[0].address == '10.42.0.3'
 
+= IE_EPCO, dissection
+h = "d89ef3da40e2fa163e956dce08004500003000010000401144e10a0f0f3d0a0f1281084b084b001c0c154821000c0000000100000100c500040080001b00"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.Protocols[0].type == 27
+
+= IE_EPCO, basic instantiation
+ie = IE_EPCO(Protocols=[PCO_S_Nssai(type=27, length=0)], ietype=197, length=4, CR_flag=0, instance=0, Extension=1, SPARE=0, PPP=0)
+ie.Extension == 1 and ie.ietype == 197 and ie.Protocols[0].type == 27 and ie.Protocols[0].length == 0
+
+= IE_APCO, dissection
+h = "d89ef3da40e2fa163e956dce0800450000360001000040115d650a0f0f3d01020304084b084b00220000482000160000000100000100a3000a0080000c00001200000d00"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.Protocols[0].type == 12 and ie.Protocols[1].type == 18 and ie.Protocols[2].type == 13
+
+= IE_APCO, basic instantiation
+ie = IE_APCO(Protocols=[PCO_P_CSCF_IPv4_Address_Request(address=None, type=12, length=0),PCO_P_CSCF_Re_selection_Support(type=18, length=0),PCO_DNS_Server_IPv4(address=None, type=13, length=0)], ietype=163, length=10, CR_flag=0, instance=0, extension=1, SPARE=0, PPP=0)
+ie.extension == 1 and ie.ietype == 163 and ie.length == 10 and ie.Protocols[0].type == 12 and ie.Protocols[1].type == 18 and ie.Protocols[2].type == 13
+
+= IE_MMContext_EPS, dissection
+h = "d89ef3da40e2fa163e956dce08004500007f0001000040114bbd0a0a0f3d0a0f0b5b084b084b006b5a234883005f0000180f76d163006b0046008800910000020000021890aa80be385102083701a2907066f8bd9f2a28b717671c71c71c71c71c71c70100003d090002625a00028040000812345678900000000000000000006d000900880005000470677731"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.Sec_Mode == 4 and ie.Nhi == 0 and ie.Drxi == 1 and ie.Ksi == 0 and ie.Num_quint == 0 and ie.Num_Quad == 0 and ie.Uambri == 0 and ie.Osci == 0 and ie.Sambri == 1 and ie.Nas_algo == 1 and ie.Nas_cipher == 1 and ie.Nas_dl_count == 2 and ie.Nas_ul_count == 2 and ie.Kasme == 11111111111111111111111111111111111111111111111111111111111111111111111111111
+
+= IE_MMContext_EPS, basic instantiation
+ie = IE_MMContext_EPS(ietype=107, length=70, CR_flag=0, instance=0, Sec_Mode=4, Nhi=0, Drxi=1, Ksi=0, Num_quint=0, Num_Quad=0, Uambri=0, Osci=0, Sambri=1, Nas_algo=1, Nas_cipher=1, Nas_dl_count=2, Nas_ul_count=2, Kasme=11111111111111111111111111111111111111111111111111111111111111111111111111111)
+ie.Sec_Mode == 4 and ie.Nhi == 0 and ie.Drxi == 1 and ie.Ksi == 0 and ie.Num_quint == 0 and ie.Num_Quad == 0 and ie.Uambri == 0 and ie.Osci == 0 and ie.Sambri == 1 and ie.Nas_algo == 1 and ie.Nas_cipher == 1 and ie.Nas_dl_count == 2 and ie.Nas_ul_count == 2 and ie.Kasme == 11111111111111111111111111111111111111111111111111111111111111111111111111111
+
+= IE_PDNConnection, IE_FQDN, dissection
+h = "d89ef3da40e2fa163e956dce08004500007f0001000040114bbd0a0a0f3d0a0f0b5b084b084b006b5a234883005f0000180f76d163006b0046008800910000020000021890aa80be385102083701a2907066f8bd9f2a28b717671c71c71c71c71c71c70100003d090002625a00028040000812345678900000000000000000006d000900880005000470677731"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[1].IE_list[0]
+ie.fqdn_tr_bit == 4 and ie.fqdn == b'pgw1'
+
+= IE_PDNConnection, IE_FQDN, basic instantiation
+ie = IE_PDNConnection(IE_list=[IE_FQDN(ietype=136, length=5, CR_flag=0, instance=0, fqdn_tr_bit=4, fqdn=b'pgw1')], ietype=109, length=9, CR_flag=0, instance=0)
+ie2 = ie.IE_list[0]
+ie2.fqdn_tr_bit == 4 and ie2.fqdn == b'pgw1'
+
 = IE_PAA, dissection
 h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
 gtp = Ether(hex_bytes(h))
@@ -215,6 +259,56 @@
                    CGI_Present=0, TAI=ULI_TAI(MCC='234', MNC='02', TAC=12345), ECGI=ULI_ECGI(MCC='234', MNC='02', ECI=123456))
 ie.ietype == 86 and ie.LAI_Present == 0 and ie.ECGI_Present == 1 and ie.TAI_Present == 1 and ie.RAI_Present == 0 and ie.SAI_Present == 0 and ie.CGI_Present == 0 and ie.TAI.MCC == b'234' and ie.TAI.MNC == b'02' and ie.TAI.TAC == 12345 and ie.ECGI.MCC == b'234' and ie.ECGI.MNC == b'02' and ie.ECGI.ECI == 123456
 
+= IE_UCI, dissection
+h = "fe1d70fa717ceeeeeeeeeeee080045000127a4f500003c11e9aec0a8ee80c0a87f50084b23a301131aa1482001070000000001020f009100080021f3540000001602"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.CSG_ID == 22 and ie.AccessMode == 0 and ie.LCSG == 1 and ie.CMI == 0 and ie.MCC == b'123' and ie.MNC == b'45'
+
+= IE_UCI, basic instantiation
+ie = IE_UCI(ietype='UCI', length=8, CR_flag=0, instance=0, MCC=b'123', MNC=b'45', SPARE=0, CSG_ID=22, AccessMode=0, LCSG=1, CMI=0)
+ie.ietype == 145 and ie.CSG_ID == 22 and ie.AccessMode == 0 and ie.LCSG == 1 and ie.CMI == 0 and ie.MCC == b'123' and ie.MNC == b'45'
+
+= IE_BearerFlags, dissection
+h = "0026f126c100000c29b131dd81004d040800450000d8a6010000401118680a2180350a212735084b138800c47f8248210011000023f2000001005d006200610001000a"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0].IE_list[0]
+ie.ASI == 1 and ie.Vind == 0 and ie.VB == 1 and ie.PPC == 0
+
+= IE_BearerFlags, basic instantiation
+ie = IE_BearerFlags(ietype='Bearer Flags', length=1, CR_flag=0, instance=0, SPARE=0, ASI=1, Vind=0, VB=1, PPC=0)
+ie.ietype == 97 and ie.ASI == 1 and ie.Vind == 0 and ie.VB == 1 and ie.PPC == 0
+
+= IE_UPF_SelInd_Flags, dissection
+h = "000c29b131dd0026f126c10081000d04080045000112608940003f111ea60a2127350a2180351388084b00fe0ec44820000d0000000000000100ca00010000"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.DCNR == 0
+
+= IE_UPF_SelInd_Flags, basic instantiation
+ie = IE_UPF_SelInd_Flags(ietype='UP Function Selection Indication Flags', length=1, CR_flag=0, instance=0, SPARE=0, DCNR=0)
+ie.ietype == 202 and ie.DCNR == 0
+
+= IE_Ran_Nas_Cause, dissection
+h = "00000000000000000000000008004500005a0000000040114d390101010101010102084b084b0046bf694824000e000ba0df00002300ac0002003011"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.protocol_type == 3 and ie.cause_type == 0 and ie.cause_value == 17
+
+= IE_Ran_Nas_Cause, basic instantiation
+ie = IE_Ran_Nas_Cause(ietype='RAN/NAS Cause', length=2, CR_flag=0, instance=0, protocol_type=3, cause_type=0, cause_value=17)
+ie.ietype == 172 and ie.protocol_type == 3 and ie.cause_type == 0 and ie.cause_value == 17
+
+= IE_FQCSID, dissection
+h = "d89ef3da40e2fa163e956dce0800450000330001000040117a2a0a0f0f3d0a09dd3a084b084b001f454648240013000000010000010084000700010a01010b00c8"
+gtp = Ether(hex_bytes(h))
+ie = gtp.IE_list[0]
+ie.ietype == 132 and ie.nodeid_type == 0 and ie.num_csid == 1 and ie.nodeid_v4 == '10.1.1.11' and ie.csid == 200
+
+= IE_FQCSID, basic instantiation
+ie = IE_FQCSID(ietype=132, length=19, CR_flag=0, instance=0, nodeid_type=1, num_csid=1, nodeid_v4=None, nodeid_v6=42540578207381523466529575969228128257, nodeid_nonip=None, csid=0)
+ie.ietype == 132 and ie.nodeid_type == 1 and ie.num_csid == 1 and ie.nodeid_v6 == 42540578207381523466529575969228128257 and ie.csid == 0
+
 = IE_FTEID, dissection
 h = "3333333333332222222222228100a384080045b800ed00000000fc1193430a2a00010a2a00027f61084b00d91c47482000cd140339f4d99f66000100080002081132547600004b000800000000000001e24056000d001832f420303932f4200001e2405300030032f4205200010006570009008a000010927f0000025700090187000010927f00000247001a00196161616161616161616161616161616161616161616161616163000100014f000500017f0000034d0004000808000048000800000017000000a4105d002c0049000100e55700090385000010927f00000250001600580700000000000000000000000000000000000000007200020014005311004c"
 gtp = Ether(hex_bytes(h))
@@ -328,20 +422,44 @@
                     length=8, uplink_rate=5696, downlink_rate=21000)
 ie.ietype == 161 and ie.uplink_rate == 5696 and ie.downlink_rate == 21000
 
-= GTPHeader answers to not GTPHeader instance
+= GTPHeader isn't an answer to not GTPHeader instance
 GTPHeader(gtp_type=2).answers(Ether()) == False
 
+= GTPHeader is an answer to a message with the same sequence number
+GTPHeader(seq=42).answers(GTPHeader(seq=42)) == True
+
+= GTPHeader isn't an answer to a message with a different sequence number
+GTPHeader(seq=42).answers(GTPHeader(seq=24)) == False
+
+= GTPV2EchoResponse answers
+assert (GTPHeader(seq=1)/GTPV2EchoResponse()).answers(GTPHeader(seq=1)/GTPV2EchoRequest())
+assert not (GTPHeader(seq=1)/GTPV2EchoResponse()).answers(GTPHeader(seq=1)/GTPV2EchoResponse())
+
 = GTPHeader post_build
 gtp = GTPHeader(gtp_type="create_session_req") / ("X"*32)
 gtp.show2()
 
 = GTPHeader hashret
-req = GTPHeader(gtp_type="create_session_req") / ("X"*32)
-res = GTPHeader(gtp_type="create_session_res") / ("Y"*32)
+req = GTPHeader(gtp_type="create_session_req", seq=1) / ("X"*32)
+res = GTPHeader(gtp_type="create_session_res", seq=1) / ("Y"*32)
 req.hashret() == res.hashret()
 
 = IE_NotImplementedTLV
-h = "333333333333222222222222810080c808004588002937dd0000fd1115490a2a00010a2a0002084b084b00152d0e4001000900000100ff0001000daa000000003f1f382f"
+h = "333333333333222222222222810080c808004588002937dd0000fd1115490a2a00010a2a0002084b084b00152d0e4001000900000100fe0001000daa000000003f1f382f"
 gtp = Ether(hex_bytes(h))
 isinstance(gtp.IE_list[0], IE_NotImplementedTLV)
+isinstance(gtp.IE_list[0].payload, NoPayload)
 
+= IE_PrivateExtension, dissection
+h = "d89ef3da40e2fa163e956dce08004500005b0001000040115d400a0f0f3d01020304084b084b00470000482000620000000100000100ff0015000137020046462d46462d46462d46462d46462d4646ff00160001370100000100000000000000000000000000000000"
+gtp = Ether(hex_bytes(h))
+ie1 = gtp.IE_list[0]
+ie2 = gtp.IE_list[1]
+ie1.enterprisenum == 311 and bytes_hex(ie1.proprietaryvalue) == b'020046462d46462d46462d46462d46462d4646'
+ie2.enterprisenum == 311 and bytes_hex(ie2.proprietaryvalue) == b'0100000100000000000000000000000000000000'
+
+= IE_PrivateExtension, basic instantiation
+ie1 = IE_PrivateExtension(ietype=255, length=21, SPARE=0, instance=0, enterprisenum=311, proprietaryvalue=hex_bytes('020046462d46462d46462d46462d46462d4646'))
+ie2 = IE_PrivateExtension(ietype=255, length=22, SPARE=0, instance=0, enterprisenum=311, proprietaryvalue=hex_bytes('0100000100000000000000000000000000000000'))
+ie1.enterprisenum == 311 and bytes_hex(ie1.proprietaryvalue) == b'020046462d46462d46462d46462d46462d4646'
+ie2.enterprisenum == 311 and bytes_hex(ie2.proprietaryvalue) == b'0100000100000000000000000000000000000000'

scapy-2.4.3.tar.gz/test/contrib/homeplugav.uts -> scapy-2.4.4.tar.gz/test/contrib/homeplugav.uts Changed

@@ -1,5 +1,11 @@
 % Regression tests for Scapy
 
++Syntax check
+= Import the homeplugav layer
+
+from scapy.contrib.homeplugav import *
+#from scapy.all import 
+
 # HomePlugAV
 
 ############
@@ -48,29 +54,21 @@
 pkt = HomePlugAV()/SetEncryptionKeyRequest()
 pkt.NMK = "A" * 16
 pkt.DAK = "B" * 16
-r = raw(pkt)
-r
-assert r == b"\x00P\xa0\x00\xb0R\x00AAAAAAAAAAAAAAAA\x00\xff\xff\xff\xff\xff\xffBBBBBBBBBBBBBBBB"
+assert raw(pkt) == b'\x00P\xa0\x00\xb0R\x00AAAAAAAAAAAAAAAA\x00\xff\xff\xff\xff\xff\xffBBBBBBBBBBBBBBBB'
 
 pkt = HomePlugAV()/ReadMACMemoryRequest()
 pkt.Address = 0x31337
 pkt.Length = 0x666
-r = raw(pkt)
-r
-assert r == b"\x00\x08\xa0\x00\xb0R7\x13\x03\x00f\x06\x00\x00"
+assert raw(pkt) == b'\x00\x08\xa0\x00\xb0R7\x13\x03\x00f\x06\x00\x00'
 
 pkt = HomePlugAV()/ReadModuleDataRequest()
 pkt.Length = 0x666
 pkt.Offset = 0x1337
-r = raw(pkt)
-r
-assert r == b"\x00$\xa0\x00\xb0R\x02\x00f\x067\x13\x00\x00"
+assert raw(pkt) == b'\x00$\xa0\x00\xb0R\x02\x00f\x067\x13\x00\x00'
 
 pkt = HomePlugAV()/SnifferRequest()
 pkt.SnifferControl = 0x1
-r = raw(pkt)
-r
-assert r == b"\x004\xa0\x00\xb0R\x01"
+assert raw(pkt) == b"\x004\xa0\x00\xb0R\x01"
 
 = Some important fields parsing
 ~ field

scapy-2.4.4.tar.gz/test/contrib/homepluggp.uts Added

@@ -0,0 +1,61 @@
+% Regression tests for Scapy
+
++Syntax check
+= Import the homeplugg layer
+
+from scapy.contrib.homepluggp import *
+import binascii
+#from scapy.all import 
+
+# HomePlugGP
+
+############
+############
++ Basic tests
+
+* Those test are here mainly to check nothing has been broken
+
+= Most important packet to intrude a HPGP network
+~ field
+_xstr = binascii.unhexlify("0108600000010000000000000000040000000227cfe35f01e50a01c8a074ad04537cb54b88b62d49b35b51000000c1f2")
+pkt = HomePlugAV(_xstr)
+assert pkt.NewKey == b'\xc8\xa0t\xad\x04S|\xb5K\x88\xb6-I\xb3[Q' 
+assert pkt.NetworkID == b"'\xcf\xe3_\x01\xe5\n"
+
+= Some other important parsing tests
+~ field
+_xstr = b'\x01\x08`\x00\x00\x01\xaa\xaa\xaa\xaa\x00\x00\x00\x00\x04\x00\x00\x00\x00\x96F`Y\xbf\xf8\x05\x0164\xc5\xdf.nO}r\x05\xf5\x8d9)S\xc0\x00\x00\x00'
+pkt = HomePlugAV(_xstr)
+assert pkt.MyNonce == 0xaaaaaaaa
+assert pkt.YourNonce == 0x0
+assert pkt.PID == 4
+assert pkt.NetworkID == b'\x96F`Y\xbf\xf8\x05'
+assert pkt.NewKey == b'64\xc5\xdf.nO}r\x05\xf5\x8d9)S\xc0'
+
+_xstr = b'\x01e`\x00\x00\xff\xff\xff\xff\xff\xff\n\x06\x01\xbc\xf2\xaf\xf1\x00\x04\x00\x00=\x83\xfb\xe2\xbb\x0b\xb8\x8a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+pkt = HomePlugAV(_xstr)
+assert pkt.MSoundTargetMAC == 'ff:ff:ff:ff:ff:ff'
+assert pkt.NumberMSounds == 10
+assert pkt.TimeOut == 6
+assert pkt.ResponseType == 1
+assert pkt.ForwardingSTA == 'bc:f2:af:f1:00:04'
+assert pkt.SecurityType == 0
+assert pkt.RunID == b'=\x83\xfb\xe2\xbb\x0b\xb8\x8a'
+
+_xstr = b'\x01n`\x00\x00\x00\x00\xbc\xf2\xaf\xf1\x00\x04=\x83\xfb\xe2\xbb\x0b\xb8\x8a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n:!\t\t\n\x06\x06\x0e\x07\x07\t\t\n\n\x0b\x0b\x0b\x0b\x0c\r\x0e\x0e\x0e\x0f\x0f\x0f\x0f\x11\x11\x11\x12\x12\x12\x12\x12\x13\x12\x12\x11\x11\x11\x10\x12\x12\x12\x11\x10\x0f\x0f\x10\x14\x12\x10\x10\x11\x12\x14\x16;'
+pkt = HomePlugAV(_xstr)
+assert len(pkt.Groups) == pkt.NumberOfGroups
+assert pkt.NumberOfSounds == 10
+
+_xstr = b'\x01v`\x00\x00\x00\x00\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\t\xe8jdY,w\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+pkt = HomePlugAV(_xstr)
+assert pkt.SenderID == b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
+
+= Some important manipulations
+~ field
+pkt = HomePlugAV(version=0x01)/CM_MNBC_SOUND_IND()
+pkt.RandomValue="AAAAAAAAAA"
+assert raw(pkt) == b'\x01v`\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00AAAAAAAAAA\x00\x00\x00\x00\x00\x00'
+
+pkt = HomePlugAV()/CM_SET_KEY_REQ(YourNonce=0xaaaa, NewKey="b" * 16)
+assert raw(pkt) == b'\x00\x08`\x00\xb0R\x00\x00\x00\x00\x00\x00\x00\xaa\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00bbbbbbbbbbbbbbbb'

scapy-2.4.4.tar.gz/test/contrib/homeplugsg.uts Added

scapy-2.4.3.tar.gz/test/contrib/ibeacon.uts -> scapy-2.4.4.tar.gz/test/contrib/ibeacon.uts Changed

scapy-2.4.3.tar.gz/test/contrib/iec104.uts -> scapy-2.4.4.tar.gz/test/contrib/iec104.uts Changed

scapy-2.4.3.tar.gz/test/contrib/ife.uts -> scapy-2.4.4.tar.gz/test/contrib/ife.uts Changed

scapy-2.4.3.tar.gz/test/contrib/igmpv3.uts -> scapy-2.4.4.tar.gz/test/contrib/igmpv3.uts Changed

scapy-2.4.3.tar.gz/test/contrib/isotp.uts -> scapy-2.4.4.tar.gz/test/contrib/isotp.uts Changed

@@ -1,24 +1,20 @@
-% ISOTP Tests
-~ vcan_socket
-* Tests for ISOTP
-
+% Regression tests for ISOTP
 
 + Configuration
 ~ conf
 
 = Imports
-
-load_layer("can")
+load_layer("can", globals_dict=globals())
 conf.contribs['CAN']['swap-bytes'] = False
-import threading, time, six, subprocess
+import scapy.modules.six as six
+import subprocess, sys
 from six.moves.queue import Queue
 from subprocess import call
 from io import BytesIO
-
-
+from scapy.contrib.isotp import get_isotp_packet
+from scapy.consts import LINUX
 
 = Definition of constants, utility functions and mock classes
-
 iface0 = "vcan0"
 iface1 = "vcan1"
 
@@ -65,93 +61,88 @@
 ISOTP_KERNEL_MODULE_AVAILABLE = False
 def exit_if_no_isotp_module():
     if not ISOTP_KERNEL_MODULE_AVAILABLE:
-        err = "TEST SKIPPED: can-isotp not available"
-        subprocess.call("printf \"%s\r\n\" > /dev/stderr" % err, shell=True)
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
         warning("Can't test ISOTP native socket because kernel module is not loaded")
         exit(0)
 
 
 = Initialize a virtual CAN interface
-~ needs_root linux
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
     # vcan0 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface0)
-    if 0 != call("sudo ip link set dev %s up" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
         raise Exception("could not bring up %s" % iface0)
 
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+if 0 != call(["cansend", iface0,  "000#"]):
     raise Exception("cansend doesn't work")
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     # vcan1 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface1)
-    if 0 != call("sudo ip link set dev %s up" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
         raise Exception("could not bring up %s" % iface1)
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     raise Exception("cansend doesn't work")
 
 print("CAN should work now")
 
+= Import CANSocket
 
-if six.PY3:
-    from scapy.contrib.cansocket_native import *
-else:
-    from scapy.contrib.cansocket_python_can import *
+from scapy.contrib.cansocket_python_can import *
 
-
-if "python_can" in CANSocket.__module__:
-    import can as python_can
-    new_can_socket = lambda iface: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface, bitrate=250000))
-    new_can_socket0 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface0, bitrate=250000), timeout=0.01)
-    new_can_socket1 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface1, bitrate=250000), timeout=0.01)
-else:
-    new_can_socket = lambda iface: CANSocket(iface)
-    new_can_socket0 = lambda: CANSocket(iface0)
-    new_can_socket1 = lambda: CANSocket(iface1)
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
 
 # utility function for draining a can interface, asserting that no packets are there
 def drain_bus(iface=iface0, assert_empty=True):
-    s = new_can_socket(iface)
-    pkts = s.sniff(timeout=0.1)
-    if assert_empty:
-        assert len(pkts) == 0
-    s.close()
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
 
 print("CAN sockets should work now")
 
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, bitrate=250000, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, bitrate=250000, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, bitrate=250000, timeout=0.01)
 
 = Verify that a CAN socket can be created and closed
-~ linux needs_root
 s = new_can_socket(iface0)
 s.close()
 
 
 = Check if can-isotp and can-utils are installed on this system
 ~ linux
-p = subprocess.Popen('lsmod | grep "^can_isotp"', stdout = subprocess.PIPE, shell=True)
-if p.wait() == 0:
-    if b"can_isotp" in p.stdout.read():
-        p = subprocess.Popen("isotpsend -s1 -d0 %s" % iface0, stdin = subprocess.PIPE, shell=True)
-        p.stdin.write(b"01")
-        p.stdin.close()
-        r = p.wait()
-        if r == 0:
-            ISOTP_KERNEL_MODULE_AVAILABLE = True
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
 
 
 + Syntax check
 
 = Import isotp
 conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': False}
-load_contrib("isotp")
+load_contrib("isotp", globals_dict=globals())
 
+ISOTPSocket = ISOTPSoftSocket
 
 + ISOTP packet check
 
@@ -161,16 +152,79 @@
 assert(p.src is None and p.dst is None and p.exsrc is None and p.exdst is None)
 assert(bytes(p) == b"")
 
-= Creation of a simple ISOTP packet with source
+= Creation of a simple ISOTP packet with src
 p = ISOTP(b"eee", src=0x241)
 assert(p.src == 0x241)
 assert(p.data == b"eee")
 assert(bytes(p) == b"eee")
 
+= Creation of a simple ISOTP packet with exsrc
+p = ISOTP(b"eee", exsrc=0x41)
+assert(p.exsrc == 0x41)
+assert(p.data == b"eee")
+assert(bytes(p) == b"eee")
+
+= Creation of a simple ISOTP packet with dst
+p = ISOTP(b"eee", dst=0x241)
+assert(p.dst == 0x241)
+assert(p.data == b"eee")
+assert(bytes(p) == b"eee")
+
+= Creation of a simple ISOTP packet with exdst
+p = ISOTP(b"eee", exdst=0x41)
+assert(p.exdst == 0x41)
+assert(p.data == b"eee")
+assert(bytes(p) == b"eee")
+
+= Creation of a simple ISOTP packet with src, dst, exsrc, exdst
+p = ISOTP(b"eee", src=1, dst=2, exsrc=3, exdst=4)
+assert(p.dst == 2)
+assert(p.exdst == 4)
+assert(p.src == 1)
+assert(p.exsrc == 3)
+assert(p.data == b"eee")
+assert(bytes(p) == b"eee")
+
+= Creation of a simple ISOTP packet with src validation error
+ex = False
+try:
+    p = ISOTP(b"eee", src=0x1000000000, dst=2, exsrc=3, exdst=4)
+except Scapy_Exception:
+    ex = True
+
+assert ex
+
+= Creation of a simple ISOTP packet with dst validation error
+ex = False
+try:
+    p = ISOTP(b"eee", src=0x10, dst=0x20000000000, exsrc=3, exdst=4)
+except Scapy_Exception:
+    ex = True
+
+assert ex
+
+= Creation of a simple ISOTP packet with exsrc validation error
+ex = False
+try:
+    p = ISOTP(b"eee", src=0x10, dst=2, exsrc=3000, exdst=4)
+except Scapy_Exception:
+    ex = True
+
+assert ex
+
+
+= Creation of a simple ISOTP packet with exdst validation error
+ex = False
+try:
+    p = ISOTP(b"eee", src=0x10, dst=2, exsrc=30, exdst=400)
+except Scapy_Exception:
+    ex = True
+
+assert ex
+
 + ISOTPFrame related checks
 
 = Build a packet with extended addressing
-
 pkt = CAN(identifier=0x123, data=b'\x42\x10\xff\xde\xea\xdd\xaa\xaa')
 isotpex = ISOTPHeaderEA(bytes(pkt))
 assert(isotpex.type == 1)
@@ -179,9 +233,7 @@
 assert(isotpex.identifier == 0x123)
 assert(isotpex.length == 8)
 
-
 = Build a packet with normal addressing
-
 pkt = CAN(identifier=0x123, data=b'\x10\xff\xde\xea\xdd\xaa\xaa')
 isotpno = ISOTPHeader(bytes(pkt))
 assert(isotpno.type == 1)
@@ -189,15 +241,11 @@
 assert(isotpno.identifier == 0x123)
 assert(isotpno.length == 7)
 
-
 = Compare both isotp payloads
-
 assert(isotpno.data == isotpex.data)
 assert(isotpno.message_size == isotpex.message_size)
 
-
 = Dissect multiple packets
-
 frames = \
     [b'\x00\x00\x00\x00\x08\x00\x00\x00\x10(\xde\xad\xbe\xef\xde\xad',
     b'\x00\x00\x00\x00\x08\x00\x00\x00!\xbe\xef\xde\xad\xbe\xef\xde',
@@ -228,7 +276,6 @@
 assert(isotpframes[5].length == 7)
 
 = Build SF frame with constructor, check for correct length assignments
-
 p = ISOTPHeader(bytes(ISOTPHeader()/ISOTP_SF(data=b'\xad\xbe\xad\xff')))
 assert(p.length == 5)
 assert(p.message_size == 4)
@@ -238,7 +285,6 @@
 assert(p.identifier == 0)
 
 = Build SF frame EA with constructor, check for correct length assignments
-
 p = ISOTPHeaderEA(bytes(ISOTPHeaderEA()/ISOTP_SF(data=b'\xad\xbe\xad\xff')))
 assert(p.extended_address == 0)
 assert(p.length == 6)
@@ -249,7 +295,6 @@
 assert(p.identifier == 0)
 
 = Build FF frame with constructor, check for correct length assignments
-
 p = ISOTPHeader(bytes(ISOTPHeader()/ISOTP_FF(message_size=10, data=b'\xad\xbe\xad\xff')))
 assert(p.length == 6)
 assert(p.message_size == 10)
@@ -259,7 +304,6 @@
 assert(p.identifier == 0)
 
 = Build FF frame EA with constructor, check for correct length assignments
-
 p = ISOTPHeaderEA(bytes(ISOTPHeaderEA()/ISOTP_FF(message_size=10, data=b'\xad\xbe\xad\xff')))
 assert(p.extended_address == 0)
 assert(p.length == 7)
@@ -270,7 +314,6 @@
 assert(p.identifier == 0)
 
 = Build FF frame EA, extended size, with constructor, check for correct length assignments
-
 p = ISOTPHeaderEA(bytes(ISOTPHeaderEA()/ISOTP_FF(message_size=0,
                                                  extended_message_size=2000,
                                                  data=b'\xad')))
@@ -284,7 +327,6 @@
 assert(p.identifier == 0)
 
 = Build FF frame, extended size, with constructor, check for correct length assignments
-
 p = ISOTPHeader(bytes(ISOTPHeader()/ISOTP_FF(message_size=0,
                                              extended_message_size=2000,
                                              data=b'\xad')))
@@ -297,7 +339,6 @@
 assert(p.identifier == 0)
 
 = Build CF frame with constructor, check for correct length assignments
-
 p = ISOTPHeader(bytes(ISOTPHeader()/ISOTP_CF(data=b'\xad')))
 assert(p.length == 2)
 assert(p.index == 0)
@@ -307,7 +348,6 @@
 assert(p.identifier == 0)
 
 = Build CF frame EA with constructor, check for correct length assignments
-
 p = ISOTPHeaderEA(bytes(ISOTPHeaderEA()/ISOTP_CF(data=b'\xad')))
 assert(p.length == 3)
 assert(p.index == 0)
@@ -317,7 +357,6 @@
 assert(p.identifier == 0)
 
 = Build FC frame EA with constructor, check for correct length assignments
-
 p = ISOTPHeaderEA(bytes(ISOTPHeaderEA()/ISOTP_FC()))
 assert(p.length == 4)
 assert(p.block_size == 0)
@@ -326,7 +365,6 @@
 assert(p.identifier == 0)
 
 = Build FC frame with constructor, check for correct length assignments
-
 p = ISOTPHeader(bytes(ISOTPHeader()/ISOTP_FC()))
 assert(p.length == 3)
 assert(p.block_size == 0)
@@ -335,7 +373,6 @@
 assert(p.identifier == 0)
 
 = Construct some single frames
-
 p = ISOTPHeader(identifier=0x123, length=5)/ISOTP_SF(message_size=4, data=b'abcd')
 assert(p.length == 5)
 assert(p.identifier == 0x123)
@@ -344,7 +381,6 @@
 assert(p.data == b'abcd')
 
 = Construct some single frames EA
-
 p = ISOTPHeaderEA(identifier=0x123, length=6, extended_address=42)/ISOTP_SF(message_size=4, data=b'abcd')
 assert(p.length == 6)
 assert(p.extended_address == 42)
@@ -353,6 +389,17 @@
 assert(p.message_size == 4)
 assert(p.data == b'abcd')
 
+= Construct ISOTP_packet with extended can frame
+p = get_isotp_packet(identifier=0x1234, extended=False, extended_can_id=True)
+print(p)
+assert (p.identifier == 0x1234)
+assert (p.flags == "extended")
+
+= Construct ISOTPEA_Packet with extended can frame
+p = get_isotp_packet(identifier=0x1234, extended=True, extended_can_id=True)
+print(p)
+assert (p.identifier == 0x1234)
+assert (p.flags == "extended")
 
 + ISOTP fragment and defragment checks
 
@@ -362,12 +409,12 @@
 assert(fragments[0].data == b"\0")
 
 = Fragment another empty ISOTP message
-fragments = ISOTP("").fragment()
+fragments = ISOTP(b"").fragment()
 assert(len(fragments) == 1)
 assert(fragments[0].data == b"\0")
 
 = Fragment a 4 bytes long ISOTP message
-fragments = ISOTP("data", src=0x241).fragment()
+fragments = ISOTP(b"data", src=0x241).fragment()
 assert(len(fragments) == 1)
 assert(isinstance(fragments[0], CAN))
 fragment = CAN(bytes(fragments[0]))
@@ -376,32 +423,42 @@
 assert(fragment.length == 5)
 assert(fragment.reserved == 0)
 
+= Fragment a 4 bytes long ISOTP message extended
+fragments = ISOTP(b"data", dst=0x1fff0000).fragment()
+assert(len(fragments) == 1)
+assert(isinstance(fragments[0], CAN))
+fragment = CAN(bytes(fragments[0]))
+assert(fragment.data == b"\x04data")
+assert(fragment.length == 5)
+assert(fragment.reserved == 0)
+assert(fragment.flags == 4)
+
 = Fragment a 7 bytes long ISOTP message
-fragments = ISOTP("abcdefg").fragment()
+fragments = ISOTP(b"abcdefg").fragment()
 assert(len(fragments) == 1)
 assert(fragments[0].data == b"\x07abcdefg")
 
 = Fragment a 8 bytes long ISOTP message
-fragments = ISOTP("abcdefgh").fragment()
+fragments = ISOTP(b"abcdefgh").fragment()
 assert(len(fragments) == 2)
 assert(fragments[0].data == b"\x10\x08abcdef")
 assert(fragments[1].data == b"\x21gh")
 
 = Fragment an ISOTP message with extended addressing
-isotp = ISOTP("abcdef", exdst=ord('A'))
+isotp = ISOTP(b"abcdef", exdst=ord('A'))
 fragments = isotp.fragment()
 assert(len(fragments) == 1)
 assert(fragments[0].data == b"A\x06abcdef")
 
 = Fragment a 7 bytes ISOTP message with destination identifier
-isotp = ISOTP("abcdefg", dst=0x64f)
+isotp = ISOTP(b"abcdefg", dst=0x64f)
 fragments = isotp.fragment()
 assert(len(fragments)  == 1)
 assert(fragments[0].data == b"\x07abcdefg")
 assert(fragments[0].identifier == 0x64f)
 
 = Fragment a 16 bytes ISOTP message with extended addressing
-isotp = ISOTP("abcdefghijklmnop", dst=0x64f, exdst=ord('A'))
+isotp = ISOTP(b"abcdefghijklmnop", dst=0x64f, exdst=ord('A'))
 fragments = isotp.fragment()
 assert(len(fragments) == 3)
 assert(fragments[0].data == b"A\x10\x10abcde")
@@ -428,6 +485,22 @@
 assert(isotp.data == b"test")
 assert(isotp.dst == 0x641)
 
+= Defragment non ISOTP message
+fragments = [CAN(identifier=0x641, data=b"\xa4test")]
+isotp = ISOTP.defragment(fragments)
+assert isotp is None
+
+= Defragment exception
+fragments = []
+ex = False
+try:
+    isotp = ISOTP.defragment(fragments)
+    isotp.show()
+except Scapy_Exception:
+    ex = True
+
+assert ex
+
 = Defragment an ISOTP message composed of multiple CAN frames
 fragments = [
     CAN(identifier=0x641, data=dhex("41 10 10 61 62 63 64 65")),
@@ -441,25 +514,25 @@
 assert(isotp.exdst == 0x41)
 
 = Check if fragmenting a message and defragmenting it back yields the original message
-isotp1 = ISOTP("abcdef", exdst=ord('A'))
+isotp1 = ISOTP(b"abcdef", exdst=ord('A'))
 fragments = isotp1.fragment()
 isotp2 = ISOTP.defragment(fragments)
 isotp2.show()
 assert(isotp1 == isotp2)
 
-isotp1 = ISOTP("abcdefghijklmnop")
+isotp1 = ISOTP(b"abcdefghijklmnop")
 fragments = isotp1.fragment()
 isotp2 = ISOTP.defragment(fragments)
 isotp2.show()
 assert(isotp1 == isotp2)
 
-isotp1 = ISOTP("abcdefghijklmnop", exdst=ord('A'))
+isotp1 = ISOTP(b"abcdefghijklmnop", exdst=ord('A'))
 fragments = isotp1.fragment()
 isotp2 = ISOTP.defragment(fragments)
 isotp2.show()
 assert(isotp1 == isotp2)
 
-isotp1 = ISOTP("T"*5000, exdst=ord('A'))
+isotp1 = ISOTP(b"T"*5000, exdst=ord('A'))
 fragments = isotp1.fragment()
 isotp2 = ISOTP.defragment(fragments)
 isotp2.show()
@@ -477,14 +550,15 @@
 assert(isotpex.exdst == 0x02)
 
 
-
 + Testing ISOTPMessageBuilder
 
 = Create ISOTPMessageBuilder
 m = ISOTPMessageBuilder()
 
 = Feed packets to machine
-m.feed(CAN(identifier=0x241, data=dhex("10 28 01 02 03 04 05 06")))
+ff = CAN(identifier=0x241, data=dhex("10 28 01 02 03 04 05 06"))
+ff.time = 1000
+m.feed(ff)
 m.feed(CAN(identifier=0x641, data=dhex("30 03 00"               )))
 m.feed(CAN(identifier=0x241, data=dhex("21 07 08 09 0A 0B 0C 0D")))
 m.feed(CAN(identifier=0x241, data=dhex("22 0E 0F 10 11 12 13 14")))
@@ -501,6 +575,9 @@
 assert(m.count == 0)
 assert(msg.dst == 0x241)
 assert(msg.exdst is None)
+assert(msg.src == 0x641)
+assert(msg.exsrc is None)
+assert(msg.time == 1000)
 expected = dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28")
 assert(msg.data == expected)
 
@@ -554,7 +631,9 @@
 
 = Verify multiple frames with EA
 m = ISOTPMessageBuilder()
-m.feed(CAN(identifier=0x241, data=dhex("EA 10 28 01 02 03 04 05")))
+ff = CAN(identifier=0x241, data=dhex("EA 10 28 01 02 03 04 05"))
+ff.time = 1005
+m.feed(ff)
 m.feed(CAN(identifier=0x641, data=dhex("EA 30 03 00"            )))
 m.feed(CAN(identifier=0x241, data=dhex("EA 21 06 07 08 09 0A 0B")))
 m.feed(CAN(identifier=0x241, data=dhex("EA 22 0C 0D 0E 0F 10 11")))
@@ -566,6 +645,27 @@
 msg = m.pop()
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xEA)
+assert(msg.time == 1005)
+assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28"))
+
+= Verify multiple frames with EA 2
+m = ISOTPMessageBuilder()
+m.feed(CAN(identifier=0x241, data=dhex("EA 10 28 01 02 03 04 05")))
+m.feed(CAN(identifier=0x641, data=dhex("AE 30 03 00"            )))
+m.feed(CAN(identifier=0x241, data=dhex("EA 21 06 07 08 09 0A 0B")))
+m.feed(CAN(identifier=0x241, data=dhex("EA 22 0C 0D 0E 0F 10 11")))
+m.feed(CAN(identifier=0x241, data=dhex("EA 23 12 13 14 15 16 17")))
+m.feed(CAN(identifier=0x641, data=dhex("AE 30 03 00"            )))
+m.feed(CAN(identifier=0x241, data=dhex("EA 24 18 19 1A 1B 1C 1D")))
+m.feed(CAN(identifier=0x241, data=dhex("EA 25 1E 1F 20 21 22 23")))
+m.feed(CAN(identifier=0x241, data=dhex("EA 26 24 25 26 27 28"   )))
+msg = m.pop()
+assert(msg.dst == 0x241)
+assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xAE)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28"))
 
 = Verify that an EA starting with 1 will still work
@@ -578,6 +678,8 @@
 msg = m.pop()
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0x1A)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0x1A)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14"))
 
 = Verify that an EA of 07 will still work
@@ -588,18 +690,26 @@
 msg = m.pop(0x241, 0x07)
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0x07)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0x07)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A"))
 
 = Verify that three interleaved messages can be sniffed simultaneously on the same identifier and extended address (very unrealistic)
 m = ISOTPMessageBuilder()
-m.feed(CAN(identifier=0x241, data=dhex("EA 10 28 01 02 03 04 05"))) # start of message A
+ff = CAN(identifier=0x241, data=dhex("EA 10 28 01 02 03 04 05"))
+ff.time = 300
+m.feed(ff) # start of message A
 m.feed(CAN(identifier=0x641, data=dhex("EA 30 03 00"            )))
 m.feed(CAN(identifier=0x241, data=dhex("EA 21 06 07 08 09 0A 0B")))
 m.feed(CAN(identifier=0x241, data=dhex("EA 22 0C 0D 0E 0F 10 11")))
 m.feed(CAN(identifier=0x241, data=dhex("EA 23 12 13 14 15 16 17")))
-m.feed(CAN(identifier=0x241, data=dhex("EA 10 10 31 32 33 34 35"))) # start of message B
+ff = CAN(identifier=0x241, data=dhex("EA 10 10 31 32 33 34 35"))
+ff.time = 400
+m.feed(ff) # start of message B
 m.feed(CAN(identifier=0x641, data=dhex("EA 30 03 00"            )))
-m.feed(CAN(identifier=0x241, data=dhex("EA 03 A6 A7 A8"         ))) # single-frame message C
+sf = CAN(identifier=0x241, data=dhex("EA 03 A6 A7 A8"         ))
+sf.time = 200
+m.feed(sf) # single-frame message C
 m.feed(CAN(identifier=0x641, data=dhex("EA 30 03 00"            )))
 m.feed(CAN(identifier=0x241, data=dhex("EA 24 18 19 1A 1B 1C 1D")))
 m.feed(CAN(identifier=0x241, data=dhex("EA 21 36 37 38 39 3A 3B")))
@@ -610,13 +720,20 @@
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
 assert(msg.data == dhex("A6 A7 A8"))
+assert(msg.time == 200)
 msg = m.pop()
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xEA)
+assert(msg.time == 400)
 assert(msg.data == dhex("31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F 40"))
 msg = m.pop()
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xEA)
+assert(msg.time == 300)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28"))
 
 
@@ -636,6 +753,8 @@
 msg = m.pop()
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xEA)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28"))
 
 = Verify multiple frames with EA from list and iterator
@@ -661,6 +780,8 @@
 msg = isotpmsgs[0]
 assert(msg.dst == 0x241)
 assert(msg.exdst is 0xEA)
+assert(msg.src == 0x641)
+assert(msg.exsrc is 0xEA)
 assert(msg.data == dhex("01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F 20 21 22 23 24 25 26 27 28"))
 
 assert isotpmsgs[1] == isotpmsgs[2]
@@ -674,8 +795,7 @@
 
 + Test sniffer
 = Test sniffer with multiple frames
-~ linux needs_root
-
+~ vcan_socket needs_root linux
 
 test_frames = [
     (0x241, "EA 10 28 01 02 03 04 05"),
@@ -690,25 +810,29 @@
 ]
 
 succ = False
+
 def sender(args=None):
-    for f in test_frames:
-        call("cansend %s %3x#%s" % (iface0, f[0], "".join(f[1].split())), shell=True)
     global succ
-    succ = True
+    with new_can_socket(iface0) as tx_sock:
+        for f in test_frames:
+            tx_sock.send(CAN(identifier=f[0], data=dhex(f[1])))
+        succ = True
+
+with new_can_socket(iface0) as s:
+    thread = threading.Thread(target=sender)
+    sniffed = sniff(opened_socket=s, session=ISOTPSession, timeout=1, prn=lambda x: x.show2(), started_callback=thread.start, count=1)
 
-s = new_can_socket(iface0)
-thread = threading.Thread(target=sender)
-sniffed = sniff(opened_socket=s, session=ISOTPSession, timeout=1, prn=lambda x: x.show2(), started_callback=thread.start, count=1)
 assert sniffed[0]['ISOTP'].data == bytearray(range(1, 0x29))
-thread.join()
+assert(sniffed[0]['ISOTP'].src == 0x641)
+assert(sniffed[0]['ISOTP'].exsrc is 0xEA)
+assert(sniffed[0]['ISOTP'].dst == 0x241)
+assert(sniffed[0]['ISOTP'].exdst is 0xEA)
+thread.join(timeout=5)
 assert(succ)
 
-
 + ISOTPSocket tests
 
-
 = Single-frame receive
-
 cans = MockCANSocket()
 cans.rcvd_queue.put(CAN(identifier=0x241, data=dhex("05 01 02 03 04 05")))
 with ISOTPSoftSocket(cans, sid=0x641, did=0x241) as s:
@@ -717,9 +841,7 @@
 assert(msg.data == dhex("01 02 03 04 05"))
 assert(cans.sent_queue.empty())
 
-
 = Single-frame send
-
 cans = MockCANSocket()
 with ISOTPSoftSocket(cans, sid=0x641, did=0x241) as s:
     s.send(ISOTP(dhex("01 02 03 04 05")))
@@ -729,9 +851,7 @@
 assert(cans.sent_queue.empty())
 assert(cans.rcvd_queue.empty())
 
-
 = Two frame receive
-
 cans = MockCANSocket()
 with ISOTPSoftSocket(cans, sid=0x641, did=0x241) as s:
     ready = threading.Event()
@@ -751,9 +871,9 @@
             raise ex
     thread = threading.Thread(target=sender, name="sender")
     thread.start()
-    ready.wait()
+    ready.wait(timeout=5)
     msg = s.recv()
-    thread.join()
+    thread.join(timeout=5)
 
 if exception is not None:
     raise exception
@@ -763,9 +883,7 @@
 assert(cans.sent_queue.empty())
 assert(cans.rcvd_queue.empty())
 
-
 = 20000 bytes receive
-
 data = dhex("01 02 03 04 05")*4000
 cans = MockCANSocket()
 
@@ -806,9 +924,7 @@
 with ISOTPSoftSocket(cans, sid=0x641, did=0x241) as s:
     s.send(ISOTP(dhex("01 02 03 04 05")))
 
-
 = 20000 bytes send
-
 data = dhex("01 02 03 04 05")*4000
 cans = MockCANSocket()
 msg = ISOTP(data, dst=0x641)
@@ -829,7 +945,7 @@
 
 thread = threading.Thread(target=acker, name="acker")
 thread.start()
-ready.wait()
+ready.wait(timeout=5)
 
 with ISOTPSoftSocket(cans, sid=0x641, did=0x241) as s:
     s.send(msg)
@@ -838,15 +954,12 @@
 succ.wait(2)
 assert(succ.is_set())
 
-
 = Create and close ISOTP soft socket
 with ISOTPSocket(MockCANSocket(), sid=0x641, did=0x241) as s:
     assert(s.impl.rx_thread.is_alive())
     s.close()
-    s.impl.rx_thread.join(5)
+    assert(not s.impl.rx_thread.join(5))
     assert(not s.impl.rx_thread.is_alive())
-    assert(not s.impl.rx_timer.is_alive())
-    assert(not s.impl.tx_timer.is_alive())
 
 
 = Verify that all threads will die when GC collects the socket
@@ -858,9 +971,6 @@
 r = gc.collect()
 impl.rx_thread.join(10)  # hope that the GC has made a pass
 assert(not impl.rx_thread.is_alive())
-assert(not impl.rx_timer.is_alive())
-assert(not impl.tx_timer.is_alive())
-
 
 = Test on_recv function with single frame
 with ISOTPSocket(MockCANSocket(), sid=0x641, did=0x241) as s:
@@ -868,20 +978,17 @@
     msg = s.ins.rx_queue.get(True, 1)
     assert(msg == dhex("01 02 03 04 05"))
 
-
 = Test on_recv function with empty frame
 with ISOTPSocket(MockCANSocket(), sid=0x641, did=0x241) as s:
     s.ins.on_recv(CAN(identifier=0x241, data=b""))
     assert(s.ins.rx_queue.empty())
 
-
 = Test on_recv function with single frame and extended addressing
 with ISOTPSocket(MockCANSocket(), sid=0x641, did=0x241, extended_rx_addr=0xea) as s:
     s.ins.on_recv(CAN(identifier=0x241, data=dhex("EA 05 01 02 03 04 05")))
     msg = s.ins.rx_queue.get(True, 1)
     assert(msg == dhex("01 02 03 04 05"))
 
-
 = CF is sent when first frame is received
 cans = MockCANSocket()
 with ISOTPSocket(cans, sid=0x641, did=0x241) as s:
@@ -890,105 +997,142 @@
     assert(can.identifier == 0x641)
     assert(can.data == dhex("30 00 00"))
 
+cans.close()
 
 + Testing ISOTPSocket with an actual CAN socket
 
 = Verify that packets are not lost if they arrive before the sniff() is called
-~ linux needs_root
-
-ss = new_can_socket(iface0)
-sr = new_can_socket(iface0)
-print("socket open")
-ss.send(CAN(identifier=0x111, data=b"\x01\x23\x45\x67"))
-time.sleep(0.02)
-p = sr.sniff(count=1, timeout=0.2)
-assert(len(p)==1)
-ss.send(CAN(identifier=0x111, data=b"\x89\xab\xcd\xef"))
-time.sleep(0.02)
-p = sr.sniff(count=1, timeout=0.2)
-assert(len(p)==1)
-del ss
-del sr
-
+with new_can_socket(iface0) as ss, new_can_socket0() as sr:
+    tx_func = lambda: ss.send(CAN(identifier=0x111, data=b"\x01\x23\x45\x67"))
+    p = sr.sniff(count=1, timeout=0.2, started_callback=tx_func)
+    assert(len(p)==1)
+    tx_func = lambda: ss.send(CAN(identifier=0x111, data=b"\x89\xab\xcd\xef"))
+    p = sr.sniff(count=1, timeout=0.2, started_callback=tx_func)
+    assert(len(p)==1)
 
 = Send single frame ISOTP message, using begin_send
-~ linux needs_root
-cans = new_can_socket(iface0)
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+with new_can_socket(iface0) as isocan, \
+        ISOTPSocket(isocan, sid=0x641, did=0x241) as s, \
+        new_can_socket0() as cans:
     can = cans.sniff(timeout=2, count=1, started_callback=lambda: s.begin_send(ISOTP(data=dhex("01 02 03 04 05"))))
     assert(can[0].identifier == 0x641)
     assert(can[0].data == dhex("05 01 02 03 04 05"))
 
-
 = Send many single frame ISOTP messages, using begin_send
-~ linux needs_root
-cans = new_can_socket(iface0)
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+
+with new_can_socket0() as isocan, \
+        ISOTPSocket(isocan, sid=0x641, did=0x241) as s, \
+        new_can_socket0() as cans:
     for i in range(100):
         data = dhex("01 02 03 04 05") + struct.pack("B", i)
         expected = struct.pack("B", len(data)) + data
-        can = cans.sniff(timeout=1, count=1, started_callback=lambda: s.begin_send(ISOTP(data=data)))
+        can = cans.sniff(timeout=4, count=1, started_callback=lambda: s.begin_send(ISOTP(data=data)))
         assert(can[0].identifier == 0x641)
         print(can[0].data, data)
         assert(can[0].data == expected)
 
 
 = Send two-frame ISOTP message, using begin_send
-~ linux needs_root
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    can = cans.sniff(timeout=1, count=1, started_callback=lambda: s.begin_send(ISOTP(data=dhex("01 02 03 04 05 06 07 08"))))
-    assert can[0].identifier == 0x641
-    assert can[0].data == dhex("10 08 01 02 03 04 05 06")
-    can = cans.sniff(timeout=1, count=1, started_callback=lambda: cans.send(CAN(identifier = 0x241, data=dhex("30 00 00"))))
-    assert can[0].identifier == 0x641
-    assert can[0].data == dhex("21 07 08")
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        can = cans.sniff(timeout=1, count=1, started_callback=lambda: s.begin_send(ISOTP(data=dhex("01 02 03 04 05 06 07 08"))))
+        assert can[0].identifier == 0x641
+        assert can[0].data == dhex("10 08 01 02 03 04 05 06")
+        can = cans.sniff(timeout=1, count=1, started_callback=lambda: cans.send(CAN(identifier = 0x241, data=dhex("30 00 00"))))
+        assert can[0].identifier == 0x641
+        assert can[0].data == dhex("21 07 08")
 
+cans.close()
 
 = Send single frame ISOTP message
-~ linux needs_root
-
-cans = new_can_socket(iface0)
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    s.send(ISOTP(data=dhex("01 02 03 04 05")))
-    can = cans.sniff(timeout=1, count=1)
-    assert(can[0].identifier == 0x641)
-    assert(can[0].data == dhex("05 01 02 03 04 05"))
+with new_can_socket(iface0) as cans:
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+        s.send(ISOTP(data=dhex("01 02 03 04 05")))
+        can = cans.sniff(timeout=1, count=1)
+        assert(can[0].identifier == 0x641)
+        assert(can[0].data == dhex("05 01 02 03 04 05"))
 
 
 = Send two-frame ISOTP message
-~ linux needs_root
+acker_ready = threading.Event()
+def acker():
+    with new_can_socket(iface0) as acks:
+        acker_ready.set()
+        can_pkt = acks.sniff(timeout=1, count=1)
+        can = can_pkt[0]
+        acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
+
+Thread(target=acker).start()
+acker_ready.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x241)
+        assert(can.data == dhex("30 00 00"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("21 07 08"))
+
+
+= Send two-frame ISOTP message with bs
 
-cans = new_can_socket(iface0)
 acker_ready = threading.Event()
 def acker():
-    acks = new_can_socket(iface0)
-    acker_ready.set()
-    can_pkt = acks.sniff(timeout=1, count=1)
-    can = can_pkt[0]
-    acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
+    with new_can_socket(iface0) as acks:
+        acker_ready.set()
+        can_pkt = acks.sniff(timeout=1, count=1)
+        can = can_pkt[0]
+        acks.send(CAN(identifier = 0x241, data=dhex("30 20 00")))
 
 Thread(target=acker).start()
-acker_ready.wait()
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
-    can = cans.sniff(timeout=1, count=1)[0] 
-    assert(can.identifier == 0x641)
-    assert(can.data == dhex("10 08 01 02 03 04 05 06"))
-    can = cans.sniff(timeout=1, count=1)[0] 
-    assert(can.identifier == 0x241)
-    assert(can.data == dhex("30 00 00"))
-    can = cans.sniff(timeout=1, count=1)[0] 
-    assert(can.identifier == 0x641)
-    assert(can.data == dhex("21 07 08"))
+acker_ready.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x241)
+        assert(can.data == dhex("30 20 00"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("21 07 08"))
+
+
+= Send two-frame ISOTP message with ST
+acker_ready = threading.Event()
+def acker():
+    with new_can_socket0() as acks:
+        acker_ready.set()
+        can_pkt = acks.sniff(timeout=1, count=1)
+        can = can_pkt[0]
+        acks.send(CAN(identifier = 0x241, data=dhex("30 00 10")))
+
+Thread(target=acker).start()
+acker_ready.wait(timeout=5)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x241)
+        assert(can.data == dhex("30 00 10"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("21 07 08"))
 
 
 = Receive a single frame ISOTP message
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("05 01 02 03 04 05")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("05 01 02 03 04 05")))
     isotp = s.recv()
     assert(isotp.data == dhex("01 02 03 04 05"))
     assert(isotp.src == 0x641)
@@ -998,11 +1142,9 @@
 
 
 = Receive a single frame ISOTP message, with extended addressing
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241, extended_addr=0xc0, extended_rx_addr=0xea) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("EA 05 01 02 03 04 05")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, extended_addr=0xc0, extended_rx_addr=0xea) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("EA 05 01 02 03 04 05")))
     isotp = s.recv()
     assert(isotp.data == dhex("01 02 03 04 05"))
     assert(isotp.src == 0x641)
@@ -1010,9 +1152,8 @@
     assert(isotp.exsrc == 0xc0)
     assert(isotp.exdst == 0xea)
 
-= Receive frames from CandumpReader
-~ linux needs_root
 
+= Receive frames from CandumpReader
 candump_fd = BytesIO(b'''  vcan0  541   [8]  10 0A DE AD BE EF AA AA
   vcan0  241   [3]  30 00 00
   vcan0  541   [5]  21 AA AA AA AA
@@ -1034,16 +1175,17 @@
   vcan0  541   [5]  21 AA AA AA AA''')
 
 with ISOTPSocket(CandumpReader(candump_fd), sid=0x241, did=0x541, listen_only=True) as s:
-    pkts = s.sniff(timeout=1, count=6)
+    pkts = s.sniff(timeout=2, count=6)
     assert(len(pkts) == 6)
     isotp = pkts[0]
+    print(repr(isotp))
+    print(hex(isotp.src))
+    print(hex(isotp.dst))
     assert(isotp.data == dhex("DE AD BE EF AA AA AA AA AA AA"))
     assert(isotp.src == 0x241)
     assert(isotp.dst == 0x541)
 
 = Receive frames from CandumpReader with ISOTPSniffer without extended addressing
-~ linux needs_root
-
 candump_fd = BytesIO(b'''  vcan0  541   [8]  10 0A DE AD BE EF AA AA
   vcan0  241   [3]  30 00 00
   vcan0  541   [5]  21 AA AA AA AA
@@ -1070,10 +1212,8 @@
 assert(isotp.data == dhex("DE AD BE EF AA AA AA AA AA AA"))
 assert (isotp.dst == 0x541)
 
-
 = Receive frames from CandumpReader with ISOTPSniffer
 * all flow control frames are detected as single frame with extended address
-~ linux needs_root
 
 candump_fd = BytesIO(b'''  vcan0  541   [8]  10 0A DE AD BE EF AA AA
   vcan0  241   [3]  30 00 00
@@ -1104,10 +1244,8 @@
 assert(isotp.data == dhex(""))
 assert (isotp.dst == 0x241)
 
-
 = Receive frames from CandumpReader with ISOTPSniffer and count
 * all flow control frames are detected as single frame with extended address
-~ linux needs_root
 
 candump_fd = BytesIO(b'''  vcan0  541   [8]  10 0A DE AD BE EF AA AA
   vcan0  241   [3]  30 00 00
@@ -1138,62 +1276,44 @@
 assert(isotp.data == dhex(""))
 assert (isotp.dst == 0x241)
 
-
-
 = Receive a two-frame ISOTP message
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
-    cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
+        cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
     isotp = s.recv()
     assert(isotp.data == dhex("01 02 03 04 05 06 07 08 09 10 11"))
 
-
 = Check what happens when a CAN frame with wrong identifier gets received
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x141, data = dhex("05 01 02 03 04 05")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x141, data = dhex("05 01 02 03 04 05")))
     assert(s.ins.rx_queue.empty())
 
-
 + Testing ISOTPSocket timeouts
 
-
 = Check if not sending the last CF will make the socket timeout
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("10 11 01 02 03 04 05 06")))
-    cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 0A 0B 0C 0D")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("10 11 01 02 03 04 05 06")))
+        cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 0A 0B 0C 0D")))
     isotp = s.sniff(timeout=1)
 
 assert(len(isotp) == 0)
 
-
-
 = Check if not sending the first CF will make the socket timeout
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("10 11 01 02 03 04 05 06")))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("10 11 01 02 03 04 05 06")))
     isotp = s.sniff(timeout=1)
 
 assert(len(isotp) == 0)
 
-
 = Check if not sending the first FC will make the socket timeout
-~ linux needs_root
-
 exception = None
 isotp = ISOTP(data=dhex("01 02 03 04 05 06 07 08 09 0A"))
 
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
     try:
         s.send(isotp)
         assert(False)
@@ -1201,105 +1321,95 @@
         exception = ex
 
 print(exception)
-assert(str(exception) == "TX state was reset due to timeout")
-
+assert(str(exception) == "TX state was reset due to timeout" or str(exception) == "ISOTP send not completed in 30s")
 
 = Check if not sending the second FC will make the socket timeout
-~ linux needs_root
-
 exception = None
 isotp = ISOTP(data=b"\xa5" * 120)
 test_sem = threading.Semaphore(0)
 evt = threading.Event()
 
 def acker():
-    cans = new_can_socket(iface0)
-    evt.set()
-    can = cans.sniff(timeout=1, count=1)[0] 
-    cans.send(CAN(identifier = 0x241, data=dhex("30 04 00")))
+    with new_can_socket(iface0) as cans:
+        evt.set()
+        can = cans.sniff(timeout=1, count=1)[0]
+        cans.send(CAN(identifier = 0x241, data=dhex("30 04 00")))
 
 thread = Thread(target=acker)
 thread.start()
-evt.wait()
+evt.wait(timeout=5)
 
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
     try:
         s.send(isotp)
     except Scapy_Exception as ex:
         exception = ex
 
-thread.join()
+cans.close()
+thread.join(timeout=5)
 
 assert(exception is not None)
 print(exception)
 assert(str(exception) == "TX state was reset due to timeout")
 
-
 = Check if reception of an overflow FC will make a send fail
-~ linux needs_root
-
 exception = None
 isotp = ISOTP(data=b"\xa5" * 120)
 test_sem = threading.Semaphore(0)
 evt = threading.Event()
 
 def acker():
-    cans = new_can_socket(iface0)
-    evt.set()
-    can = cans.sniff(timeout=1, count=1)[0] 
-    cans.send(CAN(identifier = 0x241, data=dhex("32 00 00")))
+    with new_can_socket(iface0) as cans:
+        evt.set()
+        can = cans.sniff(timeout=1, count=1)[0]
+        cans.send(CAN(identifier = 0x241, data=dhex("32 00 00")))
 
 thread = Thread(target=acker)
 thread.start()
-evt.wait()
+evt.wait(timeout=5)
 
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
     try:
         s.send(isotp)
     except Scapy_Exception as ex:
         exception = ex
 
-thread.join()
+thread.join(timeout=5)
 
 assert(exception is not None)
 print(exception)
 assert(str(exception) == "Overflow happened at the receiver side")
 
-
 = Close the Socket
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket(iface0), sid=0x641, did=0x241) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241) as s:
     s.close()
 
 + More complex operations
 
 = ISOTPSoftSocket sr1
-~ needs_root linux
-
 drain_bus(iface0)
 drain_bus(iface1)
 
 evt = threading.Event()
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
 rx2 = None
+evt2 = threading.Event()
 
-def sender():
+def sender(sock):
     global evt, rx2, msg
-    with ISOTPSoftSocket(new_can_socket(iface0), 0x123, 0x321) as sock:
-        evt.wait()
-        rx2 = sock.sr1(msg, timeout=3, verbose=True)
-
-txThread = threading.Thread(target=sender)
-txThread.start()
-
-with ISOTPSoftSocket(new_can_socket(iface0), 0x321, 0x123) as sock:
-    evt.set()
-    rx = sock.sniff(timeout=3, count=1)[0]
-    sock.send(msg)
+    evt2.set()
+    evt.wait(timeout=5)
+    rx2 = sock.sr1(msg, timeout=3, verbose=True)
+
+with new_can_socket0() as isocan_tx, ISOTPSoftSocket(isocan_tx, 0x123, 0x321) as sock_tx, \
+    new_can_socket0() as isocan_rx, ISOTPSoftSocket(isocan_rx, 0x321, 0x123) as sock_rx:
+    txThread = threading.Thread(target=sender, args=(sock_tx,))
+    txThread.start()
+    evt2.wait(timeout=1)
+    rx = sock_rx.sniff(timeout=3, count=1, started_callback=evt.set)[0]
+    sock_rx.send(msg)
     sent = True
-
-txThread.join()
+    txThread.join(timeout=5)
 
 assert(rx == msg)
 assert(sent)
@@ -1307,8 +1417,6 @@
 assert(rx2 == msg)
 
 = ISOTPSoftSocket sr1 and ISOTP test vice versa
-~ needs_root linux
-
 drain_bus(iface0)
 drain_bus(iface1)
 
@@ -1317,19 +1425,19 @@
 evt = threading.Event()
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
 
-with ISOTPSoftSocket(new_can_socket0(), 0x123, 0x321) as txSock:
+with new_can_socket0() as isocan, ISOTPSoftSocket(isocan, 0x123, 0x321) as txSock:
     def receiver():
         global rx2, sent
-        with ISOTPSoftSocket(new_can_socket0(), 0x321, 0x123) as rxSock:
+        with new_can_socket0() as isocan, ISOTPSoftSocket(isocan, 0x321, 0x123) as rxSock:
             evt.set()
             rx2 = rxSock.sniff(count=1)
             rxSock.send(msg)
             sent = True
     rxThread = threading.Thread(target=receiver, name="receiver")
     rxThread.start()
-    evt.wait()
+    evt.wait(timeout=5)
     rx = txSock.sr1(msg, timeout=5,verbose=True)
-    rxThread.join()
+    rxThread.join(timeout=5)
 
 assert(rx is not None)
 assert(rx == msg)
@@ -1338,24 +1446,23 @@
 assert(sent)
 
 = ISOTPSoftSocket sniff
-~ needs_root linux
-
 evt = threading.Event()
 succ = False
 
 def receiver():
     global evt, succ, rx
-    with ISOTPSoftSocket(new_can_socket0(), 0x321, 0x123) as sock:
-        evt.set()
-        rx = sock.sniff(count=5, timeout=1)
+    with new_can_socket0() as isocan, \
+            ISOTPSoftSocket(isocan, 0x321, 0x123) as sock:
+        rx = sock.sniff(count=5, timeout=5, started_callback=evt.set)
     succ = True
 
 rxThread = threading.Thread(target=receiver)
 rxThread.start()
-evt.wait()
+evt.wait(timeout=5)
 
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
-with ISOTPSoftSocket(new_can_socket0(), 0x123, 0x321) as sock:
+with new_can_socket0() as isocan, \
+        ISOTPSoftSocket(isocan, 0x123, 0x321) as sock:
     msg.data += b'0'
     sock.send(msg)
     msg.data += b'1'
@@ -1367,7 +1474,7 @@
     msg.data += b'4'
     sock.send(msg)
 
-rxThread.join()
+rxThread.join(timeout=5)
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
 msg.data += b'0'
 assert(rx[0] == msg)
@@ -1384,18 +1491,19 @@
 + ISOTPSoftSocket MITM attack tests
 
 = bridge and sniff with isotp soft sockets set up vcan0 and vcan1 for package forwarding vcan1
-~ linux needs_root
-
 drain_bus(iface0)
 drain_bus(iface1)
 
-packet = ISOTP('Request')
 succ = False
 
-with ISOTPSoftSocket(new_can_socket0(), sid=0x241, did=0x641) as isoTpSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x641, did=0x241) as isoTpSocket1, \
-     ISOTPSoftSocket(new_can_socket0(), sid=0x641, did=0x241) as bSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x241, did=0x641) as bSocket1:
+with new_can_socket0() as can0_0, \
+        new_can_socket0() as can0_1, \
+        new_can_socket1() as can1_0, \
+        new_can_socket1() as can1_1, \
+        ISOTPSoftSocket(can0_0, sid=0x241, did=0x641) as isoTpSocket0, \
+        ISOTPSoftSocket(can1_0, sid=0x541, did=0x141) as isoTpSocket1, \
+        ISOTPSoftSocket(can0_1, sid=0x641, did=0x241) as bSocket0, \
+        ISOTPSoftSocket(can1_1, sid=0x141, did=0x141) as bSocket1:
     evt = threading.Event()
     def forwarding(pkt):
         global forwarded
@@ -1409,9 +1517,9 @@
         succ = True
     threadBridge = threading.Thread(target=bridge)
     threadBridge.start()
-    evt.wait()
-    packetsVCan1 = isoTpSocket1.sniff(timeout=0.5, started_callback=lambda: isoTpSocket0.send(packet))
-    threadBridge.join()
+    evt.wait(timeout=5)
+    packetsVCan1 = isoTpSocket1.sniff(timeout=0.5, started_callback=lambda: isoTpSocket0.send(ISOTP(b'Request')))
+    threadBridge.join(timeout=5)
 
 assert forwarded == 1
 assert len(packetsVCan1) == 1
@@ -1421,20 +1529,21 @@
 drain_bus(iface1)
 
 = bridge and sniff with isotp soft sockets and multiple long packets
-~ linux needs_root
-
 drain_bus(iface0)
 drain_bus(iface1)
 
-packet = ISOTP('RequestASDF1234567890')
 N = 3
-T = 3
+T = 20
 
 succ = False
-with ISOTPSoftSocket(new_can_socket0(), sid=0x241, did=0x641) as isoTpSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x641, did=0x241) as isoTpSocket1, \
-     ISOTPSoftSocket(new_can_socket0(), sid=0x641, did=0x241) as bSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x241, did=0x641) as bSocket1:
+with new_can_socket0() as can0_0, \
+        new_can_socket0() as can0_1, \
+        new_can_socket1() as can1_0, \
+        new_can_socket1() as can1_1, \
+        ISOTPSoftSocket(can0_0, sid=0x241, did=0x641) as isoTpSocket0, \
+        ISOTPSoftSocket(can1_0, sid=0x541, did=0x141) as isoTpSocket1, \
+        ISOTPSoftSocket(can0_1, sid=0x641, did=0x241) as bSocket0, \
+        ISOTPSoftSocket(can1_1, sid=0x141, did=0x541) as bSocket1:
     evt = threading.Event()
     def forwarding(pkt):
         global forwarded
@@ -1447,15 +1556,18 @@
                          timeout=T, count=N, started_callback=evt.set)
         succ = True
     def sendpkts():
-        for i in range(N):
-            isoTpSocket0.send(packet)
+        for _ in range(N):
+            time.sleep(0.2)
+            isoTpSocket0.send(ISOTP(b'RequestASDF1234567890'))
     threadBridge = threading.Thread(target=bridge)
     threadBridge.start()
-    evt.wait()
-    packetsVCan1 = isoTpSocket1.sniff(timeout=T, count=N, started_callback=sendpkts)
+    evt.wait(timeout=5)
+    sender = threading.Thread(target=sendpkts)
+    packetsVCan1 = isoTpSocket1.sniff(timeout=T, count=N, started_callback=sender.start)
+    sender.join(timeout=5)
     print("forwarded: %d" % forwarded)
     print("len(packetsVCan1): %d" % len(packetsVCan1))
-    threadBridge.join()
+    threadBridge.join(timeout=5)
 
 assert forwarded == N
 assert len(packetsVCan1) == N
@@ -1465,32 +1577,32 @@
 drain_bus(iface1)
 
 = bridge and sniff with isotp soft sockets set up vcan0 and vcan1 for package change vcan1
-~ linux needs_root
-
-
 drain_bus(iface0)
 drain_bus(iface1)
 
-packet = ISOTP('Request')
 succ = False
-with ISOTPSoftSocket(new_can_socket0(), sid=0x241, did=0x641) as isoTpSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x641, did=0x241) as isoTpSocket1, \
-     ISOTPSoftSocket(new_can_socket0(), sid=0x641, did=0x241) as bSocket0, \
-     ISOTPSoftSocket(new_can_socket1(), sid=0x241, did=0x641) as bSocket1:
+with new_can_socket0() as can0_0, \
+        new_can_socket0() as can0_1, \
+        new_can_socket1() as can1_0, \
+        new_can_socket1() as can1_1, \
+        ISOTPSoftSocket(can0_0, sid=0x241, did=0x641) as isoTpSocket0, \
+        ISOTPSoftSocket(can1_0, sid=0x641, did=0x241) as isoTpSocket1, \
+        ISOTPSoftSocket(can0_1, sid=0x641, did=0x241) as bSocket0, \
+        ISOTPSoftSocket(can1_1, sid=0x241, did=0x641) as bSocket1:
     evt = threading.Event()
     def forwarding(pkt):
         pkt.data = 'changed'
         return pkt
     def bridge():
         global succ
-        bridge_and_sniff(if1=bSocket0, if2=bSocket1, xfrm12=forwarding, xfrm21=forwarding, timeout=1,
+        bridge_and_sniff(if1=bSocket0, if2=bSocket1, xfrm12=forwarding, xfrm21=forwarding, timeout=5,
                          started_callback=evt.set)
         succ = True
     threadBridge = threading.Thread(target=bridge)
     threadBridge.start()
-    evt.wait()
-    packetsVCan1 = isoTpSocket1.sniff(timeout=0.5, started_callback=lambda: isoTpSocket0.send(packet))
-    threadBridge.join()
+    evt.wait(timeout=5)
+    packetsVCan1 = isoTpSocket1.sniff(timeout=2, started_callback=lambda: isoTpSocket0.send(ISOTP(b'Request')))
+    threadBridge.join(timeout=5)
 
 assert len(packetsVCan1) == 1
 assert packetsVCan1[0].data == b'changed'
@@ -1499,143 +1611,126 @@
 drain_bus(iface0)
 drain_bus(iface1)
 
-
 = Two ISOTPSockets at the same time, sending and receiving
-~ linux needs_root
 
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241) as s1, \
-     ISOTPSocket(new_can_socket0(), sid=0x241, did=0x641) as s2:
+with new_can_socket0() as cs1, ISOTPSocket(cs1, sid=0x641, did=0x241) as s1, \
+        new_can_socket0() as cs2, ISOTPSocket(cs2, sid=0x241, did=0x641) as s2:
     isotp = ISOTP(data=b"\x10\x25" * 43)
     def sender():
         s2.send(isotp)
-    Thread(target=sender).start()
-    result = s1.recv()
+    t = Thread(target=sender)
+    result = s1.sniff(count=1, timeout=5, started_callback=t.start)
+    t.join(timeout=5)
 
-assert(result is not None)
-result.show()
-assert(result.data == isotp.data)
+assert len(result) == 1
+assert(result[0].data == isotp.data)
 
 
 = Two ISOTPSockets at the same time, multiple sends/receives
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241) as s1, \
-     ISOTPSocket(new_can_socket0(), sid=0x241, did=0x641) as s2:
+with new_can_socket0() as cs1, ISOTPSocket(cs1, sid=0x641, did=0x241) as s1, \
+        new_can_socket0() as cs2, ISOTPSocket(cs2, sid=0x241, did=0x641) as s2:
     def sender(p):
         s2.send(p)
     for i in range(1, 40, 5):
         isotp = ISOTP(data=bytearray(range(i, i * 2)))
-        Thread(target=sender, args=(isotp,)).start()
-        result = s1.recv()
-        assert (result is not None)
-        result.show()
-        assert (result.data == isotp.data)
+        t = Thread(target=sender, args=(isotp,))
+        result = s1.sniff(count=1, timeout=5, started_callback=t.start)
+        t.join(timeout=5)
+        assert len(result)
+        assert (result[0].data == isotp.data)
 
 
 = Send a single frame ISOTP message with padding
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=True) as s:
-    cans = new_can_socket(iface0)
-    s.send(ISOTP(data=dhex("01")))
-    res = cans.sniff(timeout=1, count=1)[0]
+with new_can_socket0() as cs1, ISOTPSocket(cs1, sid=0x641, did=0x241, padding=True) as s:
+    with new_can_socket(iface0) as cans:
+        s.send(ISOTP(data=dhex("01")))
+        res = cans.sniff(timeout=1, count=1)[0]
     assert(res.length == 8)
 
 
 = Send a two-frame ISOTP message with padding
-~ linux needs_root
-
-cans = new_can_socket(iface0)
 acker_ready = threading.Event()
 def acker():
-    acks = new_can_socket(iface0)
-    acker_ready.set()
-    can = acks.sniff(timeout=1, count=1)[0]
-    acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
-
-Thread(target=acker).start()
-acker_ready.wait()
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=True) as s:
-    s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
-
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("10 08 01 02 03 04 05 06"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x241)
-assert(can.data == dhex("30 00 00"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("21 07 08 00 00 00 00 00"))
+    with new_can_socket(iface0) as acks:
+        acker_ready.set()
+        can = acks.sniff(timeout=1, count=1)[0]
+        acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
+
+with new_can_socket(iface0) as cans:
+    ack_thread = Thread(target=acker)
+    ack_thread.start()
+    acker_ready.wait(timeout=5)
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=True) as s:
+        s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x241)
+        assert(can.data == dhex("30 00 00"))
+        can = cans.sniff(timeout=1, count=1)[0]
+        assert(can.identifier == 0x641)
+        assert(can.data == dhex("21 07 08 00 00 00 00 00"))
+    ack_thread.join(timeout=5)
 
 
 = Receive a padded single frame ISOTP message with padding disabled
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=False) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
-    res = s.recv()
-    assert(res.data == dhex("05 06"))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=False) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
+        res = s.recv()
+        assert(res.data == dhex("05 06"))
 
 
 = Receive a padded single frame ISOTP message with padding enabled
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=True) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
-    res = s.recv()
-    assert(res.data == dhex("05 06"))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=True) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
+        res = s.recv()
+        assert(res.data == dhex("05 06"))
 
 
 = Receive a non-padded single frame ISOTP message with padding enabled
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=True) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier=0x241, data=dhex("02 05 06")))
-    res = s.recv()
-    assert(res.data == dhex("05 06"))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=True) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier=0x241, data=dhex("02 05 06")))
+        res = s.recv()
+        assert(res.data == dhex("05 06"))
 
 
 = Receive a padded two-frame ISOTP message with padding enabled
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=True) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
-    cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
-    res = s.recv()
-    assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=True) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
+        cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
+        res = s.recv()
+        assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
 
 
 = Receive a padded two-frame ISOTP message with padding disabled
-~ linux needs_root
-
-with ISOTPSocket(new_can_socket0(), sid=0x641, did=0x241, padding=False) as s:
-    cans = new_can_socket(iface0)
-    cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
-    cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
-    res = s.recv()
-    res.show()
-    print(res.data)
-    print(raw(res))
-    assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x641, did=0x241, padding=False) as s:
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
+        cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
+        res = s.recv()
+        res.show()
+        print(res.data)
+        print(raw(res))
+        assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
 
 
 + Compatibility with can-isotp linux kernel modules
-~ linux needs_root
+~ vcan_socket needs_root linux
 
 = Compatibility with isotpsend
 exit_if_no_isotp_module()
 
 message = "01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14"
 
-with ISOTPSocket(new_can_socket0(), sid=0x642, did=0x242) as s:
-    cmd = "echo \"%s\" | isotpsend -s 242 -d 642 %s" % (message, iface0)
-    print(cmd)
-    r = subprocess.call(cmd, shell=True)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x642, did=0x242) as s:
+    p = subprocess.Popen(["isotpsend", "-s", "242", "-d", "642", iface0], stdin=subprocess.PIPE, universal_newlines=True)
+    p.communicate(message)
+    r = p.returncode
     print("returncode is %d" % r)
     assert(r == 0)
     isotp = s.recv()
@@ -1646,10 +1741,10 @@
 exit_if_no_isotp_module()
 message = "01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 10 11 12 13 14"
 
-with ISOTPSocket(new_can_socket0(), sid=0x644, did=0x244, extended_addr=0xaa, extended_rx_addr=0xee) as s:
-    cmd = "echo \"%s\" | isotpsend -s 244 -d 644 %s -x ee:aa" % (message, iface0)
-    print(cmd)
-    r = subprocess.call(cmd, shell=True)
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x644, did=0x244, extended_addr=0xaa, extended_rx_addr=0xee) as s:
+    p = subprocess.Popen(["isotpsend", "-s", "244", "-d", "644", "-x", "ee:aa", iface0], stdin=subprocess.PIPE, universal_newlines=True)
+    p.communicate(message)
+    r = p.returncode
     print("returncode is %d" % r)
     assert(r == 0)
     isotp = s.recv()
@@ -1660,11 +1755,11 @@
 exit_if_no_isotp_module()
 
 isotp = ISOTP(data=bytearray(range(1,20)))
-cmd = "isotprecv -s 243 -d 643 -b 3 %s" % iface0
-print(cmd)
-p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+cmd = ["isotprecv", "-s", "243", "-d", "643", "-b", "3", iface0]
+print(" ".join(cmd))
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
 time.sleep(0.1)
-with ISOTPSocket(new_can_socket0(), sid=0x643, did=0x243) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x643, did=0x243) as s:
     s.send(isotp)
 
 threading.Timer(1, lambda: p.terminate() if p.poll() else p.wait()).start()  # Timeout the receiver after 1 second
@@ -1688,11 +1783,11 @@
 = Compatibility with isotprecv - extended addresses
 exit_if_no_isotp_module()
 isotp = ISOTP(data=bytearray(range(1,20)))
-cmd = "isotprecv -s 245 -d 645 -b 3 %s -x ee:aa" % iface0
-print(cmd)
-p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+cmd = ["isotprecv", "-s245", "-d645", "-b3", "-x", "ee:aa", iface0]
+print(" ".join(cmd))
+p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
 time.sleep(0.1)  # Give some time for starting reception
-with ISOTPSocket(new_can_socket0(), sid=0x645, did=0x245, extended_addr=0xaa, extended_rx_addr=0xee) as s:
+with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x645, did=0x245, extended_addr=0xaa, extended_rx_addr=0xee) as s:
     s.send(isotp)
 
 threading.Timer(1, lambda: p.terminate() if p.poll() else p.wait()).start()  # Timeout the receiver after 1 second
@@ -1714,14 +1809,18 @@
 
 
 + ISOTPNativeSocket tests
-~ python3_only linux needs_root
+~ python3_only not_pypy vcan_socket needs_root linux
 
 
-= Configuration
-~ conf python3_only linux
+= Overwrite definition for vcan_socket systems native sockets
+~ conf
+if six.PY3 and LINUX:
+    conf.contribs['CANSocket'] = {'use-python-can': False}
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
 
-conf.contribs['CANSocket'] = {'use-python-can': False}
-from scapy.contrib.cansocket_native import *
 
 
 = Create ISOTP socket
@@ -1731,184 +1830,213 @@
 
 = Send single frame ISOTP message
 exit_if_no_isotp_module()
+
+with new_can_socket(iface0) as cans:
+    s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
+    s.send(ISOTP(data=dhex("01 02 03 04 05")))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x641)
+    assert(can.data == dhex("05 01 02 03 04 05"))
+
+
+= Send single frame ISOTP message Test init with CANSocket
+exit_if_no_isotp_module()
 cans = CANSocket(iface0)
-s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
+s = ISOTPNativeSocket(cans, sid=0x641, did=0x241)
 s.send(ISOTP(data=dhex("01 02 03 04 05")))
 can = cans.sniff(timeout=1, count=1)[0]
 assert(can.identifier == 0x641)
 assert(can.data == dhex("05 01 02 03 04 05"))
+cans.close()
 
 
+= Test init with wrong type
+exit_if_no_isotp_module()
+exception_catched = False
+try:
+    s = ISOTPNativeSocket(42, sid=0x641, did=0x241)
+except Scapy_Exception:
+    exception_catched = True
+
+assert exception_catched
+
 = Send two-frame ISOTP message
 exit_if_no_isotp_module()
-cans = CANSocket(iface0)
+
 evt = threading.Event()
 def acker():
-    s = CANSocket(iface0)
-    evt.set()
-    can = s.sniff(timeout=1, count=1)[0]
-    s.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
-
-Thread(target=acker).start()
-s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
-evt.wait()
-s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+    with new_can_socket(iface0) as cans:
+        evt.set()
+        can = cans.sniff(timeout=1, count=1)[0]
+        cans.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
 
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("10 08 01 02 03 04 05 06"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x241)
-assert(can.data == dhex("30 00 00"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("21 07 08"))
 
+with new_can_socket(iface0) as cans:
+    t = Thread(target=acker)
+    t.start()
+    s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
+    evt.wait(timeout=5)
+    s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x641)
+    assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x241)
+    assert(can.data == dhex("30 00 00"))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x641)
+    assert(can.data == dhex("21 07 08"))
+    t.join(timeout=5)
 
 = Send a single frame ISOTP message with padding
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
-cans = CANSocket(iface0)
-s.send(ISOTP(data=dhex("01")))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.length == 8)
+
+with new_can_socket(iface0) as cans:
+    s.send(ISOTP(data=dhex("01")))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.length == 8)
 
 
 = Send a two-frame ISOTP message with padding
 exit_if_no_isotp_module()
-cans = CANSocket(iface0)
+
 acker_ready = threading.Event()
 def acker():
-    acks = new_can_socket(iface0)
-    acker_ready.set()
-    can = acks.sniff(timeout=1, count=1)[0]
-    acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
-
-Thread(target=acker).start()
-acker_ready.wait()
-s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
-s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("10 08 01 02 03 04 05 06"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x241)
-assert(can.data == dhex("30 00 00"))
-can = cans.sniff(timeout=1, count=1)[0]
-assert(can.identifier == 0x641)
-assert(can.data == dhex("21 07 08 00 00 00 00 00"))
+    with new_can_socket(iface0) as acks:
+        acker_ready.set()
+        can = acks.sniff(timeout=1, count=1)[0]
+        acks.send(CAN(identifier = 0x241, data=dhex("30 00 00")))
+
+with new_can_socket(iface0) as cans:
+    Thread(target=acker).start()
+    acker_ready.wait(timeout=5)
+    s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
+    s.send(ISOTP(data=dhex("01 02 03 04 05 06 07 08")))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x641)
+    assert(can.data == dhex("10 08 01 02 03 04 05 06"))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x241)
+    assert(can.data == dhex("30 00 00"))
+    can = cans.sniff(timeout=1, count=1)[0]
+    assert(can.identifier == 0x641)
+    assert(can.data == dhex("21 07 08 00 00 00 00 00"))
 
 
 = Receive a padded single frame ISOTP message with padding disabled
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=False)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
-res = s.recv()
-assert(res.data == dhex("05 06"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
+    res = s.recv()
+    assert(res.data == dhex("05 06"))
 
 
 = Receive a padded single frame ISOTP message with padding enabled
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
-res = s.recv()
-assert(res.data == dhex("05 06"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier=0x241, data=dhex("02 05 06 00 00 00 00 00")))
+    res = s.recv()
+    assert(res.data == dhex("05 06"))
 
 
 = Receive a non-padded single frame ISOTP message with padding enabled
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier=0x241, data=dhex("02 05 06")))
-res = s.recv()
-assert(res.data == dhex("05 06"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier=0x241, data=dhex("02 05 06")))
+    res = s.recv()
+    assert(res.data == dhex("05 06"))
 
 
 = Receive a padded two-frame ISOTP message with padding enabled
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=True)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
-cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
-res = s.recv()
-assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
+    cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
+    res = s.recv()
+    assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
 
 
 = Receive a padded two-frame ISOTP message with padding disabled
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, padding=False)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
-cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
-res = s.recv()
-assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier=0x241, data=dhex("10 09 01 02 03 04 05 06")))
+    cans.send(CAN(identifier=0x241, data=dhex("21 07 08 09 00 00 00 00")))
+    res = s.recv()
+    assert(res.data == dhex("01 02 03 04 05 06 07 08 09"))
 
 
 = Receive a single frame ISOTP message
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier = 0x241, data = dhex("05 01 02 03 04 05")))
-isotp = s.recv()
-assert(isotp.data == dhex("01 02 03 04 05"))
-assert(isotp.src == 0x641)
-assert(isotp.dst == 0x241)
-assert(isotp.exsrc == None)
-assert(isotp.exdst == None)
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier = 0x241, data = dhex("05 01 02 03 04 05")))
+    isotp = s.recv()
+    assert(isotp.data == dhex("01 02 03 04 05"))
+    assert(isotp.src == 0x641)
+    assert(isotp.dst == 0x241)
+    assert(isotp.exsrc == None)
+    assert(isotp.exdst == None)
 
 
 = Receive a single frame ISOTP message, with extended addressing
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241, extended_addr=0xc0, extended_rx_addr=0xea)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier = 0x241, data = dhex("EA 05 01 02 03 04 05")))
-isotp = s.recv()
-assert(isotp.data == dhex("01 02 03 04 05"))
-assert(isotp.src == 0x641)
-assert(isotp.dst == 0x241)
-assert(isotp.exsrc == 0xc0)
-assert(isotp.exdst == 0xea)
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier = 0x241, data = dhex("EA 05 01 02 03 04 05")))
+    isotp = s.recv()
+    assert(isotp.data == dhex("01 02 03 04 05"))
+    assert(isotp.src == 0x641)
+    assert(isotp.dst == 0x241)
+    assert(isotp.exsrc == 0xc0)
+    assert(isotp.exdst == 0xea)
 
 
 = Receive a two-frame ISOTP message
 exit_if_no_isotp_module()
 s = ISOTPNativeSocket(iface0, sid=0x641, did=0x241)
-cans = CANSocket(iface0)
-cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
-cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
-isotp = s.recv()
-assert(isotp.data == dhex("01 02 03 04 05 06 07 08 09 10 11"))
+with new_can_socket(iface0) as cans:
+    cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
+    cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
+    isotp = s.recv()
+    assert(isotp.data == dhex("01 02 03 04 05 06 07 08 09 10 11"))
 
 = Receive a two-frame ISOTP message and test python with statement
 exit_if_no_isotp_module()
 with ISOTPNativeSocket(iface0, sid=0x641, did=0x241) as s:
-    cans = CANSocket(iface0)
-    cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
-    cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
+    with new_can_socket(iface0) as cans:
+        cans.send(CAN(identifier = 0x241, data = dhex("10 0B 01 02 03 04 05 06")))
+        cans.send(CAN(identifier = 0x241, data = dhex("21 07 08 09 10 11")))
     isotp = s.recv()
     assert(isotp.data == dhex("01 02 03 04 05 06 07 08 09 10 11"))
 
 
 = ISOTP Socket sr1 test
-~ needs_root linux
 exit_if_no_isotp_module()
 
 txSock = ISOTPNativeSocket(iface0, sid=0x123, did=0x321)
-rxSock = CANSocket(iface0)
 txmsg = ISOTP(b'\x11\x22\x33')
 rx2 = None
 
+receiver_up = Event()
+
 def sender():
-    time.sleep(0.1)
+    global receiver_up
+    receiver_up.wait(timeout=5)
     global txmsg
     global rx2
     rx2 = txSock.sr1(txmsg, timeout=1, verbose=True)
 
 def receiver():
-    rx = rxSock.sniff(timeout=1, count=1)[0]
-    rxSock.send(CAN(identifier=0x321, length=4, data=b'\x03\x7f\x22\x33'))
+    global receiver_up
+    with new_can_socket(iface0) as cans:
+        rx = cans.sniff(timeout=1, count=1, started_callback=receiver_up.set)[0]
+        cans.send(CAN(identifier=0x321, length=4, data=b'\x03\x7f\x22\x33'))
     expectedrx = CAN(identifier=0x123, length=4, data=b'\x03\x11\x22\x33')
     assert(rx.length == expectedrx.length)
     assert(rx.data == expectedrx.data)
@@ -1917,35 +2045,36 @@
 txThread = threading.Thread(target=sender)
 txThread.start()
 receiver()
-txThread.join()
+txThread.join(timeout=5)
 
 assert(rx2 is not None)
 assert(rx2 == ISOTP(b'\x7f\x22\x33'))
 assert(rx2.answers(txmsg))
 
 = ISOTP Socket sr1 and ISOTP test
-~ needs_root linux
 exit_if_no_isotp_module()
-
 txSock = ISOTPNativeSocket(iface0, 0x123, 0x321)
 rxSock = ISOTPNativeSocket(iface0, 0x321, 0x123)
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
 rx2 = None
 
+receiver_up = Event()
+
 def sender():
-    time.sleep(0.1)
+    receiver_up.wait(timeout=5)
     global rx2
     rx2 = txSock.sr1(msg, timeout=1, verbose=True)
 
 def receiver():
     global rx
+    receiver_up.set()
     rx = rxSock.recv()
     rxSock.send(msg)
 
 txThread = threading.Thread(target=sender)
 txThread.start()
 receiver()
-txThread.join()
+txThread.join(timeout=5)
 
 assert(rx == msg)
 assert(rxSock.send(msg))
@@ -1953,21 +2082,23 @@
 assert(rx2 == msg)
 
 = ISOTP Socket sr1 and ISOTP test vice versa
-~ needs_root linux
 exit_if_no_isotp_module()
 
 rxSock = ISOTPNativeSocket(iface0, 0x321, 0x123)
 txSock = ISOTPNativeSocket(iface0, 0x123, 0x321)
 
 msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
+
+receiver_up = Event()
+
 def receiver():
     global rx2, sent
-    rx2 = rxSock.sniff(count=1, timeout=1)
+    rx2 = rxSock.sniff(count=1, timeout=1, started_callback=receiver_up.set)
     sent = rxSock.send(msg)
 
 def sender():
     global rx
-    time.sleep(0.1)
+    receiver_up.wait(timeout=5)
     rx = txSock.sr1(msg, timeout=1,verbose=True)
 
 rx2 = None
@@ -1975,22 +2106,23 @@
 rxThread = threading.Thread(target=receiver)
 rxThread.start()
 sender()
-rxThread.join()
+rxThread.join(timeout=5)
 
 assert(rx == msg)
 assert(rx2[0] == msg)
 assert(sent)
 
 = ISOTP Socket sniff
-~ needs_root linux
 exit_if_no_isotp_module()
 
 rxSock = ISOTPNativeSocket(iface0, 0x321, 0x123)
 txSock = ISOTPNativeSocket(iface0, 0x123, 0x321)
 succ = False
 
+receiver_up = Event()
+
 def receiver():
-    rx = rxSock.sniff(count=5, timeout=1)
+    rx = rxSock.sniff(count=5, timeout=1, started_callback=receiver_up.set)
     msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
     msg.data += b'0'
     assert(rx[0] == msg)
@@ -2006,7 +2138,7 @@
     succ = True
 
 def sender():
-    time.sleep(0.1)
+    receiver_up.wait(timeout=5)
     msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
     msg.data += b'0'
     assert(txSock.send(msg))
@@ -2022,14 +2154,14 @@
 rxThread = threading.Thread(target=receiver)
 rxThread.start()
 sender()
-rxThread.join()
+rxThread.join(timeout=5)
 
 assert(succ)
 
 + ISOTPNativeSocket MITM attack tests
+~ python3_only vcan_socket needs_root linux
 
 = bridge and sniff with isotp native sockets set up vcan0 and vcan1 for package forwarding vcan1
-~ python3_only linux needs_root
 exit_if_no_isotp_module()
 
 isoTpSocket0 = ISOTPNativeSocket(iface0, sid=0x241, did=0x641)
@@ -2050,9 +2182,7 @@
 
 def RequestOnBus0():
     global rSucc
-    time.sleep(0.2)
-    packet = ISOTP('Request')
-    isoTpSocket0.send(packet)
+    isoTpSocket0.send(ISOTP(b'Request'))
     rSucc = True
 
 bSucc = False
@@ -2061,7 +2191,7 @@
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=RequestOnBus0)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
 packetsVCan1 = isoTpSocket1.sniff(timeout=0.5, started_callback=threadSender.start)
 
@@ -2070,14 +2200,13 @@
 isoTpSocket0.close()
 isoTpSocket1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 assert(bSucc)
 assert(rSucc)
 
 = bridge and sniff with isotp native sockets set up vcan0 and vcan1 for package change to vcan1
-~ python3_only linux needs_root
 exit_if_no_isotp_module()
 
 isoTpSocket0 = ISOTPNativeSocket(iface0, sid=0x241, did=0x641)
@@ -2102,15 +2231,13 @@
 
 def RequestOnBus0():
     global rSucc
-    time.sleep(0.2)
-    packet = ISOTP('Request')
-    isoTpSocket0.send(packet)
+    isoTpSocket0.send(ISOTP(b'Request'))
     rSucc = True
 
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=RequestOnBus0)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 packetsVCan1 = isoTpSocket1.sniff(timeout=0.5, started_callback=threadSender.start)
 
 packetsVCan1[0].data = b'changed'
@@ -2119,14 +2246,13 @@
 isoTpSocket0.close()
 isoTpSocket1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 assert(bSucc)
 assert(rSucc)
 
 = bridge and sniff with isotp native sockets set up vcan0 and vcan1 for package forwarding in both directions
-~ python3_only linux needs_root
 exit_if_no_isotp_module()
 
 bSucc = False
@@ -2150,9 +2276,8 @@
 
 def RequestBothVCans():
     global rSucc
-    time.sleep(0.2)
-    packetVcan0 = ISOTP('RequestVcan0')
-    packetVcan1 = ISOTP('RequestVcan1')
+    packetVcan0 = ISOTP(b'RequestVcan0')
+    packetVcan1 = ISOTP(b'RequestVcan1')
     isoTpSocket0.send(packetVcan0)
     isoTpSocket1.send(packetVcan1)
     rSucc = True
@@ -2160,7 +2285,7 @@
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=RequestOnBus0)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
 packetsVCan0 = isoTpSocket0.sniff(timeout=0.5, started_callback=threadSender.start)
 packetsVCan1 = isoTpSocket1.sniff(timeout=0.5)
@@ -2171,14 +2296,13 @@
 isoTpSocket0.close()
 isoTpSocket1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 assert(bSucc)
 assert(rSucc)
 
 = bridge and sniff with isotp native sockets set up vcan0 and vcan1 for package change in both directions
-~ python3_only linux needs_root
 exit_if_no_isotp_module()
 
 bSucc = False
@@ -2203,9 +2327,8 @@
 
 def RequestBothVCans():
     global rSucc
-    time.sleep(0.2)
-    packetVcan0 = ISOTP('RequestVcan0')
-    packetVcan1 = ISOTP('RequestVcan1')
+    packetVcan0 = ISOTP(b'RequestVcan0')
+    packetVcan1 = ISOTP(b'RequestVcan1')
     isoTpSocket0.send(packetVcan0)
     isoTpSocket1.send(packetVcan1)
     rSucc = True
@@ -2213,21 +2336,21 @@
 threadBridge = threading.Thread(target=bridge)
 threadBridge.start()
 threadSender = threading.Thread(target=RequestBothVCans)
-bridgeStarted.wait()
+bridgeStarted.wait(timeout=5)
 
 packetsVCan0 = isoTpSocket0.sniff(timeout=0.5, started_callback=threadSender.start)
 packetsVCan1 = isoTpSocket1.sniff(timeout=0.5)
 
 packetsVCan0[0].data = b'changed'
-len(packetsVCan0) == 1
+assert len(packetsVCan0) == 1
 packetsVCan1[0].data = b'changed'
-len(packetsVCan1) == 1
+assert len(packetsVCan1) == 1
 
 isoTpSocket0.close()
 isoTpSocket1.close()
 
-threadSender.join()
-threadBridge.join()
+threadSender.join(timeout=5)
+threadBridge.join(timeout=5)
 
 assert(bSucc)
 assert(rSucc)
@@ -2236,3 +2359,13 @@
 
 = Cleanup reference to ISOTPSoftSocket to let the thread end
 s = None
+
+
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
+
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
+
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)

scapy-2.4.3.tar.gz/test/contrib/isotpscan.uts -> scapy-2.4.4.tar.gz/test/contrib/isotpscan.uts Changed

@@ -1,16 +1,16 @@
-% ISOTPScan Tests
-~ vcan_socket linux needs_root
-* Tests for ISOTPScan
+% Regression tests for ISOTPScan
 
 + Configuration
 ~ conf
 
 = Imports
-
-load_layer("can")
-import threading, time, six, subprocess
+load_layer("can", globals_dict=globals())
+conf.contribs['CAN']['swap-bytes'] = False
+import os, subprocess, sys
 from subprocess import call
+import scapy.modules.six as six
 from scapy.contrib.isotp import send_multiple_ext, filter_periodic_packets, scan, scan_extended
+from scapy.consts import LINUX
 
 = Definition of constants, utility functions
 
@@ -21,111 +21,125 @@
 ISOTP_KERNEL_MODULE_AVAILABLE = False
 def exit_if_no_isotp_module():
     if not ISOTP_KERNEL_MODULE_AVAILABLE:
-        err = "TEST SKIPPED: can-isotp not available"
-        subprocess.call("printf \"%s\r\n\" > /dev/stderr" % err, shell=True)
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
         warning("Can't test ISOTP native socket because kernel module is not loaded")
         exit(0)
 
 
 = Initialize a virtual CAN interface
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+~ vcan_socket needs_root linux
+if 0 != call(["cansend", iface0,  "000#"]):
     # vcan0 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface0)
-    if 0 != call("sudo ip link set dev %s up" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
         raise Exception("could not bring up %s" % iface0)
 
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+if 0 != call(["cansend", iface0,  "000#"]):
     raise Exception("cansend doesn't work")
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     # vcan1 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface1)
-    if 0 != call("sudo ip link set dev %s up" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
         raise Exception("could not bring up %s" % iface1)
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     raise Exception("cansend doesn't work")
 
 print("CAN should work now")
 
-
 = Import CANSocket
 
-if six.PY3:
-    from scapy.contrib.cansocket_native import *
-else:
-    from scapy.contrib.cansocket_python_can import *
-
+from scapy.contrib.cansocket_python_can import *
 
-if "python_can" in CANSocket.__module__:
-    import can as python_can
-    new_can_socket = lambda iface: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface, bitrate=250000))
-    new_can_socket0 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface0, bitrate=250000), timeout=0.01)
-    new_can_socket1 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface1, bitrate=250000), timeout=0.01)
-else:
-    new_can_socket = lambda iface: CANSocket(iface)
-    new_can_socket0 = lambda: CANSocket(iface0)
-    new_can_socket1 = lambda: CANSocket(iface1)
+new_can_socket = lambda iface: CANSocket(bustype='virtual', channel=iface)
+new_can_socket0 = lambda: CANSocket(bustype='virtual', channel=iface0, timeout=0.01)
+new_can_socket1 = lambda: CANSocket(bustype='virtual', channel=iface1, timeout=0.01)
 
 # utility function for draining a can interface, asserting that no packets are there
 def drain_bus(iface=iface0, assert_empty=True):
-    s = new_can_socket(iface)
-    pkts = s.sniff(timeout=0.1)
-    if assert_empty:
-        assert len(pkts) == 0
-    s.close()
+    with new_can_socket0() as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
 
 print("CAN sockets should work now")
 
+= Overwrite definition for vcan_socket systems native sockets
+~ vcan_socket not_pypy needs_root linux
+
+if six.PY3 and LINUX:
+    from scapy.contrib.cansocket_native import *
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+
+
+= Overwrite definition for vcan_socket systems python-can sockets
+~ vcan_socket needs_root linux
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface, timeout=0.01)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, timeout=0.01)
 
 = Verify that a CAN socket can be created and closed
-s = new_can_socket0()
+s = new_can_socket(iface0)
 s.close()
 
 
 = Check if can-isotp and can-utils are installed on this system
-p = subprocess.Popen('lsmod | grep "^can_isotp"', stdout=subprocess.PIPE, shell=True)
-if p.wait() == 0:
-    if b"can_isotp" in p.stdout.read():
-        p = subprocess.Popen("isotpsend -s1 -d0 %s" % iface0, stdin=subprocess.PIPE, shell=True)
-        p.stdin.write(b"01")
-        p.stdin.close()
-        r = p.wait()
-        if r == 0:
-            ISOTP_KERNEL_MODULE_AVAILABLE = True
+~ linux
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
 
 
 + Syntax check
 
 = Import isotp
-if not ISOTP_KERNEL_MODULE_AVAILABLE:
-    conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': False}
-else:
-    conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': True}
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
 
+load_contrib("isotp", globals_dict=globals())
 
-load_contrib("isotp")
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
 
 
 = Test send_multiple_ext()
+
 pkt = ISOTPHeaderEA(identifier=0x100, extended_address=1)/ISOTP_FF(message_size=100, data=b'\x00\x00\x00\x00\x00')
 number_of_packets = 100
 
-drain_bus(iface0)
 def sender():
-    send_multiple_ext(new_can_socket0(), 0, pkt, number_of_packets)
+    with new_can_socket0() as sock1:
+        send_multiple_ext(sock1, 0, pkt, number_of_packets)
 
 thread = threading.Thread(target=sender)
-pkts = new_can_socket0().sniff(timeout=4, count=number_of_packets, started_callback=thread.start)
-thread.join()
-assert len(pkts) == number_of_packets
 
+with new_can_socket0() as sock:
+    pkts = sock.sniff(timeout=4, count=number_of_packets, started_callback=thread.start)
+
+thread.join(timeout=10)
+assert len(pkts) == number_of_packets
 
 = Test filter_periodic_packets() with periodic packets
 pkt = CAN(identifier=0x200, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
@@ -167,428 +181,649 @@
 filter_periodic_packets(received_packets)
 assert len(received_packets) == 40
 
-= Test scan()
-drain_bus(iface0)
-def isotpserver(idx):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+idx, did=0x600+idx) as sock:
-        sock.sniff(timeout=100 ,count=1)
+= Define helper function for dynamic sniff time tests
+
+def test_dynamic(f):
+    for t in [1, 2, 4, 10]:
+        try:
+            drain_bus(iface0)
+            f(0.02 * t)
+            return True
+        except AssertionError as e:
+            if t < 10:
+                sys.stderr.write("Test failed. Automatically increase sniff time and retry." + os.linesep)
+            else:
+                raise e
+    return False
+
+= Define test functions
+
+def make_noise(p, t):
+    with new_can_socket0() as s:
+        for _ in range(40):
+            s.send(p)
+            time.sleep(t)
+
+
+def test_scan(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(idx):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + idx, did=0x600 + idx) as sock:
+            sock.sniff(timeout=sniff_time * 1500, count=1,
+                       started_callback=semaphore.release)
+    listen_sockets = list()
+    for i in range(1, 4):
+        listen_sockets.append(
+            threading.Thread(target=isotpserver, args=(int(i),)))
+        listen_sockets[-1].start()
+    for _ in range(len(listen_sockets)):
+        semaphore.acquire()
+    with new_can_socket0() as scansock:
+        found_packets = scan(scansock, range(0x5ff, 0x604), noise_ids=[0x701],
+                             sniff_time=sniff_time, verbose=True)
+    with new_can_socket0() as cans:
+        for _ in range(5):
+            cans.send(CAN(identifier=0x601, data=b'\x01\xaa'))
+            cans.send(CAN(identifier=0x602, data=b'\x01\xaa'))
+            cans.send(CAN(identifier=0x603, data=b'\x01\xaa'))
+            time.sleep(0)
+    print(len(listen_sockets))
+    for thread in listen_sockets:
+        thread.join(timeout=1)
+    print(len(found_packets))
+    assert len(found_packets) == 2
+
+
+def test_scan_extended(sniff_time=0.02):
+    recvpacket = CAN(flags=0, identifier=0x700, length=4,
+                     data=b'\xaa0\x00\x00')
+    semaphore = threading.Semaphore(0)
+    def isotpserver():
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700, did=0x601,
+                            extended_addr=0xaa, extended_rx_addr=0xbb) as s:
+            s.sniff(timeout=1500 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    thread = threading.Thread(target=isotpserver)
+    thread.start()
+    semaphore.acquire()
+    with new_can_socket0() as scansock:
+        found_packets = scan_extended(scansock, [0x600, 0x601],
+                                      extended_scan_range=range(0xb0, 0xc0),
+                                      sniff_time=sniff_time)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x601, data=b'\xbb\x01\xaa'))
+        thread.join(timeout=10)
+    fpkt = found_packets[list(found_packets.keys())[0]][0]
+    rpkt = recvpacket
+    assert fpkt.length == rpkt.length
+    assert fpkt.data == rpkt.data
+    assert fpkt.identifier == rpkt.identifier
+
+
+def test_isotpscan_text(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + i, did=0x600 + i) as isotpsock:
+            isotpsock.sniff(timeout=1500 * sniff_time, count=1,
+                            started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread_noise.start()
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    with new_can_socket0() as scansock:
+        result = ISOTPScan(scansock, range(0x5ff, 0x604 + 1),
+                           output_format="text",
+                           noise_listen_time=sniff_time * 6,
+                           sniff_time=sniff_time,
+                           verbose=True)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x601, data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x602, data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x603, data=b'\x01\xaa'))
+    thread1.join(timeout=10)
+    thread2.join(timeout=10)
+    thread_noise.join(timeout=10)
+    text = "\nFound 2 ISOTP-FlowControl Packet(s):"
+    assert text in result
+    assert "0x602" in result
+    assert "0x603" in result
+    assert "0x702" in result
+    assert "0x703" in result
+    assert "No Padding" in result
+
+
+def test_isotpscan_text_extended_can_id(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan,
+                            sid=0x1ffff700 + i,
+                            did=0x1ffff600 + i) as isotpsock1:
+            isotpsock1.sniff(timeout=1500 * sniff_time, count=1,
+                             started_callback=semaphore.release)
+    pkt = CAN(identifier=0x1ffff701, flags="extended", length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread_noise.start()
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    with new_can_socket0() as scansock:
+        result = ISOTPScan(scansock, range(0x1ffff5ff, 0x1ffff604 + 1),
+                           output_format="text",
+                           noise_listen_time=sniff_time * 6,
+                           sniff_time=sniff_time,
+                           extended_can_id=True,
+                           verbose=True)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x1ffff601, flags="extended",
+                      data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x1ffff602, flags="extended",
+                      data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x1ffff603, flags="extended",
+                      data=b'\x01\xaa'))
+    thread1.join(timeout=10)
+    thread2.join(timeout=10)
+    thread_noise.join(timeout=10)
+    print(result)
+    text = "\nFound 2 ISOTP-FlowControl Packet(s):"
+    assert text in result
+    assert "0x1ffff602" in result
+    assert "0x1ffff603" in result
+    assert "0x1ffff702" in result
+    assert "0x1ffff703" in result
+    assert "No Padding" in result
+
+
+def test_isotpscan_code(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + i, did=0x600 + i) as isotpsock:
+            isotpsock.sniff(timeout=1500 * sniff_time, count=1,
+                            started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread_noise.start()
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    with new_can_socket0() as scansock:
+        result = ISOTPScan(scansock, range(0x5ff, 0x603 + 1),
+                           output_format="code",
+                           noise_listen_time=sniff_time * 6,
+                           sniff_time=sniff_time,
+                           can_interface="can0",
+                           verbose=True)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x601, data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x602, data=b'\x01\xaa'))
+        cans.send(CAN(identifier=0x603, data=b'\x01\xaa'))
+    thread1.join(timeout=10)
+    thread2.join(timeout=10)
+    thread_noise.join(timeout=10)
+    s1 = "ISOTPSocket(can0, sid=0x602, did=0x702, " \
+         "padding=False, basecls=ISOTP)\n"
+    s2 = "ISOTPSocket(can0, sid=0x603, did=0x703, " \
+         "padding=False, basecls=ISOTP)\n"
+    print(result)
+    assert s1 in result
+    assert s2 in result
+
+
+def test_extended_isotpscan_code(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + i, did=0x600 + i,
+                            extended_addr=0x11, extended_rx_addr=0x22) as s:
+            s.sniff(timeout=1500 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    thread_noise.start()
+    with new_can_socket0() as scansock:
+        result = ISOTPScan(scansock, range(0x5ff, 0x603 + 1),
+                           extended_scan_range=range(0x20, 0x30),
+                           extended_addressing=True, sniff_time=sniff_time,
+                           noise_listen_time=sniff_time * 6,
+                           output_format="code",
+                           can_interface="can0", verbose=True)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x602, data=b'\x22\x01\xaa'))
+        cans.send(CAN(identifier=0x603, data=b'\x22\x01\xaa'))
+        time.sleep(0)
+        cans.send(CAN(identifier=0x602, data=b'\x22\x01\xaa'))
+        cans.send(CAN(identifier=0x603, data=b'\x22\x01\xaa'))
+        thread1.join(timeout=10)
+        thread2.join(timeout=10)
+        thread_noise.join(timeout=10)
+    s1 = "ISOTPSocket(can0, sid=0x602, did=0x702, padding=False, " \
+         "extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
+    s2 = "ISOTPSocket(can0, sid=0x603, did=0x703, padding=False, " \
+         "extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
+    print(result)
+    assert s1 in result
+    assert s2 in result
+
+
+def test_extended_isotpscan_code_extended_can_id(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x1ffff700 + i, did=0x1ffff600 + i,
+                            extended_addr=0x11, extended_rx_addr=0x22) as s:
+            s.sniff(timeout=1500 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    pkt = CAN(identifier=0x1ffff701, flags="extended", length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    thread_noise.start()
+    with new_can_socket0() as scansock:
+        result = ISOTPScan(scansock, range(0x1ffff5ff, 0x1ffff604 + 1),
+                           extended_can_id=True,
+                           extended_scan_range=range(0x20, 0x30),
+                           extended_addressing=True,
+                           sniff_time=sniff_time,
+                           noise_listen_time=sniff_time * 6,
+                           output_format="code",
+                           can_interface="can0",
+                           verbose=True)
+    with new_can_socket0() as cans:
+        cans.send(CAN(identifier=0x1ffff602, flags="extended",
+                      data=b'\x22\x01\xaa'))
+        cans.send(CAN(identifier=0x1ffff603, flags="extended",
+                      data=b'\x22\x01\xaa'))
+        thread1.join(timeout=10)
+        thread2.join(timeout=10)
+        thread_noise.join(timeout=10)
+    s1 = "ISOTPSocket(can0, sid=0x1ffff602, did=0x1ffff702, padding=False, " \
+         "extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
+    s2 = "ISOTPSocket(can0, sid=0x1ffff603, did=0x1ffff703, padding=False, " \
+         "extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
+    print(result)
+    assert s1 in result
+    assert s2 in result
+
+
+def test_isotpscan_none(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + i, did=0x600 + i) as s:
+            s.sniff(timeout=1500 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    with new_can_socket0() as socks_interface:
+        thread_noise.start()
+        with new_can_socket0() as scansock:
+            result = ISOTPScan(scansock, range(0x5ff, 0x603 + 1),
+                               can_interface=socks_interface,
+                               sniff_time=sniff_time,
+                               noise_listen_time=sniff_time * 6,
+                               verbose=True)
+        result = sorted(result, key=lambda x: x.src)
+        with new_can_socket0() as cans:
+            cans.send(CAN(identifier=0x601, data=b'\x01\xaa'))
+            cans.send(CAN(identifier=0x602, data=b'\x01\xaa'))
+            cans.send(CAN(identifier=0x603, data=b'\x01\xaa'))
+            for s in result:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=0x702, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x703, data=b'\x01\xaa'))
+                s.close()
+                cans.send(CAN(identifier=0x702, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x703, data=b'\x01\xaa'))
+                time.sleep(0)
+            thread1.join(timeout=10)
+            thread2.join(timeout=10)
+            thread_noise.join(timeout=10)
+    assert len(result) == 2
+    assert 0x602 == result[0].src
+    assert 0x702 == result[0].dst
+    assert 0x603 == result[1].src
+    assert 0x703 == result[1].dst
+    for s in result:
+        del s
+
+
+def test_isotpscan_none_2(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x700 + i,
+                                                      did=0x600 + i) as s:
+            s.sniff(timeout=1000 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread1 = threading.Thread(target=isotpserver, args=(9,))
+    thread2 = threading.Thread(target=isotpserver, args=(8,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    thread_noise.start()
+    with new_can_socket0() as socks_interface:
+        with new_can_socket0() as scansock:
+            result = ISOTPScan(scansock, range(0x607, 0x60A),
+                               can_interface=socks_interface,
+                               sniff_time=sniff_time,
+                               noise_listen_time=sniff_time * 6,
+                               verbose=True)
+        result = sorted(result, key=lambda x: x.src)
+        with new_can_socket0() as cans:
+            cans.send(CAN(identifier=0x609, data=b'\x01\xaa'))
+            cans.send(CAN(identifier=0x608, data=b'\x01\xaa'))
+            for s in result:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=0x709, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x708, data=b'\x01\xaa'))
+                s.close()
+                time.sleep(0)
+                cans.send(CAN(identifier=0x709, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x708, data=b'\x01\xaa'))
+            thread1.join(timeout=10)
+            thread2.join(timeout=10)
+            thread_noise.join(timeout=10)
+    assert len(result) == 2
+    assert 0x608 == result[0].src
+    assert 0x708 == result[0].dst
+    assert 0x609 == result[1].src
+    assert 0x709 == result[1].dst
+    for s in result:
+        del s
+
+
+def test_extended_isotpscan_none(sniff_time=0.02):
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        with new_can_socket0() as isocan, \
+                ISOTPSocket(isocan, sid=0x700 + i, did=0x600 + i,
+                            extended_addr=0x11, extended_rx_addr=0x22) as s:
+            s.sniff(timeout=500 * sniff_time, count=1,
+                    started_callback=semaphore.release)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    thread1 = threading.Thread(target=isotpserver, args=(2,))
+    thread2 = threading.Thread(target=isotpserver, args=(3,))
+    thread1.start()
+    thread2.start()
+    semaphore.acquire()
+    semaphore.acquire()
+    with new_can_socket0() as socks_interface:
+        thread_noise.start()
+        with new_can_socket0() as scansock:
+            result = ISOTPScan(scansock, range(0x5ff, 0x603 + 1),
+                               extended_scan_range=range(0x20, 0x30),
+                               extended_addressing=True,
+                               can_interface=socks_interface,
+                               sniff_time=sniff_time,
+                               noise_listen_time=sniff_time * 6,
+                               verbose=True)
+        result = sorted(result, key=lambda x: x.src)
+        with new_can_socket0() as cans:
+            cans.send(CAN(identifier=0x602, data=b'\x22\x01\xaa'))
+            cans.send(CAN(identifier=0x603, data=b'\x22\x01\xaa'))
+            time.sleep(0.00)
+            cans.send(CAN(identifier=0x602, data=b'\x22\x01\xaa'))
+            cans.send(CAN(identifier=0x603, data=b'\x22\x01\xaa'))
+            time.sleep(0.00)
+            cans.send(CAN(identifier=0x602, data=b'\x22\x01\xaa'))
+            cans.send(CAN(identifier=0x603, data=b'\x22\x01\xaa'))
+            for s in result:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=0x702, data=b'\x11\x01\xaa'))
+                cans.send(CAN(identifier=0x703, data=b'\x11\x01\xaa'))
+                s.close()
+                time.sleep(0)
+                cans.send(CAN(identifier=0x702, data=b'\x11\x01\xaa'))
+                cans.send(CAN(identifier=0x703, data=b'\x11\x01\xaa'))
+        thread1.join(timeout=10)
+        thread2.join(timeout=10)
+        thread_noise.join(timeout=10)
+    assert len(result) == 2
+    assert 0x602 == result[0].src
+    assert 0x702 == result[0].dst
+    assert 0x22 == result[0].exsrc
+    assert 0x11 == result[0].exdst
+    assert 0x603 == result[1].src
+    assert 0x703 == result[1].dst
+    assert 0x22 == result[1].exsrc
+    assert 0x11 == result[1].exdst
+    for s in result:
+        del s
+
+
+def test_isotpscan_none_random_ids(sniff_time=0.02):
+    rnd = RandNum(0x1, 0x50)
+    ids = set(rnd._fix() for _ in range(10))
+    print(ids)
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        try:
+            with new_can_socket0() as isocan, \
+                    ISOTPSocket(isocan, sid=0x100 + i, did=i) as s:
+                s.sniff(timeout=1400 * sniff_time, count=1,
+                        started_callback=semaphore.release)
+            warning("ISOTPServer 0x%x finished" % i)
+        except Exception as e:
+            warning("ERROR in isotpserver 0x%x" % i)
+            warning(e)
+    pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    threads = [threading.Thread(target=isotpserver, args=(x,)) for x in ids]
+    [t.start() for t in threads]
+    for _ in range(len(threads)):
+        semaphore.acquire()
+    with new_can_socket0() as socks_interface:
+        thread_noise.start()
+        with new_can_socket0() as scansock:
+            result = ISOTPScan(scansock, range(0x001, 0x51),
+                               can_interface=socks_interface,
+                               noise_listen_time=sniff_time * 6,
+                               sniff_time=sniff_time,
+                               verbose=True)
+            result = sorted(result, key=lambda x: x.src)
+        with new_can_socket0() as cans:
+            for i in ids:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=i, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x100 + i, data=b'\x01\xaa'))
+                time.sleep(0)
+                cans.send(CAN(identifier=i, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x100 + i, data=b'\x01\xaa'))
+            for s in result:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=s.dst, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=s.src, data=b'\x01\xaa'))
+                s.close()
+                time.sleep(0)
+                cans.send(CAN(identifier=s.dst, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=s.src, data=b'\x01\xaa'))
+            [t.join(timeout=10) for t in threads]
+            thread_noise.join(timeout=10)
+    assert len(result) == len(ids)
+    ids = sorted(ids)
+    for i, s in zip(ids, result):
+        assert i == s.src
+        assert i + 0x100 == s.dst
+    for s in result:
+        del s
+
+
+def test_isotpscan_none_random_ids_padding(sniff_time=0.02):
+    rnd = RandNum(0x1, 0x50)
+    ids = set(rnd._fix() for _ in range(10))
+    semaphore = threading.Semaphore(0)
+    def isotpserver(i):
+        try:
+            with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x100 + i, did=i, padding=True) as s:
+                s.sniff(timeout=1400 * sniff_time, count=1, started_callback=semaphore.release)
+            warning("ISOTPServer 0x%x finished" % i)
+        except Exception as e:
+            warning("ERROR in isotpserver 0x%x" % i)
+            warning(e)
+    pkt = CAN(identifier=0x701, length=8,
+              data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
+    thread_noise = threading.Thread(target=make_noise, args=(pkt, sniff_time,))
+    threads = [threading.Thread(target=isotpserver, args=(x,)) for x in ids]
+    [t.start() for t in threads]
+    for _ in range(len(threads)):
+        semaphore.acquire()
+    with new_can_socket0() as socks_interface:
+        thread_noise.start()
+        with new_can_socket0() as scansock:
+            result = ISOTPScan(scansock, range(0x001, 0x51),
+                               can_interface=socks_interface,
+                               noise_listen_time=sniff_time * 6,
+                               sniff_time=sniff_time,
+                               verbose=True)
+            result = sorted(result, key=lambda x: x.src)
+        with new_can_socket0() as cans:
+            for i in ids:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=i, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x100 + i, data=b'\x01\xaa'))
+                time.sleep(0)
+                cans.send(CAN(identifier=i, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=0x100 + i, data=b'\x01\xaa'))
+            for s in result:
+                # This helps to close ISOTPSoftSockets
+                cans.send(CAN(identifier=s.dst, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=s.src, data=b'\x01\xaa'))
+                s.close()
+                cans.send(CAN(identifier=s.dst, data=b'\x01\xaa'))
+                cans.send(CAN(identifier=s.src, data=b'\x01\xaa'))
+                time.sleep(0)
+        [t.join(timeout=10) for t in threads]
+        thread_noise.join(timeout=10)
+    assert len(result) == len(ids)
+    ids = sorted(ids)
+    for i, s in zip(ids, result):
+        assert i == s.src
+        assert i + 0x100 == s.dst
+        if isinstance(s, ISOTPSoftSocket):
+            assert s.impl.padding is True
+    for s in result:
+        del s
 
-listen_sockets = list()
-for i in range(1, 4):
-    listen_sockets.append(threading.Thread(target=isotpserver, args=[i]))
-    listen_sockets[-1].start()
-
-found_packets = scan(new_can_socket0(), range(0x5ff, 0x610), noise_ids=[0x701], sniff_time=0.1)
-assert 0 == subprocess.call(['cansend', iface0, '601#01aa'])
-assert 0 == subprocess.call(['cansend', iface0, '602#01aa'])
-assert 0 == subprocess.call(['cansend', iface0, '603#01aa'])
-
-for thread in listen_sockets:
-    thread.join()
-
-assert len(found_packets) == 2
+= Test scan()
 
+test_dynamic(test_scan)
 
 = Test scan_extended()
-recvpacket = CAN(flags=0, identifier=0x700, length=4, data=b'\xaa0\x00\x00')
 
-drain_bus(iface0)
-def isotpserver():
-    with ISOTPSocket(new_can_socket0(), sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
-        s.sniff(timeout=100, count=1)
+test_dynamic(test_scan_extended)
 
-thread = threading.Thread(target=isotpserver)
-thread.start()
-time.sleep(0.1)
-found_packets = scan_extended(new_can_socket0(), [0x601], sniff_time=0.1)
-assert 0 == subprocess.call(['cansend', 'vcan0', '601#BB01aa'])
-thread.join()
-fpkt = found_packets[list(found_packets.keys())[0]][0]
-rpkt = recvpacket
-
-assert fpkt.length == rpkt.length
-assert fpkt.data == rpkt.data
-assert fpkt.identifier == rpkt.identifier
+= Test ISOTPScan(output_format=text)
 
+test_dynamic(test_isotpscan_text)
 
-= Test ISOTPScan(output_format=text)
-done = False
-
-drain_bus(iface0)
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i) as isotpsock1:
-        isotpsock1.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    global done
-    while not done:
-        new_can_socket0().send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=(pkt))
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[2])
-thread2 = threading.Thread(target=isotpserver, args=[3])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x604+1), output_format="text", noise_listen_time=1, sniff_time=0.1)
-assert 0 == subprocess.call(['cansend', 'vcan0', '601#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '602#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '603#01aa'])
-thread1.join()
-thread2.join()
-done = True
-thread_noise.join()
-
-text = "\nFound 2 ISOTP-FlowControl Packet(s):"
-assert text in result
-assert "0x602" in result
-assert "0x603" in result
-assert "0x702" in result
-assert "0x703" in result
-assert "No Padding" in result
+= Test ISOTPScan(output_format=text) extended_can_id
 
+test_dynamic(test_isotpscan_text_extended_can_id)
 
 = Test ISOTPScan(output_format=code)
-done = False
-
-drain_bus(iface0)
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i) as isotpsock1:
-        isotpsock1.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    global done
-    while not done:
-        new_can_socket0().send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[2])
-thread2 = threading.Thread(target=isotpserver, args=[3])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x604+1), output_format="code", noise_listen_time=1, sniff_time=0.1)
-assert 0 == subprocess.call(['cansend', 'vcan0', '601#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '602#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '603#01aa'])
-thread1.join()
-thread2.join()
-done = True
-thread_noise.join()
-
-s1 = "ISOTPSocket(can0, sid=0x602, did=0x702, padding=False, basecls=ISOTP)\n"
-s2 = "ISOTPSocket(can0, sid=0x603, did=0x703, padding=False, basecls=ISOTP)\n"
-
-print(result)
-assert s1 in result
-assert s2 in result
 
+test_dynamic(test_isotpscan_code)
 
 = Test extended ISOTPScan(output_format=code)
-drain_bus(iface0)
 
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i, extended_addr=0x11, extended_rx_addr=0x22) as s:
-        s.sniff(timeout=100 ,count=1)
+test_dynamic(test_extended_isotpscan_code)
 
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[2])
-thread2 = threading.Thread(target=isotpserver, args=[3])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x604+1), extended_addressing=True, sniff_time=0.1, noise_listen_time=1, output_format="code")
-
-assert 0 == subprocess.call(['cansend', 'vcan0', '602#2201aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '603#2201aa'])
-thread1.join()
-thread2.join()
-thread_noise.join()
-
-s1 = "ISOTPSocket(can0, sid=0x602, did=0x702, padding=False, extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
-s2 = "ISOTPSocket(can0, sid=0x603, did=0x703, padding=False, extended_addr=0x22, extended_rx_addr=0x11, basecls=ISOTP)"
-print(result)
-assert s1 in result
-assert s2 in result
+= Test extended ISOTPScan(output_format=code) extended_can_id
 
+test_dynamic(test_extended_isotpscan_code_extended_can_id)
 
 = Test ISOTPScan(output_format=None)
-drain_bus(iface0)
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i) as s:
-        s.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[2])
-thread2 = threading.Thread(target=isotpserver, args=[3])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x604+1), can_interface=new_can_socket0(), sniff_time=0.1, noise_listen_time=1)
-result = sorted(result, key=lambda x:x.src)
-
-assert 0 == subprocess.call(['cansend', 'vcan0', '601#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '602#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '603#01aa'])
-thread1.join()
-thread2.join()
-thread_noise.join()
-
-assert len(result) == 2
-assert 0x602 == result[0].src
-assert 0x702 == result[0].dst
-assert 0x603 == result[1].src
-assert 0x703 == result[1].dst
-
-for s in result:
-    # This helps to close ISOTPSoftSockets
-    assert 0 == subprocess.call(['cansend', 'vcan0', '702#01aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '703#01aa'])
-    s.close()
-    assert 0 == subprocess.call(['cansend', 'vcan0', '702#01aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '703#01aa'])
-
-for s in result:
-    del s
 
+test_dynamic(test_isotpscan_none)
 
 = Test ISOTPScan(output_format=None) 2
-drain_bus(iface0)
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i) as s:
-        s.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[9])
-thread2 = threading.Thread(target=isotpserver, args=[8])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x6A0), can_interface=new_can_socket0(), sniff_time=0.1, noise_listen_time=1)
-result = sorted(result, key=lambda x:x.src)
-
-assert 0 == subprocess.call(['cansend', 'vcan0', '609#01aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '608#01aa'])
-
-thread1.join()
-thread2.join()
-thread_noise.join()
-
-assert len(result) == 2
-assert 0x608 == result[0].src
-assert 0x708 == result[0].dst
-assert 0x609 == result[1].src
-assert 0x709 == result[1].dst
-
-for s in result:
-    # This helps to close ISOTPSoftSockets
-    assert 0 == subprocess.call(['cansend', 'vcan0', '709#01aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '708#01aa'])
-    s.close()
-    assert 0 == subprocess.call(['cansend', 'vcan0', '709#01aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '708#01aa'])
-
-for s in result:
-    del s
 
+test_dynamic(test_isotpscan_none_2)
 
 = Test extended ISOTPScan(output_format=None)
-drain_bus(iface0)
-
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x700+i, did=0x600+i, extended_addr=0x11, extended_rx_addr=0x22) as s:
-        s.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-thread1 = threading.Thread(target=isotpserver, args=[2])
-thread2 = threading.Thread(target=isotpserver, args=[3])
-thread1.start()
-thread2.start()
-time.sleep(0.1)
-
-result = ISOTPScan(new_can_socket0(), range(0x5ff, 0x604+1), extended_addressing=True, can_interface=new_can_socket0(), sniff_time=0.1, noise_listen_time=1)
-result = sorted(result, key=lambda x:x.src)
-
-assert 0 == subprocess.call(['cansend', 'vcan0', '602#2201aa'])
-assert 0 == subprocess.call(['cansend', 'vcan0', '603#2201aa'])
-thread1.join()
-thread2.join()
-thread_noise.join()
-
-assert len(result) == 2
-assert 0x602 == result[0].src
-assert 0x702 == result[0].dst
-assert 0x22 == result[0].exsrc
-assert 0x11 == result[0].exdst
-assert 0x603 == result[1].src
-assert 0x703 == result[1].dst
-assert 0x22 == result[1].exsrc
-assert 0x11 == result[1].exdst
-
-for s in result:
-    # This helps to close ISOTPSoftSockets
-    assert 0 == subprocess.call(['cansend', 'vcan0', '702#1101aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '703#1101aa'])
-    s.close()
-    assert 0 == subprocess.call(['cansend', 'vcan0', '702#1101aa'])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '703#1101aa'])
-
-for s in result:
-    del s
-
-= Test ISOTPScan(output_format=None) random IDs
-drain_bus(iface0)
 
-rnd = RandNum(0x0, 0x100)
+test_dynamic(test_extended_isotpscan_none)
 
-ids = set(rnd._fix() for _ in range(10))
-
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x100+i, did=i) as s:
-        s.sniff(timeout=100 ,count=1)
-
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
-
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
-
-threads = [threading.Thread(target=isotpserver, args=[x]) for x in ids]
-_ = [t.start() for t in threads]
-time.sleep(0.1)
-
-result = ISOTPScan(new_can_socket0(), range(0x000, 0x101), can_interface=new_can_socket0(), noise_listen_time=1, sniff_time=0.1, verbose=True)
-result = sorted(result, key=lambda x:x.src)
-
-for i in ids:
-    ret = subprocess.call(['cansend', 'vcan0', '%03x#01aa' % i])
-    assert ret == 0
-
-_ = [t.join() for t in threads]
-thread_noise.join()
-
-assert len(result) == len(ids)
-ids = sorted(ids)
-for i, s in zip(ids, result):
-    assert i == s.src
-    assert i+0x100 == s.dst
-
-for s in result:
-    # This helps to close ISOTPSoftSockets
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.dst])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.src])
-    s.close()
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.dst])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.src])
-    time.sleep(0.1)
-
-for s in result:
-    del s
+= Test ISOTPScan(output_format=None) random IDs
 
+test_dynamic(test_isotpscan_none_random_ids)
 
 = Test ISOTPScan(output_format=None) random IDs padding
-drain_bus(iface0)
-
-rnd = RandNum(0x0, 0x100)
-
-ids = set(rnd._fix() for _ in range(10))
 
-def isotpserver(i):
-    with ISOTPSocket(new_can_socket0(), sid=0x100+i, did=i, padding=True) as s:
-        s.sniff(timeout=100 ,count=1)
+test_dynamic(test_isotpscan_none_random_ids_padding)
 
-def make_noise(pkt):
-    s = new_can_socket0()
-    for _ in range(20):
-        s.send(pkt)
-        time.sleep(0.1)
+= Delete vcan interfaces
+~ vcan_socket needs_root linux
 
-pkt = CAN(identifier=0x701, length=8, data=b'\x01\x02\x03\x04\x05\x06\x07\x08')
-thread_noise = threading.Thread(target=make_noise, args=pkt)
-thread_noise.start()
+if 0 != call(["sudo", "ip", "link", "delete", iface0]):
+        raise Exception("%s could not be deleted" % iface0)
 
-threads = [threading.Thread(target=isotpserver, args=[x]) for x in ids]
-_ = [t.start() for t in threads]
-time.sleep(0.1)
+if 0 != call(["sudo", "ip", "link", "delete", iface1]):
+        raise Exception("%s could not be deleted" % iface1)
 
-result = ISOTPScan(new_can_socket0(), range(0x000, 0x101), can_interface=new_can_socket0(), noise_listen_time=1, sniff_time=0.1, verbose=True)
-result = sorted(result, key=lambda x:x.src)
++ Coverage stability tests
 
-for i in ids:
-    ret = subprocess.call(['cansend', 'vcan0', '%03x#01aa' % i])
-    assert ret == 0
+= empty tests
 
-_ = [t.join() for t in threads]
-thread_noise.join()
+from scapy.contrib.isotp import generate_code_output, generate_text_output
 
-assert len(result) == len(ids)
-ids = sorted(ids)
-for i, s in zip(ids, result):
-    assert i == s.src
-    assert i+0x100 == s.dst
-    if isinstance(s, ISOTPSoftSocket):
-        assert s.impl.padding == True
+assert generate_code_output("", None) == ""
+assert generate_text_output("") == "No packets found."
 
-for s in result:
-    # This helps to close ISOTPSoftSockets
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.dst])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.src])
-    s.close()
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.dst])
-    assert 0 == subprocess.call(['cansend', 'vcan0', '%03x#01aa' % s.src])
-    time.sleep(0.1)
+= get_isotp_fc
 
-for s in result:
-    del s
+from scapy.contrib.isotp import get_isotp_fc
 
+# to trigger "noise_ids.append(packet.identifier)"
+a = []
+get_isotp_fc(
+    1, [], a, False,
+    Bunch(
+        flags="extended",
+        identifier=1,
+        data=b"\x00"
+    )
+)
+assert 1 in a

scapy-2.4.3.tar.gz/test/contrib/lacp.uts -> scapy-2.4.4.tar.gz/test/contrib/lacp.uts Changed

scapy-2.4.3.tar.gz/test/contrib/lldp.uts -> scapy-2.4.4.tar.gz/test/contrib/lldp.uts Changed

scapy-2.4.4.tar.gz/test/contrib/loraphy2wan.uts Added

@@ -0,0 +1,66 @@
+% Regression tests for Scapy
+
++Syntax check
+= Import the loraphy2wan layer
+
+from scapy.contrib.loraphy2wan import *
+from scapy.compat import raw
+
+# LoRa PHY to WAN
+
+############
+############
++ Basic tests
+
+* Those test are here mainly to check nothing has been broken
+
+= Packet decoding
+~ field
+
+p = b'\x00\x00\x00\x00lovecafemeeetoo\x00iiS\x02LI'
+pkt = LoRa(p)
+assert pkt.Join_Request_Field[0].DevEUI == b'meeetoo\x00'
+assert pkt.Join_Request_Field[0].DevNonce == 26985
+
+p = b'\x0f0P@\xad\x15\x00`\x80\x06\x00\t\xca\xfe\x0c\x1d\x8d\x04\\\xb5'
+pkt = LoRa(p)
+assert pkt.MType == 2
+assert pkt.DataPayload == b'\xca\xfe'
+assert pkt.FCnt == 6
+assert pkt.FPort == 9
+assert pkt.FCtrl[0].ADR == 1
+assert pkt.DevAddr[0].NwkID == 0xad
+assert pkt.DevAddr[0].NwkAddr == 0x600015
+
+p = b'\x0f0P\x80\xad\x15\x00`\x00\x01\x00\t\xca\xfe:\x98\x89|\x8f\xd4'
+pkt = LoRa(p)
+assert pkt.MType == 4
+
+= Decoding piggyback MAC Commands
+
+p = b'\r0\xc0\x80\xad\x15\x00`\x01\x01\x00\x02\xc0\xe3N\xb7\xc7\xae'
+pkt = LoRa(p)
+assert pkt.FOpts_up[0].CID == 2
+assert pkt.CRC == 0xc7ae
+
+= Decoding an encrypted JA packet
+
+LoRa.encrypted = True
+p = b'\x00\x00\x00 \x086\xe2\x87\xa9\x80\\\xb7\xee\x9e_\xff|\x9e\xe9z'
+pkt = LoRa(p)
+assert pkt.Join_Accept_Encrypted == b'6\xe2\x87\xa9\x80\\\xb7\xee\x9e_\xff|\x9e\xe9z'
+
+= Packet crafting: generating an unencrypted JA frame
+
+ja = Join_Accept()
+ja.JoinAppNonce=0x6fe14a
+ja.NetID = 0x10203
+ja.DevAddr = 0x68e8cb1
+assert raw(ja) == b'J\xe1o\x03\x02\x01\xb1\x8c\x8e\x06\x00\x00'
+
+= Generating an unencrypted LoRa JA packet
+
+LoRa.encrypted = False
+pkt = LoRa(MType=0b001)
+pkt.Join_Accept_Field = [ja]
+assert raw(pkt) == b'\x00\x00\x00 J\xe1o\x03\x02\x01\xb1\x8c\x8e\x06\x00\x00\x00\x00\x00\x00'

scapy-2.4.3.tar.gz/test/contrib/modbus.uts -> scapy-2.4.4.tar.gz/test/contrib/modbus.uts Changed

@@ -160,7 +160,7 @@
 raw(ModbusPDU05WriteSingleCoilError()) == b'\x85\x01'
 
 # 0x06/0x86 Write Single Register ---------------------------------------------------
-= ModbusPDU06WriteSingleRegisterError
+= ModbusPDU06WriteSingleRegisterRequest
 raw(ModbusPDU06WriteSingleRegisterRequest()) == b'\x06\x00\x00\x00\x00'
 
 = ModbusPDU06WriteSingleRegisterResponse
@@ -170,9 +170,48 @@
 raw(ModbusPDU06WriteSingleRegisterError()) == b'\x86\x01'
 
 # 0x07/0x87 Read Exception Status (serial line only) --------------------------------
+= ModbusPDU07ReadExceptionStatusRequest
+raw(ModbusPDU07ReadExceptionStatusRequest()) == b'\x07'
+
+= ModbusPDU07ReadExceptionStatusResponse
+raw(ModbusPDU07ReadExceptionStatusResponse()) == b'\x07\x00'
+
+= ModbusPDU07ReadExceptionStatusError
+raw(ModbusPDU07ReadExceptionStatusError()) == b'\x87\x01'
+
 # 0x08/0x88 Diagnostics (serial line only) ------------------------------------------
+= ModbusPDU08DiagnosticsRequest
+raw(ModbusPDU08DiagnosticsRequest())
+= ModbusPDU08DiagnosticsRequest minimal parameters
+raw(ModbusPDU08DiagnosticsRequest(data=[0x1234])) == b'\x08\x00\x00\x12\x34'
+
+= ModbusPDU08DiagnosticsResponse
+raw(ModbusPDU08DiagnosticsResponse()) == b'\x08\x00\x00\x00\x00'
+= ModbusPDU08DiagnosticsResponse minimal parameters
+raw(ModbusPDU08DiagnosticsResponse(data=[0x1234])) == b'\x08\x00\x00\x12\x34'
+
+= ModbusPDU08DiagnosticsError
+raw(ModbusPDU08DiagnosticsError()) == b'\x88\x01'
+
 # 0x0b Get Comm Event Counter: serial line only -------------------------------------
+= ModbusPDU0BGetCommEventCounterRequest
+raw(ModbusPDU0BGetCommEventCounterRequest()) == b'\x0b'
+
+= ModbusPDU0BGetCommEventCounterResponse
+raw(ModbusPDU0BGetCommEventCounterResponse()) == b'\x0b\x00\x00\xff\xff'
+
+= ModbusPDU0BGetCommEventCounterError
+raw(ModbusPDU0BGetCommEventCounterError()) == b'\x8b\x01'
+
 # 0x0c Get Comm Event Log: serial line only -----------------------------------------
+= ModbusPDU0CGetCommEventLogRequest
+raw(ModbusPDU0CGetCommEventLogRequest()) == b'\x0c'
+
+= ModbusPDU0CGetCommEventLogResponse
+raw(ModbusPDU0CGetCommEventLogResponse()) == b'\x0c\x08\x00\x00\x01\x08\x01\x21\x20\x00'
+
+= ModbusPDU0CGetCommEventLogError
+raw(ModbusPDU0CGetCommEventLogError()) == b'\x8c\x01'
 
 # 0x0f/0x8f Write Multiple Coils ----------------------------------------------------
 = ModbusPDU0FWriteMultipleCoilsRequest
@@ -198,7 +237,15 @@
 = ModbusPDU10WriteMultipleRegistersError
 raw(ModbusPDU10WriteMultipleRegistersError()) == b'\x90\x01'
 
-# 0x11/91 Report Server ID: serial line only ----------------------------------------
+# 0x11/91 Report Slave ID: serial line only ----------------------------------------
+= ModbusPDU11ReportSlaveIdRequest
+raw(ModbusPDU11ReportSlaveIdRequest()) == b'\x11'
+
+= ModbusPDU11ReportSlaveIdResponse minimal parameters
+raw(ModbusPDU11ReportSlaveIdResponse(byteCount=3, slaveId="ID")) == b'\x11\x03\x49\x44\x00'
+
+= ModbusPDU11ReportSlaveIdError
+raw(ModbusPDU11ReportSlaveIdError()) == b'\x91\x01'
 
 # 0x14/944 Read File Record ---------------------------------------------------------
 = ModbusPDU14ReadFileRecordRequest len parameters

scapy-2.4.4.tar.gz/test/contrib/mount.uts Added

@@ -0,0 +1,73 @@
+% Test mount layer
+####################
+####################
+
++ Packet Creation Tests
+
+= Create subpackets
+Path()
+File_Object()
+
+= Create Mount Calls
+NULL_Call()
+MOUNT_Call()
+UNMOUNT_Call()
+
+= Create Successful Mount Replies
+MOUNT_Reply(status=0)
+
+= Create Failed Mount Replies
+MOUNT_Reply(status=1)
+
++ RPC Layer bindings tests
+
+= Layer Bindings for Mount Calls
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Call()/NULL_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100005, 3, 0))
+pkt = RPC()/RPC_Call()/MOUNT_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100005, 3, 1))
+pkt = RPC()/RPC_Call()/UNMOUNT_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100005, 3, 3))
+
+= Layer Bindings for Mount Replies
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Reply()/NULL_Reply()
+assert(pkt.mtype == 1)
+pkt = RPC()/RPC_Reply()/MOUNT_Reply()
+assert(pkt.mtype == 1)
+pkt = RPC()/RPC_Reply()/UNMOUNT_Reply()
+assert(pkt.mtype == 1)
+
++ Test Built Packets vs Raw Strings
+
+= Mount calls vs Raw strings
+pkt = MOUNT_Call(
+    path=Path(
+        length=4,
+        path='path'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04path'
+
+pkt = UNMOUNT_Call(
+    path=Path(
+        length=4,
+        path='path'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04path'
+
+= Mount replies vs Raw Strings
+pkt = MOUNT_Reply(
+    status=0,
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    flavors=3,
+    flavor=[
+        0,0,0
+    ]
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'

scapy-2.4.3.tar.gz/test/contrib/mpls.uts -> scapy-2.4.4.tar.gz/test/contrib/mpls.uts Changed

scapy-2.4.3.tar.gz/test/contrib/mqtt.uts -> scapy-2.4.4.tar.gz/test/contrib/mqtt.uts Changed

@@ -70,20 +70,20 @@
 
 
 = MQTTSubscribe, packet instantiation
-sb = MQTT()/MQTTSubscribe(msgid=1,topic='newtopic',QOS=0,length=0)
+sb = MQTT()/MQTTSubscribe(msgid=1, topics=[MQTTTopicQOS(topic='newtopic', QOS=1, length=0)])
 assert(sb.type == 8)
 assert(sb.msgid == 1)
-assert(sb.topic == b'newtopic')
-assert(sb.length == 0)
-assert(sb[MQTTSubscribe].QOS == 0)
+assert(sb.topics[0].topic == b'newtopic')
+assert(sb.topics[0].length == 0)
+assert(sb[MQTTSubscribe][MQTTTopicQOS].QOS == 1)
 
 = MQTTSubscribe, packet dissection
-s = b'\x82\t\x00\x01\x00\x04test\x00'
+s = b'\x82\t\x00\x01\x00\x04test\x01'
 subscribe = MQTT(s)
 assert(subscribe.msgid == 1)
-assert(subscribe.length == 4)
-assert(subscribe.topic == b'test')
-assert(subscribe.QOS == 1)
+assert(subscribe.topics[0].length == 4)
+assert(subscribe.topics[0].topic == b'test')
+assert(subscribe.topics[0].QOS == 1)
 
 
 = MQTTSuback, packet instantiation
@@ -98,6 +98,30 @@
 assert(suback.msgid == 1)
 assert(suback.retcode == 0)
 
+= MQTTUnsubscribe, packet instantiation
+unsb = MQTT()/MQTTUnsubscribe(msgid=1, topics=[MQTTTopic(topic='newtopic',length=0)])
+assert(unsb.type == 10)
+assert(unsb.msgid == 1)
+assert(unsb.topics[0].topic == b'newtopic')
+assert(unsb.topics[0].length == 0)
+
+= MQTTUnsubscribe, packet dissection
+u = b'\xA2\x09\x00\x01\x00\x03\x61\x2F\x62'
+unsubscribe = MQTT(u)
+assert(unsubscribe.msgid == 1)
+assert(unsubscribe.topics[0].length == 3)
+assert(unsubscribe.topics[0].topic == b'a/b')
+
+= MQTTUnsuback, packet instantiation
+unsk = MQTT()/MQTTUnsuback(msgid=1)
+assert(unsk.type == 11)
+assert(unsk.msgid == 1)
+
+= MQTTUnsuback, packet dissection
+u = b'\xb0\x02\x00\x01'
+unsuback = MQTT(u)
+assert(unsuback.type == 11)
+assert(unsuback.msgid == 1)
 
 = MQTTPubrec, packet instantiation
 pc = MQTT()/MQTTPubrec(msgid=1)
@@ -111,7 +135,7 @@
 
 = MQTTPublish, long value
 p = MQTT()/MQTTPublish(topic='test1',value='a'*200)
-assert(str(p))
+assert(bytes(p))
 assert(p.type == 3)
 assert(p.topic == b'test1')
 assert(p.value == b'a'*200)
@@ -126,3 +150,10 @@
 assert(type(MQTT().fieldtype['len'].randval()) == RandVariableFieldLen)
 assert(type(MQTT().fieldtype['len'].randval() + 0) == int)
 
+= MQTTUnsubscribe
+u = MQTT(b'\xA2\x0C\x00\x01\x00\x03\x61\x2F\x62\x00\x03\x63\x2F\x64')
+assert MQTTUnsubscribe in u and len(u.topics) == 2 and u.topics[1].topic == b"c/d"
+
+= MQTTSubscribe
+u = MQTT(b'\x82\x10\x00\x01\x00\x03\x61\x2F\x62\x02\x00\x03\x63\x2F\x64\x00')
+assert MQTTSubscribe in u and len(u.topics) == 2 and u.topics[1].topic == b"c/d"

scapy-2.4.3.tar.gz/test/contrib/mqttsn.uts -> scapy-2.4.4.tar.gz/test/contrib/mqttsn.uts Changed

scapy-2.4.4.tar.gz/test/contrib/nfs.uts Added

@@ -0,0 +1,1269 @@
+% Tests for nfs module
+############
+############
++  Packet Creation Tests
+
+= Create subpackets
+Fattr3()
+File_Object()
+Object_Name()
+WCC_Attr()
+File_From_Dir_Plus()
+File_From_Dir()
+Sattr3()
+
+= Create NFS Calls
+NULL_Call()
+GETATTR_Call()
+SETATTR_Call()
+LOOKUP_Call()
+ACCESS_Call()
+READLINK_Call()
+READ_Call()
+WRITE_Call()
+CREATE_Call()
+MKDIR_Call()
+SYMLINK_Call()
+REMOVE_Call()
+RMDIR_Call()
+RENAME_Call()
+LINK_Call()
+READDIR_Call()
+READDIRPLUS_Call()
+FSSTAT_Call()
+FSINFO_Call()
+PATHCONF_Call()
+COMMIT_Call()
+
+= Create NFS Successful replies
+
+GETATTR_Reply(status=0)
+SETATTR_Reply(status=0)
+LOOKUP_Reply(status=0)
+ACCESS_Reply(status=0)
+READLINK_Reply(status=0)
+READ_Reply(status=0)
+WRITE_Reply(status=0)
+CREATE_Reply(status=0)
+MKDIR_Reply(status=0)
+SYMLINK_Reply(status=0)
+REMOVE_Reply(status=0)
+RMDIR_Reply(status=0)
+RENAME_Reply(status=0)
+LINK_Reply(status=0)
+READDIR_Reply(status=0)
+READDIRPLUS_Reply(status=0)
+FSSTAT_Reply(status=0)
+FSINFO_Reply(status=0)
+PATHCONF_Reply(status=0)
+COMMIT_Reply(status=0)
+
+= Create NFS Failed replies
+GETATTR_Reply(status=1)
+SETATTR_Reply(status=1)
+LOOKUP_Reply(status=1)
+ACCESS_Reply(status=1)
+READLINK_Reply(status=1)
+READ_Reply(status=1)
+WRITE_Reply(status=1)
+CREATE_Reply(status=1)
+MKDIR_Reply(status=1)
+SYMLINK_Reply(status=1)
+REMOVE_Reply(status=1)
+RMDIR_Reply(status=1)
+RENAME_Reply(status=1)
+LINK_Reply(status=1)
+READDIR_Reply(status=1)
+READDIRPLUS_Reply(status=1)
+FSSTAT_Reply(status=1)
+FSINFO_Reply(status=1)
+PATHCONF_Reply(status=1)
+COMMIT_Reply(status=1)
+
++ Test RPC Call layer bindings
+
+= Layer Bindings for NFS Calls
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Call()/NULL_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 0))
+pkt = RPC()/RPC_Call()/GETATTR_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 1))
+pkt = RPC()/RPC_Call()/SETATTR_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 2))
+pkt = RPC()/RPC_Call()/LOOKUP_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 3))
+pkt = RPC()/RPC_Call()/ACCESS_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 4))
+pkt = RPC()/RPC_Call()/READLINK_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 5))
+pkt = RPC()/RPC_Call()/READ_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 6))
+pkt = RPC()/RPC_Call()/WRITE_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 7))
+pkt = RPC()/RPC_Call()/CREATE_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 8))
+pkt = RPC()/RPC_Call()/MKDIR_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 9))
+pkt = RPC()/RPC_Call()/SYMLINK_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 10))
+pkt = RPC()/RPC_Call()/REMOVE_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 12))
+pkt = RPC()/RPC_Call()/RMDIR_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 13))
+pkt = RPC()/RPC_Call()/RENAME_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 14))
+pkt = RPC()/RPC_Call()/LINK_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 15))
+pkt = RPC()/RPC_Call()/READDIR_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 16))
+pkt = RPC()/RPC_Call()/READDIRPLUS_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 17))
+pkt = RPC()/RPC_Call()/FSSTAT_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 18))
+pkt = RPC()/RPC_Call()/FSINFO_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 19))
+pkt = RPC()/RPC_Call()/PATHCONF_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 20))
+pkt = RPC()/RPC_Call()/COMMIT_Call()
+assert((pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100003, 3, 21))
+
+= Layer Bindings for NFS Replies
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Reply()/NULL_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/GETATTR_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/SETATTR_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/LOOKUP_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/ACCESS_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/READLINK_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/READ_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/WRITE_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/CREATE_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/MKDIR_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/SYMLINK_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/REMOVE_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/RMDIR_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/RENAME_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/LINK_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/READDIR_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/READDIRPLUS_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/FSSTAT_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/FSINFO_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/PATHCONF_Reply()
+assert(pkt.mtype==1)
+pkt = RPC()/RPC_Reply()/COMMIT_Reply()
+assert(pkt.mtype==1)
+
++ Test Built Packets Against Raw Strings
+
+= Built NFS Calls vs Raw Strings
+pkt = GETATTR_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file'
+
+pkt = LOOKUP_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    filename=Object_Name(
+        length=4,
+        _name='File'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04File'
+
+pkt = FSINFO_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file'
+
+pkt = PATHCONF_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file'
+
+pkt = ACCESS_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file',
+    ),
+    check_access='READ'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\x00\x00\x00\x01'
+
+pkt = READDIRPLUS_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    cookie=0xffffffffffffffff,
+    verifier=0xaaaaaaaaaaaaaaaa,
+    dircount=512,
+    maxcount=4096
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x02\x00\x00\x00\x10\x00'
+
+pkt = WRITE_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file',
+    ),
+    offset=0xffffffffffffffff,
+    count=0xaaaaaaaa,
+    stable='UNSTABLE',
+    length=8,
+    contents='\x00\x01\x02\x03\x04\x05\x06\x07'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\x00\x00\x00\x00\x00\x00\x00\x08\x00\x01\x02\x03\x04\x05\x06\x07'
+
+pkt = COMMIT_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    offset=0xffffffffffffffff,
+    count=0xaaaaaaaa
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa'
+
+pkt = SETATTR_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    attributes=Sattr3(
+        set_mode='SET', mode=0o755,
+        set_uid='SET', uid=1,
+        set_gid='SET', gid=1,
+        set_size='SET', size=0xffffffffffffffff,
+        set_atime='CLIENT TIME', atime_s=0xffffffff, atime_ns=0xffffffff,
+        set_mtime='CLIENT TIME', mtime_s=0xaaaaaaaa, mtime_ns=0xaaaaaaaa
+    ),
+    check=0xffffffff
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xff\xff\xff\xff'
+
+pkt = FSSTAT_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file'
+
+pkt = CREATE_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    filename=Object_Name(
+        length=4,
+        _name='File'
+    ),
+    create_mode='EXCLUSIVE',
+    verifier=0xffffffffffffffff
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04File\x00\x00\x00\x02\xff\xff\xff\xff\xff\xff\xff\xff'
+
+pkt = REMOVE_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    filename=Object_Name(
+        length=4,
+        _name='File'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04File'
+
+pkt = READDIR_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    cookie=0xffffffffffffffff,
+    verifier=0xaaaaaaaaaaaaaaaa,
+    count=0xabcdef12
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xab\xcd\xef\x12'
+
+pkt = RENAME_Call(
+    dir_from=File_Object(
+        length=8,
+        fh='DIR_FROM'
+    ),
+    name_from=Object_Name(
+        length=9,
+        _name='NAME_FROM',
+        fill='\x00\x00\x00'
+    ),
+    dir_to=File_Object(
+        length=6,
+        fh='DIR_TO',
+        fill='\x00\x00'
+    ),
+    name_to=Object_Name(
+        length=7,
+        _name='NAME_TO',
+        fill='\x00'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x08DIR_FROM\x00\x00\x00\tNAME_FROM\x00\x00\x00\x00\x00\x00\x06DIR_TO\x00\x00\x00\x00\x00\x07NAME_TO\x00'
+
+pkt = LINK_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    link_dir=File_Object(
+        length=8,
+        fh='LINK_DIR'
+    ),
+    link_name=Object_Name(
+        length=9,
+        _name='LINK_NAME',
+        fill='\x00\x00\x00'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\x00\x00\x00\x08LINK_DIR\x00\x00\x00\tLINK_NAME\x00\x00\x00'
+
+pkt = RMDIR_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    filename=Object_Name(
+        length=4,
+        _name='File'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04File'
+
+pkt = READLINK_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file'
+
+pkt = READ_Call(
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    offset=0xffffffffffffffff,
+    count=0xaaaaaaaa
+)
+assert bytes(pkt) == b'\x00\x00\x00\x04file\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa'
+
+pkt = MKDIR_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    dir_name=Object_Name(
+        length=4,
+        _name='DIR_NAME'
+    ),
+    attributes=Sattr3(
+        set_mode='SET', mode=0o755,
+        set_uid='SET', uid=1,
+        set_gid='SET', gid=1,
+        set_size='SET', size=0xffffffffffffffff,
+        set_atime='CLIENT TIME', atime_s=0xffffffff, atime_ns=0xffffffff,
+        set_mtime='CLIENT TIME', mtime_s=0xaaaaaaaa, mtime_ns=0xaaaaaaaa
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04DIR_NAME\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
+
+pkt = SYMLINK_Call(
+    dir=File_Object(
+        length=3,
+        fh='DIR',
+        fill='\x00'
+    ),
+    dir_name=Object_Name(
+        length=4,
+        _name='DIR_NAME'
+    ),
+    attributes=Sattr3(
+        set_mode='SET', mode=0o755,
+        set_uid='SET', uid=1,
+        set_gid='SET', gid=1,
+        set_size='SET', size=0xffffffffffffffff,
+        set_atime='CLIENT TIME', atime_s=0xffffffff, atime_ns=0xffffffff,
+        set_mtime='CLIENT TIME', mtime_s=0xaaaaaaaa, mtime_ns=0xaaaaaaaa
+    ),
+    link_name=Object_Name(
+        length=9,
+        _name='LINK_NAME',
+        fill='\x00\x00\x00'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x03DIR\x00\x00\x00\x00\x04DIR_NAME\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x02\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\tLINK_NAME\x00\x00\x00'
+
+
+= Built NFS Replies vs Raw Strings
+
+pkt = GETATTR_Reply(
+    status=0,
+    attributes=Fattr3(
+        type='NF3DIR',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = LOOKUP_Reply(
+    status='NFS3_OK',
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    af_file=1,
+    file_attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_dir=1,
+    dir_attributes=Fattr3(
+        type='NF3DIR',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = FSINFO_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    rtmax=1,
+    rtpref=2,
+    rtmult=3,
+    wtmax=4,
+    wtpref=5,
+    wtmult=6,
+    dtpref=7,
+    maxfilesize=0xa,
+    timedelta_s=0xb,
+    timedelta_ns=0xc,
+    properties=0xd
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x06\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\n\x00\x00\x00\x0b\x00\x00\x00\x0c\x00\x00\x00\r'
+
+pkt = PATHCONF_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3DIR',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    linkmax=1,
+    name_max=2,
+    no_trunc='YES',
+    chown_restricted='YES',
+    case_insensitive='YES',
+    case_preserving='YES'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01'
+
+pkt = ACCESS_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    access_rights=10
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\n'
+
+pkt = READDIRPLUS_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3DIR',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    verifier=0xa,
+    value_follows=1,
+    files=[
+        File_From_Dir_Plus(
+            fileid=0xa,
+            filename=Object_Name(
+                length=5,
+                _name='file1',
+                fill='\x00\x00\x00'
+            ),
+            cookie=0xb,
+            attributes_follow=1,
+            attributes=Fattr3(
+                type='NF3REG',
+                mode=0o755,
+                nlink=1,
+                uid=2,
+                gid=3,
+                size=0xffffffffffffffff,
+                used=0xaaaaaaaaaaaaaaaa,
+                rdev=[4, 5],
+                fsid=0xbbbbbbbbbbbbbbbb,
+                fileid=0xcccccccccccccccc,
+                atime_s=0xdddddddd,
+                atime_ns=0xeeeeeeee,
+                mtime_s=0xffffffff,
+                mtime_ns=0x11111111,
+                ctime_s=0x22222222,
+                ctime_ns=0x33333333
+            ),
+            handle_follows=1,
+            filehandle=File_Object(
+                length=3,
+                fh='fh1',
+                fill='\x00'
+            ),
+            value_follows=1
+        ),
+
+        File_From_Dir_Plus(
+            fileid=0xb,
+            filename=Object_Name(
+                length=5,
+                _name='file2',
+                fill='\x00\x00\x00'
+            ),
+            cookie=0xc,
+            attributes_follow=1,
+            attributes=Fattr3(
+                type='NF3REG',
+                mode=0o755,
+                nlink=1,
+                uid=2,
+                gid=3,
+                size=0xffffffffffffffff,
+                used=0xaaaaaaaaaaaaaaaa,
+                rdev=[4, 5],
+                fsid=0xbbbbbbbbbbbbbbbb,
+                fileid=0xcccccccccccccccc,
+                atime_s=0xdddddddd,
+                atime_ns=0xeeeeeeee,
+                mtime_s=0xffffffff,
+                mtime_ns=0x11111111,
+                ctime_s=0x22222222,
+                ctime_ns=0x33333333
+            ),
+            handle_follows=1,
+            filehandle=File_Object(
+                length=3,
+                fh='fh2',
+                fill='\x00'
+            ),
+            value_follows=0
+        )
+    ],
+    eof=1
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x00\x00\x00\x00\n\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\x00\x00\x00\x05file1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x03fh1\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x05file2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x03fh2\x00\x00\x00\x00\x00\x00\x00\x00\x01'
+
+pkt = WRITE_Reply(
+    status=0,
+    af_before=1,
+    attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    count=0xffffffff,
+    committed='STABLE',
+    verifier=0xffffffffffffffff
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\xff\xff\xff\xff\x00\x00\x00\x01\xff\xff\xff\xff\xff\xff\xff\xff'
+
+pkt = COMMIT_Reply(
+    status=0,
+    af_before=1,
+    attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    verifier=0xffffffffffffffff
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\xff\xff\xff\xff\xff\xff\xff\xff'
+
+pkt = SETATTR_Reply(
+    status=0,
+    af_before=1,
+    attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = FSSTAT_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    tbytes=1,
+    fbytes=2,
+    abytes=3,
+    tfiles=4,
+    afiles=5,
+    invarsec=6
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x06'
+
+pkt =  CREATE_Reply(
+    status=0,
+    handle_follows=1,
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_before=1,
+    dir_attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    dir_attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x04file\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = REMOVE_Reply(
+    status=0,
+    af_before=1,
+    attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = READDIR_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    verifier=0xffffffffffffffff,
+    value_follows=1,
+    files=[
+        File_From_Dir(
+            fileid=1,
+            filename=Object_Name(
+                length=5,
+                _name='file1',
+                fill='\x00\x00\x00'
+            ),
+            cookie=0xaaaaaaaaaaaaaaaa,
+            value_follows=0
+        )
+    ],
+    eof=1
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x05file1\x00\x00\x00\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x00\x00\x00\x00\x01'
+
+pkt = RENAME_Reply(
+    status=0,
+    af_before_f=1,
+    attributes_before_f=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after_f=1,
+    attributes_after_f=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_before_t=1,
+    attributes_before_t=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after_t=1,
+    attributes_after_t=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = LINK_Reply(
+    status=0,
+    af_file=1,
+    file_attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_link_before=1,
+    link_attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_link_after=1,
+    link_attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = RMDIR_Reply(
+    status=0,
+    af_before=1,
+    attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = READLINK_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    filename=Object_Name(
+        length=4,
+        _name='file'
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x04file'
+
+pkt = READ_Reply(
+    status=0,
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    count=8,
+    eof=1,
+    data_length=8,
+    data='\x00\x01\x02\x03\x04\x05\x06\x07'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x08\x00\x00\x00\x01\x00\x00\x00\x08\x00\x01\x02\x03\x04\x05\x06\x07'
+
+pkt = MKDIR_Reply(
+    status=0,
+    handle_follows=1,
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_before=1,
+    dir_attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    dir_attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x04file\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'
+
+pkt = SYMLINK_Reply(
+    status=0,
+    handle_follows=1,
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    attributes_follow=1,
+    attributes=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    ),
+    af_before=1,
+    dir_attributes_before=WCC_Attr(
+        size=0xa,
+        mtime_s=0xffffffff,
+        mtime_ns=0xeeeeeeee,
+        ctime_s=0xdddddddd,
+        ctime_ns=0xcccccccc
+    ),
+    af_after=1,
+    dir_attributes_after=Fattr3(
+        type='NF3REG',
+        mode=0o755,
+        nlink=1,
+        uid=2,
+        gid=3,
+        size=0xffffffffffffffff,
+        used=0xaaaaaaaaaaaaaaaa,
+        rdev=[4, 5],
+        fsid=0xbbbbbbbbbbbbbbbb,
+        fileid=0xcccccccccccccccc,
+        atime_s=0xdddddddd,
+        atime_ns=0xeeeeeeee,
+        mtime_s=0xffffffff,
+        mtime_ns=0x11111111,
+        ctime_s=0x22222222,
+        ctime_ns=0x33333333
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x04file\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\n\xff\xff\xff\xff\xee\xee\xee\xee\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x01\xed\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x04\x00\x00\x00\x05\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xbb\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xcc\xdd\xdd\xdd\xdd\xee\xee\xee\xee\xff\xff\xff\xff\x11\x11\x11\x11""""3333'

scapy-2.4.4.tar.gz/test/contrib/nlm.uts Added

@@ -0,0 +1,336 @@
+% Tests for nlm module
+############
+############
++  Packet creation tests
+
+= Create subpackets
+File_Object()
+NLM4_Cookie()
+Object_Name()
+
+= Create nlm Calls
+SHARE_Call()
+UNSHARE_Call()
+LOCK_Call()
+UNLOCK_Call()
+GRANTED_MSG_Call()
+GRANTED_RES_Call()
+CANCEL_Call()
+TEST_Call()
+
+= Create nlm Replies
+SHARE_Reply()
+UNSHARE_Reply()
+LOCK_Reply()
+UNLOCK_Reply()
+GRANTED_MSG_Reply()
+GRANTED_RES_Reply()
+CANCEL_Reply()
+TEST_Reply()
+
++ Layer bindings tests
+
+= RPC Layer Bindings for NLM Calls
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Call()/SHARE_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 20)
+pkt = RPC()/RPC_Call()/UNSHARE_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 21)
+pkt = RPC()/RPC_Call()/LOCK_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 2)
+pkt = RPC()/RPC_Call()/UNLOCK_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 4)
+pkt = RPC()/RPC_Call()/GRANTED_MSG_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 10)
+pkt = RPC()/RPC_Call()/GRANTED_RES_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 15)
+pkt = RPC()/RPC_Call()/CANCEL_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 3)
+pkt = RPC()/RPC_Call()/TEST_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100021, 4, 1)
+
+= RPC Layer Bindings for NLM Replies
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Reply()/SHARE_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/UNSHARE_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/LOCK_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/UNLOCK_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/GRANTED_MSG_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/GRANTED_RES_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/CANCEL_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/TEST_Reply()
+assert pkt.mtype == 1
+
++ Test Built Packets Against Raw Strings
+
+= Built NLM Calls vs Raw Strings
+pkt = SHARE_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    mode=1,
+    access=2,
+    reclaim='YES'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01'
+
+pkt = UNSHARE_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    mode=1,
+    access=2,
+    reclaim='YES'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01'
+
+pkt = LOCK_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    block='YES',
+    exclusive='YES',
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    svid=1,
+    l_offset=2,
+    l_len=3,
+    reclaim=1,
+    state=4
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x01\x00\x00\x00\x04'
+
+pkt = UNLOCK_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    svid=1,
+    l_offset=2,
+    l_len=3
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03'
+
+pkt = GRANTED_MSG_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    exclusive='YES',
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    svid=1,
+    l_offset=2,
+    l_len=3
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03'
+
+pkt = GRANTED_RES_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_BLOCKED'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x03'
+
+pkt = CANCEL_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    block='YES',
+    exclusive='YES',
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    svid=1,
+    l_offset=2,
+    l_len=3
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03'
+
+pkt = TEST_Call(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    exclusive='YES',
+    caller=Object_Name(
+        length=6,
+        _name='CALLER',
+        fill='\x00\x00'
+    ),
+    filehandle=File_Object(
+        length=4,
+        fh='file'
+    ),
+    owner=Object_Name(
+        length=5,
+        _name='OWNER',
+        fill='\x00'
+    ),
+    svid=1,
+    l_offset=2,
+    l_len=3
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x06CALLER\x00\x00\x00\x00\x00\x04file\x00\x00\x00\x05OWNER\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03'
+
+
+= NLM Replies vs Raw Strings
+pkt = SHARE_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED',
+    sequence=1
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01'
+
+pkt = UNSHARE_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED',
+    sequence=1
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01'
+
+pkt = LOCK_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01'
+
+pkt = UNLOCK_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01'
+
+pkt = CANCEL_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01'
+
+pkt = TEST_Reply(
+    cookie=NLM4_Cookie(
+        length=6,
+        contents='COOKIE',
+        fill='\x00\x00'
+    ),
+    status='NLM4_DENIED'
+)
+assert bytes(pkt) == b'\x00\x00\x00\x06COOKIE\x00\x00\x00\x00\x00\x01'

scapy-2.4.3.tar.gz/test/contrib/nsh.uts -> scapy-2.4.4.tar.gz/test/contrib/nsh.uts Changed

@@ -1,18 +1,16 @@
-% NSH Tests
-* Tests for the Scapy NSH layer
-
-+ Syntax check
-= Import the nsh layer
-from scapy.contrib.nsh import *
-
 + Basic Layer Tests
 
-= Build a NSH over NSH packet with NSP=42, and NSI=1
-raw(NSH(NSP=42, NSI=1)/NSH()) == b'\x00\x06\x01\x04\x00\x00*\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x01\x03\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+= Build a NSH over NSH packet with SPI=42, and SI=1
+raw(NSH(spi=42, si=1)/NSH()) == b'\x0f\xc6\x01\x04\x00\x00*\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\xc6\x01\x03\x00\x00\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 
+= Build a NSH with Fixed context headers
+raw(NSH(ttl=25, spi=55, si=34, context_header=b"\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff")) == b'\x06F\x01\x03\x00\x007"\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\xff\xff\xff\xff'
 
 = Build a Ethernet over NSH over Ethernet packet (NSH over Ethernet encapsulating the original packet) and verify Ethernet Bindings
-raw(Ether(src="00:00:00:00:00:01", dst="00:00:00:00:00:02")/NSH()/Ether(src="00:00:00:00:00:03", dst="00:00:00:00:00:04")/ARP(psrc="10.0.0.1", hwsrc="00:00:00:00:00:01")) == b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x01\x89O\x00\x06\x01\x03\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x03\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\x00\x00\x00\x00\x00\x01\n\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+raw(Ether(src="00:00:00:00:00:01", dst="00:00:00:00:00:02")/NSH()/Ether(src="00:00:00:00:00:03", dst="00:00:00:00:00:04")/ARP(psrc="10.0.0.1", hwsrc="00:00:00:00:00:01")) == b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x01\x89O\x0f\xc6\x01\x03\x00\x00\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x03\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\x00\x00\x00\x00\x00\x01\n\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 
 = Build a NSH over GRE packet, and verify GRE Bindings
-raw(Ether(src="00:00:00:00:00:01", dst="00:00:00:00:00:02")/IP(src="1.1.1.1", dst="2.2.2.2")/GRE()/NSH()/Ether(src="00:00:00:00:00:03", dst="00:00:00:00:00:04")/ARP(psrc="10.0.0.1", hwsrc="00:00:00:00:00:01")) == b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x01\x08\x00E\x00\x00Z\x00\x01\x00\x00@/to\x01\x01\x01\x01\x02\x02\x02\x02\x00\x00\x89O\x00\x06\x01\x03\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x03\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\x00\x00\x00\x00\x00\x01\n\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+raw(Ether(src="00:00:00:00:00:01", dst="00:00:00:00:00:02")/IP(src="1.1.1.1", dst="2.2.2.2")/GRE()/NSH()/Ether(src="00:00:00:00:00:03", dst="00:00:00:00:00:04")/ARP(psrc="10.0.0.1", hwsrc="00:00:00:00:00:01")) == b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x01\x08\x00E\x00\x00Z\x00\x01\x00\x00@/to\x01\x01\x01\x01\x02\x02\x02\x02\x00\x00\x89O\x0f\xc6\x01\x03\x00\x00\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x03\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\x00\x00\x00\x00\x00\x01\n\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+
+= 0 length variable length context header NSH
+raw(NSH(mdtype=2, spi=0xF0F0F0, si=0xFF))  == b'\x0f\xc2\x02\x03\xf0\xf0\xf0\xff'

scapy-2.4.4.tar.gz/test/contrib/oncrpc.uts Added

@@ -0,0 +1,90 @@
+% Tests for oncrpc module
+############
+############
++  Packet Creation Tests
+
+= Create subpackets
+Object_Name()
+Auth_Unix()
+
+= Create ONC RPC Packets
+RM_Header()
+RPC()
+RPC_Call()
+RPC_Reply()
+
++ Test Layer bindings
+
+= RPC Message type
+pkt = RPC()/RPC_Call()
+assert(pkt.mtype==0)
+pkt = RPC()/RPC_Reply()
+assert(pkt.mtype==1)
+
++ Test Built Packets vs Raw Strings
+
+= Test Built Packets vs Raw Strings
+pkt = RM_Header(
+    rm=0x80000000
+)
+assert bytes(pkt) == b'\x80\x00\x00\x00'
+
+pkt = RPC(
+    xid=0xabcdef12,
+    mtype='CALL'
+)
+assert bytes(pkt) == b'\xab\xcd\xef\x12\x00\x00\x00\x00'
+
+pkt = RPC_Call(
+    version=2,
+    program=100005,
+    pversion=3,
+    procedure=1,
+    aflavor='AUTH_UNIX',
+    a_unix=Auth_Unix(
+        stamp=0xffffffff,
+        mname=Object_Name(
+            length=5,
+            _name='MNAME',
+            fill='\x00\x00\x00'
+        ),
+        uid=1,
+        gid=1,
+        num_auxgids=1,
+        auxgids=[0]
+    ),
+    vflavor=1,
+    v_unix=Auth_Unix(
+        stamp=0xffffffff,
+        mname=Object_Name(
+            length=5,
+            _name='MNAME',
+            fill='\x00\x00\x00'
+        ),
+        uid=1,
+        gid=1,
+        num_auxgids=1,
+        auxgids=[0]
+    )
+)
+assert bytes(pkt) == b'\x00\x00\x00\x02\x00\x01\x86\xa5\x00\x00\x00\x03\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00 \xff\xff\xff\xff\x00\x00\x00\x05MNAME\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x05MNAME\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00'
+
+pkt = RPC_Reply(
+    reply_stat=1,
+    flavor=1,
+    a_unix=Auth_Unix(
+        stamp=0xffffffff,
+        mname=Object_Name(
+            length=5,
+            _name='MNAME',
+            fill='\x00\x00\x00'
+        ),
+        uid=1,
+        gid=1,
+        num_auxgids=1,
+        auxgids=[0]
+    ),
+    length=32,
+    accept_stat=1
+)
+assert bytes(pkt) == b'\x00\x00\x00\x01\x00\x00\x00\x01\xff\xff\xff\xff\x00\x00\x00\x05MNAME\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00 \x00\x00\x00\x01'

scapy-2.4.3.tar.gz/test/contrib/ospf.uts -> scapy-2.4.4.tar.gz/test/contrib/ospf.uts Changed

@@ -47,3 +47,36 @@
 pkt = Ether(dst="01:00:5e:00:00:05", src="ca:11:09:b3:00:1c")/IPv6(dst="::1", src="fe80::160c:12aa:fe7e:cd28")/OSPFv3_Hdr(src="75.1.3.1")/\
       OSPFv3_Hello(options=0x12, router="10.75.0.254", backup="10.75.0.1", neighbors=["75.1.0.1"])
 assert raw(pkt) == b'\x01\x00^\x00\x00\x05\xca\x11\t\xb3\x00\x1c\x86\xdd`\x00\x00\x00\x00(Y@\xfe\x80\x00\x00\x00\x00\x00\x00\x16\x0c\x12\xaa\xfe~\xcd(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x03\x01\x00(K\x01\x03\x01\x00\x00\x00\x00Y\x98\x00\x00\x00\x00\x00\x00\x01\x00\x00\x12\x00\n\x00(\nK\x00\xfe\nK\x00\x01K\x01\x00\x01'
+
+= OSPFv2 Opaque lsa
+
+data = b'\x01\x00^\x00\x00\x05\x00\x90\x92\x9d\x94\x01\x08\x00E\xc0\x00\xb4?\x99\x00\x00\x01Y\xc6\x91\xd2\x00\x00\x01\xe0\x00\x00\x05\x02\x04\x00\xa0\x11\x03\x03\x03\x00\x00\x00d9\x9f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x01 \n\x01\x00\x00\x00\x11\x03\x03\x03\x80\x00\x00\x1f\xab\xd9\x00\x84\x00\x01\x00\x04\x11\x03\x03\x03\x00\x02\x00d\x00\x01\x00\x01\x02\x00\x00\x00\x00\x02\x00\x04\xd2\x00\x00\x02\x00\x03\x00\x04\xd2\x00\x00\x01\x00\x04\x00\x04\xd2\x00\x00\x02\x00\x05\x00\x04\x00\x00\x03\xe8\x00\x06\x00\x04I\x98\x96\x80\x00\x07\x00\x04I\x98\x96\x80\x00\x08\x00 I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80\x00\t\x00\x04\x00\x00\x00\x00\x92\xe6\xb6:'
+
+p = Ether(data)
+
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].age == 1)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].type == 10)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].id == '1.0.0.0')
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].adrouter == '17.3.3.3')
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].seq == 0x8000001f)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].chksum == 0xabd9)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].len == 132)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].opaqueid() == 0)
+assert (p[OSPF_LSUpd][OSPF_Area_Scope_Opaque_LSA].opaquetype() == 1)
+
+opaque_data=b'\x00\x01\x00\x04\x11\x03\x03\x03\x00\x02\x00d\x00\x01\x00\x01\x02\x00\x00\x00\x00\x02\x00\x04\xd2\x00\x00\x02\x00\x03\x00\x04\xd2\x00\x00\x01\x00\x04\x00\x04\xd2\x00\x00\x02\x00\x05\x00\x04\x00\x00\x03\xe8\x00\x06\x00\x04I\x98\x96\x80\x00\x07\x00\x04I\x98\x96\x80\x00\x08\x00 I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80I\x18\x96\x80\x00\t\x00\x04\x00\x00\x00\x00'
+
+p = OSPF_Link_Scope_Opaque_LSA(seq=0x80000003,data=opaque_data)
+assert (p.type == 9)
+assert (p.seq == 0x80000003)
+assert (len(p) == 132)
+
+p = OSPF_Area_Scope_Opaque_LSA(seq=0x80000004,data=opaque_data)
+assert (p.type == 10)
+assert (p.seq == 0x80000004)
+assert (len(p) == 132)
+
+p = OSPF_AS_Scope_Opaque_LSA(seq=0x80000005,data=opaque_data)
+assert (p.type == 11)
+assert (p.seq == 0x80000005)
+assert (len(p) == 132)

scapy-2.4.4.tar.gz/test/contrib/pcom.uts Added

@@ -0,0 +1,68 @@
+% PCOM tests
+
++ Syntax check
+= Import the pcom layer
+from scapy.contrib.scada.pcom import *
+
++ Test PCOM/TCP
+= PCOM/TCP Default values
+raw(PCOMRequest())[2:] == b'\x65\x00\x00\x00'
+raw(PCOMResponse())[2:] == b'\x65\x00\x00\x00'
+
+= PCOM/TCP Len
+r = b'\x65\x00\x04\x00\x00\x00\x00\x00'
+raw(PCOMRequest() / b'\x00\x00\x00\x00')[2:] == r
+r =  b'\x65\x00\x04\x00\x00\x00\x00\x00'
+raw(PCOMResponse() / b'\x00\x00\x00\x00')[2:] == r
+
+= PCOM/TCP Guess Payload Class
+assert(isinstance(PCOMRequest(b'\x00\x00\x65\x00\x01\x00\x00\x00').payload,
+PCOMAsciiRequest))
+assert(isinstance(PCOMResponse(b'\x00\x00\x65\x00\x01\x00\x00\x00').payload,
+PCOMAsciiResponse))
+assert(isinstance(PCOMRequest(b'\x00\x00\x66\x00\x01\x00\x00\x00').payload,
+PCOMBinaryRequest))
+assert(isinstance(PCOMResponse(b'\x00\x00\x66\x00\x01\x00\x00\x00').payload,
+PCOMBinaryResponse))
+
++ Test PCOM/Ascii
+= PCOM/ASCII Default values
+r = b'\x65\x00\x06\x00\x2f\x30\x30\x36\x30\x0d'
+raw(PCOMRequest() / PCOMAsciiRequest())[2:] == r
+r = b'\x65\x00\x07\x00\x2f\x41\x30\x30\x36\x30\x0d'
+raw(PCOMResponse() / PCOMAsciiResponse())[2:] == r
+
+= PCOM/ASCII Checksum
+r = b'\x65\x00\x08\x00\x2f\x30\x30\x49\x44\x45\x44\x0d'
+raw(PCOMRequest() / PCOMAsciiRequest(unitId='00',command='ID'))[2:] == r
+r = b'\x65\x00\x09\x00\x2f\x41\x30\x30\x49\x44\x45\x44\x0d'
+raw(PCOMResponse() / PCOMAsciiResponse(unitId='00',command='ID'))[2:] == r
+
+= PCOM/ASCII Known Codes
+f = PCOMAsciiCommandField('command', '',  length_from= None)
+assert(f.i2repr(None, 'CCS') == 'Send Stop Command \'CCS\'')
+assert(f.i2repr(None, 'CC') == 'Reply of Admin Commands (CC*) \'CC\'')
+
++ Test PCOM/Binary
+= PCOM/Binary Default values
+r = b'\x66\x00\x1b\x00\x2f\x5f\x4f\x50\x4c\x43\x00\xfe\x01\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x45\xfd\x00\x00\x5c'
+raw(PCOMRequest(mode=0x66) / PCOMBinaryRequest())[2:] == r
+r = b'\x66\x00\x1b\x00\x2f\x5f\x4f\x50\x4c\x43\xfe\x00\x01\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x45\xfd\x00\x00\x5c'
+raw(PCOMResponse(mode=0x66) / PCOMBinaryResponse())[2:] == r
+
+= PCOM/Binary Checksum
+data = b'\x01\x00\x01\x01'
+r =  b'\x66\x00\x1f\x00\x2f\x5f\x4f\x50\x4c\x43\x00\xfe\x01\x01\x00\x00\x4d\x00\
+\x00\x00\x00\x00\x00\x01\x04\x00\xf2\xfc\x01\x00\x01\x01\xfd\xff\x5c'
+raw(PCOMRequest(mode=0x66) / PCOMBinaryRequest(command=0x4d,reserved3=0x01,
+commandSpecific='\x00\x00\x00\x00\x00\x01', len=4, data= data))[2:] == r
+r =  b'\x66\x00\x1f\x00\x2f\x5f\x4f\x50\x4c\x43\xfe\x00\x01\x01\x00\x00\x4d\x00\
+\x00\x00\x00\x00\x00\x01\x04\x00\xf2\xfc\x01\x00\x01\x01\xfd\xff\x5c'
+raw(PCOMResponse(mode=0x66) / PCOMBinaryResponse(command=0x4d,reserved3=0x01,
+commandSpecific='\x00\x00\x00\x00\x00\x01', len=4, data= data))[2:] == r
+
+= PCOM/Binary Known Codes
+f = PCOMBinaryCommandField('command', None)
+assert(f.i2repr(None, 0x4d) == 'Read Operands Request - 0x4d')

scapy-2.4.4.tar.gz/test/contrib/pfcp.uts Added

@@ -0,0 +1,791 @@
+% PFCP tests
+
+# Type the following command to launch start the tests:
+# $ test/run_tests -P "load_contrib('pfcp')" -t test/contrib/pfcp.uts
+
++ Build packets & dissect
+
+= Verify IEs
+
+import scapy.contrib.pfcp as pfcp_mod
+
+skip_IEs = [
+    IE_Base,
+    IE_Compound
+]
+
+for name, cls in pfcp_mod.__dict__.items():
+    if name.startswith("IE_") and type(cls) == Packet_metaclass and cls not in skip_IEs:
+        print("testing %s" % name)
+        pkt = cls()
+        bs = bytes(pkt)
+        restored = cls(bs)
+        assert bytes(restored) == bs
+        # TODO: also test packet field equality
+
+= Verify PCAPs
+
+~ pcaps
+
+# the following can be useful while adding more IE types
+# (e.g. updating for a newer version of the spec)
+
+def command(pkt):
+    f = []
+    for fn, fv in sorted(six.iteritems(pkt.fields), key=lambda item: item[0]):
+        if fn in ("length", "message_type"):
+            continue
+        if fn == "ietype" and not isinstance(pkt, IE_EnterpriseSpecific) and \
+           not isinstance(pkt, IE_NotImplemented):
+            continue
+        if fn.startswith("num_") or fn.endswith("_length"):
+            continue
+        if fv is None:
+            continue
+        fld = pkt.get_field(fn)
+        if isinstance(fld, ConditionalField) and not fld._evalcond(pkt):
+            continue
+        # if fv == fld.default:
+        #     continue
+        if isinstance(fv, (list, dict, set)) and len(fv) == 0:
+            continue
+        if isinstance(fv, Packet):
+            fv = command(fv)
+        elif fld.islist and fld.holds_packets and isinstance(fv, list):
+            fv = "[%s]" % ",".join(map(command, fv))
+        elif isinstance(fld, FlagsField):
+            fv = int(fv)
+        else:
+            fv = repr(fv)
+        f.append("%s=%s" % (fn, fv))
+    c = "%s(%s)" % (pkt.__class__.__name__, ", ".join(f))
+    if not isinstance(pkt.payload, NoPayload):
+        pc = command(pkt.payload)
+        if pc:
+            c += "/" + pc
+    return c
+
+broken_ies = set([])
+
+broken_ie_types = set([
+    cls.ie_type for cls in broken_ies
+])
+
+ignore = set([])
+
+def find_raw_or_not_implemented(pkt, prefix=""):
+    if prefix in ignore:
+        return False, False
+    if hasattr(pkt, "IE_list"):
+        prev = None
+        found_any = False
+        for n, ie in enumerate(pkt.IE_list, 1):
+            if type(ie) in broken_ies:
+                return False, False
+            name = "%s-%d-%s" % (prefix, n, type(ie).__name__)
+            found, leaf = find_raw_or_not_implemented(ie, prefix=name)
+            if found:
+                found_any = True
+            if found and leaf:
+                print("gotcha: %s %r" % (prefix, ie))
+                bs = b""
+                if prev is not None:
+                    bs = bytes(prev)
+                bs += bytes(ie)
+                if prev is not None:
+                    prev.show2()
+                ie.show2()
+                print("%s -- bad val: %s" % (prefix, bytes_hex(bs).decode()))
+                if len(bs) > 4:
+                    l = bs[2] * 256 + bs[3]
+                    if len(bs) >= l + 4:
+                        print("bad val (length-limited): %s" % bytes_hex(bs[:l + 4]).decode())
+                print("bad val (short): %s" % bytes_hex(bytes(ie)).decode())
+            prev = ie
+        return found_any, False
+    if isinstance(pkt, Raw):
+        bs = bytes(pkt)
+        if len(bs) > 4:
+            ie_type = bs[0] * 256 + bs[1]
+            if ie_type in broken_ie_types:
+                return False, True
+        return True, True
+    if isinstance(pkt, Padding) or isinstance(pkt, IE_NotImplemented):
+        return True, True
+    return False, True
+
+def find_mismatching_command(pkt, prefix=""):
+    c = command(pkt)
+    if hasattr(pkt, "IE_list"):
+        for n, ie in enumerate(pkt.IE_list, 1):
+            name = "%s-%d-%s" % (prefix, n, type(ie).__name__)
+            find_mismatching_command(ie, prefix=name)
+    if bytes(eval(c)) != bytes(pkt):
+        print(prefix)
+        print("ORIG: %s" % bytes_hex(bytes(pkt)))
+        print("EVAL: %s" % bytes_hex(bytes(eval(c))))
+        raise AssertionError("bad command: %s" % c)
+
+for n, pkt in enumerate(rdpcap("test/pcaps/pfcp.pcap"), 1):
+    if PFCP in pkt:
+        # if IE_DLBufferingSuggestedPacketCount in pkt:
+        #     continue
+        pkt0 = pkt[PFCP]
+        if IE_NotImplemented in pkt0 or Raw in pkt0 or IE_NotImplemented in pkt0 or Padding in pkt0:
+            found, leaf = find_raw_or_not_implemented(pkt, prefix=str(n))
+            if not found:
+                # ignored
+                continue
+            pkt0.show2()
+            raise AssertionError("IE_NotImplemented / Raw / Padding detected")
+        bs = bytes(pkt0)
+        pkt1 = PFCP(bs)
+        # TODO: diff show2() result
+        c0 = command(pkt0)
+        c1 = command(pkt1)
+        pkt2 = eval(c1)
+        c2 = command(pkt2)
+        if bytes(pkt2) != bs:
+            find_mismatching_command(pkt0, prefix=str(n))
+            print(bytes_hex(bytes(pkt2)))
+            print(bytes_hex(bs))
+            raise AssertionError("bytes(pkt2) != bs")
+        if bs != pkt0.original:
+            print(bytes_hex(bs))
+            print(bytes_hex(pkt0.original))
+            raise AssertionError("bs != pkt0.original")
+        if bytes(pkt1) != bs:
+            print(bytes_hex(bytes(pkt1)))
+            print(bytes_hex(bs))
+            raise AssertionError("bytes(pkt1) != bs")
+        if c0 != c1:
+            print("COMMAND MISMATCH:\n----\n%s\n----\n%s\n\n" % (c0, c1))
+            pkt0.show2()
+            pkt1.show2()
+            print(bytes_hex(bytes(pkt0)))
+            print("packet index: %d\n" % n)
+            raise AssertionError("c0 != c1")
+        if c0 != c2:
+            print("EVAL COMMAND MISMATCH:\n----\n%s\n----\n%s\n\n" % (c0, c2))
+            pkt0.show2()
+            pkt2.show2()
+            print(bytes_hex(bytes(pkt0)))
+            print("packet index: %d\n" % n)
+            raise AssertionError("c0 != c2")
+
+= Build and dissect PFCP Association Setup Request
+
+pfcpASReqBytes = hex_bytes("200500160000010000600004e1a47d08003c0006020465726777")
+
+pfcpASReq = PFCP(version=1, S=0, seq=1) / \
+  PFCPAssociationSetupRequest(IE_list=[
+      IE_RecoveryTimeStamp(timestamp=3785653512),
+      IE_NodeId(id_type="FQDN", id="ergw")
+  ])
+
+# print("%r" % bytes(pfcpASReq))
+# print("%r" % pfcpASReqBytes)
+assert bytes(pfcpASReq) == pfcpASReqBytes
+
+pfcpASReq = PFCP(pfcpASReqBytes)
+assert pfcpASReq.version == 1
+assert pfcpASReq.MP == 0
+assert pfcpASReq.S == 0
+assert pfcpASReq.message_type == 5
+assert pfcpASReq.length == 22
+ies = pfcpASReq[PFCPAssociationSetupRequest].IE_list
+assert isinstance(ies[0], IE_RecoveryTimeStamp)
+assert ies[0].ietype == 96
+assert ies[0].length == 4
+assert ies[0].timestamp == 3785653512
+assert isinstance(ies[1], IE_NodeId)
+assert ies[1].ietype == 60
+assert ies[1].length == 6
+assert ies[1].id_type == 2
+assert ies[1].id == b"ergw"
+
+= Build and dissect PFCP Association Setup Response
+
+pfcpASRespBytes = hex_bytes("2006008c00000100001300010100600004e1a47af9002b00020001007400092980ac1201020263708002006448f9767070207631392e30382e312d3339377e673465333431343066612d6469727479206275696c7420627920726f6f74206f6e206275696c646b697473616e64626f7820617420576564204465632031312031353a30323a3535205554432032303139")
+
+pfcpASResp = PFCP(version=1, S=0, seq=1) / \
+  PFCPAssociationSetupResponse(IE_list=[
+      IE_Cause(cause="Request accepted"),
+      IE_RecoveryTimeStamp(timestamp=3785652985),
+      IE_UPFunctionFeatures(
+          TREU=0, HEEU=0, PFDM=0, FTUP=0, TRST=0, DLBD=0, DDND=0, BUCP=0,
+          spare=0, PFDE=0, FRRT=0, TRACE=0, QUOAC=0, UDBC=0, PDIU=0, EMPU=1),
+      IE_UserPlaneIPResourceInformation(
+          ASSOSI=0, ASSONI=1, TEIDRI=2, V6=0, V4=1, teid_range=0x80,
+          ipv4="172.18.1.2", network_instance="cp"),
+      IE_EnterpriseSpecific(
+          ietype=32770,
+          enterprise_id=18681,
+          data="vpp v19.08.1-397~g4e34140fa-dirty built by root on buildkitsandbox at Wed Dec 11 15:02:55 UTC 2019")
+   ])
+
+
+pfcpASResp.show2()
+assert bytes(pfcpASResp) == pfcpASRespBytes
+
+pfcpASResp = PFCP(pfcpASRespBytes)
+assert pfcpASResp.version == 1
+assert pfcpASResp.MP == 0
+assert pfcpASResp.S == 0
+assert pfcpASResp.message_type == 6
+assert pfcpASResp.length == 140
+
+ies = pfcpASResp[PFCPAssociationSetupResponse].IE_list
+assert isinstance(ies[0], IE_Cause)
+assert ies[0].ietype == 19
+assert ies[0].length == 1
+assert ies[0].cause == 1
+assert isinstance(ies[1], IE_RecoveryTimeStamp)
+assert ies[1].ietype == 96
+assert ies[1].length == 4
+assert ies[1].timestamp == 3785652985
+assert isinstance(ies[2], IE_UPFunctionFeatures)
+assert ies[2].ietype == 43
+assert ies[2].length == 2
+assert ies[2].TREU == 0
+assert ies[2].HEEU == 0
+assert ies[2].PFDM == 0
+assert ies[2].FTUP == 0
+assert ies[2].TRST == 0
+assert ies[2].DLBD == 0
+assert ies[2].DDND == 0
+assert ies[2].BUCP == 0
+assert ies[2].spare == 0
+assert ies[2].PFDE == 0
+assert ies[2].FRRT == 0
+assert ies[2].TRACE == 0
+assert ies[2].QUOAC == 0
+assert ies[2].UDBC == 0
+assert ies[2].PDIU == 0
+assert ies[2].EMPU == 1
+assert isinstance(ies[3], IE_UserPlaneIPResourceInformation)
+assert ies[3].ASSOSI == 0
+assert ies[3].ASSONI == 1
+assert ies[3].TEIDRI == 2
+assert ies[3].V6 == 0
+assert ies[3].V4 == 1
+assert ies[3].teid_range == 0x80
+assert ies[3].ipv4 == "172.18.1.2"
+assert ies[3].network_instance == b"cp"
+assert isinstance(ies[4], IE_EnterpriseSpecific)
+assert ies[4].ietype == 32770
+assert ies[4].enterprise_id == 18681
+assert ies[4].data == b"vpp v19.08.1-397~g4e34140fa-dirty built by root on buildkitsandbox at Wed Dec 11 15:02:55 UTC 2019"
+
+assert pfcpASResp.answers(pfcpASReq)
+
+# = Build and dissect PFCP Session Establishment Request
+
+pfcpSEReq1Bytes = hex_bytes("2132011300000000000000000000020000030021002c000102006c00040000000200040010002a00010000160007066163636573730003000d002c000101006c00040000000100010038006c000400000002005f000100000200190015000901104c9033ac120102001600030263700014000103003800020002001d00040000006400010057006c000400000001000200350016000706616363657373001700210100001d7065726d6974206f75742069702066726f6d20616e7920746f20616e790014000100003800020001001d00040000fde800510004000000010006001b003e000104002500021000004a00040000003c00510004000000010039000d02ffde7210bf97810aac120101003c0006020465726777")
+
+pfcpSEReq1 = PFCP(version=1, S=1, seq=2, seid=0, spare_oct=0) / \
+  PFCPSessionEstablishmentRequest(IE_list=[
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=2),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="Access"),
+              IE_NetworkInstance(instance="access"),
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(DROP=1),
+          IE_FAR_Id(id=1)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=2),
+          IE_OuterHeaderRemoval(header="GTP-U/UDP/IPv4"),
+          IE_PDI(IE_list=[
+              IE_FTEID(V4=1, TEID=0x104c9033, ipv4="172.18.1.2"),
+              IE_NetworkInstance(instance="cp"),
+              IE_SourceInterface(interface="CP-function"),
+          ]),
+          IE_PDR_Id(id=2),
+          IE_Precedence(precedence=100)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=1),
+          IE_PDI(IE_list=[
+              IE_NetworkInstance(instance="access"),
+              IE_SDF_Filter(FD=1, flow_description="permit out ip from any to any"),
+              IE_SourceInterface(interface="Access"),
+          ]),
+          IE_PDR_Id(id=1),
+          IE_Precedence(precedence=65000),
+          IE_URR_Id(id=1)
+      ]),
+      IE_CreateURR(IE_list=[
+          IE_MeasurementMethod(EVENT=1),
+          IE_ReportingTriggers(start_of_traffic=1),
+          IE_TimeQuota(quota=60),
+          IE_URR_Id(id=1)
+      ]),
+      IE_FSEID(v4=1, seid=0xffde7210bf97810a, ipv4="172.18.1.1"),
+      IE_NodeId(id_type="FQDN", id="ergw")
+    ])
+
+assert bytes(pfcpSEReq1) == pfcpSEReq1Bytes
+assert bytes(PFCP(pfcpSEReq1Bytes)) == pfcpSEReq1Bytes
+
+pfcpSEReq2Bytes = hex_bytes("213202ba00000000000000000000080000030037002c000102006c00040000000400040026002a000102001600040373676900260015020012687474703a2f2f6578616d706c652e636f6d0003001e002c000102006c0004000000020004000d002a000102001600040373676900030021002c000102006c00040000000300040010002a000100001600070661636365737300030021002c000102006c00040000000100040010002a00010000160007066163636573730001006d006c0004000000040002004b00160007066163636573730017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3420746f2061737369676e65640014000100005d0005020ac00000003800020004001d00040000006400510004000000020001006d006c0004000000020002004b00160007066163636573730017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3220746f2061737369676e65640014000100005d0005020ac00000003800020002001d0004000000c800510004000000010001006a006c0004000000030002004800160004037367690017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3420746f2061737369676e65640014000102005d0005060ac00000003800020003001d00040000006400510004000000020001006a006c0004000000010002004800160004037367690017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3220746f2061737369676e65640014000102005d0005060ac00000003800020001001d0004000000c8005100040000000100060013003e000102002500020000005100040000000200060013003e00010200250002000000510004000000010039000d02ffde7210d971c146ac120101003c0006020465726777")
+
+pfcpSEReq2 = PFCP(seq=8) / PFCPSessionEstablishmentRequest(IE_list=[
+    IE_CreateFAR(IE_list=[
+        IE_ApplyAction(FORW=1),
+        IE_FAR_Id(id=4),
+        IE_ForwardingParameters(IE_list=[
+            IE_DestinationInterface(interface="SGi-LAN/N6-LAN"),
+            IE_NetworkInstance(instance="sgi"),
+            IE_RedirectInformation(type="URL", address="http://example.com"),
+        ])
+    ]),
+    IE_CreateFAR(IE_list=[
+        IE_ApplyAction(FORW=1),
+        IE_FAR_Id(id=2),
+        IE_ForwardingParameters(IE_list=[
+            IE_DestinationInterface(interface="SGi-LAN/N6-LAN"),
+            IE_NetworkInstance(instance="sgi"),
+        ])
+    ]),
+    IE_CreateFAR(IE_list=[
+        IE_ApplyAction(FORW=1),
+        IE_FAR_Id(id=3),
+        IE_ForwardingParameters(IE_list=[
+            IE_DestinationInterface(interface="Access"),
+            IE_NetworkInstance(instance="access")
+        ])
+    ]),
+    IE_CreateFAR(IE_list=[
+        IE_ApplyAction(FORW=1),
+        IE_FAR_Id(id=1),
+        IE_ForwardingParameters(IE_list=[
+            IE_DestinationInterface(interface="Access"),
+            IE_NetworkInstance(instance="access")
+        ])
+    ]),
+    IE_CreatePDR(IE_list=[
+        IE_FAR_Id(id=4),
+        IE_PDI(IE_list=[
+            IE_NetworkInstance(instance="access"),
+            IE_SDF_Filter(
+                FD=1, flow_description="permit out ip from 198.19.65.4 to assigned"),
+            IE_SourceInterface(interface="Access"),
+            IE_UE_IP_Address(ipv4="10.192.0.0", V4=1)
+        ]),
+        IE_PDR_Id(id=4),
+        IE_Precedence(precedence=100),
+        IE_URR_Id(id=2)
+    ]),
+    IE_CreatePDR(IE_list=[
+        IE_FAR_Id(id=2),
+        IE_PDI(IE_list=[
+            IE_NetworkInstance(instance="access"),
+            IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.2 to assigned"),
+            IE_SourceInterface(interface="Access"),
+            IE_UE_IP_Address(ipv4="10.192.0.0", V4=1)
+        ]),
+        IE_PDR_Id(id=2),
+        IE_Precedence(precedence=200),
+        IE_URR_Id(id=1)
+    ]),
+    IE_CreatePDR(IE_list=[
+        IE_FAR_Id(id=3),
+        IE_PDI(IE_list=[
+            IE_NetworkInstance(instance="sgi"),
+            IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.4 to assigned"),
+            IE_SourceInterface(interface="SGi-LAN/N6-LAN"),
+            IE_UE_IP_Address(ipv4="10.192.0.0", SD=1, V4=1)
+        ]),
+        IE_PDR_Id(id=3),
+        IE_Precedence(precedence=100),
+        IE_URR_Id(id=2)
+    ]),
+    IE_CreatePDR(IE_list=[
+        IE_FAR_Id(id=1),
+        IE_PDI(IE_list=[
+            IE_NetworkInstance(instance="sgi"),
+            IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.2 to assigned"),
+            IE_SourceInterface(interface="SGi-LAN/N6-LAN"),
+            IE_UE_IP_Address(ipv4="10.192.0.0", SD=1, V4=1)
+        ]),
+        IE_PDR_Id(id=1),
+        IE_Precedence(precedence=200),
+        IE_URR_Id(id=1)
+    ]),
+    IE_CreateURR(IE_list=[
+        IE_MeasurementMethod(VOLUM=1),
+        IE_ReportingTriggers(),
+        IE_URR_Id(id=2)
+    ]),
+    IE_CreateURR(IE_list=[
+        IE_MeasurementMethod(VOLUM=1),
+        IE_ReportingTriggers(),
+        IE_URR_Id(id=1)
+    ]),
+    IE_FSEID(ipv4="172.18.1.1", v4=1, seid=0xffde7210d971c146),
+    IE_NodeId(id_type="FQDN", id="ergw")])
+
+assert bytes(pfcpSEReq2) == pfcpSEReq2Bytes
+assert bytes(PFCP(pfcpSEReq2Bytes)) == pfcpSEReq2Bytes
+
+pfcpSEReq3Bytes = hex_bytes("213203a10000000000000000000003000003001e002c000102006c0004000000060004000d002a000102001600040373676900030037002c000102006c00040000000400040026002a000102001600040373676900260015020012687474703a2f2f6578616d706c652e636f6d0003001e002c000102006c0004000000020004000d002a000102001600040373676900030021002c000102006c00040000000500040010002a000100001600070661636365737300030021002c000102006c00040000000300040010002a000100001600070661636365737300030021002c000102006c00040000000100040010002a000100001600070661636365737300010042006c000400000006000200200018000354535400160007066163636573730014000100005d0005020ac00000003800020006001d00040000009600510004000000030001006d006c0004000000040002004b00160007066163636573730017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3420746f2061737369676e65640014000100005d0005020ac00000003800020004001d00040000006400510004000000020001006d006c0004000000020002004b00160007066163636573730017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3220746f2061737369676e65640014000100005d0005020ac00000003800020002001d0004000000c800510004000000010001003f006c0004000000050002001d0018000354535400160004037367690014000102005d0005060ac00000003800020005001d00040000009600510004000000030001006a006c0004000000030002004800160004037367690017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3420746f2061737369676e65640014000102005d0005060ac00000003800020003001d00040000006400510004000000020001006a006c0004000000010002004800160004037367690017002e0100002a7065726d6974206f75742069702066726f6d203139382e31392e36352e3220746f2061737369676e65640014000102005d0005060ac00000003800020001001d0004000000c8005100040000000100060013003e000102002500020000005100040000000200060013003e000103002500020000005100040000000300060013003e00010200250002000000510004000000010039000d02ffde7211a5ab800aac120101003c0006020465726777")
+
+pfcpSEReq3 = PFCP(seq=3) / \
+  PFCPSessionEstablishmentRequest(IE_list=[
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=6),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="SGi-LAN/N6-LAN"),
+              IE_NetworkInstance(instance="sgi")
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=4),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="SGi-LAN/N6-LAN"),
+              IE_NetworkInstance(instance="sgi"),
+              IE_RedirectInformation(type="URL", address="http://example.com")
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=2),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="SGi-LAN/N6-LAN"),
+              IE_NetworkInstance(instance="sgi")
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=5),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="Access"),
+              IE_NetworkInstance(instance="access")
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=3),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="Access"),
+              IE_NetworkInstance(instance="access")
+          ])
+      ]),
+      IE_CreateFAR(IE_list=[
+          IE_ApplyAction(FORW=1),
+          IE_FAR_Id(id=1),
+          IE_ForwardingParameters(IE_list=[
+              IE_DestinationInterface(interface="Access"),
+              IE_NetworkInstance(instance="access")
+          ])
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=6),
+          IE_PDI(IE_list=[
+              IE_ApplicationId(id="TST"),
+              IE_NetworkInstance(instance="access"),
+              IE_SourceInterface(interface="Access"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', V4=1)
+          ]),
+          IE_PDR_Id(id=6),
+          IE_Precedence(precedence=150),
+          IE_URR_Id(id=3)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=4),
+          IE_PDI(IE_list=[
+              IE_NetworkInstance(instance="access"),
+              IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.4 to assigned"),
+              IE_SourceInterface(interface="Access"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', V4=1)
+          ]),
+          IE_PDR_Id(id=4),
+          IE_Precedence(precedence=100),
+          IE_URR_Id(id=2)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=2),
+          IE_PDI(IE_list=[
+              IE_NetworkInstance(instance="access"),
+              IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.2 to assigned"),
+              IE_SourceInterface(interface="Access"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', V4=1)
+          ]),
+          IE_PDR_Id(id=2),
+          IE_Precedence(precedence=200),
+          IE_URR_Id(id=1)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=5),
+          IE_PDI(IE_list=[
+              IE_ApplicationId(id="TST"),
+              IE_NetworkInstance(instance="sgi"),
+              IE_SourceInterface(interface="SGi-LAN/N6-LAN"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', SD=1, V4=1)
+          ]),
+          IE_PDR_Id(id=5),
+          IE_Precedence(precedence=150),
+          IE_URR_Id(id=3)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=3),
+          IE_PDI(IE_list=[
+              IE_NetworkInstance(instance="sgi"),
+              IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.4 to assigned"),
+              IE_SourceInterface(interface="SGi-LAN/N6-LAN"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', SD=1, V4=1)
+          ]),
+          IE_PDR_Id(id=3),
+          IE_Precedence(precedence=100),
+          IE_URR_Id(id=2)
+      ]),
+      IE_CreatePDR(IE_list=[
+          IE_FAR_Id(id=1),
+          IE_PDI(IE_list=[
+              IE_NetworkInstance(instance="sgi"),
+              IE_SDF_Filter(FD=1, flow_description="permit out ip from 198.19.65.2 to assigned"),
+              IE_SourceInterface(interface="SGi-LAN/N6-LAN"),
+              IE_UE_IP_Address(ipv4='10.192.0.0', SD=1, V4=1)
+          ]),
+          IE_PDR_Id(id=1),
+          IE_Precedence(precedence=200),
+          IE_URR_Id(id=1)
+      ]),
+      IE_CreateURR(IE_list=[
+          IE_MeasurementMethod(VOLUM=1),
+          IE_ReportingTriggers(),
+          IE_URR_Id(id=2)
+      ]),
+      IE_CreateURR(IE_list=[
+          IE_MeasurementMethod(VOLUM=1, DURAT=1),
+          IE_ReportingTriggers(),
+          IE_URR_Id(id=3)
+      ]),
+      IE_CreateURR(IE_list=[
+          IE_MeasurementMethod(VOLUM=1),
+          IE_ReportingTriggers(),
+          IE_URR_Id(id=1)
+      ]),
+      IE_FSEID(ipv4='172.18.1.1', v4=1, seid=0xffde7211a5ab800a),
+      IE_NodeId(id_type="FQDN", id="ergw")
+  ])
+
+assert bytes(pfcpSEReq3) == pfcpSEReq3Bytes
+assert bytes(PFCP(pfcpSEReq3Bytes)) == pfcpSEReq3Bytes
+
+= Build and dissect PFCP Session Establishment Response
+
+pfcpSERespBytes = hex_bytes("21330022ffde7210bf97810a0000020000130001010039000d02ffde7210bf97810aac120102")
+
+pfcpSEResp = PFCP(version=1, S=1, seq=2, seid=0xffde7210bf97810a) / \
+  PFCPSessionEstablishmentResponse(IE_list=[
+      IE_Cause(cause="Request accepted"),
+      IE_FSEID(ipv4="172.18.1.2", v4=1, seid=0xffde7210bf97810a),
+  ])
+
+assert bytes(pfcpSEResp) == pfcpSERespBytes
+assert bytes(PFCP(pfcpSERespBytes)) == pfcpSERespBytes
+assert pfcpSEResp.answers(pfcpSEReq1)
+
+= Build and dissect PFCP Heartbeat Request
+
+pfcpHReqBytes = hex_bytes("2001000c0000030000600004e1a47d08")
+
+pfcpHReq = PFCP(version=1, S=0, seq=3) / \
+  PFCPHeartbeatRequest(IE_list=[
+      IE_RecoveryTimeStamp(timestamp=3785653512)
+  ])
+
+assert bytes(pfcpHReq) == pfcpHReqBytes
+assert bytes(PFCP(pfcpHReqBytes)) == pfcpHReqBytes
+
+# = Build and dissect PFCP Heartbeat Response
+
+pfcpHRespBytes = hex_bytes("2002000c0000030000600004e1a47af9")
+
+pfcpHResp = PFCP(version=1, S=0, seq=3) / \
+  PFCPHeartbeatResponse(IE_list=[
+      IE_RecoveryTimeStamp(timestamp=3785652985)
+  ])
+
+assert bytes(pfcpHResp) == pfcpHRespBytes
+assert bytes(PFCP(pfcpHRespBytes)) == pfcpHRespBytes
+assert pfcpHResp.answers(pfcpHReq)
+
+# = Build and dissect PFCP Session Report Request
+
+pfcpSRReq1Bytes = hex_bytes("21380034ffde7210bf99c00300006b0000270001020050001f00510004000000010068000400000001003f00021000005d0005020ac00001")
+
+pfcpSRReq1 = PFCP(seq=107, version=1, S=1, seid=18437299340760956931) / \
+  PFCPSessionReportRequest(IE_list=[
+      IE_ReportType(USAR=1),
+      IE_UsageReport_SRR(IE_list=[
+          IE_URR_Id(id=1),
+          IE_UR_SEQN(number=1),
+          IE_UsageReportTrigger(START=1),
+          IE_UE_IP_Address(ipv4="10.192.0.1", V4=1)
+      ])
+  ])
+
+assert bytes(pfcpSRReq1) == pfcpSRReq1Bytes
+assert bytes(PFCP(pfcpSRReq1Bytes)) == pfcpSRReq1Bytes
+
+pfcpSRReq2Bytes = hex_bytes("2138008a0ffde7210bf940000000310000270001020050007500510004000000030068000400000018003f00020100004b0004e1b44787004c0004e1b447910042001907000000000000000000000000000000000000000000000000004300040000000a8003000a48f9e1b4479137cbd8008004000a48f9e1b4478737cbd8008005000a48f9e1b4479137cbd800")
+
+pfcpSRReq2 = PFCP(seq=49, seid=1152331208797536256) / \
+  PFCPSessionReportRequest(IE_list=[
+      IE_ReportType(USAR=1),
+      IE_UsageReport_SRR(IE_list=[
+          IE_URR_Id(id=3),
+          IE_UR_SEQN(number=24),
+          IE_UsageReportTrigger(PERIO=1),
+          IE_StartTime(timestamp=3786688391),
+          IE_EndTime(timestamp=3786688401),
+          IE_VolumeMeasurement(
+              DLVOL=1, ULVOL=1, TOVOL=1, total=0, uplink=0, downlink=0),
+          IE_DurationMeasurement(duration=10),
+          IE_EnterpriseSpecific(
+              ietype=32771,
+              enterprise_id=18681,
+              data=b'\xe1\xb4G\x917\xcb\xd8\x00'),
+          IE_EnterpriseSpecific(
+              ietype=32772,
+              enterprise_id=18681,
+              data=b'\xe1\xb4G\x877\xcb\xd8\x00'),
+          IE_EnterpriseSpecific(
+              ietype=32773,
+              enterprise_id=18681,
+              data=b'\xe1\xb4G\x917\xcb\xd8\x00')
+      ])
+  ])
+
+assert bytes(pfcpSRReq2) == pfcpSRReq2Bytes
+assert bytes(PFCP(pfcpSRReq2Bytes)) == pfcpSRReq2Bytes
+
+pfcpSRReq3Bytes = hex_bytes("21380035a2a2aa9ad7f316fd0000010000270001020050002000510004000000010068000400000000003f0003100000005d000502ac100202")
+
+pfcpSRReq3 = PFCP(seq=1, seid=11719116762396169981) / \
+    PFCPSessionReportRequest(IE_list=[
+        IE_ReportType(USAR=1),
+        IE_UsageReport_SRR(IE_list=[
+            IE_URR_Id(id=1),
+            IE_UR_SEQN(number=0),
+            IE_UsageReportTrigger(START=1, extra_data=b'\x00'),
+            IE_UE_IP_Address(ipv4='172.16.2.2', V4=1)
+        ])
+    ])
+
+assert bytes(pfcpSRReq3) == pfcpSRReq3Bytes
+assert bytes(PFCP(pfcpSRReq3Bytes)) == pfcpSRReq3Bytes
+
+= Build and dissect PFCP Session Report Response
+
+pfcpSRRespBytes = hex_bytes("21390011ffde7210bf99c00300006b000013000101")
+
+pfcpSRResp = PFCP(version=1, S=1, seq=107, seid=0xffde7210bf99c003) / \
+  PFCPSessionReportResponse(IE_list=[
+      IE_Cause(cause="Request accepted")
+  ])
+
+assert bytes(pfcpSRResp) == pfcpSRRespBytes
+assert bytes(PFCP(pfcpSRRespBytes)) == pfcpSRRespBytes
+assert pfcpSRResp.answers(pfcpSRReq1)
+
+= Build and dissect PFCP Session Modification Request
+
+pfcpSMReqBytes = hex_bytes("21340018ffde72125aeb00a300000600004d00080051000400000001")
+pfcpSMReq = PFCP(pfcpSMReqBytes)
+
+pfcpSMReq = PFCP(version=1, seq=6, seid=0xffde72125aeb00a3) / \
+    PFCPSessionModificationRequest(IE_list=[
+        IE_QueryURR(IE_list=[IE_URR_Id(id=1)])
+    ])
+assert bytes(pfcpSMReq) == pfcpSMReqBytes
+assert bytes(PFCP(pfcpSMReqBytes)) == pfcpSMReqBytes
+
+= Build and dissect PFCP Session Modification Response
+
+pfcpSMRespBytes = hex_bytes("2135008affde72125aeb00a3000006000013000101004e007500510004000000010068000400000000003f00028000004b0004e16e7efa004c0004e16e7efa004200190700000000000000000000000000000000000000000000000000430004000000008003000a48f9e16e7efa05566c008004000a48f9e16e7efa027f08008005000a48f9e16e7efa027f0800")
+
+pfcpSMResp = PFCP(version=1, seq=6, seid=0xffde72125aeb00a3) / \
+    PFCPSessionModificationResponse(IE_list=[
+        IE_Cause(cause=1),
+        IE_UsageReport_SMR(IE_list=[
+            IE_URR_Id(id=1),
+            IE_UR_SEQN(number=0),
+            IE_UsageReportTrigger(IMMER=1),
+            IE_StartTime(timestamp=3782115066),
+            IE_EndTime(timestamp=3782115066),
+            IE_VolumeMeasurement(DLVOL=1, ULVOL=1, TOVOL=1),
+            IE_DurationMeasurement(),
+            IE_EnterpriseSpecific(ietype=32771, enterprise_id=18681, data=b'\xe1n~\xfa\x05Vl\x00'),
+            IE_EnterpriseSpecific(ietype=32772, enterprise_id=18681, data=b'\xe1n~\xfa\x02\x7f\x08\x00'),
+            IE_EnterpriseSpecific(ietype=32773, enterprise_id=18681, data=b'\xe1n~\xfa\x02\x7f\x08\x00')
+        ])
+    ])
+
+assert bytes(pfcpSMResp) == pfcpSMRespBytes
+assert bytes(PFCP(pfcpSMRespBytes)) == pfcpSMRespBytes
+assert pfcpSMResp.answers(pfcpSMReq)
+
+= Verify IEs
+
+from difflib import unified_diff
+cases = [
+    dict(
+        hex="0054000a0100010000000a177645",
+        expect=IE_OuterHeaderCreation(GTPUUDPIPV4=1, TEID=0x01000000, ipv4="10.23.118.69")),
+    dict(
+        hex="002900050461626364",
+        expect=IE_ForwardingPolicy(policy_identifier="abcd")),
+    dict(
+        hex="002e0001ae",
+        expect=IE_DownlinkDataNotificationDelay(delay=174)),
+    dict(
+        hex="003d00020000",
+        expect=IE_PFDContents()),
+    dict(
+        hex="005e00070300205903e95d",
+        expect=IE_PacketRate(ULPR=1, DLPR=1,
+                             ul_time_unit="minute", ul_max_packet_rate=8281,
+                             dl_time_unit="day", dl_max_packet_rate=59741)),
+    dict(
+        hex="00850007010906638dccd5",
+        expect=IE_MACAddress(SOUR=1, source_mac="09:06:63:8d:cc:d5")),
+    dict(
+        hex="00540014080017d0bd69dceb747a1e036c0f9c8d4af115d0",
+        expect=IE_OuterHeaderCreation(UDPIPV6=1,
+                                      ipv6="17d0:bd69:dceb:747a:1e03:6c0f:9c8d:4af1",
+                                      port=5584)),
+    dict(
+        hex="006700050280df69b2",
+        expect=IE_RemoteGTP_U_Peer(V4=1, ipv4="128.223.105.178")),
+]
+
+for case in cases:
+    bs = hex_bytes(case["hex"])
+    exp = case["expect"]
+    dissected = type(exp)(bs)
+    exp_text = exp.show2(dump=True)
+    dissected_text = dissected.show2(dump=True)
+    if exp_text != dissected_text:
+        print("---\n%s\n---\n%s\n" % (exp_text, dissected_text))
+        for line in unified_diff(exp_text.split("\n"), dissected_text.split("\n"),
+                                 fromfile="expected", tofile="dissected"):
+            print(line)
+        raise AssertionError("text mismatch")
+    assert bytes(dissected) == bs
+    assert bytes(exp) == bs
+
+# from difflib import unified_diff
+# expected = PFCP(pfcpSRReq2Bytes).show2(dump=True).split("\n")
+# actual = pfcpSRReq2.show2(dump=True).split("\n")
+# for line in unified_diff(expected, actual, fromfile="expected", tofile="actual"):
+#     print(line)

scapy-2.4.4.tar.gz/test/contrib/portmap.uts Added

@@ -0,0 +1,74 @@
+% Tests for portmap module
+############
+############
++  Packet Creation Tests
+
+= Create subpackets
+Map_Entry()
+
+= Create Portmap Packets
+NULL_Call()
+NULL_Reply()
+DUMP_Call()
+DUMP_Reply()
+GETPORT_Call()
+GETPORT_Reply()
+
++ Test Layer bindings
+
+= RPC Layer Bindings for Portmap calls
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Call()/NULL_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100000, 2, 0)
+pkt = RPC()/RPC_Call()/GETPORT_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100000, 2, 3)
+pkt = RPC()/RPC_Call()/DUMP_Call()
+assert (pkt.mtype, pkt.program, pkt.pversion, pkt.procedure) == (0, 100000, 2, 4)
+
+= RPC Layer Bindings for Portmap replies
+from scapy.contrib.oncrpc import *
+pkt = RPC()/RPC_Reply()/NULL_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/GETPORT_Reply()
+assert pkt.mtype == 1
+pkt = RPC()/RPC_Reply()/DUMP_Reply()
+assert pkt.mtype == 1
+
++ Test Built Packets vs Raw Strings
+
+= Portmap calls vs Raw Strings
+pkt = GETPORT_Call(
+    prog=100003,
+    vers=3,
+    prot=6,
+    port=0
+)
+assert bytes(pkt) == b'\x00\x01\x86\xa3\x00\x00\x00\x03\x00\x00\x00\x06\x00\x00\x00\x00'
+
+= Portmap replies vs Raw Strings
+pkt = GETPORT_Reply(
+    port=2049
+)
+assert bytes(pkt) == b'\x00\x00\x08\x01'
+
+pkt = DUMP_Reply(
+    value_follows=1,
+    mappings=[
+        Map_Entry(
+            prog=1,
+            vers=2,
+            prot=3,
+            port=4,
+            value_follows=1
+        ),
+
+        Map_Entry(
+            prog=5,
+            vers=6,
+            prot=7,
+            port=8,
+            value_follows=0
+        )
+    ]
+)
+assert bytes(pkt) == b'\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x05\x00\x00\x00\x06\x00\x00\x00\x07\x00\x00\x00\x08\x00\x00\x00\x00'

scapy-2.4.4.tar.gz/test/contrib/roce.uts Added

@@ -0,0 +1,79 @@
+# RoCE unit tests
+# run with:
+#   test/run_tests  -P "load_contrib('roce')" -t test/contrib/roce.uts -F
+
+% Regression tests for the RoCE layer
+
+################
+##### RoCE #####
+################
+
++ RoCE tests
+
+= RoCE layer
+
+# an example UC packet 
+pkt = Ether(dst='24:8a:07:a8:fa:22', src='24:8a:07:a8:fa:22')/ \
+      IP(version=4, ihl=5, tos=0x1, id=1144, flags='DF', frag=0, \
+         ttl=64, src='192.168.0.7', dst='192.168.0.7', len=64)/ \
+      UDP(sport=49152, dport=4791, len=44)/ \
+      BTH(opcode='UC_SEND_ONLY', migreq=1, padcount=2, pkey=0xffff, dqpn=211, psn=13571856)/ \
+      Raw(b'F0\x81\x8b\xe2\x895\xd9\x0e\x9a\x95PT\x01\xbe\x88^P\x00\x00')
+
+# include ICRC placeholder
+pkt = Ether(pkt.build() + b'\x00' * 4)
+
+assert IP in pkt.layers()
+print(hex(pkt[IP].chksum))
+assert pkt[IP].chksum == 0xb4d5
+assert UDP in pkt.layers()
+print(hex(pkt[UDP].chksum))
+assert pkt[UDP].chksum == 0xaca2
+assert BTH in pkt.layers()
+assert pkt[BTH].icrc == 0x78f353f3
+
+= RoCE CNP packet
+
+# based on this example packet:
+# https://community.mellanox.com/s/article/rocev2-cnp-packet-format-example
+
+pkt = Ether()/IP(src='22.22.22.8', dst='22.22.22.7', id=0x98c6, flags='DF',
+                 ttl=0x20, tos=0x89)/ \
+      UDP(sport=56238, dport=4791, chksum=0)/ \
+      cnp(dqpn=0xd2)
+pkt = Ether(pkt.build())
+
+assert pkt[IP].len == 60
+assert pkt[UDP].len == 40
+assert pkt[BTH].opcode == 0x81
+assert pkt[BTH].becn
+assert not pkt[BTH].fecn
+assert pkt[BTH].resv6 == 0
+assert pkt[BTH].resv7 == 0
+assert pkt[BTH].dqpn == 0xd2
+assert pkt[BTH].version == 0
+assert not pkt[BTH].solicited
+assert not pkt[BTH].migreq
+assert pkt[BTH].padcount == 0
+assert pkt[BTH].pkey == 0xffff
+assert not pkt[BTH].ackreq
+assert pkt[BTH].psn == 0
+assert pkt[CNPPadding].reserved1 == 0
+assert pkt[CNPPadding].reserved2 == 0
+# assert pkt[BTH].icrc == 0xe42dad81 TODO - does not match example
+
+= RoCE CNP captured on ConnectX-4 Lx
+
+pkt = Ether(import_hexcap('''0x0000:  e41d 2dab 2bc2 7cfe 9064 3b32 0800 45c2
+0x0010:  003c 718c 4000 4011 9161 0a00 1101 0a00
+0x0020:  1201 0000 12b7 0028 0000 8100 ffff 4000
+0x0030:  0118 0000 0000 0000 0000 0000 0000 0000
+0x0040:  0000 0000 0000 82fd 002a
+'''))
+
+assert BTH in pkt.layers()
+assert pkt.opcode == CNP_OPCODE
+del pkt.icrc
+pkt = Ether(pkt.build())
+assert pkt.icrc == 0x82fd002a
+

scapy-2.4.4.tar.gz/test/contrib/rpl.uts Added

@@ -0,0 +1,116 @@
+% RPL layer test campaign
+
++ Syntax check
+= Import the RPL layer
+load_contrib("rpl")
+load_contrib("rpl_metrics")
+
++ Test RPL Control Messages
+= RPL Base Objects construction
+assert(raw(ICMPv6RPL()/RPLDIS()) == b'\x9b\x00\x00\x00\x00\x00')
+assert(raw(ICMPv6RPL()/RPLDIO()) == b'\x9b\x01\x00\x00\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+assert(raw(ICMPv6RPL()/RPLDAO()) == b'\x9b\x02\x00\x00\x32\x00\x00\x01')
+assert(raw(ICMPv6RPL()/RPLDAOACK()) == b'\x9b\x03\x00\x00\x32\x00\x01\x00')
+assert(raw(ICMPv6RPL()/RPLDCO()) == b'\x9b\x07\x00\x00\x32\x00\x00\x01')
+assert(raw(ICMPv6RPL()/RPLDCOACK()) == b'\x9b\x08\x00\x00\x32\x00\x01\x00')
+p=raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDCOACK()/RPLOptPadN(optdata='0'*10))
+assert(p == b'\x60\x00\x00\x00\x00\x14\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x08\x42\x0f\x32\x00\x01\x00\x01\x0a\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDCO()/RPLOptTgt(prefix="fd00::1", plen=128))
+assert(p == b'\x60\x00\x00\x00\x00\x1c\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x07\x32\x6e\x32\x00\x00\x01\x05\x12\x00\x80\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptRIO(plen=64, prefix="fd00::1"))
+assert(p == b'\x60\x00\x00\x00\x00\x34\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\x6b\xe6\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x03\x16\x40\x00\xff\xff\xff\xff\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO(dodagid="aaaa::1")/RPLOptDODAGConfig()/RPLOptDAGMC()/RPLDAGMCLinkETX())
+assert(p == b'\x60\x00\x00\x00\x00\x34\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xef\x1e\x32\x00\x00\x01\x88\xf0\x00\x00\xaa\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x04\x0e\x00\x14\x03\x0a\x00\x00\x01\x00\x00\x01\x00\xff\xff\xff\x02\x06\x07\x00\x00\x02\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO(dodagid="aaaa::1")/RPLOptPIO(plen=64, prefix="fd00::1"))
+assert(p == b'\x60\x00\x00\x00\x00\x3c\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xbc\x2b\x32\x00\x00\x01\x88\xf0\x00\x00\xaa\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x08\x1e\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+
+p = raw(IPv6(src="fe80::1", dst="fe80::2")/ICMPv6RPL()/RPLDAO()/RPLOptTgtDesc())
+assert(p == b'\x60\x00\x00\x00\x00\x0e\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x9b\x02\x2c\xab\x32\x00\x00\x01\x09\x04\x00\x00\x00\x00')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCNSA())
+assert(p == b'\x60\x00\x00\x00\x00\x24\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa9\x06\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x01\x00\x00\x02\x00\x00')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCNodeEnergy())
+assert(p == b'\x60\x00\x00\x00\x00\x24\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa8\x06\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x02\x00\x00\x02\x00\x00')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCHopCount())
+assert(p == b'\x60\x00\x00\x00\x00\x24\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa7\x05\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x03\x00\x00\x02\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCLinkThroughput())
+assert(p == b'\x60\x00\x00\x00\x00\x26\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa5\xff\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x08\x04\x00\x00\x04\x00\x00\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCLinkColor())
+assert(p == b'\x60\x00\x00\x00\x00\x25\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\x61\x03\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x07\x08\x00\x00\x03\x00\x00\x41')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCLinkLatency())
+assert(p == b'\x60\x00\x00\x00\x00\x26\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa4\xff\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x08\x05\x00\x00\x04\x00\x00\x00\x01')
+
+p = raw(IPv6(src="fe80::1")/ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCLinkQualityLevel())
+assert(p == b'\x60\x00\x00\x00\x00\x24\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa4\x06\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x06\x00\x00\x02\x00\x00')
+
+
+= RPL Base Objects dissection
+# Test DIS dissection
+p = ICMPv6RPL(b'\x9b\x00\x00\x00\x00\x00')
+assert(p.code == 0)
+
+# Test DIO dissection
+p = ICMPv6RPL(b'\x9b\x01\x00\x00\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+assert(p.code == 1)
+assert(p.RPLInstanceID == 50)
+assert(p.ver == 0)
+assert(p.rank == 1)
+assert(p.G == 1)
+assert(p.mop == 1)
+assert(p.dtsn == 240)
+assert(p.dodagid == "::1")
+
+# Test DAO dissection
+p = ICMPv6RPL(b'\x9b\x02\x00\x00\x32\x00\x00\x01')
+assert(p.code == 2)
+
++ Test RPL Control Message Options
+= RPL Control Options construction
+# DIS
+assert(raw(ICMPv6RPL()/RPLDIS()/RPLOptPad1()) == b'\x9b\x00\x00\x00\x00\x00\x00')
+
+# DIS with solicited info option
+assert(raw(ICMPv6RPL()/RPLDIS()/RPLOptSolInfo()) == \
+        b'\x9b\x00\x00\x00\x00\x00\x07\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00')
+
+# DIO with DAG MC option with link ETX metric
+assert(raw(ICMPv6RPL()/RPLDIO()/RPLOptDAGMC()/RPLDAGMCLinkETX()) == \
+        b'\x9b\x01\x00\x00\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x07\x00\x00\x02\x00\x01')
+
+# Normal DAO message with single target, since transit
+assert(raw(IPv6(src="fe80::1", dst="fe80::2")/\
+        ICMPv6RPL()/RPLDAO()/\
+        RPLOptTgt(plen=128,prefix="fd00::1")/\
+        RPLOptTIO()) == \
+        b'\x60\x00\x00\x00\x00\x22\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x9b\x02\x2c\x04\x32\x00\x00\x01\x05\x12\x00\x80\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x06\x04\x00\x00\x00\xff')
+
+assert(raw(ICMPv6RPL()/RPLDAO(D=1, dodagid="fd00::1")/RPLOptDAGMC()) == \
+    b'\x9b\x02\x00\x00\x32\x40\x00\x01\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x00')
+
+p=IPv6(b'\x60\x00\x00\x00\x00\x1c\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x0f\x86\xcc\x88\xaf\xfa\xbe\x25\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x07\xe8\x3f\x32\x00\x00\x01\x05\x12\x00\x80\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+assert(p.payload.code == 7) # Its a DCO
+
+p=IPv6(b'\x60\x00\x00\x00\x00\x2c\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x9b\x02\x35\xbb\x32\x40\x00\x01\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x05\x12\x00\x80\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
+p.show()
+assert(p.payload.code == 2) # Its a DAO
+
+p=IPv6(b'\x60\x00\x00\x00\x00\x24\x3a\x40\xfe\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1a\x9b\x01\xa3\x05\x32\x00\x00\x01\x88\xf0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x06\x07\x00\x00\x02\x00\x01')
+#p.show()
+rpl=p.payload
+assert(rpl.code == 1)
+dio=rpl.payload
+assert(dio.RPLInstanceID == 50)
+assert(dio.dtsn == 240)
+dagmc=dio.payload
+assert(dagmc.len == 6)
+mc=dagmc.options[0]
+assert(mc.ETX == 1)

scapy-2.4.3.tar.gz/test/contrib/rtr.uts -> scapy-2.4.4.tar.gz/test/contrib/rtr.uts Changed

scapy-2.4.3.tar.gz/test/contrib/tacacs.uts -> scapy-2.4.4.tar.gz/test/contrib/tacacs.uts Changed

scapy-2.4.4.tar.gz/test/contrib/vtp.uts Added

scapy-2.4.3.tar.gz/test/dot15d4.uts -> scapy-2.4.4.tar.gz/test/dot15d4.uts Changed

@@ -9,7 +9,7 @@
 = Dot15D4 layers
 
 # a crazy packet with all classes in it!
-pkt = Dot15d4()/Dot15d4Ack()/Dot15d4AuxSecurityHeader()/Dot15d4Beacon()/Dot15d4Cmd()/Dot15d4CmdAssocReq()/Dot15d4CmdAssocResp()/Dot15d4CmdCoordRealign()/Dot15d4CmdDisassociation()/Dot15d4CmdGTSReq()/Dot15d4Data()/Dot15d4FCS()
+pkt = Dot15d4()/Dot15d4Ack()/Dot15d4AuxSecurityHeader()/Dot15d4Beacon()/Dot15d4Cmd()/Dot15d4CmdAssocReq()/Dot15d4CmdAssocResp()/Dot15d4CmdCoordRealign()/Dot15d4CmdCoordRealignPage()/Dot15d4CmdDisassociation()/Dot15d4CmdGTSReq()/Dot15d4Data()/Dot15d4FCS()
 assert Dot15d4 in pkt.layers()
 assert Dot15d4Ack in pkt.layers()
 assert Dot15d4AuxSecurityHeader in pkt.layers()
@@ -18,6 +18,7 @@
 assert Dot15d4CmdAssocReq in pkt.layers()
 assert Dot15d4CmdAssocResp in pkt.layers()
 assert Dot15d4CmdCoordRealign in pkt.layers()
+assert Dot15d4CmdCoordRealignPage in pkt.layers()
 assert Dot15d4CmdDisassociation in pkt.layers()
 assert Dot15d4CmdGTSReq in pkt.layers()
 assert Dot15d4Data in pkt.layers()
@@ -28,6 +29,126 @@
 pkt = Ether()/IP()/Dot15d4FCS()
 assert pkt[Dot15d4]
 
+= Dot15d4FCS - Beacon (without pending addresses)
+
+pkt = Dot15d4FCS(b'\x00\x80\x89\xaa\x99\x00\x00\xff\xcf\x00\x00\x00"\x84\xfe\xca\xef\xbe\xed\xfe\xce\xfa\xff\xff\xff\x00X\xa4')
+assert Dot15d4FCS in pkt.layers()
+assert pkt[Dot15d4FCS].fcf_frametype == 0
+assert pkt[Dot15d4FCS].fcf_security == False
+assert pkt[Dot15d4FCS].fcf_pending == False
+assert pkt[Dot15d4FCS].fcf_ackreq == False
+assert pkt[Dot15d4FCS].fcf_panidcompress == False
+assert pkt[Dot15d4FCS].fcf_destaddrmode == 0
+assert pkt[Dot15d4FCS].fcf_framever == 0
+assert pkt[Dot15d4FCS].fcf_srcaddrmode == 2
+assert pkt[Dot15d4FCS].seqnum == 137
+assert Dot15d4Beacon in pkt.layers()
+assert pkt[Dot15d4Beacon].src_panid == 0x99aa
+assert pkt[Dot15d4Beacon].src_addr == 0x0000
+assert pkt[Dot15d4Beacon].sf_beaconorder == 15
+assert pkt[Dot15d4Beacon].sf_sforder == 15
+assert pkt[Dot15d4Beacon].sf_finalcapslot == 15
+assert pkt[Dot15d4Beacon].sf_battlifeextend == False
+assert pkt[Dot15d4Beacon].sf_pancoord == True
+assert pkt[Dot15d4Beacon].sf_assocpermit == True
+assert pkt[Dot15d4Beacon].gts_spec_permit == False
+assert pkt[Dot15d4Beacon].gts_spec_reserved == 0
+assert pkt[Dot15d4Beacon].gts_spec_desccount == 0
+assert pkt[Dot15d4Beacon].pa_num_short == 0
+assert pkt[Dot15d4Beacon].pa_num_long == 0
+assert pkt[Dot15d4Beacon].pa_short_addresses == []
+assert pkt[Dot15d4Beacon].pa_long_addresses == []
+assert raw(pkt[Dot15d4Beacon].payload) == b'\x00"\x84\xfe\xca\xef\xbe\xed\xfe\xce\xfa\xff\xff\xff\x00'
+assert pkt[Dot15d4FCS].fcs == 0xa458
+
+= Dot15d4FCS - Beacon (with pending addresses)
+
+pkt = Dot15d4FCS(b'\x00\x80\x89\xaa\x99\x00\x00\xff\xcf\x00\x124\x12xV\x88wfUD3"\x11\x00"\x84\xfe\xca\xef\xbe\xed\xfe\xce\xfa\xff\xff\xff\x00\x96\xd3')
+assert Dot15d4FCS in pkt.layers()
+assert pkt[Dot15d4FCS].fcf_frametype == 0
+assert pkt[Dot15d4FCS].fcf_security == False
+assert pkt[Dot15d4FCS].fcf_pending == False
+assert pkt[Dot15d4FCS].fcf_ackreq == False
+assert pkt[Dot15d4FCS].fcf_panidcompress == False
+assert pkt[Dot15d4FCS].fcf_destaddrmode == 0
+assert pkt[Dot15d4FCS].fcf_framever == 0
+assert pkt[Dot15d4FCS].fcf_srcaddrmode == 2
+assert pkt[Dot15d4FCS].seqnum == 137
+assert Dot15d4Beacon in pkt.layers()
+assert pkt[Dot15d4Beacon].src_panid == 0x99aa
+assert pkt[Dot15d4Beacon].src_addr == 0x0000
+assert pkt[Dot15d4Beacon].sf_beaconorder == 15
+assert pkt[Dot15d4Beacon].sf_sforder == 15
+assert pkt[Dot15d4Beacon].sf_finalcapslot == 15
+assert pkt[Dot15d4Beacon].sf_battlifeextend == False
+assert pkt[Dot15d4Beacon].sf_pancoord == True
+assert pkt[Dot15d4Beacon].sf_assocpermit == True
+assert pkt[Dot15d4Beacon].gts_spec_permit == False
+assert pkt[Dot15d4Beacon].gts_spec_reserved == 0
+assert pkt[Dot15d4Beacon].gts_spec_desccount == 0
+assert pkt[Dot15d4Beacon].pa_num_short == 2
+assert pkt[Dot15d4Beacon].pa_num_long == 1
+assert pkt[Dot15d4Beacon].pa_short_addresses == [0x1234, 0x5678]
+assert pkt[Dot15d4Beacon].pa_long_addresses == [0x1122334455667788]
+assert raw(pkt[Dot15d4Beacon].payload) == b'\x00"\x84\xfe\xca\xef\xbe\xed\xfe\xce\xfa\xff\xff\xff\x00'
+assert pkt[Dot15d4FCS].fcs == 0xd396
+
+= Dot15d4FCS - Coordinator Realignment (without the channel page)
+
+pkt = Dot15d4FCS(b'#\xcc\x89\xff\xff\x88wfUD3"\x11\xaa\x99\xff\xee\xdd\xcc\xbb\xaa\x99\x88\x08\xaa\x99\xde\xc0\x14\xad\xde\\!')
+assert Dot15d4FCS in pkt.layers()
+assert pkt[Dot15d4FCS].fcf_frametype == 3
+assert pkt[Dot15d4FCS].fcf_security == False
+assert pkt[Dot15d4FCS].fcf_pending == False
+assert pkt[Dot15d4FCS].fcf_ackreq == True
+assert pkt[Dot15d4FCS].fcf_panidcompress == False
+assert pkt[Dot15d4FCS].fcf_destaddrmode == 3
+assert pkt[Dot15d4FCS].fcf_framever == 0
+assert pkt[Dot15d4FCS].fcf_srcaddrmode == 3
+assert pkt[Dot15d4FCS].seqnum == 137
+assert Dot15d4Cmd in pkt.layers()
+assert pkt[Dot15d4Cmd].dest_panid == 0xffff
+assert pkt[Dot15d4Cmd].dest_addr == 0x1122334455667788
+assert pkt[Dot15d4Cmd].src_panid == 0x99aa
+assert pkt[Dot15d4Cmd].src_addr == 0x8899aabbccddeeff
+assert pkt[Dot15d4Cmd].cmd_id == 0x08
+assert Dot15d4CmdCoordRealign in pkt.layers()
+assert pkt[Dot15d4CmdCoordRealign].panid == 0x99aa
+assert pkt[Dot15d4CmdCoordRealign].coord_address == 0xc0de
+assert pkt[Dot15d4CmdCoordRealign].channel == 20
+assert pkt[Dot15d4CmdCoordRealign].dev_address == 0xdead
+assert raw(pkt[Dot15d4CmdCoordRealign].payload) == b''
+assert pkt[Dot15d4FCS].fcs == 0x215c
+
+= Dot15d4FCS - Coordinator Realignment (with the channel page)
+
+pkt = Dot15d4FCS(b'#\xcc\x89\xff\xff\x88wfUD3"\x11\xaa\x99\xff\xee\xdd\xcc\xbb\xaa\x99\x88\x08\xaa\x99\xde\xc0\x14\xad\xde\x00\xc8\x98')
+assert Dot15d4FCS in pkt.layers()
+assert pkt[Dot15d4FCS].fcf_frametype == 3
+assert pkt[Dot15d4FCS].fcf_security == False
+assert pkt[Dot15d4FCS].fcf_pending == False
+assert pkt[Dot15d4FCS].fcf_ackreq == True
+assert pkt[Dot15d4FCS].fcf_panidcompress == False
+assert pkt[Dot15d4FCS].fcf_destaddrmode == 3
+assert pkt[Dot15d4FCS].fcf_framever == 0
+assert pkt[Dot15d4FCS].fcf_srcaddrmode == 3
+assert pkt[Dot15d4FCS].seqnum == 137
+assert Dot15d4Cmd in pkt.layers()
+assert pkt[Dot15d4Cmd].dest_panid == 0xffff
+assert pkt[Dot15d4Cmd].dest_addr == 0x1122334455667788
+assert pkt[Dot15d4Cmd].src_panid == 0x99aa
+assert pkt[Dot15d4Cmd].src_addr == 0x8899aabbccddeeff
+assert pkt[Dot15d4Cmd].cmd_id == 0x08
+assert Dot15d4CmdCoordRealign in pkt.layers()
+assert pkt[Dot15d4CmdCoordRealign].panid == 0x99aa
+assert pkt[Dot15d4CmdCoordRealign].coord_address == 0xc0de
+assert pkt[Dot15d4CmdCoordRealign].channel == 20
+assert pkt[Dot15d4CmdCoordRealign].dev_address == 0xdead
+assert Dot15d4CmdCoordRealignPage in pkt.layers()
+assert pkt[Dot15d4CmdCoordRealignPage].channel_page == 0
+assert raw(pkt[Dot15d4CmdCoordRealignPage].payload) == b''
+assert pkt[Dot15d4FCS].fcs == 0x98c8
+
 ###################
 #### SixLoWPAN ####
 ###################
@@ -261,6 +382,15 @@
 assert packet.sourceAddr == "aaaa::1"
 assert packet.destinyAddr == "ff02::1a"
 
+= SixLoWPAN over Ethernet
+# See https://github.com/secdev/scapy/issues/2716
+packet = Ether(b'\xff\xff\xff\xff\xff\xffPQRg\x15i\xa0\xed~;\x02\xf0\x1f\x90\x1f\x90\x03Qtesttext2')
+assert LoWPAN_IPHC in packet
+assert packet[LoWPAN_IPHC].src == "fe80::5051:52ff:fe67:1569"
+assert packet[LoWPAN_IPHC].dst == "ff02::2"
+assert packet[UDP].dport == packet[UDP].sport == 8080
+
+
 + Dot15d4 with SixLoWPAN - Advanced dissection
 
 = Compressed SixLoWPAN - real packets with ZEP2
@@ -348,12 +478,13 @@
 = Zigbee - layers
 
 # a crazy packet with all classes in it!
-pkt = ZigBeeBeacon()/ZigbeeAppCommandPayload()/ZigbeeAppDataPayload()/ZigbeeAppDataPayloadStub()/ZigbeeClusterLibrary()/ZigbeeNWK()/ZigbeeNWKCommandPayload()/ZigbeeNWKStub()/ZigbeeSecurityHeader()
+pkt = ZigBeeBeacon()/ZigbeeAppCommandPayload()/ZigbeeAppDataPayload()/ZigbeeAppDataPayloadStub()/ZigbeeClusterLibrary()/ZigbeeDeviceProfile()/ZigbeeNWK()/ZigbeeNWKCommandPayload()/ZigbeeNWKStub()/ZigbeeSecurityHeader()
 assert ZigBeeBeacon in pkt.layers()
 assert ZigbeeAppCommandPayload in pkt.layers()
 assert ZigbeeAppDataPayload in pkt.layers()
 assert ZigbeeAppDataPayloadStub in pkt.layers()
 assert ZigbeeClusterLibrary in pkt.layers()
+assert ZigbeeDeviceProfile in pkt.layers()
 assert ZigbeeNWK in pkt.layers()
 assert ZigbeeNWKCommandPayload in pkt.layers()
 assert ZigbeeNWKStub in pkt.layers()
@@ -449,3 +580,148 @@
 assert pkt1[ZigbeeAppCommandPayload].src_addr == 18446744073709551615
 f,v = pkt1[ZigbeeAppCommandPayload].getfield_and_val("src_addr")
 assert f.i2repr(None, v) == "ff:ff:ff:ff:ff:ff:ff:ff"
+
+= Zigbee - Link Status
+
+pkt = ZigbeeNWKCommandPayload(b'\x08c\x00\x00\x11\xad\xde\x11\xde\xc0\x11')
+assert ZigbeeNWKCommandPayload in pkt.layers()
+assert pkt[ZigbeeNWKCommandPayload].cmd_identifier == 0x08
+assert pkt[ZigbeeNWKCommandPayload].entry_count == 3
+assert pkt[ZigbeeNWKCommandPayload].first_frame == 1
+assert pkt[ZigbeeNWKCommandPayload].last_frame == 1
+assert len(pkt[ZigbeeNWKCommandPayload].link_status_list) == 3
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[0].neighbor_network_address == 0x0000
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[0].incoming_cost == 1
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[0].outgoing_cost == 1
+assert raw(pkt[ZigbeeNWKCommandPayload].link_status_list[0].payload) == b''
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[1].neighbor_network_address == 0xdead
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[1].incoming_cost == 1
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[1].outgoing_cost == 1
+assert raw(pkt[ZigbeeNWKCommandPayload].link_status_list[1].payload) == b''
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[2].neighbor_network_address == 0xc0de
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[2].incoming_cost == 1
+assert pkt[ZigbeeNWKCommandPayload].link_status_list[2].outgoing_cost == 1
+assert raw(pkt[ZigbeeNWKCommandPayload].link_status_list[2].payload) == b''
+assert raw(pkt[ZigbeeNWKCommandPayload].payload) == b''
+
+= Zigbee - End Device Timeout Request
+
+pkt = ZigbeeNWKCommandPayload(b'\x0b\x03\x00')
+assert ZigbeeNWKCommandPayload in pkt.layers()
+assert pkt[ZigbeeNWKCommandPayload].cmd_identifier == 0x0b
+assert pkt[ZigbeeNWKCommandPayload].req_timeout == 3
+assert pkt[ZigbeeNWKCommandPayload].ed_conf == 0
+assert raw(pkt[ZigbeeNWKCommandPayload].payload) == b''
+
+= Zigbee - End Device Timeout Response
+
+pkt = ZigbeeNWKCommandPayload(b'\x0c\x00\x03')
+assert ZigbeeNWKCommandPayload in pkt.layers()
+assert pkt[ZigbeeNWKCommandPayload].cmd_identifier == 0x0c
+assert pkt[ZigbeeNWKCommandPayload].status == 0
+assert pkt[ZigbeeNWKCommandPayload].mac_data_poll_keepalive == 1
+assert pkt[ZigbeeNWKCommandPayload].ed_timeout_req_keepalive == 1
+assert raw(pkt[ZigbeeNWKCommandPayload].payload) == b''
+
+= Zigbee - Transport Key
+
+pkt = ZigbeeAppCommandPayload(b'\x05\x01\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x00\x88wfUD3"\x11\xff\xee\xdd\xcc\xbb\xaa\x99\x88')
+assert ZigbeeAppCommandPayload in pkt.layers()
+assert pkt[ZigbeeAppCommandPayload].cmd_identifier == 0x05
+assert pkt[ZigbeeAppCommandPayload].key_type == 1
+assert pkt[ZigbeeAppCommandPayload].key == b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
+assert pkt[ZigbeeAppCommandPayload].key_seqnum == 0
+assert pkt[ZigbeeAppCommandPayload].dest_addr == 0x1122334455667788
+assert pkt[ZigbeeAppCommandPayload].src_addr == 0x8899aabbccddeeff
+assert raw(pkt[ZigbeeAppCommandPayload].payload) == b''
+
+= Zigbee - Request Key
+
+pkt = ZigbeeAppCommandPayload(b'\x08\x04')
+assert ZigbeeAppCommandPayload in pkt.layers()
+assert pkt[ZigbeeAppCommandPayload].cmd_identifier == 0x08
+assert pkt[ZigbeeAppCommandPayload].key_type == 0x04
+assert raw(pkt[ZigbeeAppCommandPayload].payload) == b''
+
+= Zigbee - Tunnel
+
+pkt = ZigbeeAppCommandPayload(b'\x0e\x88wfUD3"\x11!\xe20\x0bP\x00\x00\xff\xee\xdd\xcc\xbb\xaa\x99\x88\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc')
+assert ZigbeeAppCommandPayload in pkt.layers()
+assert pkt[ZigbeeAppCommandPayload].cmd_identifier == 0x0e
+assert pkt[ZigbeeAppCommandPayload].dest_addr == 0x1122334455667788
+assert pkt[ZigbeeAppCommandPayload].aps_frametype == 1
+assert pkt[ZigbeeAppCommandPayload].delivery_mode == 0
+assert pkt[ZigbeeAppCommandPayload].frame_control == 0b0010
+assert ZigbeeSecurityHeader in pkt.layers()
+assert raw(pkt[ZigbeeSecurityHeader]) == b'0\x0bP\x00\x00\xff\xee\xdd\xcc\xbb\xaa\x99\x88\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xcc\xcc\xcc\xcc'
+
+= Zigbee - Verify Key
+
+pkt = ZigbeeAppCommandPayload(b'\x0f\x04\x88wfUD3"\x11\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f')
+assert ZigbeeAppCommandPayload in pkt.layers()
+assert pkt[ZigbeeAppCommandPayload].cmd_identifier == 0x0f
+assert pkt[ZigbeeAppCommandPayload].key_type == 0x04
+assert pkt[ZigbeeAppCommandPayload].address == 0x1122334455667788
+assert pkt[ZigbeeAppCommandPayload].key_hash == b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
+assert raw(pkt[ZigbeeAppCommandPayload].payload) == b''
+
+= Zigbee - Confirm Key
+
+pkt = ZigbeeAppCommandPayload(b'\x10\x00\x04\x88wfUD3"\x11')
+assert ZigbeeAppCommandPayload in pkt.layers()
+assert pkt[ZigbeeAppCommandPayload].cmd_identifier == 0x10
+assert pkt[ZigbeeAppCommandPayload].status == 0
+assert pkt[ZigbeeAppCommandPayload].key_type == 0x04
+assert pkt[ZigbeeAppCommandPayload].address == 0x1122334455667788
+assert raw(pkt[ZigbeeAppCommandPayload].payload) == b''
+
+= Zigbee - APS acknowledgment (with the Acknowledgment Format enabled)
+pkt = ZigbeeAppDataPayload(b'\x12\xa8')
+assert ZigbeeAppDataPayload in pkt.layers()
+assert pkt[ZigbeeAppDataPayload].aps_frametype == 2
+assert pkt[ZigbeeAppDataPayload].delivery_mode == 0
+assert pkt[ZigbeeAppDataPayload].frame_control == 0b0001
+assert pkt[ZigbeeAppDataPayload].counter == 168
+assert raw(pkt[ZigbeeAppDataPayload].payload) == b''
+
+= Zigbee - APS acknowledgment (with the Acknowledgment Format disabled)
+pkt = ZigbeeAppDataPayload(b'\x02\x00\x02\x00\x00\x00\x00\xa6')
+assert ZigbeeAppDataPayload in pkt.layers()
+pkt.show()
+assert pkt[ZigbeeAppDataPayload].aps_frametype == 2
+assert pkt[ZigbeeAppDataPayload].delivery_mode == 0
+assert pkt[ZigbeeAppDataPayload].frame_control == 0b0000
+assert pkt[ZigbeeAppDataPayload].dst_endpoint == 0
+assert pkt[ZigbeeAppDataPayload].cluster == 0x0002
+assert pkt[ZigbeeAppDataPayload].profile == 0x0000
+assert pkt[ZigbeeAppDataPayload].src_endpoint == 0
+assert pkt[ZigbeeAppDataPayload].counter == 166
+assert raw(pkt[ZigbeeAppDataPayload].payload) == b''
+
+= Zigbee - ZDP command
+pkt = ZigbeeAppDataPayload(b'\x08\x006\x00\x00\x00\x00\xb5\x01\x14\x01')
+assert ZigbeeAppDataPayload in pkt.layers()
+assert pkt[ZigbeeAppDataPayload].aps_frametype == 0
+assert pkt[ZigbeeAppDataPayload].delivery_mode == 2
+assert pkt[ZigbeeAppDataPayload].frame_control == 0b0000
+assert pkt[ZigbeeAppDataPayload].dst_endpoint == 0
+assert pkt[ZigbeeAppDataPayload].cluster == 0x0036
+assert pkt[ZigbeeAppDataPayload].profile == 0x0000
+assert pkt[ZigbeeAppDataPayload].src_endpoint == 0
+assert pkt[ZigbeeAppDataPayload].counter == 181
+assert ZigbeeDeviceProfile in pkt.layers()
+assert raw(pkt[ZigbeeDeviceProfile]) == b'\x01\x14\x01'
+
+= Zigbee - ZCL command
+pkt = ZigbeeAppDataPayload(b'@\x01\n\x00\x04\x01\x01\x9d\x00\x00\x00\x00\x00')
+assert ZigbeeAppDataPayload in pkt.layers()
+assert pkt[ZigbeeAppDataPayload].aps_frametype == 0
+assert pkt[ZigbeeAppDataPayload].delivery_mode == 0
+assert pkt[ZigbeeAppDataPayload].frame_control == 0b0100
+assert pkt[ZigbeeAppDataPayload].dst_endpoint == 1
+assert pkt[ZigbeeAppDataPayload].cluster == 0x000a
+assert pkt[ZigbeeAppDataPayload].profile == 0x0104
+assert pkt[ZigbeeAppDataPayload].src_endpoint == 1
+assert pkt[ZigbeeAppDataPayload].counter == 157
+assert ZigbeeClusterLibrary in pkt.layers()
+assert raw(pkt[ZigbeeClusterLibrary]) == b'\x00\x00\x00\x00\x00'

scapy-2.4.3.tar.gz/test/fields.uts -> scapy-2.4.4.tar.gz/test/fields.uts Changed

@@ -22,7 +22,11 @@
 
 = Simple tests
 
+assert LongField("test", None).addfield(None, b"", 0x44434241) == b'\x00\x00\x00\x00DCBA'
+assert SignedLongField("test", None).addfield(None, b"", -2) == b'\xff\xff\xff\xff\xff\xff\xff\xfe'
+
 assert LELongField("test", None).addfield(None, b"", 0x44434241) == b'ABCD\x00\x00\x00\x00'
+assert LESignedLongField("test", None).addfield(None, b"", -2) == b'\xfe\xff\xff\xff\xff\xff\xff\xff'
 
 = MACField class
 ~ core field
@@ -37,10 +41,12 @@
 r
 assert(r == b"FOO\xc0\x01\xbe\xef\xba\xbe" )
 
-= SourceMACField, SourceMACField
+= SourceMACField
 conf.route.add(net="1.2.3.4/32", dev=conf.iface)
 p = Ether() / ARP(pdst="1.2.3.4")
 assert p.src == p.hwsrc == p[ARP].hwsrc == get_if_hwaddr(conf.iface)
+p = Dot3() / LLC() / SNAP() / ARP(pdst="1.2.3.4")
+assert p.src == p.hwsrc == p[ARP].hwsrc == get_if_hwaddr(conf.iface)
 conf.route.delt(net="1.2.3.4/32")
 
 = IPField class
@@ -98,6 +104,74 @@
 assert(raw(p) == b'\x12\x34\x56\x01\xe2\x40\xca\xdb\xfe\x52\xaa\x08')
 print(p.sprintf('%test1% %test2% %test3% %test4%'))
 assert(p.sprintf('%test1% %test2% %test3% %test4%') == '0x123456 123456 0xfedbca 567890')
+assert(repr(p.test1) == '1193046')
+
+
+= NBytesField
+~ field nbytesfield
+
+class TestNBytesField(Packet):
+    fields_desc = [
+        NBytesField('test1', None, 7),
+        XNBytesField('test2', None, 5),
+        XNBytesField('test3', None, 11),
+        NBytesField('test4', None, 11),
+    ]
+
+p = TestNBytesField(test1=0x00112233445566, test2=824650445619, test3=0xffeeddccbbaa9988776655, test4=0xffeeddccbbaa9988776655)
+print(raw(p))
+assert(raw(p) == b'\x00\x11\x22\x33\x44\x55\x66\xc0\x00\xff\x33\x33\xff\xee\xdd\xcc\xbb\xaa\x99\x88\x77\x66\x55\xff\xee\xdd\xcc\xbb\xaa\x99\x88\x77\x66\x55')
+print(p.sprintf('%test1% %test2% %test3% %test4%'))
+assert(p.sprintf('%test1% %test2% %test3% %test4%') == '18838586676582 0xc000ff3333 0xffeeddccbbaa9988776655 309404098707666285700277845')
+assert(p.test1 == 0x112233445566)
+assert(p.test2 == 0xc000ff3333)
+assert(p.test3 == 0xffeeddccbbaa9988776655)
+assert(p.test4 == 309404098707666285700277845)
+
+
+= StrField
+~ field strfield
+~ field strlenfield
+
+class TestStrField(Packet):
+    fields_desc = [
+        LEFieldLenField('slen', None, length_of="s1"),
+        StrLenField('s1', None, length_from=lambda pkt: pkt.slen),
+        StrField('s2', None),
+    ]
+
+p = TestStrField(s1="cafe", s2="deadbeef")
+assert(raw(p) == b'\x04\x00cafedeadbeef')
+print(p.sprintf("%s1% %s2%"))
+assert(p.sprintf("%s1% %s2%") == "'cafe' 'deadbeef'")
+
+
+= StrFieldUtf16
+~ field strfieldutf16
+~ field strlenfieldutf16
+
+class TestStrLenFieldUtf16(Packet):
+    fields_desc = [
+        LEFieldLenField('slen', None, length_of="s1"),
+        StrLenFieldUtf16('s1', None, length_from=lambda pkt: pkt.slen),
+    ]
+
+p = TestStrLenFieldUtf16(s1='cafe')
+assert(raw(p) == b'\x08\x00c\x00a\x00f\x00e\x00')
+assert(p.sprintf("%s1%") == 'cafe')
+
+= StrFieldUtf16
+~ field strfieldutf16
+~ field strlenfieldutf16
+
+class TestStrFieldUtf16(Packet):
+    fields_desc = [
+        StrFieldUtf16('s1', None),
+    ]
+
+p = TestStrFieldUtf16(s1='cafe')
+assert(raw(p) == b'c\x00a\x00f\x00e\x00')
+assert(p.sprintf("%s1%") == 'cafe')
 
 ############
 ############
@@ -1413,6 +1487,35 @@
 assert "f4" in flags
 assert "f0" in flags
 
+= FlagsField with str
+
+class TCPTest(Packet):
+    fields_desc = [
+        BitField("reserved", 0, 7),
+        FlagsField("flags", 0x2, 9, "FSRPAUECN")
+    ]
+
+a = TCPTest(flags=3)
+assert a.flags.F
+assert a.flags.S
+assert a.sprintf("%flags%") == "FS"
+
+= FlagsField with dict
+
+class FlagsTest2(Packet):
+    fields_desc = [
+        FlagsField("flags", 0x2, 16, {
+            0: "A",  # 0 bit
+            7: "B"   # 7 bit
+        })
+    ]
+
+a = FlagsTest2(flags=255)
+a.sprintf("%flags%")
+assert a.flags.A
+assert a.flags.B
+assert a.sprintf("%flags%") == "A+bit_1+bit_2+bit_3+bit_4+bit_5+bit_6+B"
+
 
 ########
 ########
@@ -1827,18 +1930,22 @@
         "B": ("b", "1.0"),
     }
 
-pkt = TestPacket(a=2, B=3)
-assert pkt.B == 3
-assert pkt.b == 3
-assert pkt.a == 2
-
-import warnings
-
-with warnings.catch_warnings(record=True) as w:
-    warnings.simplefilter("always")
-    assert pkt.dpr == 2
-    assert len(w) == 1
-    assert issubclass(w[-1].category, DeprecationWarning)
+try:
+    pkt = TestPacket(a=2, B=3)
+    assert pkt.B == 3
+    assert pkt.b == 3
+    assert pkt.a == 2
+    
+    import warnings
+    
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        assert pkt.dpr == 2
+        assert len(w) == 1
+        assert issubclass(w[-1].category, DeprecationWarning)
+except DeprecationWarning:
+    # -Werror is used
+    pass
 
 
 ############

scapy-2.4.3.tar.gz/test/ipsec.uts -> scapy-2.4.4.tar.gz/test/ipsec.uts Changed

@@ -2476,6 +2476,76 @@
 except IPSecIntegrityError as err:
     err
 
+#######################################
+= IPv4 / AH - Transport - AES-CMAC-96 -- ESN
+
+p = IP(src='1.1.1.1', dst='2.2.2.2')
+p /= TCP(sport=45012, dport=80)
+p /= Raw('testdata')
+p = IP(raw(p))
+p
+
+sa = SecurityAssociation(AH, spi=0x222,
+                         auth_algo='AES-CMAC-96', auth_key=b'sixteenbytes key',
+                         esn_en=True, esn=0x200)
+
+e = sa.encrypt(p)
+e
+
+assert(isinstance(e, IP))
+assert(e.src == '1.1.1.1' and e.dst == '2.2.2.2')
+assert(e.chksum != p.chksum)
+* the encrypted packet should have an AH layer
+assert(e.proto == socket.IPPROTO_AH)
+assert(e.haslayer(AH))
+assert(e.haslayer(TCP))
+assert(e[AH].spi == sa.spi)
+
+* alter mutable fields in the packet
+e.ttl = 2
+
+* integrity verification should pass
+d = sa.decrypt(e)
+d
+
+* after decryption the original packet should be unaltered
+assert(d[TCP] == p[TCP])
+
+#######################################
+= IPv4 / AH - Transport - AES-CMAC-96 - altered packet -- ESN
+
+p = IP(src='1.1.1.1', dst='2.2.2.2')
+p /= TCP(sport=45012, dport=80)
+p /= Raw('testdata')
+p = IP(raw(p))
+p
+
+sa = SecurityAssociation(AH, spi=0x222,
+                         auth_algo='AES-CMAC-96', auth_key=b'sixteenbytes key',
+                         esn_en=True, esn=0x200)
+
+e = sa.encrypt(p)
+e
+
+assert(isinstance(e, IP))
+assert(e.src == '1.1.1.1' and e.dst == '2.2.2.2')
+assert(e.chksum != p.chksum)
+* the encrypted packet should have an AH layer
+assert(e.proto == socket.IPPROTO_AH)
+assert(e.haslayer(AH))
+assert(e.haslayer(TCP))
+assert(e[AH].spi == sa.spi)
+
+* simulate the alteration of the packet before verification
+e[TCP].dport = 46
+
+* integrity verification should fail
+try:
+    d = sa.decrypt(e)
+    assert(False)
+except IPSecIntegrityError as err:
+    err
+
 ###############################################################################
 + IPv4 / AH - Tunnel
 
@@ -2868,6 +2938,76 @@
 
 e = sa.encrypt(p)
 e
+
+assert(isinstance(e, IP))
+assert(e.src == '11.11.11.11' and e.dst == '22.22.22.22')
+assert(e.chksum != p.chksum)
+assert(e.proto == socket.IPPROTO_AH)
+assert(e.haslayer(AH))
+assert(e.haslayer(TCP))
+assert(e[AH].spi == sa.spi)
+
+* simulate the alteration of the packet before verification
+e.dst = '4.4.4.4'
+
+* integrity verification should fail
+try:
+    d = sa.decrypt(e)
+    assert(False)
+except IPSecIntegrityError as err:
+    err
+
+#######################################
+= IPv4 / AH - Tunnel - AES-CMAC-96 -- ESN
+
+p = IP(src='1.1.1.1', dst='2.2.2.2')
+p /= TCP(sport=45012, dport=80)
+p /= Raw('testdata')
+p = IP(raw(p))
+p
+
+sa = SecurityAssociation(AH, spi=0x222,
+                         auth_algo='AES-CMAC-96', auth_key=b'sixteenbytes key',
+                         tunnel_header=IP(src='11.11.11.11', dst='22.22.22.22'),
+                         esn_en=True, esn=0x200)
+
+e = sa.encrypt(p)
+e
+
+assert(isinstance(e, IP))
+assert(e.src == '11.11.11.11' and e.dst == '22.22.22.22')
+assert(e.chksum != p.chksum)
+assert(e.proto == socket.IPPROTO_AH)
+assert(e.haslayer(AH))
+assert(e.haslayer(TCP))
+assert(e[AH].spi == sa.spi)
+
+* alter mutable fields in the packet
+e.ttl = 2
+
+* integrity verification should pass
+d = sa.decrypt(e)
+d
+
+* after decryption the original packet should be unaltered
+assert(d == p)
+
+#######################################
+= IPv4 / AH - Tunnel - AES-CMAC-96 - altered packet -- ESN
+
+p = IP(src='1.1.1.1', dst='2.2.2.2')
+p /= TCP(sport=45012, dport=80)
+p /= Raw('testdata')
+p = IP(raw(p))
+p
+
+sa = SecurityAssociation(AH, spi=0x222,
+                         auth_algo='AES-CMAC-96', auth_key=b'sixteenbytes key',
+                         tunnel_header=IP(src='11.11.11.11', dst='22.22.22.22'),
+                         esn_en=True, esn=0x200)
+
+e = sa.encrypt(p)
+e
 
 assert(isinstance(e, IP))
 assert(e.src == '11.11.11.11' and e.dst == '22.22.22.22')

scapy-2.4.3.tar.gz/test/linux.uts -> scapy-2.4.4.tar.gz/test/linux.uts Changed

@@ -36,22 +36,6 @@
 #select.select([socket],[],[],2)
 #_flush_fd(socket.ins)
 
-= Test legacy attach_filter function
-~ tcpdump
-import mock
-from scapy.arch.common import get_bpf_pointer
-
-tcpdump_lines = ['12\n', '40 0 0 12\n', '21 0 5 34525\n', '48 0 0 20\n', '21 6 0 6\n', '21 0 6 44\n', '48 0 0 54\n', '21 3 4 6\n', '21 0 3 2048\n', '48 0 0 23\n', '21 0 1 6\n', '6 0 0 1600\n', '6 0 0 0\n']
-
-@mock.patch("scapy.arch.common.conf", Bunch(use_pypy=True))
-def _test_get_bpf_pointer():
-    pointer = get_bpf_pointer(tcpdump_lines)
-    assert isinstance(pointer, str)
-    assert len(pointer) > 1
-
-if six.PY2:
-    _test_get_bpf_pointer()
-
 = Interface aliases & sub-interfaces
 ~ linux needs_root
 
@@ -60,24 +44,27 @@
 exit_status = os.system("ip addr add 192.0.2.1/24 dev scapy0")
 exit_status = os.system("ip link set scapy0 up")
 exit_status = os.system("ifconfig scapy0:0 inet 198.51.100.1/24 up")
-exit_status = os.system("ip addr show scapy0")
-print(get_if_list())
-conf.route.resync()
-print(conf.route.routes)
-assert(conf.route.route("198.51.100.254") == ("scapy0", "198.51.100.1", "0.0.0.0"))
-route_alias = (3325256704, 4294967040, "0.0.0.0", "scapy0", "198.51.100.1", 0)
-assert(route_alias in conf.route.routes)
-exit_status = os.system("ip link add link scapy0 name scapy0.42 type vlan id 42")
-exit_status = os.system("ip addr add 203.0.113.42/24 dev scapy0.42")
-exit_status = os.system("ip link set scapy0.42 up")
-exit_status = os.system("ip route add 192.0.2.43/32 via 203.0.113.41")
-print(get_if_list())
-conf.route.resync()
-print(conf.route.routes)
-assert(conf.route.route("192.0.2.43") == ("scapy0.42", "203.0.113.42", "203.0.113.41"))
-route_specific = (3221226027, 4294967295, "203.0.113.41", "scapy0.42", "203.0.113.42", 0)
-assert(route_specific in conf.route.routes)
-exit_status = os.system("ip link del name dev scapy0")
+if exit_status == 0:
+    exit_status = os.system("ip addr show scapy0")
+    print(get_if_list())
+    conf.route.resync()
+    print(conf.route.routes)
+    assert(conf.route.route("198.51.100.254") == ("scapy0", "198.51.100.1", "0.0.0.0"))
+    route_alias = (3325256704, 4294967040, "0.0.0.0", "scapy0", "198.51.100.1", 0)
+    assert(route_alias in conf.route.routes)
+    exit_status = os.system("ip link add link scapy0 name scapy0.42 type vlan id 42")
+    exit_status = os.system("ip addr add 203.0.113.42/24 dev scapy0.42")
+    exit_status = os.system("ip link set scapy0.42 up")
+    exit_status = os.system("ip route add 192.0.2.43/32 via 203.0.113.41")
+    print(get_if_list())
+    conf.route.resync()
+    print(conf.route.routes)
+    assert(conf.route.route("192.0.2.43") == ("scapy0.42", "203.0.113.42", "203.0.113.41"))
+    route_specific = (3221226027, 4294967295, "203.0.113.41", "scapy0.42", "203.0.113.42", 0)
+    assert(route_specific in conf.route.routes)
+    exit_status = os.system("ip link del name dev scapy0")
+else:
+    assert True
 
 = catch loopback device missing
 ~ linux needs_root
@@ -86,9 +73,17 @@
 
 # can't remove the lo device (or its address without causing trouble) - use some pseudo dummy instead
 
-with patch('scapy.consts.LOOPBACK_NAME', 'scapy_lo_x'):
+with patch('scapy.arch.linux.conf.loopback_name', 'scapy_lo_x'):
     routes = read_routes()
 
+= catch get_working_if only loopback
+~ linux
+
+from mock import patch
+
+with patch('scapy.arch.linux.get_if_list', side_effect=lambda: [conf.loopback_name]):
+    assert get_working_if() == conf.loopback_name
+
 = catch loopback device no address assigned
 ~ linux needs_root
 
@@ -100,13 +95,13 @@
 exit_status = os.system("ip link set dev scapy_lo up")
 assert(exit_status == 0)
 
-with patch('scapy.consts.LOOPBACK_NAME', 'scapy_lo'):
+with patch('scapy.arch.linux.conf.loopback_name', 'scapy_lo'):
     routes = read_routes()
 
 exit_status = os.system("ip addr add dev scapy_lo 10.10.0.1/24")
 assert(exit_status == 0)
 
-with patch('scapy.consts.LOOPBACK_NAME', 'scapy_lo'):
+with patch('scapy.arch.linux.conf.loopback_name', 'scapy_lo'):
     routes = read_routes()
 
 got_lo_device = False
@@ -129,8 +124,8 @@
 = IPv6 link-local address selection
 
 from mock import patch
-bck_conf_route6_routes = conf.route6.routes
 conf.route6.routes =  [('fe80::', 64, '::', 'scapy0', ['fe80::e039:91ff:fe79:1910'], 256)]
+conf.route6.ipv6_ifaces = set(['scapy0'])
 bck_conf_iface = conf.iface
 conf.iface = "scapy0"
 with patch("scapy.layers.l2.get_if_hwaddr") as mgih:
@@ -144,8 +139,8 @@
     print(p[Ether].src, mac_address)
     assert p[Ether].src == mac_address
 
-conf.route6.routes = bck_conf_route6_routes
 conf.iface = bck_conf_iface
+conf.route6.resync()
 
 = IPv6
 ~ linux
@@ -155,7 +150,7 @@
     assert True
 else:
     assert all([in6_isvalid(addr[0]) for addr in in6_getifaddr()])
-    assert set([addr[2] for addr in in6_getifaddr()]) == set(get_if_list())
+    assert set([addr[2] for addr in in6_getifaddr()]) == conf.route6.ipv6_ifaces
 
 
 = veth interface error handling
@@ -309,15 +304,6 @@
         return True
     assert test_L3PacketSocket_sendto_python3()
 
-= Test _check_tcpdump()
-
-from scapy.arch.common import _check_tcpdump
-
-saved_conf_prog_tcpdump = conf.prog.tcpdump
-conf.prog.tcpdump = "does_not_exist"
-assert _check_tcpdump() == False
-conf.prog.tcpdump = saved_conf_prog_tcpdump
-
 = Test _interface_selection
 ~ netaccess linux needs_root

scapy-2.4.4.tar.gz/test/pcaps/bad_rsn_parsing_overrides_ssid.pcap Added

scapy-2.4.4.tar.gz/test/pcaps/http2_h2c.pcap Added

scapy-2.4.4.tar.gz/test/pcaps/http_compressed-brotli.pcap Added

scapy-2.4.4.tar.gz/test/pcaps/http_tcp_psh.pcap.gz Added

scapy-2.4.4.tar.gz/test/pcaps/pfcp.pcap Added

scapy-2.4.4.tar.gz/test/pcaps/tls_tcp_frag.pcap.gz Added

scapy-2.4.3.tar.gz/test/pipetool.uts -> scapy-2.4.4.tar.gz/test/pipetool.uts Changed

@@ -216,6 +216,14 @@
 p.wait_and_stop()
 assert test_val == "hello"
 
+= Test PeriodicSource exhaustion
+
+s = PeriodicSource("", 1)
+s.msg = []
+p = PipeEngine(s)
+p.start()
+p.wait_and_stop()
+
 + Advanced ScapyPipes pipetools tests
 
 = Test SniffSource
@@ -310,89 +318,68 @@
     pass
 
 = Test WiresharkSink
+~ wiresharksink
 
-from io import BytesIO
+q = ObjectPipe()
+pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-f = BytesIO()
-pkt = Ether()/IP()/ICMP()
-
-with mock.patch("subprocess.Popen", return_value=Bunch(stdin=f)) as popen:
-    p = PipeEngine()
-    src = CLIFeeder()
+import mock
+with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink()
-    p.add(src > sink)
-    p.start()
-    src.send(pkt)
-    time.sleep(3)
-    # Prevent stop from closing the BytesIO
-    with mock.patch.object(f, 'close'):
-        p.stop()
+    sink.start()
+
+sink.push(pkt)
+
+q.recv()
+q.recv()
+assert raw(pkt) in q.recv()
 
 popen.assert_called_once_with(
-    [conf.prog.wireshark, '-ki', '-'], stdin=subprocess.PIPE, stdout=None,
+    [conf.prog.wireshark, '-Slki', '-'], stdin=subprocess.PIPE, stdout=None,
     stderr=None)
-bytes_hex(f.getvalue())
-bytes_hex(raw(pkt))
-assert raw(pkt) in f.getvalue()
 
 = Test WiresharkSink with linktype
+~ wiresharksink
 
-f = BytesIO()
-pkt = Ether()/IP()/ICMP()
 linktype = scapy.data.DLT_EN3MB
+q = ObjectPipe()
+pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-with mock.patch("subprocess.Popen", return_value=Bunch(stdin=f)) as popen:
-    p = PipeEngine()
-    src = CLIFeeder()
+import mock
+with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink(linktype=linktype)
-    p.add(src > sink)
-    p.start()
-    src.send(pkt)
-    time.sleep(3)
-    # Prevent stop from closing the BytesIO
-    with mock.patch.object(f, 'close'):
-        p.stop()
-
-popen.assert_called_once_with(
-    [conf.prog.wireshark, '-ki', '-'],
-    stdin=subprocess.PIPE, stdout=None, stderr=None)
+    sink.start()
 
-bytes_hex(f.getvalue())
-bytes_hex(raw(pkt))
-assert raw(pkt) in f.getvalue()
+sink.push(pkt)
 
-# Check that the linktype was also correct
-f.seek(0) or None
-r = PcapReader(f)
-assert r.linktype == DLT_EN3MB
+chb(linktype) in q.recv()
+q.recv()
+assert raw(pkt) in q.recv()
 
 = Test WiresharkSink with args
+~ wiresharksink
 
-f = BytesIO()
-pkt = Ether()/IP()/ICMP()
+linktype = scapy.data.DLT_EN3MB
+q = ObjectPipe()
+pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-with mock.patch("subprocess.Popen", return_value=Bunch(stdin=f)) as popen:
-    p = PipeEngine()
-    src = CLIFeeder()
+import mock
+with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink(args=['-c', '1'])
-    p.add(src > sink)
-    p.start()
-    src.send(pkt)
-    time.sleep(3)
-    # Prevent stop from closing the BytesIO
-    with mock.patch.object(f, 'close'):
-        p.stop()
+    sink.start()
+
+sink.push(pkt)
 
 popen.assert_called_once_with(
-    [conf.prog.wireshark, '-ki', '-', '-c', '1'],
+    [conf.prog.wireshark, '-Slki', '-', '-c', '1'],
     stdin=subprocess.PIPE, stdout=None, stderr=None)
 
 = Test RdpcapSource and WrpcapSink
 
 dname = get_temp_dir()
 
-req = Ether()/IP()/ICMP()
-rpy = Ether()/IP('E\x00\x00\x1c\x00\x00\x00\x004\x01\x1d\x04\xd8:\xd0\x83\xc0\xa8\x00w\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+req = Ether(b'E\x00\x00\x1c\x00\x00\x00\x004\x01\x1d\x04\xd8:\xd0\x83\xc0\xa8\x00w\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+rpy = Ether(b'\x8c\xf8\x13C5P\xdcS`\xeb\x80H\x08\x00E\x00\x00\x1c\x00\x00\x00\x004\x01\x1d\x04\xd8:\xd0\x83\xc0\xa8\x00w\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
 
 wrpcap(os.path.join(dname, "t.pcap"), [req, rpy])
 
@@ -696,7 +683,7 @@
 p = PipeEngine()
 
 s = CLIFeeder()
-d1 = TCPConnectPipe(addr="www.secdev.org", port=80)
+d1 = TCPConnectPipe(addr="www.google.com", port=80)
 c = QueueSink()
 
 s > d1 > c
@@ -704,7 +691,8 @@
 p.add(s)
 p.start()
 
-s.send(b"GET / HTTP/1.1\nHost: www.secdev.org\n\n")
+from scapy.layers.http import HTTPRequest, HTTP
+s.send(bytes(HTTP()/HTTPRequest(Host="www.google.com")))
 result = c.q.get(timeout=10)
 p.stop()

scapy-2.4.3.tar.gz/test/pptp.uts -> scapy-2.4.4.tar.gz/test/pptp.uts Changed

@@ -41,7 +41,7 @@
 assert gre_pptp.proto == 0x880b
 assert gre_pptp.payload_len == 28
 assert gre_pptp.call_id == 39925
-assert gre_pptp.seqence_number == 0x0
+assert gre_pptp.sequence_number == 0x0
 
 assert HDLC in pkt
 assert PPP in pkt
@@ -51,7 +51,7 @@
 ~ gre ip pptp ppp hdlc lcp lcp_echo
 
 pkt = IP(src='192.168.0.1', dst='192.168.0.2') /\
-      GRE_PPTP(seqnum_present=1, acknum_present=1, seqence_number=47, ack_number=42) /\
+      GRE_PPTP(seqnum_present=1, acknum_present=1, sequence_number=47, ack_number=42) /\
       HDLC() / PPP() / PPP_LCP_Echo(id=42, magic_number=4242, data='abcdef')
 pkt_data = raw(pkt)
 pkt_data_ref = hex_bytes('4500003600010000402ff944c0a80001c0a800023081880b001200000000002f000000'\
@@ -70,7 +70,7 @@
 assert pkt[GRE_PPTP].key_present == 1
 assert pkt[GRE_PPTP].seqnum_present == 1
 assert pkt[GRE_PPTP].acknum_present == 1
-assert pkt[GRE_PPTP].seqence_number == 47
+assert pkt[GRE_PPTP].sequence_number == 47
 assert pkt[GRE_PPTP].ack_number == 42
 assert pkt[PPP].proto == 0xc021
 assert pkt[PPP_LCP_Echo].code == 9
@@ -472,7 +472,7 @@
                                                              firmware_revision=47,
                                                              host_name='test host name',
                                                              vendor_string='test vendor string')
-start_control_connection_ref_data = hex_bytes('009c00011a2b3c4d00010000000100000000000100000002002a00'\
+start_control_connection_ref_data = hex_bytes('009c00011a2b3c4d00010000010000000000000100000002002a00'\
                                     '2f7465737420686f7374206e616d65000000000000000000000000'\
                                     '000000000000000000000000000000000000000000000000000000'\
                                     '0000000000000000000000746573742076656e646f722073747269'\
@@ -485,7 +485,7 @@
 
 assert isinstance(start_control_connection_pkt, PPTPStartControlConnectionRequest)
 assert start_control_connection_pkt.magic_cookie == 0x1a2b3c4d
-assert start_control_connection_pkt.protocol_version == 1
+assert start_control_connection_pkt.protocol_version == 0x0100
 assert start_control_connection_pkt.framing_capabilities == 1
 assert start_control_connection_pkt.bearer_capabilities == 2
 assert start_control_connection_pkt.maximum_channels == 42
@@ -500,7 +500,7 @@
                                                                  framing_capabilities='Synchronous Framing supported',
                                                                  bearer_capabilities='Analog access supported',
                                                                  vendor_string='vendor')
-start_control_connection_reply_ref_data = hex_bytes('009c00011a2b3c4d00020000000102010000000200000001ffff0'\
+start_control_connection_reply_ref_data = hex_bytes('009c00011a2b3c4d00020000010002010000000200000001ffff0'\
                                           '1006c696e75780000000000000000000000000000000000000000'\
                                           '00000000000000000000000000000000000000000000000000000'\
                                           '000000000000000000000000076656e646f720000000000000000'\
@@ -513,7 +513,7 @@
 
 assert isinstance(start_control_connection_reply_pkt, PPTPStartControlConnectionReply)
 assert start_control_connection_reply_pkt.magic_cookie == 0x1a2b3c4d
-assert start_control_connection_reply_pkt.protocol_version == 1
+assert start_control_connection_reply_pkt.protocol_version == 0x0100
 assert start_control_connection_reply_pkt.result_code == 2
 assert start_control_connection_reply_pkt.error_code == 1
 assert start_control_connection_reply_pkt.framing_capabilities == 2

scapy-2.4.3.tar.gz/test/regression.uts -> scapy-2.4.4.tar.gz/test/regression.uts Changed

@@ -20,7 +20,7 @@
 conf
 
 IP().src
-scapy.consts.LOOPBACK_INTERFACE
+conf.loopback_name
 
 = Test module version detection
 ~ conf
@@ -44,8 +44,6 @@
 
 assert _version_checker(FakeModule3, (2, 4, 2))
 
-assert _version_checker(scapy, (2, 4, 2))
-
 = List layers
 ~ conf command
 ls()
@@ -75,6 +73,41 @@
 
 test_list_contrib()
 
+= Test automatic doc generation
+~ command
+
+dat = rfc(IP, ret=True).split("\n")
+assert dat[0].replace(" ", "").strip() == "0123"
+assert "0123456789" in dat[1].replace(" ", "")
+for l in dat:
+    # only upper case and +-
+    assert re.match(r"[A-Z+-]*", l)
+
+# Add a space before each + to avoid conflicts with UTscapy !
+# They will be stripped below
+result = """
+ 0                   1                   2                   3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |VERSION|  IHL  |      TOS      |              LEN              |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |               ID              |FLAGS|           FRAG          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |      TTL      |     PROTO     |             CHKSUM            |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                              SRC                              |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                              DST                              |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |            OPTIONS            |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+                             Fig. IP
+""".strip()
+result = [x.strip() for x in result.split("\n")]
+output = [x.strip() for x in rfc(IP, ret=True).strip().split("\n")]
+assert result == output
+
 = Check that all contrib modules are well-configured
 ~ command
 list_contrib(_debug=True)
@@ -94,6 +127,15 @@
 
 assert not conf.use_bpf
 
+if not conf.use_pcap:
+    a = six.moves.builtins.__dict__
+    conf.interactive = True
+    conf.use_pcap = True
+    assert a["get_if_list"] == scapy.arch.pcapdnet.get_if_list
+    conf.use_pcap = False
+    assert a["get_if_list"] == scapy.arch.linux.get_if_list
+    conf.interactive = False
+
 = Configuration conf.use_* WINDOWS
 ~ windows
 
@@ -105,6 +147,17 @@
 
 assert not conf.use_bpf
 
+= Test layer filtering
+~ filter
+
+pkt = NetflowHeader()/NetflowHeaderV5()/NetflowRecordV5()
+
+conf.layers.filter([NetflowHeader, NetflowHeaderV5])
+assert NetflowRecordV5 not in NetflowHeader(bytes(pkt))
+
+conf.layers.unfilter()
+assert NetflowRecordV5 in NetflowHeader(bytes(pkt))
+
 
 ###########
 ###########
@@ -140,9 +193,9 @@
         data["ipv6_metric"] = 1
         data["mac"] = "00:00:00:00:00:00"
         data["ips"] = ["127.0.0.1", "::1"]
-        dummy_int = NetworkInterface(data)
-        dummy_int.pcap_name = "\\Device\\NPF_" + data["guid"]
-        return dummy_int
+        data["pcap_name"] = "\\Device\\NPF_" + data["guid"]
+        data["flags"] = 0
+        return NetworkInterface(data)
     else:
         return "dummy0"
 
@@ -152,41 +205,48 @@
 
 get_working_if()
 
-get_if_raw_addr6(conf.iface6)
+get_if_raw_addr6(conf.iface)
 
 = Test read_routes6() - default output
 
 routes6 = read_routes6()
 if WINDOWS:
-    route_add_loopback(routes6, True)
+    from scapy.arch.windows import _route_add_loopback
+    _route_add_loopback(routes6, True)
 
 routes6
 
 # Expected results:
 # - one route if there is only the loopback interface
+# - one route if IPv6 is supported but disabled on network interfaces
 # - three routes if there is a network interface
 # - on OpenBSD, only two routes on lo0 are expected
 
 if routes6:
     iflist = get_if_list()
     if WINDOWS:
-        route_add_loopback(ipv6=True, iflist=iflist)
+        from scapy.arch.windows import _route_add_loopback
+        _route_add_loopback(ipv6=True, iflist=iflist)
     if OPENBSD:
         len(routes6) >= 2
-    elif iflist == [LOOPBACK_NAME]:
+    elif iflist == [conf.loopback_name]:
         len(routes6) == 1
     elif len(iflist) >= 2:
-        len(routes6) >= 3
+        len(routes6) >= 1
     else:
         False
 else:
     # IPv6 seems disabled. Force a route to ::1
-    conf.route6.routes.append(("::1", 128, "::", LOOPBACK_NAME, ["::1"], 1))
+    conf.route6.routes.append(("::1", 128, "::", conf.loopback_name, ["::1"], 1))
+    conf.route6.ipv6_ifaces = set([conf.loopback_name])
     True
 
 = Test read_routes6() - check mandatory routes
 
-if len(routes6) and not WINDOWS:
+conf.route6
+
+# Doesn't pass on Travis Bionic XXX
+if len(routes6) > 2 and not WINDOWS:
     assert(sum(1 for r in routes6 if r[0] == "::1" and r[4] == ["::1"]) >= 1)
     if not OPENBSD and len(iflist) >= 2:
         assert sum(1 for r in routes6 if r[0] == "fe80::" and r[1] == 64) >= 1
@@ -194,13 +254,13 @@
             assert sum(1 for r in routes6 if in6_islladdr(r[0]) and r[1] == 128 and r[4] == ["::1"]) >= 1
         except:
             # IPv6 is not available, but we still check the loopback
-            assert conf.route6.route("::/0") == (scapy.consts.LOOPBACK_NAME, "::", "::")
+            assert conf.route6.route("::/0") == (conf.loopback_name, "::", "::")
             assert sum(1 for r in routes6 if r[1] == 128 and r[4] == ["::1"]) >= 1
 else:
     True
 
 = Test ifchange()
-conf.route6.ifchange(LOOPBACK_NAME, "::1/128")
+conf.route6.ifchange(conf.loopback_name, "::1/128")
 if WINDOWS:
     conf.netcache.in6_neighbor["::1"] = "ff:ff:ff:ff:ff:ff"  # Restore fake cache
 
@@ -214,11 +274,18 @@
 
 = plain_str test
 
+data = b"\xffsweet\xef celestia\xab"
 if not six.PY2:
     # Only Python 3 has to deal with Str/Bytes conversion,
     # as we don't use Python 2's unicode
-    data = b"\xffsweet\xef celestia\xab"
-    assert plain_str(data) == "sweet celestia"
+    if sys.version_info[0:2] <= (3, 4):
+        # Python3.4 can only ignore unknown special characters
+        assert plain_str(data) == "sweet celestia"
+    else:
+        # Python >3.4 can replace them with a backslash representation
+        assert plain_str(data) == "\\xffsweet\\xef celestia\\xab"
+else:
+    assert plain_str(data) == "\xffsweet\xef celestia\xab"
 
 ############
 ############
@@ -241,6 +308,10 @@
 data = b"sweet celestia"
 assert gzip_decompress(gzip_compress(data)) == data
 
+= orb/chb
+
+assert orb(b"\x01"[0]) == 1
+assert chb(1) == b"\x01"
 
 ############
 ############
@@ -438,6 +509,13 @@
 load_contrib("gtp")
 assert GTPHeader.__module__ == "scapy.contrib.gtp"
 
+= Test load_contrib failure
+try:
+    load_contrib("doesnotexist")
+    assert False
+except:
+    pass
+
 = Test sane function
 sane("A\x00\xFFB") == "A..B"
 
@@ -615,6 +693,39 @@
 
 scapy_delete_temp_files()
 
+= Test load_services
+
+data_services = """
+cvsup		5999/udp			# CVSup
+x11		6000-6063/tcp			# X Window System
+x11		6000-6063/udp			# X Window System
+ndl-ahp-svc	6064/tcp			# NDL-AHP-SVC
+"""
+
+services = get_temp_file()
+with open(services, "w") as w:
+    w.write(data_services)
+
+tcp, udp = load_services(services)
+assert tcp[6002] == "x11"
+assert tcp.ndl_ahp_svc == 6064
+assert tcp.x11 in range(6000, 6093)
+assert udp[6002] == "x11"
+assert udp.x11 in range(6000, 6093)
+assert udp.cvsup == 5999
+
+scapy_delete_temp_files()
+
+= Test ARPingResult output
+~ manufdb
+
+ar = ARPingResult([(None, Ether(src='70:ee:50:50:ee:70')/ARP(psrc='192.168.0.1'))])
+with ContextManagerCaptureOutput() as cmco:
+    ar.show()
+    result_ar = cmco.get_output()
+
+assert result_ar.startswith("  70:ee:50:50:ee:70 Netatmo 192.168.0.1")
+
 = Test utility functions - network related
 ~ netaccess
 
@@ -631,6 +742,9 @@
 ret = autorun_get_latex_interactive_session("IP().src")
 assert(ret == ("\\textcolor{blue}{{\\tt\\char62}{\\tt\\char62}{\\tt\\char62} }IP().src\n'127.0.0.1'\n", '127.0.0.1'))
 
+ret = autorun_get_text_interactive_session("scapy_undefined")
+assert "NameError" in ret[0]
+
 = Test utility TEX functions
 
 assert tex_escape("{scapy}\\^$~#_&%|><") == "{\\tt\\char123}scapy{\\tt\\char125}{\\tt\\char92}\\^{}\\${\\tt\\char126}\\#\\_\\&\\%{\\tt\\char124}{\\tt\\char62}{\\tt\\char60}"
@@ -656,6 +770,11 @@
 assert(conf.verb == 42)
 conf.verb = saved_conf_verb
 
+= Test config file functions failures
+
+from scapy.main import _probe_config_file
+assert _probe_config_file("filethatdoesnotexistnorwillever.tsppajfsrdrr") is None
+
 = Test CacheInstance repr
 
 conf.netcache
@@ -672,18 +791,18 @@
 bck_scapy_ext_lib = sys.modules.get("scapy.extlib", None)
 del(sys.modules["scapy.extlib"])
 
-matplotlib = MagicMock()
-matplotlib.get_backend.return_value = "inline"
-matplotlib.pyplot = MagicMock()
-matplotlib.pyplot.plt = None
-with patch.dict("sys.modules", matplotlib=matplotlib):
-    from scapy.extlib import MATPLOTLIB, MATPLOTLIB_INLINED, MATPLOTLIB_DEFAULT_PLOT_KARGS
+mock_matplotlib = MagicMock()
+mock_matplotlib.get_backend.return_value = "inline"
+mock_matplotlib.pyplot = MagicMock()
+mock_matplotlib.pyplot.plt = None
+with patch.dict("sys.modules", **{ "matplotlib": mock_matplotlib, "matplotlib.lines": mock_matplotlib}):
+    from scapy.extlib import MATPLOTLIB, MATPLOTLIB_INLINED, MATPLOTLIB_DEFAULT_PLOT_KARGS, Line2D
     assert MATPLOTLIB == 1
     assert MATPLOTLIB_INLINED == 1
     assert "marker" in MATPLOTLIB_DEFAULT_PLOT_KARGS
 
-matplotlib.get_backend.return_value = "ko"
-with patch.dict("sys.modules", matplotlib=matplotlib):
+mock_matplotlib.get_backend.return_value = "ko"
+with patch.dict("sys.modules", **{ "matplotlib": mock_matplotlib, "matplotlib.lines": mock_matplotlib}):
     from scapy.extlib import MATPLOTLIB, MATPLOTLIB_INLINED, MATPLOTLIB_DEFAULT_PLOT_KARGS
     assert MATPLOTLIB == 1
     assert MATPLOTLIB_INLINED == 0
@@ -730,15 +849,13 @@
 bind_layers(IP, ICMP, frag=0, proto=1)
 
 = fuzz
-~ not_pypy random_weird_py3
-random.seed(0x2807)
-r = raw(fuzz(IP()/ICMP()))
-r
-assert r in [
-    b'u\x14\x00\x1c\xc2\xf6\x80\x00\xde\x01k\xd3\x7f\x00\x00\x01\x7f\x00\x00\x01y\xc9>\xa6\x84\xd8\xc2\xb7',
-    b'E\xa7\x00\x1c\xb0c\xc0\x00\xf6\x01U\xd3\x7f\x00\x00\x01\x7f\x00\x00\x01\xfex\xb3\x92B<\x0b\xb8',
-    '\x85\x7f\x00\x1c\xc2\xf6\x00\x00\xde\x01\xdbh\x7f\x00\x00\x01\x7f\x00\x00\x01y\xc9>\xa6\x84\xd8\xc2\xb7'
-]
+
+r = fuzz(IP(tos=2)/ICMP())
+assert r.tos == 2
+z = r.ttl
+assert r.ttl != z
+assert r.ttl != z
+
 
 = fuzz a Packet with MultipleTypeField
 
@@ -796,7 +913,7 @@
 
 = sprintf() function 
 ~ basic sprintf IP TCP SNAP LLC Dot11
-* This test is on the conditionnal substring feature of <tt>sprintf()</tt>
+* This test is on the conditional substring feature of <tt>sprintf()</tt>
 a=Dot11()/LLC()/SNAP()/IP()/TCP()
 r = a.sprintf("{IP:{TCP:flags=%TCP.flags%}{UDP:port=%UDP.ports%} %IP.src%}")
 r
@@ -1081,6 +1198,11 @@
 w_payload = hex_bytes('00002000ae4000a0200800a02008000010028509a000e2006400000000000001a0403a0100c0caa47d504c6641ace4b300c0caa47d50000300200820000000000f291dd4d4391f3e34eb')
 assert raw(pkt) == w_payload
 
+= Dot11FCS computation
+
+pkt = RadioTap() / Dot11FCS() / Dot11Beacon()
+assert raw(pkt) == b'\x00\x00\t\x00\x02\x00\x00\x00\x10\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00d\x00\x00\x00e\xd9=\xb9'
+
 = WEP tests
 ~ wifi crypto Dot11 LLC SNAP IP TCP
 conf.wepkey = ""
@@ -1189,7 +1311,7 @@
 assert radiotap.fcs == 0xdbc04908
 
 assert Dot11EltRates in radiotap
-assert radiotap[Dot11EltRates].rates == [0x82, 0x84, 0x8b, 0x96, 0x24, 0x30, 0x48, 0x6c]
+assert radiotap[Dot11EltRates].rates == [130, 132, 139, 150, 36, 48, 72, 108]
 
 = RadioTap - Build with Extended presence mask
 
@@ -1202,6 +1324,26 @@
 for i in range(10):
     assert isinstance(raw(fuzz(Dot11Elt())), bytes)
 
+= PMKIDListPacket - Check computation of nb_pmkids
+assert PMKIDListPacket(raw(PMKIDListPacket())).nb_pmkids == 0
+assert PMKIDListPacket(raw(PMKIDListPacket(pmkid_list=["AZEDFREZSDERFGTY"]))).nb_pmkids == 1
+assert PMKIDListPacket(raw(PMKIDListPacket(pmkid_list=["0123456789ABDEFX", "AZEDFREZSDERFGTY"]))).nb_pmkids == 2
+
+= Dot11EltRSN - Check computation of nb_pairwise_cipher_suites and nb_akm_suites 
+assert Dot11EltRSN(raw(Dot11EltRSN())).nb_pairwise_cipher_suites == 1 
+assert Dot11EltRSN(raw(Dot11EltRSN(pairwise_cipher_suites=[RSNCipherSuite(cipher="TKIP")]))).nb_pairwise_cipher_suites == 1 
+assert Dot11EltRSN(raw(Dot11EltRSN(pairwise_cipher_suites=[RSNCipherSuite(cipher="TKIP"), RSNCipherSuite(cipher="CCMP-128")]))).nb_pairwise_cipher_suites == 2 
+assert Dot11EltRSN(raw(Dot11EltRSN())).nb_akm_suites == 1
+assert Dot11EltRSN(raw(Dot11EltRSN(akm_suites=[AKMSuite(suite="PSK")]))).nb_akm_suites == 1
+assert Dot11EltRSN(raw(Dot11EltRSN(akm_suites=[AKMSuite(suite="PSK"), AKMSuite(suite="802.1X")]))).nb_akm_suites == 2
+
+= Dot11EltMicrosoftWPA - Check computation of nb_pairwise_cipher_suites and nb_akm_suites 
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA())).nb_pairwise_cipher_suites == 1
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA(pairwise_cipher_suites=[RSNCipherSuite(cipher="TKIP")]))).nb_pairwise_cipher_suites == 1
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA(pairwise_cipher_suites=[RSNCipherSuite(cipher="TKIP"), RSNCipherSuite(cipher="CCMP-128")]))).nb_pairwise_cipher_suites == 2
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA())).nb_akm_suites == 1
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA(akm_suites=[AKMSuite(suite="PSK")]))).nb_akm_suites == 1
+assert Dot11EltMicrosoftWPA(raw(Dot11EltMicrosoftWPA(akm_suites=[AKMSuite(suite="PSK"), AKMSuite(suite="802.1X")]))).nb_akm_suites == 2
 
 ############
 ############
@@ -1262,10 +1404,17 @@
 ASN1_Object(2).show()
 
 = ASN1 - RandASN1Object
-~ random_weird_py3
 a = RandASN1Object()
 random.seed(0x2807)
-assert raw(a) in [b'A\x02\x07q', b'C\x02\xfe\x92', b'\x1e\x023V']
+o = bytes(a)
+o
+assert o in [
+    b'\x02\x02\xfe\x92',
+    b'A\x02\x07q',
+    b'\x15\x10E55WW2a7yrh9XEck',
+    b'C\x02\xfe\x92',
+    b'\x1e\x023V'
+]
 
 = ASN1 - ASN1_BIT_STRING
 a = ASN1_BIT_STRING("test", readable=True)
@@ -1313,6 +1462,27 @@
 random.seed(1873503288)
 raw(RandASN1Object())
 
+= SSID is parsed properly even with the presence of RSN Information
+~ SSID RSN Information
+# A regression test for https://github.com/secdev/scapy/pull/2685.
+# https://github.com/secdev/scapy/issues/2683 describes a packet with
+# RSN Information that isn't parsed properly,
+# causing the SSID to be overridden.
+# This test checks the SSID is parsed properly.
+print(os.path.dirname(__file__))
+filename = os.path.abspath(
+    os.path.join(
+        os.path.dirname(__file__),
+        "..",
+        "test",
+        "pcaps",
+        "bad_rsn_parsing_overrides_ssid.pcap"
+    ))
+frame = rdpcap(filename)[0]
+beacon = frame.getlayer(5)
+ssid = beacon.network_stats()['ssid']
+assert ssid == "ROUTE-821E295"
+
 
 ############
 ############
@@ -1342,9 +1512,31 @@
     
     tmp = sendp(Ether()/IP(dst="8.8.8.8")/ICMP(), return_packets=True, realtime=True)
     assert(len(tmp) == 1)
+    
+    p = Ether()/IP(dst="8.8.8.8")/ICMP()
+    from decimal import Decimal
+    p.time = Decimal(p.time)
+    tmp = sendp(p, return_packets=True, realtime=True)
+    assert(len(tmp) == 1)
 
 retry_test(_test)
 
+= Latency check: localhost ICMP
+~ netaccess linux latency
+
+sock = conf.L3socket
+conf.L3socket = L3RawSocket
+
+def _test():
+    req = IP(dst="127.0.0.1")/ICMP()
+    ans = sr1(req)
+    assert (ans.time - req.sent_time) >= 0
+    assert (ans.time - req.sent_time) <= 1e-3
+
+retry_test(_test)
+
+conf.L3socket = sock
+
 = Sending an ICMP message 'forever' at layer 2 and layer 3
 ~ netaccess IP ICMP
 def _test():
@@ -1424,7 +1616,7 @@
 retry_test(_test)
 
 = AS resolvers
-~ netaccess IP
+~ netaccess IP as_resolvers
 * This test retries on failure because it often fails
 
 def _test():
@@ -1434,10 +1626,10 @@
 
 retry_test(_test)
 
-def _test():
-    ret = AS_resolver_riswhois().resolve("8.8.8.8")
-    assert (len(ret) == 1)
-    assert all(x[1] == "AS15169" for x in ret)
+riswhois_data = b"route:      8.8.8.0/24\ndescr:      Google\norigin:     AS15169\nnotify:     radb-contact@google.com\nmnt-by:     MAINT-AS15169\nchanged:    radb-contact@google.com 20150728\nsource:     RADB\n\nroute:         8.0.0.0/9\ndescr:         Proxy-registered route object\norigin:        AS3356\nremarks:       auto-generated route object\nremarks:       this next line gives the robot something to recognize\nremarks:       L'enfer, c'est les autres\nremarks:       \nremarks:       This route object is for a Level 3 customer route\nremarks:       which is being exported under this origin AS.\nremarks:       \nremarks:       This route object was created because no existing\nremarks:       route object with the same origin was found, and\nremarks:       since some Level 3 peers filter based on these objects\nremarks:       this route may be rejected if this object is not created.\nremarks:       \nremarks:       Please contact routing@Level3.net if you have any\nremarks:       questions regarding this object.\nmnt-by:        LEVEL3-MNT\nchanged:       roy@Level3.net 20060203\nsource:        LEVEL3\n\n\n"
+
+ret = AS_resolver_riswhois()._parse_whois(riswhois_data)
+assert ret == ('AS15169', 'Google')
 
 retry_test(_test)
 
@@ -1682,6 +1874,24 @@
 retry_test(lambda: send_and_sniff(IP(dst="secdev.org")/ICMP(), flt="icmp"))
 retry_test(lambda: send_and_sniff(Ether()/IP(dst="secdev.org")/ICMP()))
 
+= Test SuperSocket.select
+~ select
+
+import mock
+
+@mock.patch("scapy.supersocket.select")
+def _test_select(select):
+    def f(a, b, c, d):
+        raise IOError(0)
+    select.side_effect = f
+    try:
+        SuperSocket.select([])
+        return False
+    except:
+        return True
+
+assert _test_select()
+
 = Test L2ListenTcpdump socket
 ~ netaccess FIXME_py3
 
@@ -2166,7 +2376,7 @@
     assert response.Reason_Phrase == b'OK'
 
 def _http_request_test():
-    response = http_request("www.kame.net", path="/")
+    response = http_request("www.kame.net", path="/", iptables=LINUX)
     assert response.Http_Version == b'HTTP/1.1'
     assert response.Status_Code == b'200'
     assert response.Reason_Phrase == b'OK'
@@ -2175,11 +2385,11 @@
 if not BSD:
     try:
         retry_test(_tcp_client_test)
-        retry_test(_http_request_test)
     finally:
         if LINUX:
             # Remove the iptables rule
             assert(os.system(IPTABLE_RULE % ('D', SECDEV_IP4)) == 0)
+    retry_test(_http_request_test)
 
 ############
 ############
@@ -2199,6 +2409,12 @@
 r = raw(IPOption_LSRR(routers=["1.2.3.4","5.6.7.8"]))
 r
 assert(r == b'\x83\x0b\x04\x01\x02\x03\x04\x05\x06\x07\x08')
+r = raw(IPOption_Timestamp(internet_address='192.168.15.7', timestamp=11223344))
+r
+assert(r == b'D\x0c\t\x01\xc0\xa8\x0f\x07\x00\xabA0')
+r = raw(IPOption_Timestamp(flg=0, length=8))
+r
+assert(r == b'D\x08\t\x00\x00\x00\x00\x00')
 
 = IP options individual dissection
 ~ IP options
@@ -2330,10 +2546,10 @@
 assert( q[PPP_ECP_Option].data == b"ABCDEFG" )
 
 
-= PPP_ (PPP with only one byte for protocol)
+= PPP with only one byte for protocol
 ~ ppp
 
-assert(len(raw(PPP_() / IP())) == 21)
+assert(len(raw(PPP() / IP())) == 21)
 
 p = PPP(b'!E\x00\x00<\x00\x00@\x008\x06\xa5\xce\x85wP)\xc0\xa8Va\x01\xbbd\x8a\xe2}r\xb8O\x95\xb5\x84\xa0\x12q \xc8\x08\x00\x00\x02\x04\x02\x18\x04\x02\x08\nQ\xdf\xd6\xb0\x00\x07LH\x01\x03\x03\x07Ao')
 assert(IP in p)
@@ -2387,6 +2603,8 @@
 p = IP(s)
 GRE in p and p[GRE:1].proto == 0x6558 and p[GRE:2].proto == 0x86DD and IPv6 in p
 
+= IPv6 ma_addr coverage on hashret
+IPv6(dst="ff00::1:ff28:9c5a", src="::").hashret() == b';'
 
 ########### IPv6ExtHdrRouting Class ###########################
 
@@ -2936,7 +3154,7 @@
 = HAO - hashret
 
 p = IPv6()/IPv6ExtHdrDestOpt(options=HAO(hoa="2001:db8::1"))/ICMPv6EchoRequest()
-p.hashret() == b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:\x00\x00\x00\x00"
+p.hashret() == b' \x01\r\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:\x00\x00\x00\x00'
 
 
 ############
@@ -2979,6 +3197,9 @@
 = IPv6ExtHdrHopByHop - Instantiation with RouterAlert, HAO, Jumbo
 raw(IPv6ExtHdrHopByHop(options=[RouterAlert(), HAO(), Jumbo()])) == b';\x03\x05\x02\x00\x00\xc9\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\xc2\x04\x00\x00\x00\x00'
 
+= IPv6ExtHdrHopByHop - Hashret
+(IPv6(src="::1", dst="::1")/IPv6ExtHdrHopByHop()).hashret() == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00;'
+
 = IPv6ExtHdrHopByHop - Basic Dissection
 a=IPv6ExtHdrHopByHop(b';\x00\x01\x04\x00\x00\x00\x00')
 a.nh == 59 and a.len == 0 and len(a.options) == 1 and isinstance(a.options[0], PadN) and a.options[0].otype == 1 and a.options[0].optlen == 4 and a.options[0].optdata == b'\x00'*4
@@ -3005,7 +3226,8 @@
 
 = ICMPv6ND_RS - Basic instantiation with empty dst in IPv6 underlayer
 a=IPv6(b'`\x00\x00\x00\x00\x08:\xff \x01\r\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xff\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x85\x00M\xfe\x00\x00\x00\x00')
-isinstance(a, IPv6) and a.nh == 58 and a.hlim == 255 and isinstance(a.payload, ICMPv6ND_RS) and a.payload.type == 133 and a.payload.code == 0 and a.payload.cksum == 0x4dfe and a.payload.res == 0
+assert isinstance(a, IPv6) and a.nh == 58 and a.hlim == 255 and isinstance(a.payload, ICMPv6ND_RS) and a.payload.type == 133 and a.payload.code == 0 and a.payload.cksum == 0x4dfe and a.payload.res == 0
+assert a.hashret() == b":"
 
 
 ############
@@ -3051,7 +3273,8 @@
 
 = ICMPv6ND_NS - Dissection with specific values
 a=ICMPv6ND_NS(b'\x87\x11\x00\x00\xe0\x00\x00\x01\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x11')
-a.code==0x11 and a.res==3758096385 and a.tgt=="ffff::1111"
+assert a.code==0x11 and a.res==3758096385 and a.tgt=="ffff::1111"
+assert a.hashret() == b"ffff::1111"
 
 = ICMPv6ND_NS - IPv6 layer fields overloading
 a=IPv6(raw(IPv6()/ICMPv6ND_NS()))
@@ -3155,7 +3378,7 @@
 + ICMPv6NDOptPrefixInfo Class Test
 
 = ICMPv6NDOptPrefixInfo - Basic Instantiation
-raw(ICMPv6NDOptPrefixInfo()) == b'\x03\x04\x00\xc0\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+raw(ICMPv6NDOptPrefixInfo()) == b'\x03\x04@\xc0\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 
 = ICMPv6NDOptPrefixInfo - Instantiation with specific values
 raw(ICMPv6NDOptPrefixInfo(len=5, prefixlen=64, L=0, A=0, R=1, res1=1, validlifetime=0x11111111, preferredlifetime=0x22222222, res2=0x33333333, prefix="2001:db8::1")) == b'\x03\x05@!\x11\x11\x11\x11""""3333 \x01\r\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01'
@@ -3664,12 +3887,16 @@
 assert ICMPv6NIQueryIPv4 in p and p.data == b"freebsd"
 
 = ICMPv6NIQueryIPv4 - hashret()
-~ not_pypy random_weird_py3
+
 random.seed(0x2807)
-p = IPv6()/ICMPv6NIQueryIPv4(data="freebsd")
-h_py2 = '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:y\xb2V<\x7f\x87\x14\xde'
-h_py3 = b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:\x88\xccb\x19~\x9e\xe3a'
-assert p.hashret() in [h_py2, h_py3]
+p = IPv6(src="::", dst="::")/ICMPv6NIQueryIPv4(data="freebsd")
+h = p.hashret()
+h
+assert h in [
+    b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:g\x02f1\xbd?\xb3\xc4',
+    b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:\x88\xccb\x19~\x9e\xe3a',
+    b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00:$#\xb5\xb7\xd0\xbf \xe2'
+]
 
 
 ############
@@ -4052,6 +4279,10 @@
 a=IPv6ExtHdrFragment(b'\xff\xee\xff\xfb\x11\x11\x11\x11')
 a.nh == 0xff and a.res1 == 0xee and a.offset==0x1fff and a.res2==1 and a.m == 1 and a.id == 0x11111111
 
+= IPv6 - IPv6ExtHdrFragment hashret
+a=IPv6()/IPv6ExtHdrFragment(b'\xff\xee\xff\xfb\x11\x11\x11\x11')
+a.hashret() == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff'
+
 
 ############
 ############
@@ -4061,6 +4292,10 @@
 l=fragment6(IPv6()/IPv6ExtHdrFragment()/TCP()/Raw(load="A"*40000), 1280) 
 len(l) == 33 and len(raw(l[-1])) == 644
 
+= fragment6 - test against a long TCP packet with a 1280 MTU without fragment header
+l=fragment6(IPv6()/TCP()/Raw(load="A"*40000), 1280)
+len(l) == 33 and len(raw(l[-1])) == 644
+
 
 ############
 ############
@@ -4071,6 +4306,11 @@
 raw(defragment6(l)) == (b'`\x00\x00\x00\x9cT\x06@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x14\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00\xe92\x00\x00' + b'A'*40000)
 
 
+= defragment6 - test against packets with L2 header
+l=defragment6(fragment6(Ether()/IPv6()/IPv6ExtHdrFragment()/TCP()/Raw(load="A"*2000), 1280))
+Ether in l
+
+
 = defragment6 - test against a large TCP packet fragmented with a 1280 bytes MTU and missing fragments
 l=fragment6(IPv6()/IPv6ExtHdrFragment()/TCP()/Raw(load="A"*40000), 1280) 
 del(l[2])
@@ -4107,6 +4347,7 @@
 
 = Route6 - Route6.route
 conf.route6.flush()
+conf.route6.ipv6_ifaces = set(['lo', 'eth0'])
 conf.route6.routes=[
 (                               '::1', 128,                       '::',   'lo', ['::1'], 1), 
 (          'fe80::20f:1fff:feca:4650', 128,                       '::',   'lo', ['::1'], 1), 
@@ -4120,13 +4361,16 @@
 conf.route6.resync()
 if not len(conf.route6.routes):
     # IPv6 seems disabled. Force a route to ::1
-    conf.route6.routes.append(("::1", 128, "::", LOOPBACK_NAME, ["::1"], 1))
+    conf.route6.routes.append(("::1", 128, "::", conf.loopback_name, ["::1"], 1))
     True
 
 = Route6 - Route6.make_route
 
 r6 = Route6()
-r6.make_route("2001:db8::1", dev=LOOPBACK_NAME) == ("2001:db8::1", 128, "::", LOOPBACK_NAME, [], 1)
+r6.make_route("2001:db8::1", dev=conf.loopback_name) in [
+    ("2001:db8::1", 128, "::", conf.loopback_name, [], 1),
+    ("2001:db8::1", 128, "::", conf.loopback_name, ["::1"], 1)
+]
 len_r6 = len(r6.routes)
 
 = Route6 - Route6.add & Route6.delt
@@ -4171,11 +4415,13 @@
 # Test _ICMPv6Error
 from scapy.layers.inet6 import _ICMPv6Error
 assert _ICMPv6Error().guess_payload_class(None) == IPerror6
+assert _ICMPv6Error().hashret() == b''
 
 = Windows: reset routes properly
 
 if WINDOWS:
-    route_add_loopback()
+    from scapy.arch.windows import _route_add_loopback
+    _route_add_loopback()
 
 ############
 ############
@@ -4690,7 +4936,7 @@
 
 = DHCP6OptIAAddress - Basic Dissection
 a = DHCP6OptIAAddress(b'\x00\x05\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-a.optcode == 5 and a.optlen == 24 and a.addr == "::" and a.preflft == 0 and a. validlft == 0 and a.iaaddropts == b""
+a.optcode == 5 and a.optlen == 24 and a.addr == "::" and a.preflft == 0 and a. validlft == 0 and a.iaaddropts == []
 
 = DHCP6OptIAAddress - Instantiation with specific values
 raw(DHCP6OptIAAddress(optlen=0x1111, addr="2222:3333::5555", preflft=0x66666666, validlft=0x77777777, iaaddropts="somestring")) == b'\x00\x05\x11\x11""33\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00UUffffwwwwsomestring'
@@ -4700,7 +4946,7 @@
 
 = DHCP6OptIAAddress - Dissection with specific values 
 a = DHCP6OptIAAddress(b'\x00\x05\x00"""33\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00UUffffwwwwsomerawing')
-a.optcode == 5 and a.optlen == 34 and a.addr == "2222:3333::5555" and a.preflft == 0x66666666 and a. validlft == 0x77777777 and a.iaaddropts == b"somerawing"
+a.optcode == 5 and a.optlen == 34 and a.addr == "2222:3333::5555" and a.preflft == 0x66666666 and a. validlft == 0x77777777 and a.iaaddropts[0].load == b"somerawing"
 
 
 ############
@@ -5195,18 +5441,18 @@
 + Test DHCP6 Option - NIS Domain Name
 
 = DHCP6OptNISDomain - Basic Instantiation
-raw(DHCP6OptNISDomain()) == b'\x00\x1d\x00\x00'
+raw(DHCP6OptNISDomain()) == b'\x00\x1d\x00\x01\x00'
 
 = DHCP6OptNISDomain - Basic Dissection
 a = DHCP6OptNISDomain(b'\x00\x1d\x00\x00')
-a.optcode == 29 and a.optlen == 0 and a.nisdomain == b""
+a.optcode == 29 and a.optlen == 0 and a.nisdomain == b"."
 
 = DHCP6OptNISDomain - Instantiation with one domain name
-raw(DHCP6OptNISDomain(nisdomain="toto.example.org")) == b'\x00\x1d\x00\x11\x04toto\x07example\x03org'
+raw(DHCP6OptNISDomain(nisdomain="toto.example.org")) == b'\x00\x1d\x00\x12\x04toto\x07example\x03org\x00'
 
 = DHCP6OptNISDomain - Dissection with one domain name
 a = DHCP6OptNISDomain(b'\x00\x1d\x00\x11\x04toto\x07example\x03org\x00')
-a.optcode == 29 and a.optlen == 17 and a.nisdomain == b"toto.example.org"
+a.optcode == 29 and a.optlen == 17 and a.nisdomain == b"toto.example.org."
 
 = DHCP6OptNISDomain - Instantiation with one domain with trailing dot
 raw(DHCP6OptNISDomain(nisdomain="toto.example.org.")) == b'\x00\x1d\x00\x12\x04toto\x07example\x03org\x00'
@@ -5217,18 +5463,18 @@
 + Test DHCP6 Option - NIS+ Domain Name
 
 = DHCP6OptNISPDomain - Basic Instantiation
-raw(DHCP6OptNISPDomain()) == b'\x00\x1e\x00\x00'
+raw(DHCP6OptNISPDomain()) == b'\x00\x1e\x00\x01\x00'
 
 = DHCP6OptNISPDomain - Basic Dissection
 a = DHCP6OptNISPDomain(b'\x00\x1e\x00\x00')
-a.optcode == 30 and a.optlen == 0 and a.nispdomain == b""
+a.optcode == 30 and a.optlen == 0 and a.nispdomain == b"."
 
 = DHCP6OptNISPDomain - Instantiation with one domain name
-raw(DHCP6OptNISPDomain(nispdomain="toto.example.org")) == b'\x00\x1e\x00\x11\x04toto\x07example\x03org'
+raw(DHCP6OptNISPDomain(nispdomain="toto.example.org")) == b'\x00\x1e\x00\x12\x04toto\x07example\x03org\x00'
 
 = DHCP6OptNISPDomain - Dissection with one domain name
-a = DHCP6OptNISPDomain(b'\x00\x1e\x00\x11\x04toto\x07example\x03org\x00')
-a.optcode == 30 and a.optlen == 17 and a.nispdomain == b"toto.example.org"
+a = DHCP6OptNISPDomain(b'\x00\x1e\x00\x12\x04toto\x07example\x03org\x00')
+a.optcode == 30 and a.optlen == 18 and a.nispdomain == b"toto.example.org."
 
 = DHCP6OptNISPDomain - Instantiation with one domain with trailing dot
 raw(DHCP6OptNISPDomain(nispdomain="toto.example.org.")) == b'\x00\x1e\x00\x12\x04toto\x07example\x03org\x00'
@@ -5368,21 +5614,21 @@
 + Test DHCP6 Option - Client FQDN
 
 = DHCP6OptClientFQDN - Basic Instantiation
-raw(DHCP6OptClientFQDN()) == b"\x00'\x00\x01\x00"
+raw(DHCP6OptClientFQDN()) == b"\x00'\x00\x02\x00\x00"
 
 = DHCP6OptClientFQDN - Basic Dissection
 a = DHCP6OptClientFQDN(b"\x00'\x00\x01\x00")
-a.optcode == 39 and a.optlen == 1 and a.res == 0 and a.flags == 0 and a.fqdn == b""
+a.optcode == 39 and a.optlen == 1 and a.res == 0 and a.flags == 0 and a.fqdn == b"."
 
 = DHCP6OptClientFQDN - Instantiation with various flags combinations
-raw(DHCP6OptClientFQDN(flags="S")) == b"\x00'\x00\x01\x01" and raw(DHCP6OptClientFQDN(flags="O")) == b"\x00'\x00\x01\x02" and raw(DHCP6OptClientFQDN(flags="N")) == b"\x00'\x00\x01\x04" and raw(DHCP6OptClientFQDN(flags="SON")) == b"\x00'\x00\x01\x07" and raw(DHCP6OptClientFQDN(flags="ON")) == b"\x00'\x00\x01\x06"
+raw(DHCP6OptClientFQDN(flags="S")) == b"\x00'\x00\x02\x01\x00" and raw(DHCP6OptClientFQDN(flags="O")) == b"\x00'\x00\x02\x02\x00" and raw(DHCP6OptClientFQDN(flags="N")) == b"\x00'\x00\x02\x04\x00" and raw(DHCP6OptClientFQDN(flags="SON")) == b"\x00'\x00\x02\x07\x00" and raw(DHCP6OptClientFQDN(flags="ON")) == b"\x00'\x00\x02\x06\x00"
 
 = DHCP6OptClientFQDN - Instantiation with one fqdn 
-raw(DHCP6OptClientFQDN(fqdn="toto.example.org")) == b"\x00'\x00\x12\x00\x04toto\x07example\x03org"
+raw(DHCP6OptClientFQDN(fqdn="toto.example.org")) == b"\x00'\x00\x13\x00\x04toto\x07example\x03org\x00"
 
 = DHCP6OptClientFQDN - Dissection with one fqdn 
 a = DHCP6OptClientFQDN(b"\x00'\x00\x12\x00\x04toto\x07example\x03org\x00")
-a.optcode == 39 and a.optlen == 18 and a.res == 0 and a.flags == 0 and a.fqdn == b"toto.example.org"
+a.optcode == 39 and a.optlen == 18 and a.res == 0 and a.flags == 0 and a.fqdn == b"toto.example.org."
 
 
 ############
@@ -5936,15 +6182,15 @@
 p[ICMPv6MPSol].cksum == 0x2808 and p[ICMPv6MPSol].id == 8
 
 = ICMPv6MPAdv - build (default values)
-s = b'`\x00\x00\x00\x00(:@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93\x00\xe8\xd6\x00\x00\x80\x00\x03\x04\x00\xc0\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+s = b'`\x00\x00\x00\x00(:@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93\x00\xa8\xd6\x00\x00\x80\x00\x03\x04@\xc0\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 raw(IPv6()/ICMPv6MPAdv()/ICMPv6NDOptPrefixInfo()) == s
 
 = ICMPv6MPAdv - dissection (default values)
 p = IPv6(s)
-p[ICMPv6MPAdv].type == 147 and p[ICMPv6MPAdv].cksum == 0xe8d6 and p[ICMPv6NDOptPrefixInfo].prefix == '::'
+p[ICMPv6MPAdv].type == 147 and p[ICMPv6MPAdv].cksum == 0xa8d6 and p[ICMPv6NDOptPrefixInfo].prefix == '::'
 
 = ICMPv6MPAdv - build
-s = b'`\x00\x00\x00\x00(:@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93\x00(\x07\x00*@\x00\x03\x04\x00@\xff\xff\xff\xff\x00\x00\x00\x0c\x00\x00\x00\x00 \x01\r\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01'
+s = b'`\x00\x00\x00\x00(:@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93\x00(\x07\x00*@\x00\x03\x04@@\xff\xff\xff\xff\x00\x00\x00\x0c\x00\x00\x00\x00 \x01\r\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01'
 raw(IPv6()/ICMPv6MPAdv(cksum=0x2807, flags=1, id=42)/ICMPv6NDOptPrefixInfo(prefix='2001:db8::1', L=0, preferredlifetime=12)) == s
 
 = ICMPv6MPAdv - dissection
@@ -6610,6 +6856,9 @@
 
 raw(NetflowHeader()/NetflowHeaderV5(count=1)/NetflowRecordV5(dst="192.168.0.1")) == b'\x00\x05\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7f\x00\x00\x01\xc0\xa8\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00<\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00'
 
+raw(NetflowHeader()/NetflowHeaderV5()/NetflowRecordV5(dst="192.168.0.1")/NetflowRecordV5(dst="172.16.0.1")) == b'\x00\x05\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7f\x00\x00\x01\xc0\xa8\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00<\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7f\x00\x00\x01\xac\x10\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00<\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+
+
 = NetflowHeaderV5 - UDP bindings
 
 s = raw(IP(src="127.0.0.1")/UDP()/NetflowHeader()/NetflowHeaderV5())
@@ -6682,6 +6931,50 @@
 assert nfv9_defrag[0].records[0].PROTOCOL == 17
 assert nfv9_defrag[0].records[0].IPV4_SRC_ADDR == "127.0.0.1"
 
+= NetflowV9 - build and dissection
+~ netflow
+
+header = Ether()/IP()/UDP()
+netflow_header = NetflowHeader()/NetflowHeaderV9()
+
+flowset = NetflowFlowsetV9(
+    templates=[NetflowTemplateV9(
+        template_fields=[
+            NetflowTemplateFieldV9(fieldType=1, fieldLength=1),  # IN_BYTES
+            NetflowTemplateFieldV9(fieldType=2, fieldLength=4),  # IN_PKTS
+            NetflowTemplateFieldV9(fieldType=4),  # PROTOCOL
+            NetflowTemplateFieldV9(fieldType=8),  # IPV4_SRC_ADDR
+            NetflowTemplateFieldV9(fieldType=12),  # IPV4_DST_ADDR
+        ],
+        templateID=256,
+        fieldCount=5)
+    ],
+    flowSetID=0
+)
+recordClass = GetNetflowRecordV9(flowset)
+dataFS = NetflowDataflowsetV9(
+    templateID=256,
+    records=[ # Some random data.
+        recordClass(
+            IN_BYTES=b"\x12",
+            IN_PKTS=b"\0\0\0\0",
+            PROTOCOL=6,
+            IPV4_SRC_ADDR="192.168.0.10",
+            IPV4_DST_ADDR="192.168.0.11"
+        ),
+    ],
+)
+
+pkt = netflow_header / flowset / dataFS
+assert raw(pkt) == b'\x00\t\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1c\x01\x00\x00\x05\x00\x01\x00\x01\x00\x02\x00\x04\x00\x04\x00\x01\x00\x08\x00\x04\x00\x0c\x00\x04\x01\x00\x00\x14\x12\x00\x00\x00\x00\x06\xc0\xa8\x00\n\xc0\xa8\x00\x0b\x00\x00'
+
+pkt = header / netflow_header / flowset / dataFS
+pkt = netflowv9_defragment(Ether(raw(pkt)))[0]
+
+assert NetflowDataflowsetV9 in pkt
+assert len(pkt[NetflowDataflowsetV9].records) == 1
+assert pkt[NetflowDataflowsetV9].records[0].IPV4_DST_ADDR == "192.168.0.11"
+
 = NetflowV9 - advanced build
 ~ netflow
 
@@ -6697,6 +6990,14 @@
 
 assert raw(pkt) == b'\xaa\xaa\xaa\xaa\xaa\xaa\x00\x00\x00\x00\x00\x00\x08\x00E\x00\x00\xcc\x00\x01\x00\x00@\x11|\x1e\x7f\x00\x00\x01\x7f\x00\x00\x01\x08\x07\x08\x07\x00\xb8\x86\xe7\x00\t\x00\x02\x00\x00\x00\x00\\C\x7f5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\\\x01\xa8\x00\x15\x00\x08\x00\x04\x00\x0c\x00\x04\x00\x05\x00\x01\x00\x04\x00\x01\x00\x07\x00\x02\x00\x0b\x00\x02\x00 \x00\x02\x00\n\x00\x04\x00\x10\x00\x04\x00\x11\x00\x04\x00\x12\x00\x04\x00\x0e\x00\x04\x00\x01\x00\x04\x00\x02\x00\x04\x00\x16\x00\x04\x00\x15\x00\x04\x00\x0f\x00\x04\x00\t\x00\x01\x00\r\x00\x01\x00\x06\x00\x01\x00<\x00\x01\x01\xa8\x00@\x14\x00\x00\xfd\x1e\x00\x00\xfd\x00\xfd\x00\x00\x00\x00\x00\x00\x00\x00\x03 \x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x02\xfb\x00\x15a|\x00\x00\x07\x0f$\x95x\xed$\x99\x91<\ndg\x01  \x00\x04'
 
+= NetflowV9 - padding #GH2257
+
+dat = hex_bytes("fb200807007840a10009000277efe9c450c843f900362202000000000001001801000004000800010000002a00040029000400000101004477ef819077ef81900000003c00000001009300930ac900640ac9033b060009ee0b3500000ac9033b131302000000000000260bdc69aa6480996649a000000000")
+pkt = UDP(dat)
+assert pkt[NetflowOptionsFlowsetV9].pad == b"\x00\x00"
+pkt[NetflowOptionsFlowsetV9].pad = None
+assert raw(pkt) == dat
+
 
 ############
 ############
@@ -6738,6 +7039,49 @@
 assert pkt3.scopes[0].scopeFieldlength == 2
 assert pkt3[NetflowOptionsFlowset10].options[0].optionFieldType == 36
 
+# Templates with enterprise-specific Information Elements.
+s=b'\x01\x07\x00\x12\x01\n\x00\x04\x84\x0c\x00\x02\x00\x00\x00\t\x01\n\x00&\x00\x0b\x00\x02\x00\x07\x00\x02\x00\x04\x00\x01\x00\x0c\x00\x04\x00\x08\x00\x04\x00\xea\x00\x02\x01\n\x00\x01\x84\x10\x00\x06\x00\x00\x00\t\x84\x0e\x00\x06\x00\x00\x00\t\x84\x0f\x00\x06\x00\x00\x00\t\x00\x01\x00\x04\x00\x02\x00\x04\x00\xf3\x00\x02\x00\x06\x00\x01\x01\n\x00#'
+pkt4 = NetflowTemplateV9(s)
+assert len(pkt4.template_fields) == pkt4.fieldCount
+assert sum([template.fieldLength for template in pkt4.template_fields]) == 124
+
+= NetflowV10/IPFIX - build
+
+netflow_header = NetflowHeader()/NetflowHeaderV10()
+
+flowset = NetflowFlowsetV9(
+    templates=[NetflowTemplateV9(
+        template_fields=[
+            NetflowTemplateFieldV9(fieldType=1, fieldLength=1),  # IN_BYTES
+            NetflowTemplateFieldV9(fieldType=2, fieldLength=4),  # IN_PKTS
+            NetflowTemplateFieldV9(fieldType=4),  # PROTOCOL
+            NetflowTemplateFieldV9(fieldType=8),  # IPV4_SRC_ADDR
+            NetflowTemplateFieldV9(fieldType=12),  # IPV4_DST_ADDR
+        ],
+        templateID=256,
+        fieldCount=5)
+    ],
+    flowSetID=0
+)
+recordClass = GetNetflowRecordV9(flowset)
+dataFS = NetflowDataflowsetV9(
+    templateID=256,
+    records=[ # Some random data.
+        recordClass(
+            IN_BYTES=b"\x12",
+            IN_PKTS=b"\0\0\0\0",
+            PROTOCOL=6,
+            IPV4_SRC_ADDR="192.168.0.10",
+            IPV4_DST_ADDR="192.168.0.11"
+        ),
+    ],
+)
+
+pkt = netflow_header / flowset / dataFS
+assert raw(pkt) == b'\x00\n\x00>\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1c\x01\x00\x00\x05\x00\x01\x00\x01\x00\x02\x00\x04\x00\x04\x00\x01\x00\x08\x00\x04\x00\x0c\x00\x04\x01\x00\x00\x14\x12\x00\x00\x00\x00\x06\xc0\xa8\x00\n\xc0\xa8\x00\x0b\x00\x00'
+
+
+
 ############
 ############
 + pcap / pcapng format support
@@ -6748,6 +7092,7 @@
 pcapngfile = BytesIO(b'\n\r\r\n\\\x00\x00\x00M<+\x1a\x01\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x01\x00,\x00File created by merging: \nFile1: test.pcap \n\x04\x00\x08\x00mergecap\x00\x00\x00\x00\\\x00\x00\x00\x01\x00\x00\x00\\\x00\x00\x00e\x00\x00\x00\xff\xff\x00\x00\x02\x006\x00Unknown/not available in original file format(libpcap)\x00\x00\t\x00\x01\x00\x06\x00\x00\x00\x00\x00\x00\x00\\\x00\x00\x00\x06\x00\x00\x00H\x00\x00\x00\x00\x00\x00\x00\x8d*\x05\x00/\xfc[\xcd(\x00\x00\x00(\x00\x00\x00E\x00\x00(\x00\x01\x00\x00@\x06|\xcd\x7f\x00\x00\x01\x7f\x00\x00\x01\x00\x14\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00\x91|\x00\x00H\x00\x00\x00\x06\x00\x00\x00<\x00\x00\x00\x00\x00\x00\x00\x8d*\x05\x00\x1f\xff[\xcd\x1c\x00\x00\x00\x1c\x00\x00\x00E\x00\x00\x1c\x00\x01\x00\x00@\x11|\xce\x7f\x00\x00\x01\x7f\x00\x00\x01\x005\x005\x00\x08\x01r<\x00\x00\x00\x06\x00\x00\x00<\x00\x00\x00\x00\x00\x00\x00\x8d*\x05\x00\xb9\x02\\\xcd\x1c\x00\x00\x00\x1c\x00\x00\x00E\x00\x00\x1c\x00\x01\x00\x00@\x01|\xde\x7f\x00\x00\x01\x7f\x00\x00\x01\x08\x00\xf7\xff\x00\x00\x00\x00<\x00\x00\x00')
 pcapnanofile = BytesIO(b"M<\xb2\xa1\x02\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00e\x00\x00\x00\xcf\xc5\xacV\xc9\xc1\xb5'(\x00\x00\x00(\x00\x00\x00E\x00\x00(\x00\x01\x00\x00@\x06|\xcd\x7f\x00\x00\x01\x7f\x00\x00\x01\x00\x14\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00\x91|\x00\x00\xcf\xc5\xacV-;\xc1'\x1c\x00\x00\x00\x1c\x00\x00\x00E\x00\x00\x1c\x00\x01\x00\x00@\x11|\xce\x7f\x00\x00\x01\x7f\x00\x00\x01\x005\x005\x00\x08\x01r\xcf\xc5\xacV\x9aL\xcf'\x1c\x00\x00\x00\x1c\x00\x00\x00E\x00\x00\x1c\x00\x01\x00\x00@\x01|\xde\x7f\x00\x00\x01\x7f\x00\x00\x01\x08\x00\xf7\xff\x00\x00\x00\x00")
 pcapwirelenfile = BytesIO(b'\xd4\xc3\xb2\xa1\x02\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x01\x00\x00\x00}\x87pZ.\xa2\x08\x00\x0f\x00\x00\x00\x10\x00\x00\x00\xff\xff\xff\xff\xff\xff GG\xee\xdd\xa8\x90\x00a')
+pcapngdefaults = BytesIO(base64_bytes(b'Cg0NChwAAABNPCsaAQAAAP//////////HAAAAAEAAAAgAAAAEgEAAP//AAAJAAEACUeZiQAAAAAgAAAAAQAAACAAAAASAQAA//8AAAkAAQAJAAAAAAAAACAAAAABAAAAIAAAABIBAAD//wAACQABAAkAAAAAAAAAIAAAAAEAAAAgAAAAEgEAAP//AAAJAAEACQAAAAAAAAAgAAAABgAAAIQBAAADAAAApO/bFdgJaeBiAQAAYgEAAFVVVVVVVVXV////////IMbr4D7PCABFAAFIlQkAAEAR5JwAAAAA/////wBEAEMBNJDsAQEGAFSpVwIACoAAAAAAAAAAAAAAAAAAAAAAACDG6+A+zwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjglNjNQEB/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsOs+bAAAhAEAAAYAAACAAQAAAwAAAKTv2xXIDYznYAEAAGABAABVVVVVVVVV1QEAXn//+iDG6+A+zwgARQABRgGPAAAEEal3qf5wqO////rhbgdsATJi0U5PVElGWSAqIEhUVFAvMS4xDQpIT1NUOiAyMzkuMjU1LjI1NS4yNTA6MTkwMA0KQ0FDSEUtQ09OVFJPTDogbWF4LWFnZT0xODAwDQpMT0NBVElPTjogaHR0cDovLzE2OS4yNTQuMTEyLjE2ODo1NTAwMC9ucmMvZGRkLnhtbA0KTlQ6IHV1aWQ6NEQ0NTQ5MzAtMDIwMC0xMDAwLTgwMDEtMjBDNkVCRTAzRUNGDQpOVFM6IHNzZHA6YWxpdmUNClNFUlZFUjogRnJlZUJTRC84LjAgVVBuUC8xLjAgUGFuYXNvbmljLU1JTC1ETE5BLVNWLzEuMA0KVVNOOiB1dWlkOjRENDU0OTMwLTAyMDAtMTAwMC04MDAxLTIwQzZFQkUwM0VDRg0KDQpcQcvWgAEAAAYAAAC4AQAAAwAAAKTv2xV4Ao3nlQEAAJUBAABVVVVVVVVV1QEAXn//+iDG6+A+zwgARQABewGQAAAEEalBqf5wqO////rhbgdsAWfu+k5PVElGWSAqIEhUVFAvMS4xDQpIT1NUOiAyMzkuMjU1LjI1NS4yNTA6MTkwMA0KQ0FDSEUtQ09OVFJPTDogbWF4LWFnZT0xODAwDQpMT0NBVElPTjogaHR0cDovLzE2OS4yNTQuMTEyLjE2ODo1NTAwMC9ucmMvZGRkLnhtbA0KTlQ6IHVybjpwYW5hc29uaWMtY29tOmRldmljZTpwMDBSZW1vdGVDb250cm9sbGVyOjENCk5UUzogc3NkcDphbGl2ZQ0KU0VSVkVSOiBGcmVlQlNELzguMCBVUG5QLzEuMCBQYW5hc29uaWMtTUlMLURMTkEtU1YvMS4wDQpVU046IHV1aWQ6NEQ0NTQ5MzAtMDIwMC0xMDAwLTgwMDEtMjBDNkVCRTAzRUNGOjp1cm46cGFuYXNvbmljLWNvbTpkZXZpY2U6cDAwUmVtb3RlQ29udHJvbGxlcjoxDQoNCrLVKmoAAAC4AQAABgAAAHgBAAADAAAApO/bFVjbjedXAQAAVwEAAFVVVVVVVVXVAQBef//6IMbr4D7PCABFAAE9AZEAAAQRqX6p/nCo7///+uFuB2wBKaZATk9USUZZICogSFRUUC8xLjENCkhPU1Q6IDIzOS4yNTUuMjU1LjI1MDoxOTAwDQpDQUNIRS1DT05UUk9MOiBtYXgtYWdlPTE4MDANCkxPQ0FUSU9OOiBodHRwOi8vMTY5LjI1NC4xMTIuMTY4OjU1MDAwL25yYy9kZGQueG1sDQpOVDogdXBucDpyb290ZGV2aWNlDQpOVFM6IHNzZHA6YWxpdmUNClNFUlZFUjogRnJlZUJTRC84LjAgVVBuUC8xLjAgUGFuYXNvbmljLU1JTC1ETE5BLVNWLzEuMA0KVVNOOiB1dWlkOjRENDU0OTMwLTAyMDAtMTAwMC04MDAxLTIwQzZFQkUwM0VDRjo6dXBucDpyb290ZGV2aWNlDQoNCjagXoUAeAEAAAYAAAC0AQAAAwAAAKTv2xXYw47nkwEAAJMBAABVVVVVVVVV1QEAXn//+iDG6+A+zwgARQABeQGSAAAEEalBqf5wqO////rhbgdsAWWV4E5PVElGWSAqIEhUVFAvMS4xDQpIT1NUOiAyMzkuMjU1LjI1NS4yNTA6MTkwMA0KQ0FDSEUtQ09OVFJPTDogbWF4LWFnZT0xODAwDQpMT0NBVElPTjogaHR0cDovLzE2OS4yNTQuMTEyLjE2ODo1NTAwMC9ucmMvZGRkLnhtbA0KTlQ6IHVybjpwYW5hc29uaWMtY29tOnNlcnZpY2U6cDAwTmV0d29ya0NvbnRyb2w6MQ0KTlRTOiBzc2RwOmFsaXZlDQpTRVJWRVI6IEZyZWVCU0QvOC4wIFVQblAvMS4wIFBhbmFzb25pYy1NSUwtRExOQS1TVi8xLjANClVTTjogdXVpZDo0RDQ1NDkzMC0wMjAwLTEwMDAtODAwMS0yMEM2RUJFMDNFQ0Y6OnVybjpwYW5hc29uaWMtY29tOnNlcnZpY2U6cDAwTmV0d29ya0NvbnRyb2w6MQ0KDQovXKFrALQBAAAGAAAAqAEAAAMAAACk79sVuJKP54cBAACHAQAAVVVVVVVVVdUBAF5///ogxuvgPs8IAEUAAW0BkwAABBGpTKn+cKjv///64W4HbAFZRNJOT1RJRlkgKiBIVFRQLzEuMQ0KSE9TVDogMjM5LjI1NS4yNTUuMjUwOjE5MDANCkNBQ0hFLUNPTlRST0w6IG1heC1hZ2U9MTgwMA0KTE9DQVRJT046IGh0dHA6Ly8xNjkuMjU0LjExMi4xNjg6NTUwMDAvbnJjL2RkZC54bWwNCk5UOiB1cm46ZGlhbC1tdWx0aXNjcmVlbi1vcmc6c2VydmljZTpkaWFsOjENCk5UUzogc3NkcDphbGl2ZQ0KU0VSVkVSOiBGcmVlQlNELzguMCBVUG5QLzEuMCBQYW5hc29uaWMtTUlMLURMTkEtU1YvMS4wDQpVU046IHV1aWQ6NEQ0NTQ5MzAtMDIwMC0xMDAwLTgwMDEtMjBDNkVCRTAzRUNGOjp1cm46ZGlhbC1tdWx0aXNjcmVlbi1vcmc6c2VydmljZTpkaWFsOjENCg0KLn5A6QCoAQAA'))
 
 = Read a pcap file
 pktpcap = rdpcap(pcapfile)
@@ -6758,7 +7103,12 @@
 
 = Read a pcap file with nanosecond precision
 pktpcapnano = rdpcap(pcapnanofile)
-assert pktpcapnano[0].time == Decimal('1454163407.666223049')
+assert pktpcapnano[0].time == 1454163407.666223049
+
+= Read a pcapng file with nanosecond precision and default tsresol
+pktpcapngdefaults = rdpcap(pcapngdefaults)
+assert pktpcapngdefaults[0].time == 1575115986.114775512
+assert Ether in pktpcapngdefaults[0]
 
 = Read a pcap file with wirelen != captured len
 pktpcapwirelen = rdpcap(pcapwirelenfile)
@@ -6788,6 +7138,17 @@
 assert len(newpktpcapwirelen[0]) < newpktpcapwirelen[0].wirelen
 assert newpktpcapwirelen[0].wirelen == pktpcapwirelen[0].wirelen
 
+= Check wrpcap() then rdpcap() with sent_time on SndRcvList
+f = get_temp_file()
+s = Ether()/IP()
+r = Ether()/IP()
+s.sent_time = 1
+r.time = 2
+wrpcap(f, SndRcvList([(s, r)]))
+pcap = rdpcap(f)
+assert pcap[0].time == 1
+assert pcap[1].time == 2
+
 = Check wrpcap()
 fdesc, filename = tempfile.mkstemp()
 fdesc = os.fdopen(fdesc, "wb")
@@ -6830,6 +7191,19 @@
 l = sniff(offline=IP()/UDP(sport=(10000, 10001)), filter="tcp")
 assert len(l) == 0
 
+= Check offline sniff() with Packets, tcpdump and a bad filter
+~ tcpdump
+
+try:
+    sniff(offline=IP()/UDP(), filter="bad filter")
+except Scapy_Exception:
+    pass
+else:
+    assert False
+
+= Check offline sniff with lfilter
+assert len(sniff(offline=[IP()/UDP(), IP()/TCP()], lfilter=lambda x: TCP in x)) == 1
+
 = Check offline sniff() without a tcpdump binary
 ~ tcpdump
 import mock
@@ -6837,14 +7211,11 @@
 conf_prog_tcpdump = conf.prog.tcpdump
 conf.prog.tcpdump = "tcpdump_fake"
 
-from scapy.arch.common import _check_tcpdump
-
-@mock.patch("scapy.arch.common.TCPDUMP", _check_tcpdump())
 def _test_sniff_notcpdump():
     try:
         sniff(offline="fake.pcap", filter="tcp")
         assert False
-    except Scapy_Exception:
+    except:
         assert True
 
 _test_sniff_notcpdump()
@@ -6898,6 +7269,12 @@
 pkt = pkt.payload
 assert isinstance(pkt, NoPayload)
 
+= Invalid pcapng file
+
+from io import BytesIO
+invalid_pcapngfile = BytesIO(b'\n\r\r\n\r\x00\x00\x00M<+\x1a\xb2<\xb2\xa1\x01\x00\x00\x00\r\x00\x00\x00M<+\x1a\x80\xaa\xb2\x02')
+assert(len(rdpcap(invalid_pcapngfile)) == 0)
+
 = Check PcapWriter on null write
 
 f = BytesIO()
@@ -6937,7 +7314,6 @@
 l = [ p for p in RawPcapReader(f) ]
 assert len(l) == 1
 
-
 = Check tcpdump()
 ~ tcpdump
 from io import BytesIO
@@ -6957,14 +7333,11 @@
 conf_prog_tcpdump = conf.prog.tcpdump
 conf.prog.tcpdump = "tcpdump_fake"
 
-from scapy.arch.common import _check_tcpdump
-
-@mock.patch("scapy.arch.common.TCPDUMP", _check_tcpdump())
 def _test_tcpdump_notcpdump():
     try:
         tcpdump(IP()/TCP())
         assert False
-    except Scapy_Exception:
+    except:
         assert True
 
 _test_tcpdump_notcpdump()
@@ -7101,6 +7474,7 @@
 tshark(count=1, timeout=3)
 
 = Check wireshark()
+~ wireshark
 
 f = BytesIO()
 pkt = Ether()/IP()/ICMP()
@@ -7144,6 +7518,18 @@
 assert len(rdpcap(filename)) == 2
 os.remove(filename)
 
+= Check wrpcap() with different packets types
+
+import mock
+import os
+import tempfile
+
+with mock.patch("scapy.utils.warning") as warning:
+    filename = tempfile.mktemp()
+    wrpcap(filename, [IP(), Ether(), IP(), IP()])
+    os.remove(filename)
+    assert any("Inconsistent" in arg for arg in warning.call_args[0])
+
 ############
 ############
 + Sessions
@@ -7301,6 +7687,56 @@
 assert HTTPResponse in pkts[2]
 assert pkts[2].load == b'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html><head><title></title></head><body style="background-color: transparent"><img src=\'https://pixel.mathtag.com/event/img?mt_id=151466&mt_adid=106144&v1=&v2=&v3=&s1=&s2=&s3=&ord=2047279765\' width=\'1\' height=\'1\' /><img src="https://adservice.google.com/ddm/fls/z/src=3656617;type=hpvisit;cat=homep198;u2=;u6=;u5=;u4=;u3=;u9=;u10=;u7=;u13=;u14=;u11=;u17=;u18=unknown;u20=;ord=1956603866265.9536"/></body></html>'
 
+= HTTP decompression (brotli)
+~ brotli
+
+conf.debug_dissector = True
+load_layer("http")
+
+import os
+import brotli
+
+tmp = "/test/pcaps/http_compressed-brotli.pcap"
+filename = os.path.abspath(os.path.join(os.path.dirname(__file__),"../")) + tmp
+filename = os.getenv("SCAPY_ROOT_DIR")+tmp if not os.path.exists(filename) else filename
+
+# First without auto decompression
+
+conf.contribs["http"]["auto_compression"] = False
+pkts = sniff(offline=filename, session=TCPSession)
+
+data = b'\x1f\x41\x00\xe0\xc5\x6d\xec\x77\x56\xf7\xb5\x8b\x1c\x52\x10\x48\xe0\x90\x03\xf6\x6f\x97\x30\xd0\x40\x24\xb8\x01\x9b\xdb\xa0\xf4\x5c\x92\x4c\xc4\x6f\x89\x58\xf7\x4b\xf7\x4b\x6f\x8c\x2e\x2c\x28\x64\x06\x1d\x03'
+
+pkts[0].show()
+assert HTTPResponse in pkts[0]
+assert pkts[0].Content_Encoding == b'br'
+assert pkts[0].Content_Type == b'text/plain'
+assert pkts[0].load == data
+
+# Now with auto decompression
+
+conf.contribs["http"]["auto_compression"] = True
+pkts = sniff(offline=filename, session=TCPSession)
+
+pkts[0].show()
+assert HTTPResponse in pkts[0]
+assert pkts[0].load == b'This is a test file for testing brotli decompression in Wireshark\n'
+
+= HTTP PSH bug fix
+
+tmp = "/test/pcaps/http_tcp_psh.pcap.gz"
+filename = os.path.abspath(os.path.join(os.path.dirname(__file__),"../")) + tmp
+filename = os.getenv("SCAPY_ROOT_DIR")+tmp if not os.path.exists(filename) else filename
+
+pkts = sniff(offline=filename, session=TCPSession)
+
+assert len(pkts) == 15
+# Verify a split header exists in the packet
+assert pkts[5].User_Agent == b'example_user_agent'
+
+# Verify all of the response data exists in the packet
+assert int(pkts[7][HTTP].Content_Length.decode()) == len(pkts[7][Raw].load)
+
 = HTTP build
 
 pkt = TCP()/HTTP()/HTTPRequest(Method=b'GET', Path=b'/download', Http_Version=b'HTTP/1.1', Accept=b'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', Accept_Encoding=b'gzip, deflate', Accept_Language=b'en-US,en;q=0.5', Cache_Control=b'max-age=0', Connection=b'keep-alive', Host=b'scapy.net', User_Agent=b'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:67.0) Gecko/20100101 Firefox/67.0')
@@ -7308,6 +7744,42 @@
 raw_pkt
 assert raw_pkt == b'\x00P\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00\x00\x00\x00\x00GET /download HTTP/1.1\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Encoding: gzip, deflate\r\nAccept-Language: en-US,en;q=0.5\r\nCache-Control: max-age=0\r\nConnection: keep-alive\r\nHost: scapy.net\r\nUser-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:67.0) Gecko/20100101 Firefox/67.0\r\n\r\n'
 
+= HTTP 1.1 -> HTTP 2.0 Upgrade (h2c)
+~ Test h2c
+
+conf.debug_dissector = True
+load_layer("http")
+from scapy.contrib.http2 import H2Frame
+
+import os
+
+tmp = "/test/pcaps/http2_h2c.pcap"
+filename = os.path.abspath(os.path.join(os.path.dirname(__file__),"../")) + tmp
+filename = os.getenv("SCAPY_ROOT_DIR")+tmp if not os.path.exists(filename) else filename
+
+pkts = sniff(offline=filename, session=TCPSession)
+
+assert HTTPResponse in pkts[1]
+assert pkts[1].Connection == b"Upgrade"
+assert H2Frame in pkts[1]
+assert pkts[1][H2Frame].settings[0].id == 3
+
+for i in range(3, 10):
+    assert HTTP not in pkts[i]
+    assert H2Frame in pkts[i]
+
+= Test chunked with gzip
+
+conf.contribs["http"]["auto_compression"] = False
+z = b'\x1f\x8b\x08\x00S\\-_\x02\xff\xb3\xc9(\xc9\xcd\xb1\xcb\xcd)\xb0\xd1\x07\xb3\x00\xe6\xedpt\x10\x00\x00\x00'
+a = IP(dst="1.1.1.1", src="2.2.2.2")/TCP(seq=1)/HTTP()/HTTPResponse(Content_Encoding="gzip", Transfer_Encoding="chunked")/(b"5\r\n" + z[:5] + b"\r\n")
+b = IP(dst="1.1.1.1", src="2.2.2.2")/TCP(seq=len(a[TCP].payload)+1)/HTTP()/(hex(len(z[5:])).encode()[2:] + b"\r\n" + z[5:] + b"\r\n0\r\n\r\n")
+xa, xb = IP(raw(a)), IP(raw(b))
+conf.contribs["http"]["auto_compression"] = True
+
+c = sniff(offline=[xa, xb], session=TCPSession)[0]
+assert gzip_decompress(z) == c.load
+
 ############
 ############
 + LLMNR protocol
@@ -7446,6 +7918,15 @@
 
 assert plen == payloadlen
 
+= fragment() with non-multiple-of-8 MTU
+paylen = 1400 + 1
+frags1 = fragment(IP() / ("X" * paylen), paylen)
+assert len(frags1) == 1
+frags2 = fragment(IP() / ("X" * (paylen + 1)), paylen)
+assert len(frags2) == 2
+assert len(frags2[0]) == 20 + paylen - paylen % 8
+assert len(frags2[1]) == 20 + 1 + paylen % 8
+
 = defrag()
 nonfrag, unfrag, badfrag = defrag(frags)
 assert not nonfrag
@@ -7464,8 +7945,8 @@
 assert fragsize % 8 == 0
 packet = Ether()/IP()/("X" * payloadlen)
 frags = fragment(packet, fragsize)
-for i,fragment in enumerate(frags):
-    fragment.time -= 100 + i
+for i,frag in enumerate(frags):
+    frag.time -= 100 + i
 
 last_time = max(frag.time for frag in frags)
 defrags = defragment(frags)
@@ -7473,6 +7954,10 @@
 nonfrag, defrags, badfrag = defrag(frags)
 assert defrags[0].time == last_time
 
+= defragment() - Missing fragments
+
+pkts = fragment(IP(dst="10.0.0.5")/ICMP()/("X"*1500))
+assert len(defragment(pkts[1:])) == 1
 
 = defrag() / defragment() - Real DNS packets
 
@@ -7544,6 +8029,7 @@
 ############
 ############
 + TCP/IP tests
+~ tcp
 
 = TCP options: UTO - basic build
 raw(TCP(options=[("UTO", 0xffff)])) == b"\x00\x14\x00\x50\x00\x00\x00\x00\x00\x00\x00\x00\x60\x02\x20\x00\x00\x00\x00\x00\x1c\x04\xff\xff"
@@ -7590,6 +8076,10 @@
 p = TCP(data)
 assert TCP in p and Raw in p and len(p.options) == 3
 
+= TCP options: build oversized packet
+
+raw(TCP(options=[('TFO', (1607681672, 2269173587)), ('AltChkSum', (81, 27688)), ('TFO', (253281879, 1218258937)), ('Timestamp', (1613741359, 4215831072)), ('Timestamp', (3856332598, 1434258666))]))
+
 = TCP random options
 pkt = TCP()
 random.seed(0x2807)
@@ -7638,6 +8128,10 @@
 bpkt = IP(raw(pkt))
 assert bpkt.chksum == 0x70bc and bpkt.payload.chksum == 0x4b2c
 
+pkt = IP(options=[IPOption_Timestamp()]) / TCP() / ("A" * 10)
+bpkt = IP(raw(pkt))
+assert bpkt.chksum == 0x2caa and bpkt.payload.chksum == 0x4b2c
+
 pkt = IP() / UDP()
 bpkt = IP(raw(pkt))
 assert bpkt.chksum == 0x7cce and bpkt.payload.chksum == 0x0172
@@ -7824,6 +8318,21 @@
 assert p[DNS].an.rdata == [b"sweet", b"celestia"]
 assert raw(p) == b'\x00\x01\x01\x80\x00\x00\x00\x01\x00\x00\x00\x00\x06secdev\x00\x00\x10\x00\x01\x00\x00\x00\x01\x00\x0f\x05sweet\x08celestia'
 
+= DNS - Malformed DNS over TCP message
+
+try:
+    p = IP(IP(raw(IP()/TCP()/DNS(length=28))[:-13]))
+    assert False
+except Scapy_Exception as e:
+    assert str(e) == "Malformed DNS message: too small!"
+
+try:
+    p = IP(raw(IP()/TCP()/DNS(length=28, qdcount=1)))
+    assert False
+except Scapy_Exception as e:
+    assert str(e) == "Malformed DNS message: invalid length!"
+
+
 = Layer binding
 
 * Test DestMACField & DestIPField
@@ -8426,6 +8935,44 @@
 test_freebsd_10_2()
 
 
+= FreeBSD 13.0
+~ mock_read_routes_bsd
+
+import mock
+from io import StringIO
+
+@mock.patch("scapy.arch.unix.os")
+def test_freebsd_13(mock_os):
+    """Test read_routes() on FreeBSD 13"""
+    # 'netstat -rnW -f inet' output
+    netstat_output = u"""
+Routing tables
+
+Internet:
+Destination        Gateway            Flags   Nhop#    Mtu      Netif Expire
+default            10.0.0.1           UGS         3   1500     vtnet0
+10.0.0.0/24        link#1             U           2   1500     vtnet0
+10.0.0.8           link#2             UHS         1  16384        lo0
+127.0.0.1          link#2             UH          1  16384        lo0
+"""
+    # Mocked file descriptor
+    strio = StringIO(netstat_output)
+    mock_os.popen = mock.MagicMock(return_value=strio)
+    # Test the function
+    from scapy.arch.unix import read_routes
+    routes = read_routes()
+    scapy.arch.unix.DARWIN = False
+    scapy.arch.unix.FREEBSD = True
+    scapy.arch.unix.NETBSD = False
+    scapy.arch.unix.OPENBSD = False
+    for r in routes:
+        print(r)
+        assert(r[3] in ["vtnet0", "lo0"])
+    assert(len(routes) == 4)
+
+test_freebsd_13()
+
+
 = OpenBSD 5.5
 ~ mock_read_routes_bsd
 
@@ -8550,10 +9097,10 @@
 
 old_routes = conf.route.routes
 old_iface = conf.iface
-old_loopback = scapy.consts.LOOPBACK_INTERFACE
+old_loopback = conf.loopback_name
 try:
     conf.iface = 'enp3s0'
-    scapy.consts.LOOPBACK_INTERFACE = 'lo'
+    conf.loopback_name = 'lo'
     conf.route.invalidate_cache()
     conf.route.routes = [
         (4294967295, 4294967295, '0.0.0.0', 'wlan0', '', 281),
@@ -8573,7 +9120,7 @@
     assert conf.route.route("255.255.255.255") == ('enp3s0', '192.168.0.119', '0.0.0.0')
     assert conf.route.route("*") == ('enp3s0', '192.168.0.119', '192.168.0.254')
 finally:
-    scapy.consts.LOOPBACK_INTERFACE = old_loopback
+    conf.loopback_name = old_loopback
     conf.iface = old_iface
     conf.route.routes = old_routes
     conf.route.invalidate_cache()
@@ -8581,12 +9128,12 @@
 
 = Mocked IPv6 routes calls
 
-old_routes = conf.route6.routes
 old_iface = conf.iface
-old_loopback = scapy.consts.LOOPBACK_INTERFACE
+old_loopback = conf.loopback_name
 try:
+    conf.route6.ipv6_ifaces = set(['enp3s0', 'wlan0', 'lo'])
     conf.iface = 'enp3s0'
-    scapy.consts.LOOPBACK_INTERFACE = 'lo'
+    conf.loopback_name = 'lo'
     conf.route6.invalidate_cache()
     conf.route6.routes = [
         ('fe80::dd17:1fa6:a123:ab4', 128, '::', 'lo', ['fe80::dd17:1fa6:a123:ab4'], 291),
@@ -8606,15 +9153,25 @@
     assert conf.route6.route("fe80::1") == ('enp3s0', 'fe80::7101:5678:1234:da65', '::')
     assert conf.route6.route("fe80::1", dev='lo') == ('lo', 'fe80::dd17:1fa6:a123:ab4', '::')
 finally:
-    scapy.consts.LOOPBACK_INTERFACE = old_loopback
+    conf.loopback_name = old_loopback
     conf.iface = old_iface
-    conf.route6.routes = old_routes
-    conf.route6.invalidate_cache()
+    conf.route6.resync()
+
+= Find a link-local address when conf.iface does not support IPv6
+
+old_iface = conf.iface
+conf.route6.ipv6_ifaces = set(['eth1', 'lo'])
+conf.iface = "eth0"
+conf.route6.routes = [("fe80::", 64, "::", "eth1", ["fe80::a00:28ff:fe07:1980"], 256), ("::1", 128, "::", "lo", ["::1"], 0), ("fe80::a00:28ff:fe07:1980", 128, "::", "lo", ["::1"], 0)]
+assert(conf.route6.route("fe80::2807") == ("eth1", "fe80::a00:28ff:fe07:1980", "::"))
+conf.iface = old_iface
+conf.route6.resync()
 
 = Windows: reset routes properly
 
 if WINDOWS:
-    route_add_loopback()
+    from scapy.arch.windows import _route_add_loopback
+    _route_add_loopback()
 
 ############
 ############
@@ -9100,6 +9657,12 @@
 assert(p.mode == 3)
 assert(p.stratum == 2)
 
+= NTPAuthenticator
+
+s = hex_bytes("000c2962f268d094666d23750800450000640db640004011a519c0a80364c0a80305a51e007b0050731a2300072000000000000000000000000000000000000000000000000000000000000000000000000052c7bc1dda64b97d0000000bcdc3825dbf6b7ad02886ff45aa8b2eaf7ac78bc1")
+p = Ether(s)
+assert NTPAuthenticator in p and p[NTPAuthenticator].key_id == 3452142173
+
 
 ############
 ############
@@ -10441,6 +11004,14 @@
 p = IP(s)
 VRRP in p and p[VRRP].chksum == 0x7afd
 
+= VRRP IPv6 - build
+s6 = raw(IPv6()/VRRPv3())
+s6 == b'`\x00\x00\x00\x00\x08p@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x011\x01d\x01\x00dj\x1f'
+
+= VRRP IPv6 - dissection
+p6 = IPv6(s6)
+VRRPv3 in p6 and p6[VRRPv3].chksum == 0x6a1f
+
 = VRRP - chksums
 # VRRPv3
 p = Ether(src="00:00:5e:00:02:02",dst="01:00:5e:00:00:12")/IP(src="20.0.0.3", dst="224.0.0.18",ttl=255)/VRRPv3(priority=254,vrid=2,version=3,adv=1,addrlist=["20.0.1.2","20.0.1.3"])
@@ -10451,6 +11022,12 @@
 b = Ether(raw(p))
 assert b[VRRP].chksum == 0xc6f4
 
+= VRRP IPv6 - chksums
+# VRRPv3 IPv6
+p = Ether(src="00:00:5e:00:02:02",dst="33:33:00:00:00:12")/IPv6(src="2001:db8::1", dst="ff02::12",hlim=255)/VRRPv3(priority=254,vrid=2,version=3,adv=1,ipcount=2,addrlist=["2001:db8::2","2001:db8::3"])
+c = Ether(raw(p))
+assert c[VRRPv3].chksum == 0x481b
+
 ############
 ############
 + L2TP tests
@@ -10526,7 +11103,7 @@
 
 = IP/UDP/RADIUS - Build
 s = raw(IP()/UDP(sport=1812)/Radius(authenticator="scapy")/RadiusAttribute(value="scapy"))
-s == b'E\x00\x007\x00\x01\x00\x00@\x11|\xb3\x7f\x00\x00\x01\x7f\x00\x00\x01\x07\x14\x07\x15\x00#U\xb2\x01\x00\x00\x1bscapy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x07scapy'
+s == b'E\x00\x007\x00\x01\x00\x00@\x11|\xb3\x7f\x00\x00\x01\x7f\x00\x00\x01\x07\x14\x07\x14\x00#U\xb3\x01\x00\x00\x1bscapy\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x07scapy'
 
 = IP/UDP/RADIUS - Dissection
 p = IP(s)
@@ -10540,7 +11117,7 @@
 assert(radius_packet.authenticator == b'>k\xd4\xc4\x19V\x0b*1\x99\xc8D\xea\xc2\x94Z')
 assert(len(radius_packet.attributes) == 17)
 assert(radius_packet.attributes[0].type == 1)
-assert(type(radius_packet.attributes[0]) == RadiusAttribute)
+assert(type(radius_packet.attributes[0]) == RadiusAttr_User_Name)
 assert(radius_packet.attributes[0].len == 6)
 assert(radius_packet.attributes[0].value == b"leap")
 assert(radius_packet.attributes[1].type == 6)
@@ -10619,7 +11196,7 @@
 assert(radius_packet.authenticator == b'C\xbe!J\x08\xdf\xcf\x9f\x00v~,\xfb\x8e`\xc8')
 assert(len(radius_packet.attributes) == 18)
 assert(radius_packet.attributes[0].type == 1)
-assert(type(radius_packet.attributes[0]) == RadiusAttribute)
+assert(type(radius_packet.attributes[0]) == RadiusAttr_User_Name)
 assert(radius_packet.attributes[0].len == 6)
 assert(radius_packet.attributes[0].value == b"leap")
 assert(radius_packet.attributes[1].type == 6)
@@ -10718,13 +11295,18 @@
 = RADIUS - attributes with IPv4 addresses
 
 r = raw(RadiusAttr_NAS_IP_Address())
-p = RadiusAttr_NAS_IP_Address(p)
+p = RadiusAttr_NAS_IP_Address(r)
 assert p.type == 4
 
 r = raw(RadiusAttr_Framed_IP_Address())
-p = RadiusAttr_Framed_IP_Address(p)
+p = RadiusAttr_Framed_IP_Address(r)
 assert p.type == 8
 
+= RadiusAttr_User_Password
+
+r = b'\x01\x00\x00\x1c0x10x20x30x40x50\x02\x08geheim'
+p = Radius(r)
+assert isinstance(p.attributes[0], RadiusAttr_User_Password)
 
 ############
 ############
@@ -10976,6 +11558,21 @@
 r4.ifdel(get_dummy_interface())
 len(r4.routes) == len_r4
 
+dummy_interface = get_dummy_interface()
+
+bck_conf_route_routes = conf.route.routes
+conf.route.routes = [
+    (0, 0, '172.21.230.1', dummy_interface, '172.21.230.10', 1),                # 0.0.0.0         / 0.0.0.0         == 255.255.255.255
+    (2851995648, 4294901760, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 169.254.0.0     / 255.255.0.0     == 169.254.255.255
+    (2887116288, 4294967040, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 172.21.230.0    / 255.255.255.0   == 172.21.230.255
+    (2887116289, 4294967295, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 172.21.230.1    / 255.255.255.255 == 172.21.230.1
+    (3758096384, 4026531840, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 224.0.0.0       / 240.0.0.0       == 239.255.255.255
+    (3758096635, 4294967295, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 224.0.0.251     / 255.255.255.255 == 224.0.0.251
+    (4294967295, 4294967295, '0.0.0.0', dummy_interface, '172.21.230.10', 1),   # 255.255.255.255 / 255.255.255.255 == 255.255.255.255
+    ]
+
+assert sorted(conf.route.get_if_bcast(dummy_interface)) == sorted(['169.254.255.255', '172.21.230.255', '239.255.255.255'])
+conf.route.routes = bck_conf_route_routes
 
 ############
 ############
@@ -11028,6 +11625,9 @@
 rex = RandRegExp("[g-v]* @? [0-9]{3} . (g|v)")
 bytes(rex) == ('vmuvr @ 906 \x9e g' if six.PY2 else b'irrtv @ 517 \xc2\xb8 v')
 
+rex = RandRegExp("[:digit:][:space:][:word:]")
+assert re.match(b"\\d\\s\\w", bytes(rex))
+
 = Corrupted(Bytes|Bits)
 
 random.seed(0x2807)
@@ -11038,18 +11638,18 @@
 assert(sane(raw(cb)) in ["ECk@Y", "QB.P."])
 
 = RandEnumKeys
-~ not_pypy random_weird_py3
 random.seed(0x2807)
 rek = RandEnumKeys({'a': 1, 'b': 2, 'c': 3}, seed=0x2807)
 rek.enum.sort()
-assert(rek == ('c' if six.PY2 else 'a'))
+r = str(rek)
+r
+assert(r == ('c' if six.PY2 else 'a'))
 
 = RandSingNum
-~ not_pypy random_weird_py3
 random.seed(0x2807)
-rs = RandSingNum(-28, 7)
-assert(rs == (3 if six.PY2 else 2))
-assert(rs == (-27 if six.PY2 else -17))
+rs = RandSingNum(-28, 7)._fix()
+rs
+assert(rs in [2, 3])
 
 = Rand*
 random.seed(0x2807)
@@ -11067,7 +11667,7 @@
 = Various volatiles
 
 random.seed(0x2807)
-assert RandNumGamma(1, 42) == 8
+assert RandNumGamma(1, 42)._fix() in (8, 73)
 
 random.seed(0x2807)
 assert RandNumGauss(1, 42) == 8
@@ -11471,19 +12071,18 @@
 assert BOOTP().hashret() == b"\x00\x00\x00\x00"
 
 import random
-random.seed(0x2807)
-assert str(RandDHCPOptions(size=1)) in [r"[('WWW_server', '36.35.181.183')]",
-                                        r"[('boot-file-name', '\xe4Z\xdb\xef\xaf\xf5\x10\x91\x9eD\x0c9. \x91\xa5*Ug\x9cl\xa1\xca\xe3\xa2\xf0:\xd7\x00\xc9g\x02f1\xbd?\xb3\xc4\xe10S7\x9d\x91\x84\xc9y\xb2V<\x7f\x87\x14\xde\xc2\xf4\x94\xabyk\xc1\xbcU\x14\xcb\xb8\xcf\x96\xfedU\x81Z\xff\t\xa6\xe0\xf5\x15p\x91\xf0\xec\x7f')]"]
+random.seed(0x2809)
+assert str(RandDHCPOptions(size=1)) in [r"[('NIS_server', '0.45.231.69')]", r"[('ieee802-3-encapsulation', 229)]"]
 
 = DHCPOptionsField
 
 value = [("hostname", "scapy")]
-dof = DHCPOptionsField("options", "")
-assert dof.i2repr("", value) == "[hostname='scapy']"
-assert dof.i2repr("", ["opt", "opt2"]) == "[opt opt2]"
-assert dof.i2m("", value) == b'\x0c\x05scapy'
-assert dof.m2i("", b'\x0cunknown') == [b'\x0cunknown']
-assert dof.m2i("", b'\x0c\x05scapy') == [('hostname', b'scapy')]
+dhcpoptfield = DHCPOptionsField("options", "")
+assert dhcpoptfield.i2repr("", value) == "[hostname='scapy']"
+assert dhcpoptfield.i2repr("", ["opt", "opt2"]) == "[opt opt2]"
+assert dhcpoptfield.i2m("", value) == b'\x0c\x05scapy'
+assert dhcpoptfield.m2i("", b'\x0cunknown') == [b'\x0cunknown']
+assert dhcpoptfield.m2i("", b'\x0c\x05scapy') == [('hostname', b'scapy')]
 
 unknown_value_end = b"\xfe" + b"\xff"*257
 udof = DHCPOptionsField("options", unknown_value_end)
@@ -11494,13 +12093,19 @@
 assert udof.m2i("", unknown_value_pad) == [(254, b'\xff'*255), 'pad']
 
 = DHCP - build
+
 s = raw(IP(src="127.0.0.1")/UDP()/BOOTP(chaddr="00:01:02:03:04:05")/DHCP(options=[("message-type","discover"),"end"]))
 assert s == b'E\x00\x01\x10\x00\x01\x00\x00@\x11{\xda\x7f\x00\x00\x01\x7f\x00\x00\x01\x00C\x00D\x00\xfcf\xea\x01\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0000:01:02:03:04:0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00c\x82Sc5\x01\x01\xff'
 
 s2 = raw(IP(src="127.0.0.1")/UDP()/BOOTP(chaddr="05:04:03:02:01:00")/DHCP(options=[("param_req_list",[12,57,45,254]),("requested_addr", "192.168.0.1"),"end"]))
 assert s2 == b'E\x00\x01\x19\x00\x01\x00\x00@\x11{\xd1\x7f\x00\x00\x01\x7f\x00\x00\x01\x00C\x00D\x01\x058\xeb\x01\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0005:04:03:02:01:0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00c\x82Sc7\x04\x0c9-\xfe2\x04\xc0\xa8\x00\x01\xff'
 
+s3 = raw(IP(src="127.0.0.1")/UDP()/BOOTP(chaddr="05:04:03:02:01:00")/DHCP(options=[("time_zone",123),("uap-servers","www.example.com"),("netinfo-server-address","10.0.0.1"),
+                                                                                   ("ieee802-3-encapsulation", 2),("max_dgram_reass_size", 120), ("pxelinux_path_prefix","/some/path"), "end"]))
+assert s3 == b'E\x00\x01=\x00\x01\x00\x00@\x11{\xad\x7f\x00\x00\x01\x7f\x00\x00\x01\x00C\x00D\x01)\x04i\x01\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0005:04:03:02:01:0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00c\x82Sc\x02\x04\x00\x00\x00{b\x0fwww.example.comp\x04\n\x00\x00\x01$\x01\x02\x16\x02\x00x\xd2\n/some/path\xff'
+
 = DHCP - dissection
+
 p = IP(s)
 assert DHCP in p and p[DHCP].options[0] == ('message-type', 1)
 
@@ -11509,6 +12114,16 @@
 assert p2[DHCP].options[0] == ("param_req_list",[12,57,45,254])
 assert p2[DHCP].options[1] == ("requested_addr", "192.168.0.1")
 
+p3 = IP(s3)
+assert DHCP in p3
+assert p3[DHCP].options[0] == ("time_zone",123)
+assert p3[DHCP].options[1] == ("uap-servers", b'www.example.com')
+assert p3[DHCP].options[2] == ("netinfo-server-address", "10.0.0.1")
+assert p3[DHCP].options[3] == ("ieee802-3-encapsulation", 2)
+assert p3[DHCP].options[4] == ("max_dgram_reass_size", 120)
+assert p3[DHCP].options[5] == ("pxelinux_path_prefix", b'/some/path')
+assert p3[DHCP].options[6] == "end"
+
 ############
 ############
 + 802.11
@@ -11530,11 +12145,14 @@
 = Dot11 - dissection
 p = Dot11(s)
 Dot11 in p and p.addr3 == "00:00:00:00:00:00"
-p.mysummary() == '802.11 Management 0 00:00:00:00:00:00 > 00:00:00:00:00:00'
+assert p.mysummary() == '802.11 Management Association Request 00:00:00:00:00:00 (TA=SA) > 00:00:00:00:00:00 (RA=DA)'
+assert "DA" in p.address_meaning(1)
+assert "SA" in p.address_meaning(2)
+assert "BSSID" in p.address_meaning(3)
 
 = Dot11QoS - build
 s = raw(Dot11()/Dot11QoS(Ack_Policy=1))
-assert s == b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00'
+assert s == b'\xc8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00 \x00'
 
 s = raw(Dot11(type=2, subtype=8)/Dot11QoS(TID=4))
 assert s == b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00'
@@ -11557,7 +12175,11 @@
 
 = Dot11QoS - dissection
 p = Dot11(s)
-Dot11QoS in p
+assert Dot11QoS in p
+assert p.TID == 4
+assert "DA" in p.address_meaning(1)
+assert "SA" in p.address_meaning(2)
+assert "BSSID" in p.address_meaning(3)
 
 = Dot11 - answers
 query = Dot11(type=0, subtype=0)
@@ -11569,7 +12191,7 @@
 assert Dot11(b'\x84\x00\x00\x00\x00\x11\x22\x33\x44\x55\x00\x11\x22\x33\x44\x55').addr2 == '00:11:22:33:44:55'
 
 = Multiple Dot11Elt layers
-pkt = Dot11() / Dot11Beacon() / Dot11Elt(ID="Rates") / Dot11Elt(ID="SSID", info="Scapy")
+pkt = Dot11() / Dot11Beacon() / Dot11Elt(ID="Supported Rates") / Dot11Elt(ID="SSID", info="Scapy")
 assert pkt[Dot11Elt::{"ID": 0}].info == b"Scapy"
 assert pkt.getlayer(Dot11Elt, ID=0).info == b"Scapy"
 
@@ -11602,6 +12224,10 @@
 assert pkt[Dot11TKIP].TSC4 == 0
 assert pkt[Dot11TKIP].TSC5 == 160
 
+assert "DA" in pkt[Dot11].address_meaning(1)
+assert "TA=BSSID" in pkt[Dot11].address_meaning(2)
+assert "SA" in pkt[Dot11].address_meaning(3)
+
 = Dot11CCMP - dissection
 
 pkt = RadioTap(b'\x00\x00\x0f\x00*\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x08b\x00\x00\x01\x00^\x7f\xff\xfa\x0e\xec\xda\x1d\xa3M\x00\x0eX7\xbe\xbe\x00\x8aD#\x00\xa0D#\x00\xa0\x00\x00\x00\x00c\xb7\rv/s\x88N;>\x07\x0e\xe5\xd9\xf5\xfa\xcdD\xc2he\xfc\xc5^m\xae\xf2\xfe\xf9\xb06\xce\rt\xbe\x9d(\xb5\x98\x848NU\x0f\x93\x0f]m\xa2\x96\x80{\x95\x00\xb5\x98Y!\xa3^\xfc\xda\xca.R\xf3\xd3\xf8^\xeda\x88\x82p\xc6\xb8L\x0b\x815-\x85(\xb1F\xd5K\x166dJ\xc7\x04B\xdb\xec\x8d\xb7:{\x0f\'g<\x06\xd07>\xde\xad\x08\xcb\xffr\xfa\xf4}o\xe9\xa9b\xa5)\x87\x90\xa5{\xe1\xea\x0f\x0fGf`x1\xbd\xc1\xe8\xa0\xb6(\x05gq\xf3\x99\x9e\x93\xde\'\x8e\nQ\xf7\xad\xf7\x89"\xee\xcf\xe8$\x8a\x9c\xb4\xe6\x03\xab\x9ec\xd0\xd5\x08\xca\xd2\xbb\xae\xcc\x9c$R\xbc\xcdFO?\xc3Ah\x9ch\xd4\x9b)m\xea\xbab+\'\x06I2\xb5!\xdb\x03\xbe\xb8\xb2\x86\x0f\x80\n\xbc\x85\x02\xb4T\x00\x00\xc7|\xac\xc0B\xb2\x89\xbb\xc5\xc0\x93\x858\xe3Q\xf9\t\xff4\xdb\x9a>\xe5O-e\x16\x81w!9m\xb9dZ\xaa\xaa0\x9cW\xaa\xa3\xf1\xdd\xecW\xdd\xc41D\xe6\xba\xf3SQ\x81S\xf6\xbd\xe3\xc0e\xba\xa0*\x15%\x9cz0\xa8\xa6l\x8e\x0c(\xd3\xe4\xa2\xf9\xc2:Yae#T\x8d\xef\x01\xfad\x05/\xdb\xf2!D\xde~\x0f\x99\xf6U\xf5\xbf\xd0\xaf\xbe0\xf7\xf03\xa8s`\x8d>4\x98\xb5Y\x06dXFz\x88\x82\'B\x84\xe6\xca\x05\x02\xd5G\xb6\x11\xed <\xb1\xd4\xc9\xa9\xaa\xae\xc9\xb3g\xbc\xfd+\xe7\x1aG\x92\x17\xdb\xce\xf7\x843\xce4\xc4w\x8f\x8a\x83\xf0\'\xfe\x87\x14\x95\xd3\x0bM\xbaL$\xc8\x8d\' 8\x87c 3yt\xc5\xeeN\xc9\xe1\x95\x1d\xe9\xddh\x87E\x07\xe5\x86\xc7\x82\x8a\x88\x05\xa4\x06\xb1\x0c\xddV\xd0\xf0d\xc8\xcet`\xc5C\xcb\x8f\x06]A\x92\x1a\xae5wc\x8dN\xa2\xf0}aJ\x9c\x8e\xd1\xb2[*\xffK\x0f\xf8u\xd5\x84#\xc3"\xffX\x9f\xffC\x0fb\x02n\x1b\xbaAr\x93\xe1\xb7\x1f\x8e\x1c\xfev]w\xaa\xcch\x8c{lm\xb9\x9aE\x08\x1d\xc28u\x82\xa8\xbe\xf2\xb3\x11\xdc\x90 \x83\xa7\x9c*:\x01R\xcf\xd6\xc6~\x989\x9a5\xc97\xfa\x10<x|kQ5\xa1S\x17\x1a\xc1\x83\xa03\xec\xf0h8\xfbZA\x03"&p\x99\n\x01\x9c\xa9\xd9\xff\xdf\'n$K8t\x0br_\xce^\xf3\xf4v\xff\x11\xde\xc7Wo\xe9\xaf%\x02UM\xb5l\xb9\x88=x\x87\xfamH\xb2;7|\x99C\xb6{}n_Z\xc7i\\:D\xdd\x87\xf3\\e\xdeH\x1b~9\xcb\xaeg\x99\xde4\xcf9\xe9\xc8\x8f\x87DLz\xe0\xa4\xca\x04\xa2\x93\xaf\x80g\xfb\x9d\xb8\xa8y\xb8K\xaa\x8b2\xfe\xfb\x90+\x0e\xcc_J\x13\xe5,\x12\x9a>\xe4!uEP\x968\x00*\xd0\xefE\xf8{\x1d(\xcb\xe3IR\\r\xee\x9fU\x14\ty\xe3\xdc\x96@\xf4\x8d\x17\xab\xcc\x98I\x8e\xe16\x9e\xa5+\xe0\xa8{S\x051##\x90:A')
@@ -11636,12 +12262,24 @@
 assert nstats == {
    'channel': 8,
    'crypto': {'WPA2/PSK'},
-   'rates': [130, 132, 12, 18, 24, 36, 48, 72, 96, 108],
+   'rates': [1.0, 2.0, 6.0, 9.0, 12.0, 18.0, 24.0, 36.0, 48.0, 54.0],
    'ssid': 'SSID76',
    'country': 'US',
    'country_desc_type': 'Indoor'
 }
 
+data = b'\x00\x00\x16\x00\x0f\x00\x00\x00|P\xb1\x82\xae\x86\x05\x00\x00\x02l\t\xa0\x00\x80\x00\x00\x00\xff\xff\xff\xff\xff\xff\x02\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00:Q\xb1\x82\xae\x86\x05\x00d\x00\x11\x04\x00\x0cWPA3-Network\x01\x08\x82\x84\x8b\x96\x0c\x12\x18$\x03\x01\x01\x05\x04\x00\x02\x00\x00*\x01\x042\x040H`l0\x14\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x08\xc0\x00;\x02Q\x00\x7f\x08\x04\x00\x00\x00\x00\x00\x00@'
+pkt = RadioTap(data)
+nstats = pkt[Dot11Beacon].network_stats()
+nstats
+assert nstats == {
+   'ssid': 'WPA3-Network',
+   'rates': [1.0, 2.0, 5.5, 11.0, 6.0, 9.0, 12.0, 18.0, 24.0, 36.0, 48.0, 54.0],
+   'channel': 1,
+   'crypto': {'WPA3/SAE'}
+}
+
+
 = Dot11EltCountry dissection
 
 data = b"\x00\x00&\x00/@\x00\xa0 \x08\x00\xa0 \x08\x00\x00R\xa9[#\x00\x00\x00\x00\x10\x18\x85\t\xc0\x00\xc8\x00\x00\x00\xc3\x00\xc7\x01P\x080\x00V\x9cm\xf4\xb1\xe9\xa0\xcf[\xfb%0\xa0\xcf[\xfb%0\xa0R&\x1a@\xc2\x06\x03\x00\x00f\x00!\x14\x00\x1eDisney Convention Center Guest\x01\x07\x12\x98$0H`l\x03\x01\x06\x07\x06US \x01\x0b\x1e\x0b\x05\n\x00\x8a\x8d[ \x01\x03*\x01\x00-\x1a,\x18\x1b\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x006\x03*L\x01=\x16\x06\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00F\x05s\xc0\x00\x00\x00\x7f\x06\x00\x10\x00\x04\x01@\x85\x1e\x10\x00\x8f\x00\x0f\x00\xff\x03Y\x001617-AP33-SorcA\x00\n\x00\x00:\x96\x06\x00@\x96\x00\x0b\x00\xdd\x18\x00P\xf2\x02\x01\x01\x80\x00\x03\xa4\x00\x00'\xa4\x00\x00BC^\x00b2/\x00\xdd\x06\x00@\x96\x01\x01\x04\xdd\x05\x00@\x96\x03\x05\xdd\x05\x00@\x96\x0bI\xdd\x05\x00@\x96\x14\x00dZ\x97\xbf"
@@ -11656,6 +12294,17 @@
 assert pkt[Dot11EltCountry].pad == 0
 assert pkt.getlayer(Dot11Elt, ID=11)
 
+* Country element: Secondary padding check
+erp_payload = b'\x1e\x2a\x01\x62'
+country_payload = b'\x07\x06\x55\x53\x20\x01\x0b'
+
+bare_country = Dot11EltCountry(country_payload)
+country_nested = Dot11EltCountry(country_payload + erp_payload)
+
+assert not bare_country.payload
+assert country_nested.payload
+assert country_nested.payload.ID == 42
+
 = RSNCipherSuite
 assert bytes(RSNCipherSuite()) == b'\x00\x0f\xac\x04'
 rsn =  RSNCipherSuite(b'\x00\x0f\xac\x04')
@@ -11686,6 +12335,22 @@
 assert rsn_ie.pre_auth
 assert Dot11Elt in rsn_ie
 
+pkt = RadioTap(b"\x00\x000\x00/@\x00\xa0 \x08\x00\xa0 \x08\x00\xa0 \x08\x00\x00\x00\x00\x00\x00\x0bpin;%\xedN\x10\x0cl\t\xc0\x00\xce\x00\x00\x00\xb2\x00\xbd\x01\xce\x02\x80\x00\x00\x00\xff\xff\xff\xff\xff\xff\xec\x17/\x82\x1e)\xec\x17/\x82\x1e)\x10p\x81a\xa1\x08\x00\x00\x00\x00d\x001\x04\x00\rROUTE-821E295\x01\x01\x8c\x03\x01\x01\x05\x04\x00\x02\x00\x00\x07$IL \x01\x01\x14\x02\x01\x14\x03\x01\x14\x04\x01\x14\x05\x01\x14\x06\x01\x14\x07\x01\x14\x08\x01\x14\t\x01\x14\n\x01\x14\x0b\x01\x14;\x12QQRSTstuvwxyz{}~\x7f\x80*\x01\x000\x1a\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x02\x8c\x00\x00\x00\x00\x0f\xac\x06-\x1a\x8d\x01\x1f\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00=\x16\x01\x00\x15\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd\x18\x00P\xf2\x02\x01\x01\x81\x00\x03\xa4\x00\x00'\xa4\x00\x00BT^\x00a2/\x00\x7f\x01\x04\xdd\x07\x00\xa0\xc6\x02\x02\x03\x00\xdd\x17\xec\x17/RRRRRRRRRRRRRRRRRRRRR\x9e[\xf2")
+assert Dot11EltRSN in pkt
+pkt[Dot11Beacon].network_stats()
+assert pkt[Dot11Beacon].network_stats() == {
+    'ssid': 'ROUTE-821E295',
+    'rates': [6.0],
+    'channel': 1,
+    'country': 'IL',
+    'country_desc_type': None,
+    'crypto': {'WPA2/PSK'}
+}
+assert [x.ID for x in pkt[Dot11Elt].iterpayloads()] == [0, 1, 3, 5, 7, 59, 42, 48, 45, 61, 221, 127, 221, 221]
+assert pkt.pmkids.nb_pmkids == 0
+assert pkt.group_management_cipher_suite.oui == 0xfac
+assert pkt.group_management_cipher_suite.cipher == 0x6
+
 = Dot11EltMicrosoftWPA
 assert bytes(Dot11EltMicrosoftWPA()) == b'\xdd\x16\x00P\xf2\x01\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x01'
 ms_wpa_ie = Dot11EltMicrosoftWPA(b'\xdd\x1a\x00P\xf2\x01\x01\x00\x00P\xf2\x02\x02\x00\x00P\xf2\x04\x00P\xf2\x02\x01\x00\x00P\xf2\x01')
@@ -11724,6 +12389,129 @@
 assert f[Dot11EltMicrosoftWPA].nb_akm_suites == 0x01
 assert f[Dot11EltMicrosoftWPA].akm_suites[0].suite == 0x01
 
+= HT Capabilities
+f = RadioTap(b"\x00\x00&\x00/@\x00\xa0 \x08\x00\xa0 \x08\x00\x00\x9dt\xc3\xf1\x18\x00\x00\x00\x10\x02l\t\xa0\x00\xd9\x00\x00\x00\xd3\x00\xd7\x01@\x00\x00\x00\xff\xff\xff\xff\xff\xff\xaa\xaa\xaa\xaa\xaa\xaa\xff\xff\xff\xff\xff\xffP'\x00\x00\x01\x04\x02\x04\x0b\x162\x08\x0c\x12\x18$0H`l\x03\x01\x01-\x1a-@\x17\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7f\x08\x00\x00\x08\x04\x00\x00\x00@Y\xb7T\x13")
+assert Dot11EltHTCapabilities in f
+assert f.L_SIG_TXOP_Protection == 0
+assert f.Forty_Mhz_Intolerant == 1
+assert f.PSMP == 0
+assert f.DSSS_CCK == 0
+assert f.Max_A_MSDU == 0
+assert f.Delayed_BlockAck == 0
+assert f.Rx_STBC == 0
+assert f.Tx_STBC == 0
+assert f.Short_GI_40Mhz == 0
+assert f.Short_GI_20Mhz == 1
+assert f.Green_Field == 0
+assert f.SM_Power_Save == 3
+assert f.Supported_Channel_Width == 0
+assert f.LDPC_Coding_Capability == 1
+assert f.res == 0
+assert f.Min_MPDCU_Start_Spacing == 5
+assert f.Max_A_MPDU_Length_Exponent == 3
+assert f.TX_Unequal_Modulation == 0
+assert f.TX_Max_Spatial_Streams == 0
+assert f.TX_RX_MCS_Set_Not_Equal == 0
+assert f.TX_MCS_Set_Defined == 0
+assert f.RX_Highest_Supported_Data_Rate == 0
+assert f.RX_MSC_Bitmask == 255
+assert f.RD_Responder == 0
+assert f.HTC_HT_Support == 0
+assert f.MCS_Feedback == 0
+assert f.PCO_Transition_Time == 0
+assert f.PCO == 0
+assert f.Channel_Estimation_Capability == 0
+assert f.CSI_max_n_Rows_Beamformer_Supported == 0
+assert f.Compressed_Steering_n_Beamformer_Antennas_Supported == 0
+assert f.Noncompressed_Steering_n_Beamformer_Antennas_Supported == 0
+assert f.CSI_n_Beamformer_Antennas_Supported == 0
+assert f.Minimal_Grouping == 0
+assert f.Explicit_Compressed_Beamforming_Feedback == 0
+assert f.Explicit_Noncompressed_Beamforming_Feedback == 0
+assert f.Explicit_Transmit_Beamforming_CSI_Feedback == 0
+assert f.Explicit_Compressed_Steering == 0
+assert f.Explicit_Noncompressed_Steering == 0
+assert f.Explicit_CSI_Transmit_Beamforming == 0
+assert f.Calibration == 0
+assert f.Implicit_Trasmit_Beamforming == 0
+assert f.Transmit_NDP == 0
+assert f.Receive_NDP == 0
+assert f.Transmit_Staggered_Sounding == 0
+assert f.Receive_Staggered_Sounding == 0
+assert f.Implicit_Transmit_Beamforming_Receiving == 0
+assert f.ASEL == 0
+
+= HT Capabilities with fuzzed values
+# Those were checked with Wireshark !
+f = RadioTap(b'\x00\x00\t\x00\x02\x00\x00\x00\x10@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00-\x1a\xecH\xbf\x85!\x02\xd0m\x91\xa8\xd9\xf0\xa9\xb8\x15\xae\x00\x00\x00,Y\x86\xb3H\xa7?Z\xd2\xa8\xc2')
+assert Dot11EltHTCapabilities in f
+assert f.L_SIG_TXOP_Protection == 0
+assert f.Forty_Mhz_Intolerant == 1
+assert f.PSMP == 0
+assert f.DSSS_CCK == 0
+assert f.Max_A_MSDU == 1
+assert f.Delayed_BlockAck == 0
+assert f.Rx_STBC == 0
+assert f.Tx_STBC == 1
+assert f.Short_GI_40Mhz == 1
+assert f.Short_GI_20Mhz == 1
+assert f.Green_Field == 0
+assert f.SM_Power_Save == 3
+assert f.Supported_Channel_Width == 0
+assert f.LDPC_Coding_Capability == 0
+assert f.res == 5
+assert f.Min_MPDCU_Start_Spacing == 7
+assert f.Max_A_MPDU_Length_Exponent == 3
+assert f.TX_Unequal_Modulation == 0
+assert f.TX_Max_Spatial_Streams == 3
+assert f.TX_RX_MCS_Set_Not_Equal == 1
+assert f.TX_MCS_Set_Defined == 0
+assert f.RX_Highest_Supported_Data_Rate == 440
+assert f.RX_MSC_Bitmask == 46944200869120244326789
+assert f.RD_Responder == 1
+assert f.HTC_HT_Support == 0
+assert f.MCS_Feedback == 1
+assert f.PCO_Transition_Time == 2
+assert f.PCO == 0
+assert f.Channel_Estimation_Capability == 0
+assert f.CSI_max_n_Rows_Beamformer_Supported == 3
+assert f.Compressed_Steering_n_Beamformer_Antennas_Supported == 2
+assert f.Noncompressed_Steering_n_Beamformer_Antennas_Supported == 2
+assert f.CSI_n_Beamformer_Antennas_Supported == 1
+assert f.Minimal_Grouping == 0
+assert f.Explicit_Compressed_Beamforming_Feedback == 1
+assert f.Explicit_Noncompressed_Beamforming_Feedback == 1
+assert f.Explicit_Transmit_Beamforming_CSI_Feedback == 2
+assert f.Explicit_Compressed_Steering == 0
+assert f.Explicit_Noncompressed_Steering == 1
+assert f.Explicit_CSI_Transmit_Beamforming == 1
+assert f.Calibration == 2
+assert f.Implicit_Trasmit_Beamforming == 0
+assert f.Transmit_NDP == 0
+assert f.Receive_NDP == 0
+assert f.Transmit_Staggered_Sounding == 1
+assert f.Receive_Staggered_Sounding == 1
+assert f.Implicit_Transmit_Beamforming_Receiving == 0
+assert f.ASEL.resTransmit_Sounding_PPDUs
+assert f.ASEL.Receive_ASEL
+assert f.ASEL.Antenna_Indices_Feedback
+assert f.ASEL.Explicit_CSI_Feedback
+assert f.ASEL.Explicit_CSI_Feedback_Based_Transmit_ASEL
+assert f.ASEL.Antenna_Selection
+assert f.ASEL == 63
+
+= RadioTap - MCS weird padding
+f = RadioTap(b'\x00\x00,\x00K\x08\x1c\x00"b\x96\x03\x00\x00\x00\x00\x10\x00l\t\x80\x04\xb0\x00\x80\x04\x01\x00l\t\x01\x00\x1f\x08\x0c\x00\x94\x05\x00\x00\x04\x00\x00\x00\x88\x020\x00.\xdf\xc4J\xb0\xdc\xa0c\x91sf\xech\x05\xca?\xf4h@Y\x00\x00\xaa\xaa\x03\x00\x00\x00\x08\x00E\x00\x05\xdc \xcf@\x00\x80\x06P\xf0\xc0\xa8\x01\n\xc0\xa8\x01\x02\xdb\x8f\x13\x89\xfbv\xa3\xde\xf6\xd8L\xe8P\x10\xff\xfft\xdd\x00\x0023456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901O\xdc\x01x')
+assert f.knownMCS == 31
+assert f.Ness_LSB == 0
+assert f.STBC_streams == 0
+assert f.FEC_type == 0
+assert f.HT_format == 1
+assert f.guard_interval == 0
+assert f.MCS_bandwidth == 0
+assert f.MCS_index == 0xc
+assert f.A_MPDU_ref == 1428
+
 = Reassociation request
 f = Dot11(b' \x00:\x01@\xe3\xd6\x7f*\x00\x00\x10\x18\xa9l.@\xe3\xd6\x7f*\x00 \t1\x04\n\x00@\xe3\xd6\x7f*\x00\x00\x064.2.12\x01\x08\x82\x84\x0b\x16$0Hl!\x02\x08\x1a$\x02\x01\x0b0&\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac\x01\x00\x00\x01\x00LD\xfe\xf2l\xdcV\xce\x0b7\xab\xc62\x02O\x112\x04\x0c\x12\x18`\x7f\x08\x01\x00\x00\x00\x00\x00\x00@\xdd\t\x00\x10\x18\x02\x00\x00\x10\x00\x00')
 assert Dot11EltRSN in f
@@ -11731,6 +12519,12 @@
 assert len(f[Dot11EltRSN].pmkids.pmkid_list) == 1
 assert f[Dot11EltRSN].pmkids.pmkid_list[0] == b'LD\xfe\xf2l\xdcV\xce\x0b7\xab\xc62\x02O\x11'
 
+= Backward compatibility of Dot11Elt
+
+# Old naming scheme
+assert Dot11Elt(ID="DSset").sprintf("%ID%") == 'DSSS Set'
+assert Dot11Elt(ID="RSNinfo").sprintf("%ID%") == 'RSN'
+
 
 ######################################
 # More PPI tests in contrib/ppi_cace #
@@ -11773,12 +12567,6 @@
 
 assert(sum(1 for oid in conf.mib) > 100)
 
-assert(conf.mib._my_find("MIB", "keyUsage"))
-
-assert(len(conf.mib._find("MIB", "keyUsage")))
-
-assert(len(conf.mib._recurs_find_all((), "MIB", "keyUsage")))
-
 = MIB - graph
 ~ mib
 
@@ -11794,34 +12582,43 @@
 
 get_mib_graph()
 
+= MIB - test aliases
+~ mib
+
+# https://github.com/secdev/scapy/issues/2542
+assert conf.mib._oidname("2.5.29.19") == "basicConstraints"
+
 = DADict tests
 
 a = DADict("test")
-a.test_value = "scapy"
+a[0] = "test_value1"
+a["scapy"] = "test_value2"
+
+assert a.test_value1 == 0
+assert a.test_value2 == "scapy"
+
 with ContextManagerCaptureOutput() as cmco:
     a._show()
-    assert(cmco.get_output() == "test_value = 'scapy'\n")
+    outp = cmco.get_output()
 
-b = DADict("test2")
-b.test_value_2 = "hello_world"
+assert "scapy = 'test_value2'" in outp
+assert "0 = 'test_value1'" in outp
 
-a._branch(b, 1)
+= Test ETHER_TYPES
+
+assert ETHER_TYPES.IPv4 == 2048
 try:
-    a._branch(b, 1)
-    assert False
-except DADict_Exception:
+    import warnings
+    
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        ETHER_TYPES["BAOBAB"] = 0xffff
+        assert ETHER_TYPES.BAOBAB == 0xffff
+        assert issubclass(w[-1].category, DeprecationWarning)
+except DeprecationWarning:
+    # -Werror is used
     pass
 
-assert(len(a._find("test2")))
-
-assert(len(a._find(test_value_2="hello_world")))
-
-assert(len(a._find_all("test2")))
-
-assert(not a._recurs_find((a,)))
-
-assert(not a._recurs_find_all((a,)))
-
 = BER tests
 
 BER_id_enc(42) == '*'
@@ -11845,6 +12642,14 @@
 
 assert(ret)
 
+= BER trigger failures
+
+try:
+    BERcodec_INTEGER.do_dec(b"\x02\x01")
+    assert False
+except BER_Decoding_Error:
+    pass
+
 ############
 ############
 + inet.py
@@ -12034,6 +12839,9 @@
 assert p.hwdst == p.hwsrc == p.pdst == p.psrc == b"\x00"
 assert isinstance(p.payload, NoPayload)
 
+p = ARP(pdst='192.168.178.0/24')
+assert "Net" in repr(p)
+
 
 ############
 ############
@@ -12398,24 +13206,9 @@
 
 test_hexdump()
 
-= conversations()
-~ linux
-
-def test_conversations():
-    import tempfile
-    filename = tempfile.mktemp()
-    p = PacketList([IP()/Raw(str(i)) for i in range(2)])
-    p.conversations(prog="echo", target="> %s" % filename)
-    fd = open(filename)
-    assert "-Tsvg" in fd.read()
-    fd.close()
-    os.unlink(filename)
-
-test_conversations()
-
 = import_hexcap()
 
-@mock.patch("%s.input" % six.moves.builtins.__name__)
+@mock.patch("scapy.utils.input")
 def test_import_hexcap(mock_input):
     data = """
 0000  FF FF FF FF FF FF AA AA AA AA AA AA 08 00 45 00  ..............E.
@@ -12432,6 +13225,18 @@
 assert pkt[IP].dst == "127.0.0.1"
 assert ICMP in pkt
 
+= import_hexcap(input_string)
+data = """
+0000  FF FF FF FF FF FF AA AA AA AA AA AA 08 00 45 00  ..............E.
+0010  00 1C 00 01 00 00 40 01 7C DE 7F 00 00 01 7F 00  ......@.|.......
+0020  00 01 08 00 F7 FF 00 00 00 00                    ..........
+"""[1:]
+pkt = import_hexcap(data)
+pkt = Ether(pkt)
+assert pkt[Ether].dst == "ff:ff:ff:ff:ff:ff"
+assert pkt[IP].dst == "127.0.0.1"
+assert ICMP in pkt
+
 = padding()
 
 def test_padding():
@@ -12541,13 +13346,19 @@
 import pickle
 
 frm = Ether(src='00:11:22:33:44:55', dst='00:22:33:44:55:66')/Raw()
+frm.time = EDecimal(123.45)
+frm.sniffed_on = "iface"
+frm.wirelen = 1
 pl = PacketList(res=[frm, frm], name='WhatAGreatName')
 pickled = pickle.dumps(pl)
 pl = pickle.loads(pickled)
-assert(pl.listname == "WhatAGreatName")
-assert(len(pl) == 2)
-assert(pl[0][Ether].src == '00:11:22:33:44:55')
-assert(pl[1][Ether].dst == '00:22:33:44:55:66')
+assert pl.listname == "WhatAGreatName"
+assert len(pl) == 2
+assert pl[0].time == 123.45
+assert pl[0].sniffed_on == "iface"
+assert pl[0].wirelen == 1
+assert pl[0][Ether].src == '00:11:22:33:44:55'
+assert pl[1][Ether].dst == '00:22:33:44:55:66'
 
 
 ############
@@ -12646,8 +13457,24 @@
 assert os.path.isdir(dname)
 
 = test fragleak functions
-~ netaccess linux
+~ netaccess linux fragleak
 
-fragleak("8.8.8.8", count=1)
-fragleak2("8.8.8.8", count=1)
-assert True
+import mock
+
+@mock.patch("scapy.layers.inet.conf.L3socket")
+@mock.patch("scapy.layers.inet.select.select")
+@mock.patch("scapy.layers.inet.sr1")
+def _test_fragleak(func, sr1, select, L3socket):
+    packets = [IP(src="4.4.4.4")/ICMP()/IPerror(dst="8.8.8.8")/conf.padding_layer(load=b"greatdata")]
+    iterator = iter(packets)
+    ne = lambda *args, **kwargs: next(iterator)
+    L3socket.side_effect = lambda: Bunch(recv=ne, send=lambda x: None)
+    sr1.side_effect = ne
+    select.side_effect = lambda a, b, c, d: a+b+c
+    with ContextManagerCaptureOutput() as cmco:
+        func("8.8.8.8", count=1)
+        out = cmco.get_output()
+        return "greatdata" in out
+
+assert _test_fragleak(fragleak)
+assert _test_fragleak(fragleak2)

scapy-2.4.3.tar.gz/test/run_tests -> scapy-2.4.4.tar.gz/test/run_tests Changed

scapy-2.4.4.tar.gz/test/run_tests.bat Added

scapy-2.4.3.tar.gz/test/sendsniff.uts -> scapy-2.4.4.tar.gz/test/sendsniff.uts Changed

scapy-2.4.4.tar.gz/test/smb.uts Added

@@ -0,0 +1,38 @@
+############
+############
++ SMB
+
+= test SMB Negociate Header - dissect
+
+# OK test
+rawpkt = b'\x45\x00\x00\x5b\x69\x10\x40\x00\x73\x06\xca\x85\x7a\xa0\x9a\xb6\xc0\xa8\xfe\x07\xeb\xec\x01\xbd\xaf\x97\x2e\xb7\x78\x60\x84\x6c\x50\x18\x40\x29\xd5\x36\x00\x00\x00\x00\x00\x2f\xff\x53\x4d\x42\x72\x00\x00\x00\x00\x18\x01\x48\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x20\x18\x00\x00\x00\x00\x00\x0c\x00\x02\x4e\x54\x20\x4c\x4d\x20\x30\x2e\x31\x32\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 47
+assert SMBNegociate_Protocol_Request_Header in pkt
+smb = pkt[SMBNegociate_Protocol_Request_Header]
+# Check header values
+print(smb.show())
+assert smb.Start == b'\xffSMB'
+assert smb.Command == 0x72      # SMB_COM_NEGOCIATE
+
+# KO test
+rawpkt = b'\x45\x00\x00\x5b\x69\x10\x40\x00\x73\x06\xca\x85\x7a\xa0\x9a\xb6\xc0\xa8\xfe\x07\xeb\xec\x01\xbd\xaf\x97\x2e\xb7\x78\x60\x84\x6c\x50\x18\x40\x29\xd5\x36\x00\x00\x00\x00\x00\x2f\xf0\x53\x4d\x42\x72\x00\x00\x00\x00\x18\x01\x48\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x20\x18\x00\x00\x00\x00\x00\x0c\x00\x02\x4e\x54\x20\x4c\x4d\x20\x30\x2e\x31\x32\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 47
+assert SMBNegociate_Protocol_Request_Header_Generic in pkt
+# Should not have a proper SMBNegociate header as magic is \xf0SMB, not \xffSMB
+assert SMBNegociate_Protocol_Request_Header not in pkt
+
+
+= test SMB Negociate Header - assemble
+
+pkt = IP() / TCP() / NBTSession() / SMBNegociate_Protocol_Request_Header()
+assert pkt[NBTSession].TYPE == 0x00         # session message
+smb = pkt[SMBNegociate_Protocol_Request_Header]
+assert smb.Start == b'\xffSMB'

scapy-2.4.4.tar.gz/test/smb2.uts Added

@@ -0,0 +1,206 @@
++ SMB2 Header
+
+= SMB2 Header dissecting
+
+# OK test
+rawpkt = b'\x45\x00\x01\x18\x16\x2c\x40\x00\x37\x06\xc4\x14\x91\xdc\x18\x13\xc0\xa8\xfe\x07\x9d\x76\x01\xbd\x37\x06\x5e\x82\xa3\xca\x83\xd2\x50\x18\x01\xf6\x11\x5b\x00\x00\x00\x00\x00\xec\xfe\x53\x4d\x42\x40\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x24\x00\x04\x00\x00\x00\x00\x00\x7f\x00\x00\x00\x59\x9e\x84\xf1\x9d\x61\xce\x99\x1f\x50\x5c\x04\x44\x74\xb1\x0a\x70\x00\x00\x00\x04\x00\x00\x00\x10\x02\x00\x03\x02\x03\x11\x03\x00\x00\x00\x00\x01\x00\x26\x00\x00\x00\x00\x00\x01\x00\x20\x00\x01\x00\x75\x06\x05\xed\x60\x88\x9e\xcb\x5e\x79\xbb\xe8\x44\x59\xc5\x5c\xd2\x82\x51\x06\x32\x7a\x6e\x2e\x41\xc5\xa8\x3f\xdd\xf2\xc5\x18\x00\x00\x02\x00\x06\x00\x00\x00\x00\x00\x02\x00\x01\x00\x02\x00\x00\x00\x03\x00\x10\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x1c\x00\x00\x00\x00\x00\x31\x00\x39\x00\x32\x00\x2e\x00\x31\x00\x36\x00\x38\x00\x2e\x00\x31\x00\x37\x00\x38\x00\x2e\x00\x32\x00\x31\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 236
+assert SMB2_Header in pkt
+smb2 = pkt[SMB2_Header]
+# Check header values
+print(smb2.show())
+assert smb2.Start == b'\xfeSMB'
+assert smb2.HeaderLength == 64
+assert smb2.CreditCharge == 1
+assert smb2.ChannelSequence == 0
+assert smb2.Command == 0
+assert smb2.CreditsRequested == 0
+assert smb2.Flags == 0
+assert smb2.ChainOffset == 0
+assert smb2.MessageID == 0
+assert smb2.ProcessID == 0
+assert smb2.TreeID == 0
+assert smb2.SessionID == 0
+assert smb2.Signature == 0xffeeddccbbaa99887766554433221100
+
+# KO test
+rawpkt = b'\x45\x00\x01\x18\x16\x2c\x40\x00\x37\x06\xc4\x14\x91\xdc\x18\x13\xc0\xa8\xfe\x07\x9d\x76\x01\xbd\x37\x06\x5e\x82\xa3\xca\x83\xd2\x50\x18\x01\xf6\x11\x5b\x00\x00\x00\x00\x00\xec\xf0\x53\x4d\x42\x40\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x24\x00\x04\x00\x00\x00\x00\x00\x7f\x00\x00\x00\x59\x9e\x84\xf1\x9d\x61\xce\x99\x1f\x50\x5c\x04\x44\x74\xb1\x0a\x70\x00\x00\x00\x04\x00\x00\x00\x10\x02\x00\x03\x02\x03\x11\x03\x00\x00\x00\x00\x01\x00\x26\x00\x00\x00\x00\x00\x01\x00\x20\x00\x01\x00\x75\x06\x05\xed\x60\x88\x9e\xcb\x5e\x79\xbb\xe8\x44\x59\xc5\x5c\xd2\x82\x51\x06\x32\x7a\x6e\x2e\x41\xc5\xa8\x3f\xdd\xf2\xc5\x18\x00\x00\x02\x00\x06\x00\x00\x00\x00\x00\x02\x00\x01\x00\x02\x00\x00\x00\x03\x00\x10\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x1c\x00\x00\x00\x00\x00\x31\x00\x39\x00\x32\x00\x2e\x00\x31\x00\x36\x00\x38\x00\x2e\x00\x31\x00\x37\x00\x38\x00\x2e\x00\x32\x00\x31\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 236
+# Should not have a proper SMB2 Header as magic is \xf0SMB (not valid)
+assert SMB2_Header not in pkt
+
+# KO test with compression header
+rawpkt = b'\x45\x00\x01\x18\x16\x2c\x40\x00\x37\x06\xc4\x14\x91\xdc\x18\x13\xc0\xa8\xfe\x07\x9d\x76\x01\xbd\x37\x06\x5e\x82\xa3\xca\x83\xd2\x50\x18\x01\xf6\x11\x5b\x00\x00\x00\x00\x00\xec\xfc\x53\x4d\x42\x40\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x24\x00\x04\x00\x00\x00\x00\x00\x7f\x00\x00\x00\x59\x9e\x84\xf1\x9d\x61\xce\x99\x1f\x50\x5c\x04\x44\x74\xb1\x0a\x70\x00\x00\x00\x04\x00\x00\x00\x10\x02\x00\x03\x02\x03\x11\x03\x00\x00\x00\x00\x01\x00\x26\x00\x00\x00\x00\x00\x01\x00\x20\x00\x01\x00\x75\x06\x05\xed\x60\x88\x9e\xcb\x5e\x79\xbb\xe8\x44\x59\xc5\x5c\xd2\x82\x51\x06\x32\x7a\x6e\x2e\x41\xc5\xa8\x3f\xdd\xf2\xc5\x18\x00\x00\x02\x00\x06\x00\x00\x00\x00\x00\x02\x00\x01\x00\x02\x00\x00\x00\x03\x00\x10\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x1c\x00\x00\x00\x00\x00\x31\x00\x39\x00\x32\x00\x2e\x00\x31\x00\x36\x00\x38\x00\x2e\x00\x31\x00\x37\x00\x38\x00\x2e\x00\x32\x00\x31\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 236
+# Should not have a proper SMB2 Header as magic is \xfcSMB (compressed version)
+assert SMB2_Header not in pkt
+
+
+= SMB2 Header assembling
+
+pkt = IP() / TCP() / NBTSession() / SMB2_Header()
+assert pkt[NBTSession].TYPE == 0x00         # session message
+smb2 = pkt[SMB2_Header]
+assert smb2.Start == b'\xfeSMB'
+
++ SMB2 Negociate Procotol Request Header dissecting
+
+= Common fields in header
+
+# OK test
+rawpkt = b'\x45\x00\x01\x18\x16\x2c\x40\x00\x37\x06\xc4\x14\x91\xdc\x18\x13\xc0\xa8\xfe\x07\x9d\x76\x01\xbd\x37\x06\x5e\x82\xa3\xca\x83\xd2\x50\x18\x01\xf6\x11\x5b\x00\x00\x00\x00\x00\xec\xfe\x53\x4d\x42\x40\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff\x24\x00\x04\x00\x00\x00\x00\x00\x7f\x00\x00\x00\x59\x9e\x84\xf1\x9d\x61\xce\x99\x1f\x50\x5c\x04\x44\x74\xb1\x0a\x70\x00\x00\x00\x04\x00\x00\x00\x10\x02\x00\x03\x02\x03\x11\x03\x00\x00\x00\x00\x01\x00\x26\x00\x00\x00\x00\x00\x01\x00\x20\x00\x01\x00\x75\x06\x05\xed\x60\x88\x9e\xcb\x5e\x79\xbb\xe8\x44\x59\xc5\x5c\xd2\x82\x51\x06\x32\x7a\x6e\x2e\x41\xc5\xa8\x3f\xdd\xf2\xc5\x18\x00\x00\x02\x00\x06\x00\x00\x00\x00\x00\x02\x00\x01\x00\x02\x00\x00\x00\x03\x00\x10\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x1c\x00\x00\x00\x00\x00\x31\x00\x39\x00\x32\x00\x2e\x00\x31\x00\x36\x00\x38\x00\x2e\x00\x31\x00\x37\x00\x38\x00\x2e\x00\x32\x00\x31\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 236
+assert SMB2_Header in pkt
+assert SMB2_Negociate_Protocol_Request_Header in pkt
+nego_req = pkt[SMB2_Negociate_Protocol_Request_Header]
+# Check field values
+assert nego_req.StructureSize == 0x24
+assert nego_req.DialectCount == 4
+assert nego_req.SecurityMode == 0
+assert nego_req.Capabilities == 0x7f000000 
+assert str(nego_req.ClientGUID) == 'f1849e59-619d-99ce-1f50-5c044474b10a'
+assert nego_req.NegociateContextOffset == 0x70
+assert nego_req.NegociateCount == 4
+for dialect in nego_req.Dialects:
+    assert dialect in SMB_DIALECTS.keys()
+
+# Check SMB 2.1
+assert 0x210 in nego_req.Dialects
+# Check SMB 3.0
+assert 0x300 in nego_req.Dialects
+# Check SMB 3.0.2
+assert 0x302 in nego_req.Dialects
+# Check SMB 3.1.1
+assert 0x311 in nego_req.Dialects
+assert len(nego_req.NegociateContexts) == nego_req.NegociateCount
+
+= SMB2 Negociate Context in Request - type PREAUTH - disassemble
+
+preauth = nego_req.NegociateContexts[0]
+assert preauth.ContextType == 0x1
+assert preauth.DataLength == 38
+assert preauth.HashAlgorithmCount == 1
+assert preauth.SaltLength == 32
+assert preauth.Salt == b'\x75\x06\x05\xed\x60\x88\x9e\xcb\x5e\x79\xbb\xe8\x44\x59\xc5\x5c\xd2\x82\x51\x06\x32\x7a\x6e\x2e\x41\xc5\xa8\x3f\xdd\xf2\xc5\x18'
+assert len(preauth.HashAlgorithms) == 1
+assert preauth.HashAlgorithms[0] == 0x1
+
+= SMB2 Negociate Context in Request - type ENCRYPTION disassemble
+
+enc = nego_req.NegociateContexts[1]
+assert enc.ContextType == 0x2
+assert enc.DataLength == 6
+assert enc.CipherCount == 2
+assert len(enc.Ciphers) == 2
+assert enc.Ciphers[0] == 1
+assert enc.Ciphers[1] == 2
+
+
+= SMB2 Negociate Context in Request - type COMPRESSION
+
+comp = nego_req.NegociateContexts[2]
+assert comp.ContextType == 0x3
+assert comp.DataLength == 16
+assert comp.CompressionAlgorithmCount == 4
+assert len(comp.CompressionAlgorithms) == 4
+assert comp.CompressionAlgorithms[0] == 1
+assert comp.CompressionAlgorithms[1] == 2
+assert comp.CompressionAlgorithms[2] == 3
+assert comp.CompressionAlgorithms[3] == 4
+
+
+= SMB2 Negociate Context in Request - type NETNAME NEGOCIATE
+
+netname = nego_req.NegociateContexts[3]
+assert netname.ContextType == 0x5
+assert netname.DataLength == 28
+assert netname.NetName == '192.168.178.21'
+
+= test SMB2 Negociate Protocol Request Header - assembling
+
+pkt = IP() / TCP() / NBTSession() / SMB2_Header() / SMB2_Negociate_Protocol_Request_Header()
+pkt = IP(raw(pkt))
+assert SMB2_Negociate_Protocol_Request_Header in pkt
+
++ SMB2 Negociate Protocol Response Header dissecting
+
+= Common fields in header
+
+rawpkt = b'\x45\x00\x02\x3e\x84\xa6\x40\x00\x80\x06\x0b\x74\xc0\xa8\xfe\x07\x91\xdc\x18\x13\x01\xbd\x9d\x76\xa3\xca\x83\xd2\x37\x06\x5f\x72\x50\x18\x04\x01\xe3\x14\x00\x00\x00\x00\x02\x12\xfe\x53\x4d\x42\x40\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x41\x00\x01\x00\x11\x03\x03\x00\x53\x6d\xdd\x1c\x30\x1f\x44\x42\xa5\xc8\x88\x73\x7a\x68\x05\xe1\x2f\x00\x00\x00\x00\x00\x80\x00\x00\x00\x80\x00\x00\x00\x80\x00\xe9\xbe\x9e\x6c\xa4\xf8\xd5\x01\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x40\x01\xc0\x01\x00\x00\x60\x82\x01\x3c\x06\x06\x2b\x06\x01\x05\x05\x02\xa0\x82\x01\x30\x30\x82\x01\x2c\xa0\x1a\x30\x18\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x1e\x06\x0a\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a\xa2\x82\x01\x0c\x04\x82\x01\x08\x4e\x45\x47\x4f\x45\x58\x54\x53\x01\x00\x00\x00\x00\x00\x00\x00\x60\x00\x00\x00\x70\x00\x00\x00\x11\x70\xff\xd0\xfa\xf1\x4f\xa2\x6f\x40\x5c\x94\x55\x68\x53\xcf\xa1\x77\x02\x7a\x32\xa9\x62\x78\x0a\x21\xfb\x9e\x2c\x5e\xe9\x78\xeb\xab\xee\x91\xfd\xfc\xda\x0f\xc5\x91\x03\x6e\xf8\xfd\x4c\x08\x00\x00\x00\x00\x00\x00\x00\x00\x60\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x5c\x33\x53\x0d\xea\xf9\x0d\x4d\xb2\xec\x4a\xe3\x78\x6e\xc3\x08\x4e\x45\x47\x4f\x45\x58\x54\x53\x03\x00\x00\x00\x01\x00\x00\x00\x40\x00\x00\x00\x98\x00\x00\x00\x11\x70\xff\xd0\xfa\xf1\x4f\xa2\x6f\x40\x5c\x94\x55\x68\x53\xcf\x5c\x33\x53\x0d\xea\xf9\x0d\x4d\xb2\xec\x4a\xe3\x78\x6e\xc3\x08\x40\x00\x00\x00\x58\x00\x00\x00\x30\x56\xa0\x54\x30\x52\x30\x27\x80\x25\x30\x23\x31\x21\x30\x1f\x06\x03\x55\x04\x03\x13\x18\x54\x6f\x6b\x65\x6e\x20\x53\x69\x67\x6e\x69\x6e\x67\x20\x50\x75\x62\x6c\x69\x63\x20\x4b\x65\x79\x30\x27\x80\x25\x30\x23\x31\x21\x30\x1f\x06\x03\x55\x04\x03\x13\x18\x54\x6f\x6b\x65\x6e\x20\x53\x69\x67\x6e\x69\x6e\x67\x20\x50\x75\x62\x6c\x69\x63\x20\x4b\x65\x79\x01\x00\x26\x00\x00\x00\x00\x00\x01\x00\x20\x00\x01\x00\x09\x33\xe9\xe8\xcb\xf4\x8a\x5c\x61\x4d\x38\x42\xa1\x53\x41\x18\x1b\xeb\x99\x78\x0b\x19\x6f\x5c\xef\xdd\x02\x51\x07\x3b\xc6\xcc\x00\x00\x02\x00\x04\x00\x00\x00\x00\x00\x01\x00\x01\x00\x00\x00\x00\x00\x03\x00\x0a\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00'
+pkt = IP(rawpkt)
+# Check layers
+assert TCP in pkt
+assert NBTSession in pkt
+assert pkt[NBTSession].LENGTH == 530
+assert SMB2_Header in pkt
+assert SMB2_Negociate_Protocol_Response_Header in pkt
+nego_resp = pkt[SMB2_Negociate_Protocol_Response_Header]
+# check field values
+print(nego_resp.show())
+print(repr(nego_resp.SecurityMode))
+print(dir(nego_resp.SecurityMode))
+assert nego_resp.StructureSize == 0x41
+assert str(nego_resp.SecurityMode) == 'Signing Enabled'
+assert nego_resp.Dialect == 0x0311
+assert nego_resp.NegociateCount == 0x3
+assert str(nego_resp.ServerGUID) == '1cdd6d53-1f30-4244-a5c8-88737a6805e1'
+assert nego_resp.Capabilities == 0x2f000000
+assert nego_resp.MaxTransactionSize == 0x00800000
+assert nego_resp.MaxReadSize == 0x00800000
+assert nego_resp.MaxWriteSize == 0x00800000
+assert nego_resp.SecurityBufferOffset == 0x00000080
+assert nego_resp.SecurityBufferLength == 320
+assert nego_resp.NegociateContextOffset == 0x1c0
+assert nego_resp.SecurityBuffer == b"`\x82\x01<\x06\x06+\x06\x01\x05\x05\x02\xa0\x82\x0100\x82\x01,\xa0\x1a0\x18\x06\n+\x06\x01\x04\x01\x827\x02\x02\x1e\x06\n+\x06\x01\x04\x01\x827\x02\x02\n\xa2\x82\x01\x0c\x04\x82\x01\x08NEGOEXTS\x01\x00\x00\x00\x00\x00\x00\x00`\x00\x00\x00p\x00\x00\x00\x11p\xff\xd0\xfa\xf1O\xa2o@\\\x94UhS\xcf\xa1w\x02z2\xa9bx\n!\xfb\x9e,^\xe9x\xeb\xab\xee\x91\xfd\xfc\xda\x0f\xc5\x91\x03n\xf8\xfdL\x08\x00\x00\x00\x00\x00\x00\x00\x00`\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\\3S\r\xea\xf9\rM\xb2\xecJ\xe3xn\xc3\x08NEGOEXTS\x03\x00\x00\x00\x01\x00\x00\x00@\x00\x00\x00\x98\x00\x00\x00\x11p\xff\xd0\xfa\xf1O\xa2o@\\\x94UhS\xcf\\3S\r\xea\xf9\rM\xb2\xecJ\xe3xn\xc3\x08@\x00\x00\x00X\x00\x00\x000V\xa0T0R0'\x80%0#1!0\x1f\x06\x03U\x04\x03\x13\x18Token Signing Public Key0'\x80%0#1!0\x1f\x06\x03U\x04\x03\x13\x18Token Signing Public Key"
+assert len(nego_resp.NegociateContexts) == 3
+
+= SMB2 Negociate Context in Response - Type PREAUTH
+
+preauth = nego_resp.NegociateContexts[0]
+assert preauth.ContextType == 0x0001
+assert preauth.DataLength == 38
+assert preauth.HashAlgorithmCount == 1
+assert preauth.SaltLength == 32
+assert preauth.Salt == b"\x09\x33\xe9\xe8\xcb\xf4\x8a\x5c\x61\x4d\x38\x42\xa1\x53\x41\x18\x1b\xeb\x99\x78\x0b\x19\x6f\x5c\xef\xdd\x02\x51\x07\x3b\xc6\xcc"
+assert len(preauth.HashAlgorithms) == 1
+assert preauth.HashAlgorithms[0] == 0x1
+
+= SMB2 Negociate Context in Response - Type ENCRYPTION
+
+enc = nego_resp.NegociateContexts[1]
+assert enc.ContextType == 0x0002
+assert enc.DataLength == 4
+assert enc.CipherCount == 1
+assert len(enc.Ciphers) == 1
+assert enc.Ciphers[0] == 1
+
+= SMB2 Negociate Context in Response - Type COMPRESSION
+
+comp = nego_resp.NegociateContexts[2]
+assert comp.ContextType == 0x0003
+assert comp.DataLength  == 10
+assert comp.CompressionAlgorithmCount == 1
+assert len(comp.CompressionAlgorithms) == 1
+assert comp.CompressionAlgorithms[0] == 1
+
+= SMB2 Negociate Protocol Response Header assembling
+
+pkt = IP() / TCP() / NBTSession() / SMB2_Header() / SMB2_Negociate_Protocol_Response_Header()
+pkt = IP(raw(pkt))
+assert SMB2_Negociate_Protocol_Response_Header in pkt

scapy-2.4.3.tar.gz/test/tftp.uts -> scapy-2.4.4.tar.gz/test/tftp.uts Changed

@@ -2,7 +2,21 @@
 
 # More information at http://www.secdev.org/projects/UTscapy/
 
-+ Automatons
++ TFTP coverage tests
+
+= Test answers
+
+assert TFTP_DATA(block=1).answers(TFTP_RRQ())
+assert not TFTP_WRQ().answers(TFTP_RRQ())
+assert not TFTP_RRQ().answers(TFTP_WRQ())
+assert TFTP_ACK(block=1).answers(TFTP_DATA(block=1))
+assert not TFTP_ACK(block=0).answers(TFTP_DATA(block=1))
+assert TFTP_ACK(block=0).answers(TFTP_RRQ())
+assert not TFTP_ACK().answers(TFTP_ACK())
+assert TFTP_ERROR().answers(TFTP_DATA()) and TFTP_ERROR().answers(TFTP_ACK())
+assert TFTP_OACK().answers(TFTP_WRQ())
+
++ TFTP Automatons
 ~ linux
 
 = Utilities
@@ -44,10 +58,29 @@
                       ll=MockReadSocket,
                       recvsock=MockReadSocket)
 
-tftp_read.run()
+res = tftp_read.run()
 scapy.automaton.select_objects = legacy_select_objects
-assert tftp_read.res == (b"P" * 512 + b"<3")
+assert res == (b"P" * 512 + b"<3")
+
+= TFTP_read() automaton error
+~ linux
+
+class MockReadSocket(MockTFTPSocket):
+    packets = [IP(src="1.2.3.4") / UDP(dport=0x2807) / TFTP_ERROR(errorcode=2, errormsg="Fatal error")]
+
+patch_select_objects(MockReadSocket)
 
+tftp_read = TFTP_read("file.txt", "1.2.3.4", sport=0x2807,
+                      ll=MockReadSocket,
+                      recvsock=MockReadSocket)
+
+try:
+    tftp_read.run()
+    assert False
+except Automaton.ErrorState as e:
+    assert str(e) == "Reached ERROR: [\"ERROR Access violation: 'Fatal error'\"]"
+
+scapy.automaton.select_objects = legacy_select_objects
 
 = TFTP_write() automaton
 ~ linux
@@ -71,6 +104,24 @@
 scapy.automaton.select_objects = legacy_select_objects
 assert data_received == (b"P" * 767 + b"Scapy <3")
 
+= TFTP_write() automaton error
+~ linux
+
+class MockWriteSocket(MockTFTPSocket):
+    packets = [IP(src="1.2.3.4") / UDP(dport=0x2807) / TFTP_ERROR(errorcode=2, errormsg="Fatal error")]
+
+tftp_write = TFTP_write("file.txt", "P" * 767 + "Scapy <3", "1.2.3.4", sport=0x2807,
+                        ll=MockWriteSocket,
+                        recvsock=MockWriteSocket)
+
+patch_select_objects(MockWriteSocket)
+try:
+    tftp_write.run()
+    assert False
+except Automaton.ErrorState as e:
+    assert str(e) == "Reached ERROR: [\"ERROR Access violation: 'Fatal error'\"]"
+
+scapy.automaton.select_objects = legacy_select_objects
 
 = TFTP_WRQ_server() automaton
 ~ linux
@@ -87,6 +138,20 @@
 assert tftp_wrq.run() == (b"scapy.txt", (b"P" * 512 + b"<3"))
 scapy.automaton.select_objects = legacy_select_objects
 
+= TFTP_WRQ_server() automaton with options
+~ linux
+
+class MockWRQSocket(MockTFTPSocket):
+    packets = [IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_WRQ(filename="scapy.txt") / TFTP_Options(options=[TFTP_Option(oname="blksize", value="100")]),
+               IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_DATA(block=1) / ("P" * 100),
+               IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_DATA(block=2) / "<3"]
+
+tftp_wrq = TFTP_WRQ_server(ip="1.2.3.4", sport=0x2807,
+                           ll=MockWRQSocket,
+                           recvsock=MockWRQSocket)
+patch_select_objects(MockWRQSocket)
+assert tftp_wrq.run() == (b"scapy.txt", (b"P" * 100 + b"<3"))
+scapy.automaton.select_objects = legacy_select_objects
 
 = TFTP_RRQ_server() automaton
 ~ linux
@@ -101,7 +166,7 @@
 received_data = ""
 
 class MockRRQSocket(MockTFTPSocket):
-    packets = [IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_RRQ(filename="scapy.txt") / TFTP_Options(),
+    packets = [IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_RRQ(filename="scapy.txt") / TFTP_Options(options=[TFTP_Option(oname="blksize", value="100")]),
                IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_RRQ(filename=filename[5:]) / TFTP_Options(),
                IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_ACK(block=1),
                IP(dst="1.2.3.4") / UDP(dport=0x2807) / TFTP() / TFTP_ACK(block=2) ]

scapy-2.4.3.tar.gz/test/tls.uts -> scapy-2.4.4.tar.gz/test/tls.uts Changed

@@ -979,6 +979,10 @@
 assert(isinstance(rec_fin.msg[0], _TLSEncryptedContent))
 rec_fin.msg[0].load == b'7\\)`\xaa`\x7ff\xcd\x10\xa9v\xa3*\x17\x1a'
 
+###
+### Other/bug tests
+###
+
 = Reading TLS test session - Full TLSNewSessionTicket captured
 import os
 tmp = "/test/pcaps/tls_new-session-ticket.pcap"
@@ -1003,7 +1007,27 @@
 
 = Reading TLS msg dissect - Wrong data
 from scapy.layers.tls.record import _TLSMsgListField
-assert isinstance(_TLSMsgListField.m2i(_TLSMsgListField("", []), TLS(type=0), '\x00\x03\x03\x00\x03abc'), Raw)
+# Unknown type
+assert isinstance(_TLSMsgListField.m2i(_TLSMsgListField("", []), TLS(type=0), b'\x00\x03\x03\x00\x03abc'), Raw)
+
+old_debug_dissector = conf.debug_dissector
+conf.debug_dissector = False
+# not even bytes to make it crash
+assert isinstance(_TLSMsgListField.m2i(_TLSMsgListField("", []), TLS(type=20), 1), Raw)
+conf.debug_dissector = old_debug_dissector
+
+= Test x25519 dissection in ServerKeyExchange
+
+import binascii
+
+session = tlsSession(connection_end="client")
+# Raw hex data of a TLS Handshake - Server Key Exchange with x25519 elliptic curve
+hex_data = "160303012c0c00012803001d202f19b3f5defbd65cfdcbb3583d4760ef74dde4144e01049a43d8a036df38ca15080401008e4e4afc21f612d2f024bb489940a733ea606ed36cba9c60b8479264dcb5f4a0f839d85fa02f0a4be087243e69e575af48917ba6dfda9b485311cd8fe0d7616ece9b216b7b878588c03d3ab90b9dc981f758588905307541c7d3ccb6655baf7bfb0628f3a0ac181729da6b7fcba3efdd43f5bbaec53cfa4dd512941ee1204a42cba8a989e724bd42ac2cb1373ddb54acba29ae45fd58047176e4cb623a9b301711b926d15103f5251f6a0288b04a644834a9843752bbe2f8554beffdbf412983456fcc38b9caabdf7cf9ea2c30bd72dc00cf2cf48f22cd7f17b2d22fb651facb772507cc2fb83301c0c8dd1c3b4f24f38f0c4c82d21d0fa5d1e0b260d545e701"
+packet = TLS(binascii.unhexlify(hex_data), tls_session=session)
+
+assert isinstance(packet.msg[0], TLSServerKeyExchange)
+assert packet.msg[0].params[0].sprintf("%named_curve%") == "x25519"
+assert packet.msg[0].params[0].point == b'/\x19\xb3\xf5\xde\xfb\xd6\\\xfd\xcb\xb3X=G`\xeft\xdd\xe4\x14N\x01\x04\x9aC\xd8\xa06\xdf8\xca\x15'
 
 
 ###############################################################################
@@ -1055,8 +1079,11 @@
 # suite does not provide PFS, we are able to break the data confidentiality.
 
 + Read a vulnerable TLS session
+~ server_rsa_key
 
 = Reading TLS vulnerable session - Decrypt data from using a compromised server key
+load_layer("tls")
+
 from scapy.layers.tls.cert import PrivKeyRSA
 from scapy.layers.tls.record import TLSApplicationData
 import os
@@ -1078,7 +1105,26 @@
 assert(len(t.msg) == 1)
 assert(isinstance(t.msg[0], TLSApplicationData))
 assert(t.msg[0].data == b"")
-t.getlayer(2).msg[0].data == b"To boldly go where no man has gone before...\n"
+t.getlayer(TLS, 2).msg[0].data == b"To boldly go where no man has gone before...\n"
+
+= Auto provide the session
+
+conf.debug_dissector = 2
+client = "192.168.0.1"
+server = "1.2.3.4"
+bc = Ether()/IP(src=client, dst=server)/TCP(sport=51478, dport=443, seq=1)
+bs = Ether()/IP(src=server, dst=client)/TCP(sport=443, dport=51478, seq=1)
+pcap = [
+    bc/ch,
+    bs/sh,
+    bc/ck,
+    bs/fin,
+    bc/data
+]
+res = sniff(offline=pcap, session=TLSSession(server_rsa_key=key))
+
+res[4].show()
+assert res[4].getlayer(TLS, 2).msg[0].data == b"To boldly go where no man has gone before...\n"
 
 
 ###############################################################################
@@ -1159,7 +1205,7 @@
 
 = Building packets - TLS record with bad data
 a = TLS(b'\x17\x03\x03\x00\x03data')
-assert a.haslayer(Raw)
+assert a[Raw]
 
 
 = Building packets - _CipherSuitesField with no cipher
@@ -1198,9 +1244,14 @@
 
 = Truncated TCP segment
 
+dd = conf.debug_dissector
+conf.debug_dissector = False
+
 pkt = Ether(hex_bytes('00155dfb587a00155dfb58430800450005dc54d3400070065564400410d40a00000d01bb044e8b86744e16063ac45010faf06ba9000016030317c30200005503035cb336a067d53a5d2cedbdfec666ac740afbd0637ddd13eddeab768c3c63abee20981a0000d245f1c905b329323ad67127cd4b907a49f775c331d0794149aca7cdc02800000d0005000000170000ff010001000b000ec6000ec300090530820901308206e9a00302010202132000036e72aded906765595fae000000036e72300d06092a864886f70d01010b050030818b310b30090603550406130255533113'))
 assert TLSServerHello in pkt
 
+conf.debug_dissector = dd
+
 ###############################################################################
 ########################### TLS Misc tests ####################################
 ###############################################################################
@@ -1307,6 +1358,60 @@
 
 test_tls_tools()
 
+= Dissect TLSCertificateVerify
+
+from scapy.layers.tls.handshake import TLSCertificateVerify
+
+t = TLS(b'\x16\x03\x03\x00P\x0f\x00\x00L\x04\x03\x00H0F\x02!\x00\xcf\xf1\xd0:1\xb8\xe4JCU\x00\x8c\xcdg\xf9=g\x84\xa3h;V@\xfd\xd1\\\xf0\xc4f\xfa\x18\xdc\x02!\x00\x82\x1dF\xc1\xd1\xab\x86\xaa\xb9"\x0eA\xf2\xc3Rj\xd7\xf1\xe9\xaf\x9b\xa5?R\n\xca\x15\xfe)\xa9j\x84')
+assert TLSCertificateVerify in t
+assert t[TLSCertificateVerify].sig.sig_len == 72
+
+
+= Test complex TLSServerKeyExchange dissection & build
+
+a = b'\x16\x03\x03\x0e4\x02\x00\x00M\x03\x03^\xfa\xb5~\x88\xdf\xdc#}\'\xa0\xff\xa2\xe2\xb5\xec\x0e\x93\xa8\xe0\xde\x01[\x13[F\x151 x\xc6\xcc `)\x00\x00\x8aZ\x90l\xda\x0b\xe1\xec[i\x13\xa7\x8e\xb9a\x98"\x8a7L\x9d\x90\xe0\x01\x06c$9\xc0\'\x00\x00\x05\xff\x01\x00\x01\x00\x0b\x00\x0c\x8e\x00\x0c\x8b\x00\x06n0\x82\x06j0\x82\x05R\xa0\x03\x02\x01\x02\x02\x10EY\xe8\x1c\x1e\x9a\xe0?X\xaa\xc3\xbc\xcd`jh0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x000\x81\x8f1\x0b0\t\x06\x03U\x04\x06\x13\x02GB1\x1b0\x19\x06\x03U\x04\x08\x13\x12Greater Manchester1\x100\x0e\x06\x03U\x04\x07\x13\x07Salford1\x180\x16\x06\x03U\x04\n\x13\x0fSectigo Limited1705\x06\x03U\x04\x03\x13.Sectigo RSA Domain Validation Secure Server CA0\x1e\x17\r190309000000Z\x17\r210308235959Z0W1!0\x1f\x06\x03U\x04\x0b\x13\x18Domain Control Validated1\x1d0\x1b\x06\x03U\x04\x0b\x13\x14PositiveSSL Wildcard1\x130\x11\x06\x03U\x04\x03\x0c\n*.mql5.net0\x82\x01"0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x03\x82\x01\x0f\x000\x82\x01\n\x02\x82\x01\x01\x00\xcb\xbcn=\xbaGd\xe1XB\x07\xc9\xb1\xc8/\x86\xaa4Z\xbdNk\xfb\xffR\x8f\xe4\x1c^\x91m8\xb9^\x97\xa5\xd3N\xfb\x80\x92\x8ap\xda\x15\x9f\xee\xe7\xb3\xc8?\xb0>~\xaa\x07\x91\xb1\x99q\xe2\xe5\xc8\x9b\x1d5\xa0\x96,\x98\xdaW\x93\x95\x8e%\xe8\xd4L\xeb\xcbSg\x15"\xba\xb7\xc7\x1f\xe9\xd6\x1a\xe6E\x1d\xc8\x1e%\xd36\xe0/r\xd1\xce1C\xce\x91&\xa1\x08*R\xbf\x8cu\xb0\xda\x0e\x1e2\xd66\x1df&3\x9b\x03\x0b\xcam:\xf7\x12\xd9ud(\xae\xdc\xbci\x85\xbd\xcf\xeb{\x15:\xbd\x0e\x11\x1bi\xd8\xff]y~E\x15\x95\xee\xe9\xea\xc6Cr</\x0b\xe8\xc2\x9d\xe3\x83\x07R\xeb1\xf0\x93<|.\xf8G\xab\xa8=\xac\x16\x1d\xf9\x93%\x1b;)\xb2FN\x15\xc4\x17\xa9}\xb0\x80\xba\xfb\xc8\x15-G\x9e\x05\xe9\xf6\xc76\xc1\x9af\xa3\x91\n\xa4\x80,\x11=\x87\xec\xf9\xd6iJ\xd0\xbe\xc3K\x99J\xe7&\xc4\x86\x84:W\xc4/\x7f\x02\x03\x01\x00\x01\xa3\x82\x02\xf70\x82\x02\xf30\x1f\x06\x03U\x1d#\x04\x180\x16\x80\x14\x8d\x8c^\xc4T\xad\x8a\xe1w\xe9\x9b\xf9\x9b\x05\xe1\xb8\x01\x8da\xe10\x1d\x06\x03U\x1d\x0e\x04\x16\x04\x14z\x87\xb6T\xcbt:a\x03\xef:\x1f_\xad\xc0\x1cT\x15\x9d\xe30\x0e\x06\x03U\x1d\x0f\x01\x01\xff\x04\x04\x03\x02\x05\xa00\x0c\x06\x03U\x1d\x13\x01\x01\xff\x04\x020\x000\x1d\x06\x03U\x1d%\x04\x160\x14\x06\x08+\x06\x01\x05\x05\x07\x03\x01\x06\x08+\x06\x01\x05\x05\x07\x03\x020I\x06\x03U\x1d \x04B0@04\x06\x0b+\x06\x01\x04\x01\xb21\x01\x02\x02\x070%0#\x06\x08+\x06\x01\x05\x05\x07\x02\x01\x16\x17https://sectigo.com/CPS0\x08\x06\x06g\x81\x0c\x01\x02\x010\x81\x84\x06\x08+\x06\x01\x05\x05\x07\x01\x01\x04x0v0O\x06\x08+\x06\x01\x05\x05\x070\x02\x86Chttp://crt.sectigo.com/SectigoRSADomainValidationSecureServerCA.crt0#\x06\x08+\x06\x01\x05\x05\x070\x01\x86\x17http://ocsp.sectigo.com0\x1f\x06\x03U\x1d\x11\x04\x180\x16\x82\n*.mql5.net\x82\x08mql5.net0\x82\x01\x7f\x06\n+\x06\x01\x04\x01\xd6y\x02\x04\x02\x04\x82\x01o\x04\x82\x01k\x01i\x00v\x00\xbb\xd9\xdf\xbc\x1f\x8aq\xb5\x93\x94#\x97\xaa\x92{G8W\x95\n\xabR\xe8\x1a\x90\x96d6\x8e\x1e\xd1\x85\x00\x00\x01icH\xf8\x9b\x00\x00\x04\x03\x00G0E\x02 =\xab\xac\xefa \xc3\xf3J\xbb] w8\xc1+\xa9\x1b8\xcc\x94LP,T\xe0\x07\xe8\x87\x93s\xf5\x02!\x00\xf4D\x0e\x86a\xc9M\x8b\xc5\xf8\xec\x821\x9b\xbf]^\xacB1p\xfc\x8a\n\x07\xefz\xb6\x82 \xe0\xd5\x00v\x00D\x94e.\xb0\xee\xce\xaf\xc4@\x07\xd8\xa8\xfe(\xc0\xda\xe6\x82\xbe\xd8\xcb1\xb5?\xd33\x96\xb5\xb6\x81\xa8\x00\x00\x01icH\xf8\xdb\x00\x00\x04\x03\x00G0E\x02 ]\x91\x03.5\xaaA\xa82\xf4Bg\x08\xf7\xf1\x948N\x08,\xf5\x96\x01\x08\xdcM]&7J\xebv\x02!\x00\xeb\x90\r\xd5k\xf9\xa3L<\xc67]\xc5]\x16\xb2\x10\xed\xd5\x9b\xec\xdc$\xe1\xd5r+\x99\x19\xdbb\xe4\x00w\x00\\\xdcC\x92\xfe\xe6\xabED\xb1^\x9a\xd4V\xe6\x107\xfb\xd5\xfaG\xdc\xa1s\x94\xb2^\xe6\xf6\xc7\x0e\xca\x00\x00\x01icH\xf8\xe5\x00\x00\x04\x03\x00H0F\x02!\x00\x8f\xf5W\xd5 \xea\x02\xc4v\x1b\xd0h\x03\xe7`\xec\xdfp\xd7\xb8\x10\xd9nb7\xadDp\xf6V\xa0l\x02!\x00\xa9\x935\x94\xe3\xdb\xab\xc8N\xd2t\xa2M\xd5\xf0\x1c8\xccl\xd3}\xceQ\xc5u\xbc\xa1>!=~y0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x00\x03\x82\x01\x01\x00\x17\x7f\x18\x82[\t\x18@R@\xa6\xb7\xc5[\xf1su\xc7\x8cG?\xf7\x91\xe2E]\x1b\x7f\xc3su\x88\xb6\x17t\xc3\x8b\xb1g\xd2\x06\xfc\x82\x84\x8d\xbb\x13\xc1\x8c\xf71\xc0>(?\xa3\xf0P\x14Z\x8a\x97\x9c\xa3\xb1!ddy\xa3 .\xdb\xd3\xfb\xa6\x0b\xf7k\xdbP\xb48\xeb\xc7\x90\x00\xa9\x90\xa4\x9d\xbf\x9c\xa7\n\x8e\x90\xfe\x8f\xa3\x95Th\xe6,\xdd\xde\xde\x06\x0b\x8e+\xf5\xca\x85>n\xbf\xd87\xff\xe3\xd2|*\xc0\x89\x07\x95\xbeV\x90:lG[\xf0\xadUF\xa1\x88nmj\xbb\xa9\x16\x90\xdd\x84\xe4\xbf\xe7\xe8\xe3"\xd4+0\xa0d\xdc.\x8e\x85+\xbd\x99\xd8\x02\xa7K}\xb1\xc4\xed;\xe2\xaf\x81R\xceJ\xb9iZ\xec\xda\x8f`\x8eI\xf6]\x83-\x9e\xa7{]\x02\x9d\x1fh\xf4\xef\x14\xf4\xb3\x0e\r\xe6\x9b\x9d\x96\xb4\x90iWA\xe0\xf4\x1d_\xbeRD\x15a;?\t\x8c\x8f6\xea!\xf2\xd6/Yg\x82e/5\xe1\xb4\xa1\x94\xef\xd7\x94\x82\x04\x00\x06\x170\x82\x06\x130\x82\x03\xfb\xa0\x03\x02\x01\x02\x02\x10}[Q&\xb4v\xba\x11\xdbt\x16\x0b\xbcS\r\xa70\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0c\x05\x000\x81\x881\x0b0\t\x06\x03U\x04\x06\x13\x02US1\x130\x11\x06\x03U\x04\x08\x13\nNew Jersey1\x140\x12\x06\x03U\x04\x07\x13\x0bJersey City1\x1e0\x1c\x06\x03U\x04\n\x13\x15The USERTRUST Network1.0,\x06\x03U\x04\x03\x13%USERTrust RSA Certification Authority0\x1e\x17\r181102000000Z\x17\r301231235959Z0\x81\x8f1\x0b0\t\x06\x03U\x04\x06\x13\x02GB1\x1b0\x19\x06\x03U\x04\x08\x13\x12Greater Manchester1\x100\x0e\x06\x03U\x04\x07\x13\x07Salford1\x180\x16\x06\x03U\x04\n\x13\x0fSectigo Limited1705\x06\x03U\x04\x03\x13.Sectigo RSA Domain Validation Secure Server CA0\x82\x01"0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x03\x82\x01\x0f\x000\x82\x01\n\x02\x82\x01\x01\x00\xd6s3\xd6\xd7< \xd0\x00\xd2\x17E\xb8\xd6>\x07\xa2?\xc7A\xee20\xc9\xb0l\xfd\xf4\x9f\xcb\x12\x98\x0f-?\x8dM\x01\x0c\x82\x0f\x17\x7fb.\xe9\xb8Hy\xfb\x16\x83N\xad\xd72%\x93\xb7\x07\xbf\xb9P?\xa9L\xc3@*\xe99\xff\xd9\x81\xca\x1f\x162A\xda\x80&\xb9#z\x87 \x1e\xe3\xff \x9a<\x95Do\x87u\x06\x90@\xb42\x93\x16\t\x10\x08#>\xd2\xdd\x87\x0fo]Q\x14j\ni\xc5O\x01ri\xcf\xd3\x93Lm\x04\xa0\xa3\x1b\x82~\xb1\x9a\xb9\xed\xc5\x9e\xc57x\x9f\x9a\x084\xfbV.X\xc4\t\x0e\x06d[\xbc7\xdc\xf1\x9f(h\xa8V\xb0\x92\xa3\\\x9f\xbb\x88\x98\x08\x1b$\x1d\xab0\x85\xae\xaf\xb0.\x9ez\x9d\xc1\xc0B\x1c\xe2\x02\xf0\xea\xe0J\xd2\xef\x90\x0e\xb4\xc1@\x16\xf0o\x85BJd\xf7\xa40\xa0\xfe\xbf.\xa3\'Z\x8e\x8bX\xb8\xad\xc3\x19\x17\x84c\xedoV\xfd\x83\xcb`4\xc4t\xbe\xe6\x9d\xdb\xe1\xe4\xe5\xca\x0c_\x15\x02\x03\x01\x00\x01\xa3\x82\x01n0\x82\x01j0\x1f\x06\x03U\x1d#\x04\x180\x16\x80\x14Sy\xbfZ\xaa+J\xcfT\x80\xe1\xd8\x9b\xc0\x9d\xf2\xb2\x03f\xcb0\x1d\x06\x03U\x1d\x0e\x04\x16\x04\x14\x8d\x8c^\xc4T\xad\x8a\xe1w\xe9\x9b\xf9\x9b\x05\xe1\xb8\x01\x8da\xe10\x0e\x06\x03U\x1d\x0f\x01\x01\xff\x04\x04\x03\x02\x01\x860\x12\x06\x03U\x1d\x13\x01\x01\xff\x04\x080\x06\x01\x01\xff\x02\x01\x000\x1d\x06\x03U\x1d%\x04\x160\x14\x06\x08+\x06\x01\x05\x05\x07\x03\x01\x06\x08+\x06\x01\x05\x05\x07\x03\x020\x1b\x06\x03U\x1d \x04\x140\x120\x06\x06\x04U\x1d \x000\x08\x06\x06g\x81\x0c\x01\x02\x010P\x06\x03U\x1d\x1f\x04I0G0E\xa0C\xa0A\x86?http://crl.usertrust.com/USERTrustRSACertificationAuthority.crl0v\x06\x08+\x06\x01\x05\x05\x07\x01\x01\x04j0h0?\x06\x08+\x06\x01\x05\x05\x070\x02\x863http://crt.usertrust.com/USERTrustRSAAddTrustCA.crt0%\x06\x08+\x06\x01\x05\x05\x070\x01\x86\x19http://ocsp.usertrust.com0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0c\x05\x00\x03\x82\x02\x01\x002\xbfa\xbd\x0eH\xc3O\xc7\xbaGM\xf8\x9cx\x19\x01\xdc\x13\x1d\x80o\xfc\xc3p\xb4R\x9a13\x9aWR\xfb1\x9ek\xa4\xefT\xaa\x89\x8d@\x17h\xf8\x11\x10|\xd2\xca\xb1\xf1U\x86\xc7\xee\xb36\x91\x86\xf69Q\xbfF\xbf\x0f\xa0\xba\xb4\xf7~I\xc4*6\x17\x9e\xe4h9z\xaf\x94NVo\xb2{;\xbf\n\x86\xbd\xcd\xc5w\x1c\x03\xb88\xb1\xa2\x1f_~\xdb\x8a\xdcFH\xb6h\n\xcf\xb2\xb5\xb4\xe24\xe4g\xa98f\t^\xd2\xb8\xfc\x9d(:\x17@\'\xc2rN)\xfd!<|\xcf\x13\xfb\x96,\xc51D\xfd\x13\xed\xd5\x9b\xa9ihw|\xee\xe1\xff\xa4\xf968\x08S9\xa2\x844\x9c\x19\xf3\xbe\x0e\xac\xd5$7\xeb#\xa8x\xd0\xd3\xe7\xef\x92Gdb9"\xef\xc6\xf7\x11\xbe"\x85\xc6fD$&\x8e\x102\x8d\xc8\x93\xae\x07\x9e\x83>/\xd9\xf9\xf5F\x8ec\xbe\xc1\xe6\xb4\xdc\xa6\xcd!\xa8\x86\n\x95\xd9.\x85&\x1a\xfd\xfc\xb1\xb6WBm\x95\xd13\xf69\x14\x06\x82A8\xf5\x8fX\xdc\x80[\xa4\xd5}\x95x\xfd\xa7\x9b\xff\xfd\xc5\xa8i\xab&\xe7\xa7\xa4\x05\x87[\xa9\xb7\xb8\xa3 \x0b\x97\xa9E\x85\xdd\xb3\x8b\xe5\x897\x8e)\r\xfc\x06\x17\xf68@\x0eB\xe4\x12\x06\xfb{\xf3\xc6\x11hb\xdf\xe3\x98\xf4\x13\xd8\x15O\x8b\xb1i\xd9\x10`\xbcd*\xea1\xb7\xe4\xb5\xa3:\x14\x9b&\xe3\x0b{\xfd\x02\x8e\xb6\x99\xc18\x97Y6\xf6\xa8t\xa2\x86\xb6^\xeb\xc6d\xea\xcf\xa0\xa3\xf9n\x9e\xba-\x11\xb6\x86\x98\x08X-\xc9\xac%d\xf2^u\xb48\xc1\xae\x7fZF\x83\xeaQ\xca\xb6\xf1\x99\x115k\xa5j{\xc6\x00\xb0\xe7\xf8\xbed\xb2\xad\xc8\xc2\xf1\xac\xe3Q\xea\xa4\x93\xe0y\xc8\xe1\x81@\xc9\n[\xe1\x12<\xc1`*\xe3\x97\xc0\x89B\xca\x94\xcfF\x98\x12i\xbb\x98\xd0\xc2\xd3\rrKGn\xe5\x93\xc42(c\x87C\xe4\xb02>\n\xd3K\xbf#\x9b\x14)A+\x9a\x04\x1f\x93-\xf1\xc79H<\xadZ\x12\x7f\x0c\x00\x01I\x03\x00\x17A\x04\x13\x1c\x02q\xd4m\x97\x01\x99\xcf\xf2\x80G\xa8\xe1\xdf\x1ak\xbf\x1fJ\xf9\x9e\xd0\x02\x01W\x9d\xb8\xbc*\xf9S\xb6\xbf\xb8\xf1\xc1\x89\xcd\x96C(\xa8|\x189\x13\xcd\xc5\xf7Q\x1e\xe17h~\x8c`\x1f8\x8e\xacq\x04\x01\x01\x00\xc1R`\xb8\x14!\xed\xb9\xbca\x9d0{\xb7\x95\x94\x80\x06\t.A\xcc\x82\x99\x89N_\xa1\x08M%#\x1fg\xb6\xa2\xfe\x00\xd6\xa8\xe9\x9fd\x91O\xdbzw\xbfS\x88?\xeb[2\x7f\xa1\xeb\xd1vmi_\x95\xd0A\x04`\x01+\x02\\\x99\xa0\xe9\n\xb5\xb5j\x85\x89J\x82\xf8\x00\xbb\xa3%\x14\x15D\xbf9\x12{\x9e\xca\x0e\x92\xdf\xbb\xfd\xd3\xc8\x0ez\x04n \x12\x01\xd2|\xc6t\xc36\xce>:J\xc3\x81+d\xbc\xb1\x1d\x8d\x00o\x00\xc9\xd4%\xb6\x90\x1f\xe1\xc5\x14\xb5Qk\x06\x1e\xf6{\xbdJ\xb2H\xcbf\xe9_mQ(\x9e4\x10U#\xcd4\x88\x1c\xfb\x03\x80(Q:\x9c\x0f\x16\xed\xad\xb4\x18k\t\xc5$\x97}~s\xc1\xca\xae\x9d\xd1q\x94\x9fi+Pj\x80:v\xc1z#\xf6\xee]ou~\xa3\xd9I\xce\xb8Z|\x1b\x8ep\xc6\x19\xb4A\x03\x92\x1bp\x16\x10\x0f\x84\xa9\x9f\xb7\xc9\x01\xc8^\x93\xaat\r\x87\x96\x86\xf6\xc5\xfe\x88\x13\xc3N\x0e\x00\x00\x00'
+p = TLS(a)
+p.clear_cache()
+assert raw(p) == a
+
+= Issue 2763
+
+dd = conf.debug_dissector
+conf.debug_dissector = False
+
+p = Ether(b'RU\x10\x00\x02\x02RT\x00\x124V\x08\x00E\x00\x05\xc8\r\xd8\x00\x00@\x06\x96\x9d\x9c&\xce\x12\xc0\xa8\xa5\xd9\x01\xbb\xc0\x1f\x00w$\x02\x03\xbe\xc5#P\x10#(\x0b\x9e\x00\x00\x16\x03\x03\x0e4\x02\x00\x00M\x03\x03^\xfa\xb5~\x88\xdf\xdc#}\'\xa0\xff\xa2\xe2\xb5\xec\x0e\x93\xa8\xe0\xde\x01[\x13[F\x151 x\xc6\xcc `)\x00\x00\x8aZ\x90l\xda\x0b\xe1\xec[i\x13\xa7\x8e\xb9a\x98"\x8a7L\x9d\x90\xe0\x01\x06c$9\xc0\'\x00\x00\x05\xff\x01\x00\x01\x00\x0b\x00\x0c\x8e\x00\x0c\x8b\x00\x06n0\x82\x06j0\x82\x05R\xa0\x03\x02\x01\x02\x02\x10EY\xe8\x1c\x1e\x9a\xe0?X\xaa\xc3\xbc\xcd`jh0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x000\x81\x8f1\x0b0\t\x06\x03U\x04\x06\x13\x02GB1\x1b0\x19\x06\x03U\x04\x08\x13\x12Greater Manchester1\x100\x0e\x06\x03U\x04\x07\x13\x07Salford1\x180\x16\x06\x03U\x04\n\x13\x0fSectigo Limited1705\x06\x03U\x04\x03\x13.Sectigo RSA Domain Validation Secure Server CA0\x1e\x17\r190309000000Z\x17\r210308235959Z0W1!0\x1f\x06\x03U\x04\x0b\x13\x18Domain Control Validated1\x1d0\x1b\x06\x03U\x04\x0b\x13\x14PositiveSSL Wildcard1\x130\x11\x06\x03U\x04\x03\x0c\n*.mql5.net0\x82\x01"0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x03\x82\x01\x0f\x000\x82\x01\n\x02\x82\x01\x01\x00\xcb\xbcn=\xbaGd\xe1XB\x07\xc9\xb1\xc8/\x86\xaa4Z\xbdNk\xfb\xffR\x8f\xe4\x1c^\x91m8\xb9^\x97\xa5\xd3N\xfb\x80\x92\x8ap\xda\x15\x9f\xee\xe7\xb3\xc8?\xb0>~\xaa\x07\x91\xb1\x99q\xe2\xe5\xc8\x9b\x1d5\xa0\x96,\x98\xdaW\x93\x95\x8e%\xe8\xd4L\xeb\xcbSg\x15"\xba\xb7\xc7\x1f\xe9\xd6\x1a\xe6E\x1d\xc8\x1e%\xd36\xe0/r\xd1\xce1C\xce\x91&\xa1\x08*R\xbf\x8cu\xb0\xda\x0e\x1e2\xd66\x1df&3\x9b\x03\x0b\xcam:\xf7\x12\xd9ud(\xae\xdc\xbci\x85\xbd\xcf\xeb{\x15:\xbd\x0e\x11\x1bi\xd8\xff]y~E\x15\x95\xee\xe9\xea\xc6Cr</\x0b\xe8\xc2\x9d\xe3\x83\x07R\xeb1\xf0\x93<|.\xf8G\xab\xa8=\xac\x16\x1d\xf9\x93%\x1b;)\xb2FN\x15\xc4\x17\xa9}\xb0\x80\xba\xfb\xc8\x15-G\x9e\x05\xe9\xf6\xc76\xc1\x9af\xa3\x91\n\xa4\x80,\x11=\x87\xec\xf9\xd6iJ\xd0\xbe\xc3K\x99J\xe7&\xc4\x86\x84:W\xc4/\x7f\x02\x03\x01\x00\x01\xa3\x82\x02\xf70\x82\x02\xf30\x1f\x06\x03U\x1d#\x04\x180\x16\x80\x14\x8d\x8c^\xc4T\xad\x8a\xe1w\xe9\x9b\xf9\x9b\x05\xe1\xb8\x01\x8da\xe10\x1d\x06\x03U\x1d\x0e\x04\x16\x04\x14z\x87\xb6T\xcbt:a\x03\xef:\x1f_\xad\xc0\x1cT\x15\x9d\xe30\x0e\x06\x03U\x1d\x0f\x01\x01\xff\x04\x04\x03\x02\x05\xa00\x0c\x06\x03U\x1d\x13\x01\x01\xff\x04\x020\x000\x1d\x06\x03U\x1d%\x04\x160\x14\x06\x08+\x06\x01\x05\x05\x07\x03\x01\x06\x08+\x06\x01\x05\x05\x07\x03\x020I\x06\x03U\x1d \x04B0@04\x06\x0b+\x06\x01\x04\x01\xb21\x01\x02\x02\x070%0#\x06\x08+\x06\x01\x05\x05\x07\x02\x01\x16\x17https://sectigo.com/CPS0\x08\x06\x06g\x81\x0c\x01\x02\x010\x81\x84\x06\x08+\x06\x01\x05\x05\x07\x01\x01\x04x0v0O\x06\x08+\x06\x01\x05\x05\x070\x02\x86Chttp://crt.sectigo.com/SectigoRSADomainValidationSecureServerCA.crt0#\x06\x08+\x06\x01\x05\x05\x070\x01\x86\x17http://ocsp.sectigo.com0\x1f\x06\x03U\x1d\x11\x04\x180\x16\x82\n*.mql5.net\x82\x08mql5.net0\x82\x01\x7f\x06\n+\x06\x01\x04\x01\xd6y\x02\x04\x02\x04\x82\x01o\x04\x82\x01k\x01i\x00v\x00\xbb\xd9\xdf\xbc\x1f\x8aq\xb5\x93\x94#\x97\xaa\x92{G8W\x95\n\xabR\xe8\x1a\x90\x96d6\x8e\x1e\xd1\x85\x00\x00\x01icH\xf8\x9b\x00\x00\x04\x03\x00G0E\x02 =\xab\xac\xefa \xc3\xf3J\xbb] w8\xc1+\xa9\x1b8\xcc\x94LP,T\xe0\x07\xe8\x87\x93s\xf5\x02!\x00\xf4D\x0e\x86a\xc9M\x8b\xc5\xf8\xec\x821\x9b\xbf]^\xacB1p\xfc\x8a\n\x07\xefz\xb6\x82 \xe0\xd5\x00v\x00D\x94e.\xb0\xee\xce\xaf\xc4@\x07\xd8\xa8\xfe(\xc0\xda\xe6\x82\xbe\xd8\xcb1\xb5?\xd33\x96\xb5\xb6\x81\xa8\x00\x00\x01icH\xf8\xdb\x00\x00\x04\x03\x00G0E\x02 ]\x91\x03.5\xaaA\xa82\xf4Bg\x08\xf7\xf1\x948N\x08,\xf5\x96\x01\x08\xdcM]&7J\xebv\x02!\x00\xeb\x90\r\xd5k\xf9\xa3L<\xc67]\xc5]\x16\xb2\x10\xed\xd5\x9b\xec\xdc$\xe1\xd5r+\x99\x19\xdbb\xe4\x00w\x00\\\xdcC\x92\xfe\xe6\xabED\xb1^\x9a\xd4V\xe6\x107\xfb\xd5\xfaG\xdc\xa1s\x94\xb2^\xe6\xf6\xc7\x0e\xca\x00\x00\x01icH\xf8\xe5\x00\x00\x04\x03\x00H0F\x02!\x00\x8f\xf5W\xd5 \xea\x02\xc4v\x1b\xd0h\x03\xe7`\xec\xdfp\xd7\xb8\x10\xd9nb7\xadDp\xf6V\xa0l\x02!\x00\xa9\x935\x94\xe3\xdb')
+assert raw(p[TLS]) == b'\x17\x03\x03\x0e4\x02\x00\x00M\x03\x03^\xfa\xb5~\x88\xdf\xdc#}\'\xa0\xff\xa2\xe2\xb5\xec\x0e\x93\xa8\xe0\xde\x01[\x13[F\x151 x\xc6\xcc `)\x00\x00\x8aZ\x90l\xda\x0b\xe1\xec[i\x13\xa7\x8e\xb9a\x98"\x8a7L\x9d\x90\xe0\x01\x06c$9\xc0\'\x00\x00\x05\xff\x01\x00\x01\x00\x0b\x00\x0c\x8e\x00\x0c\x8b\x00\x06n0\x82\x06j0\x82\x05R\xa0\x03\x02\x01\x02\x02\x10EY\xe8\x1c\x1e\x9a\xe0?X\xaa\xc3\xbc\xcd`jh0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x000\x81\x8f1\x0b0\t\x06\x03U\x04\x06\x13\x02GB1\x1b0\x19\x06\x03U\x04\x08\x13\x12Greater Manchester1\x100\x0e\x06\x03U\x04\x07\x13\x07Salford1\x180\x16\x06\x03U\x04\n\x13\x0fSectigo Limited1705\x06\x03U\x04\x03\x13.Sectigo RSA Domain Validation Secure Server CA0\x1e\x17\r190309000000Z\x17\r210308235959Z0W1!0\x1f\x06\x03U\x04\x0b\x13\x18Domain Control Validated1\x1d0\x1b\x06\x03U\x04\x0b\x13\x14PositiveSSL Wildcard1\x130\x11\x06\x03U\x04\x03\x0c\n*.mql5.net0\x82\x01"0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x03\x82\x01\x0f\x000\x82\x01\n\x02\x82\x01\x01\x00\xcb\xbcn=\xbaGd\xe1XB\x07\xc9\xb1\xc8/\x86\xaa4Z\xbdNk\xfb\xffR\x8f\xe4\x1c^\x91m8\xb9^\x97\xa5\xd3N\xfb\x80\x92\x8ap\xda\x15\x9f\xee\xe7\xb3\xc8?\xb0>~\xaa\x07\x91\xb1\x99q\xe2\xe5\xc8\x9b\x1d5\xa0\x96,\x98\xdaW\x93\x95\x8e%\xe8\xd4L\xeb\xcbSg\x15"\xba\xb7\xc7\x1f\xe9\xd6\x1a\xe6E\x1d\xc8\x1e%\xd36\xe0/r\xd1\xce1C\xce\x91&\xa1\x08*R\xbf\x8cu\xb0\xda\x0e\x1e2\xd66\x1df&3\x9b\x03\x0b\xcam:\xf7\x12\xd9ud(\xae\xdc\xbci\x85\xbd\xcf\xeb{\x15:\xbd\x0e\x11\x1bi\xd8\xff]y~E\x15\x95\xee\xe9\xea\xc6Cr</\x0b\xe8\xc2\x9d\xe3\x83\x07R\xeb1\xf0\x93<|.\xf8G\xab\xa8=\xac\x16\x1d\xf9\x93%\x1b;)\xb2FN\x15\xc4\x17\xa9}\xb0\x80\xba\xfb\xc8\x15-G\x9e\x05\xe9\xf6\xc76\xc1\x9af\xa3\x91\n\xa4\x80,\x11=\x87\xec\xf9\xd6iJ\xd0\xbe\xc3K\x99J\xe7&\xc4\x86\x84:W\xc4/\x7f\x02\x03\x01\x00\x01\xa3\x82\x02\xf70\x82\x02\xf30\x1f\x06\x03U\x1d#\x04\x180\x16\x80\x14\x8d\x8c^\xc4T\xad\x8a\xe1w\xe9\x9b\xf9\x9b\x05\xe1\xb8\x01\x8da\xe10\x1d\x06\x03U\x1d\x0e\x04\x16\x04\x14z\x87\xb6T\xcbt:a\x03\xef:\x1f_\xad\xc0\x1cT\x15\x9d\xe30\x0e\x06\x03U\x1d\x0f\x01\x01\xff\x04\x04\x03\x02\x05\xa00\x0c\x06\x03U\x1d\x13\x01\x01\xff\x04\x020\x000\x1d\x06\x03U\x1d%\x04\x160\x14\x06\x08+\x06\x01\x05\x05\x07\x03\x01\x06\x08+\x06\x01\x05\x05\x07\x03\x020I\x06\x03U\x1d \x04B0@04\x06\x0b+\x06\x01\x04\x01\xb21\x01\x02\x02\x070%0#\x06\x08+\x06\x01\x05\x05\x07\x02\x01\x16\x17https://sectigo.com/CPS0\x08\x06\x06g\x81\x0c\x01\x02\x010\x81\x84\x06\x08+\x06\x01\x05\x05\x07\x01\x01\x04x0v0O\x06\x08+\x06\x01\x05\x05\x070\x02\x86Chttp://crt.sectigo.com/SectigoRSADomainValidationSecureServerCA.crt0#\x06\x08+\x06\x01\x05\x05\x070\x01\x86\x17http://ocsp.sectigo.com0\x1f\x06\x03U\x1d\x11\x04\x180\x16\x82\n*.mql5.net\x82\x08mql5.net0\x82\x01\x7f\x06\n+\x06\x01\x04\x01\xd6y\x02\x04\x02\x04\x82\x01o\x04\x82\x01k\x01i\x00v\x00\xbb\xd9\xdf\xbc\x1f\x8aq\xb5\x93\x94#\x97\xaa\x92{G8W\x95\n\xabR\xe8\x1a\x90\x96d6\x8e\x1e\xd1\x85\x00\x00\x01icH\xf8\x9b\x00\x00\x04\x03\x00G0E\x02 =\xab\xac\xefa \xc3\xf3J\xbb] w8\xc1+\xa9\x1b8\xcc\x94LP,T\xe0\x07\xe8\x87\x93s\xf5\x02!\x00\xf4D\x0e\x86a\xc9M\x8b\xc5\xf8\xec\x821\x9b\xbf]^\xacB1p\xfc\x8a\n\x07\xefz\xb6\x82 \xe0\xd5\x00v\x00D\x94e.\xb0\xee\xce\xaf\xc4@\x07\xd8\xa8\xfe(\xc0\xda\xe6\x82\xbe\xd8\xcb1\xb5?\xd33\x96\xb5\xb6\x81\xa8\x00\x00\x01icH\xf8\xdb\x00\x00\x04\x03\x00G0E\x02 ]\x91\x03.5\xaaA\xa82\xf4Bg\x08\xf7\xf1\x948N\x08,\xf5\x96\x01\x08\xdcM]&7J\xebv\x02!\x00\xeb\x90\r\xd5k\xf9\xa3L<\xc67]\xc5]\x16\xb2\x10\xed\xd5\x9b\xec\xdc$\xe1\xd5r+\x99\x19\xdbb\xe4\x00w\x00\\\xdcC\x92\xfe\xe6\xabED\xb1^\x9a\xd4V\xe6\x107\xfb\xd5\xfaG\xdc\xa1s\x94\xb2^\xe6\xf6\xc7\x0e\xca\x00\x00\x01icH\xf8\xe5\x00\x00\x04\x03\x00H0F\x02!\x00\x8f\xf5W\xd5 \xea\x02\xc4v\x1b\xd0h\x03\xe7`\xec\xdfp\xd7\xb8\x10\xd9nb7\xadDp\xf6V\xa0l\x02!\x00\xa9\x935\x94\xe3\xdb'
+
+conf.debug_dissector = dd
+
+= Test TLS TCP defragmentation
+
+import os
+
+tmp = "/test/pcaps/tls_tcp_frag.pcap.gz"
+filename = os.path.abspath(os.path.join(os.path.dirname(__file__),"../")) + tmp
+filename = os.getenv("SCAPY_ROOT_DIR")+tmp if not os.path.exists(filename) else filename
+
+dd = conf.debug_dissector
+conf.debug_dissector = False
+
+a = sniff(offline=filename, session=TCPSession)[0]
+
+conf.debug_dissector = dd
+
+assert len(a.msg) == 4
+assert isinstance(a.msg[0], TLSServerHello)
+assert isinstance(a.msg[1], TLSCertificate)
+assert isinstance(a.msg[2], TLSServerKeyExchange)
+assert isinstance(a.msg[3], TLSServerHelloDone)
+
+= Issue 2527
+
+p = TLS(b'\x16\x03\x00\x05\'\x02\x00\x00&\x03\x00\x00\x00\x00\x00\x7fk77\n\xe2\x1d\xdf\x82e\x06p$\xbaV7_\xa9\xb1\x03\x01\x0c\x0c\x18\x90\x00H\x01\x00\x00\x03\x00\x0b\x00\x03\xa8\x00\x03\xa5\x00\x03\xa20\x82\x03\x9e0\x82\x02\x86\xa0\x03\x02\x01\x02\x02\t\x00\xfe\x04W\r\xc7\'\xe9\xf60\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x000T1\x0b0\t\x06\x03U\x04\x06\x13\x02MN1\x140\x12\x06\x03U\x04\x07\x0c\x0bUlaanbaatar1\x170\x15\x06\x03U\x04\x0b\x0c\x0eScapy Test PKI1\x160\x14\x06\x03U\x04\x03\x0c\rScapy Test CA0\x1e\x17\r160916102811Z\x17\r260915102811Z0X1\x0b0\t\x06\x03U\x04\x06\x13\x02MN1\x140\x12\x06\x03U\x04\x07\x0c\x0bUlaanbaatar1\x170\x15\x06\x03U\x04\x0b\x0c\x0eScapy Test PKI1\x1a0\x18\x06\x03U\x04\x03\x0c\x11Scapy Test Server0\x82\x01"0\r\x06\t*\x86H\x86\xf7\r\x01\x01\x01\x05\x00\x03\x82\x01\x0f\x000\x82\x01\n\x02\x82\x01\x01\x00\xcc\xf1\xf1\x9b`-`\xae\xf2\x98\r\')\xd9\xc0\tYL\x0fJ0\xa8R\xdf\xe5\xb1!\x9fO\xc3=V\x93\xdd_\xc6\xf7\xb3\xf6U\x8b\xe7\x92\xe2\xde\xf2\x85I\xb4\xa1,\xf4\xfdv\xa8g\xca\x04 `\x11\x18\xa6\xf2\xa9\xb6\xa6\x1d\xd9\xaa\xe5\xd9\xdb\xaf\xe6\xafUW\x9f\xffR\x89e\xe6\x80b\x80!\x94\xbc\xcf\x81\x1b\xcbg\xc2\x9d\xb5\x05w\x04\xa6\xc7\x88\x18\x80xh\x956\xde\x97\x1b\xb6a\x87B\x1au\x98E\x82\xeb>2\x11\xc8\x9b\x86B9\x8dM\x12\xb7X\x1b\x19\xf3\x9d+\xa1\x98\x82\xca\xd7;$\xfb\t9\xb0\xbc\xc2\x95\xcf\x82)u\x16)?B \x17+M@\x8cVl\xad\xba\x0f4\x85\xb1\x7f@yqx\xb7\xa5\x04\xbb\x94\xf7\xb5A\x95\xee|\xeb\x8d\x0cyhY\xef\xcb\xb3\xfa>x\x1e\xeegLz\xdd\xe0\x99\xef\xda\xe7\xef\xb2\t]\xbe\x80 !\x05\x83,D\xdb]*v)\xa5\xb0#\x88t\x07T"\xd6)z\x92\xf5o-\x9e\xe7\xf8&+\x9cXe\x02\x03\x01\x00\x01\xa3o0m0\t\x06\x03U\x1d\x13\x04\x020\x000\x0b\x06\x03U\x1d\x0f\x04\x04\x03\x02\x05\xe00\x1d\x06\x03U\x1d\x0e\x04\x16\x04\x14\xa1+ p\xd2k\x80\xe5e\xbc\xeb\x03\x0f\x88\x9ft\xad\xdd\xf6\x130\x1f\x06\x03U\x1d#\x04\x180\x16\x80\x14fS\x94\xf4\x15\xd1\xbdgh\xb0Q725\xe1\xa4\xaa\xde\x07|0\x13\x06\x03U\x1d%\x04\x0c0\n\x06\x08+\x06\x01\x05\x05\x07\x03\x010\r\x06\t*\x86H\x86\xf7\r\x01\x01\x0b\x05\x00\x03\x82\x01\x01\x00\x81\x88\x92sk\x93\xe7\x95\xd6\xddA\xee\x8e\x1e\xbd\xa3HX\xa7A5?{}\xd07\x98\x0e\xb8,\x94w\xc8Q6@\xadY\t(\xc8V\xd6\xea[\xac\xb4\xd8?h\xb7f\xca\xe1V7\xa9\x00e\xeaQ\xc9\xec\xb2iI]\xf9\xe3\xc0\xedaT\xc9\x12\x9f\xc6\xb0\nsU\xe8U5`\xef\x1c6\xf0\xda\xd1\x90wV\x04\xb8\xab8\xee\xf7\t\xc5\xa5\x98\x90#\xea\x1f\xdb\x15\x7f2(\x81\xab\x9b\x85\x02K\x95\xe77Q{\x1bH.\xfb>R\xa3\r\xb4F\xa9\x92:\x1c\x1f\xd7\n\x1eXJ\xfa.Q\x8f)\xc6\x1e\xb8\x0e1\x0es\xf1\'\x88\x17\xca\xc8i\x0c\xfa\x83\xcd\xb3y\x0e\x14\xb0\xb8\x9b/:-\t\xe3\xfc\x06\xf0:n\xfd6;+\x1a\t*\xe8\xab_\x8c@\xe4\x81\xb2\xbc\xf7\x83g\x11nN\x93\xea"\xaf\xff\xa3\x9awWv\xd0\x0b8\xac\xf8\x8a\x945\x8e\xd7\xd4a\xcc\x01\xff$\xb4\x8fa#\xba\x88\xd7Y\xe4\xe9\xba*N\xb5\x15\x0f\x9c\xd0\xea\x06\x91\xd9\xde\xab\x0c\x00\x01I\x00@\xd1L\xf3\xe7\x8b\xdd\x98\xff\xb2\xf5Rd\xd6\x85\x0f\r{\x9f\xc2\xc0\x8aY\xbf.\xfb\xf0o\x96\xa5\xba;\x877qet\xe8\xe4K\xd7\xcb\xb8\xecAk>S\xe0\xa5\xc3\xfc\xe8\xde\xf1\xb0\xe5\x15s|\xb7\xe6D\x15+\x00\x03\x01\x00\x01\x01\x00H\xf1\x08\x88\xe9\xf8\xe6\xb2y\\\xf9\xf64\x95r\xf9\x8c]\x0b\x88%s\xee{\xd4\xa3{|Jd>\xfb\x01\x0b\xfdAf\xea\x13%\x1f\xcc\xba\xf8H\xed\xeb?u\x00\xc46\xe4\x9f!r\x99\xec\'!\xa1+\xe9\xcd;\xfa\x00a\xd1ME7\x9a\xc3C\xb2\xb0>\xec\x07\xff>\xb3\xa3\xbd\x8db\xa2\x17\x0b\xce\xe1H\xaf\xba_\xdc\x18\x83Fr^\xf6\xfd\x8f\xbd\xc1\xdf\xc3\xf9T\xc2RC\xfa1\xe1\x16\x94RgZ\xb1\xe8rycp\xaeEa@\xe2\xb7T\xe4\xaa7\x02\x1e\xb3\x0c_P\x14\xd9\x023]\xc9)\x1b\xd7]\xba\x8aS\x18\xe5\x88\x1e08W\xc7\xd5\xc0\x7f\xf6n\n>\x83_\r\t\x1f\x01\x99\xda\x88(\xbc\xd9\xb8!=\xb6%\x15wh\xacl)\xde\xb3-\x81M\xc6(,\xceom\x15W7\xcc\xd3\xe3\xc2e\xb4\x96\xf1\xfc\x1e\xa5?\xe1B\xbd\x00\x89\xc1\xd0t\xd6\xaa\xf8\xa7\x1f\xa1z}\x91M\x8egg\xa1}\x93\xaal\xec\x16@\xf3\xd7\x0b\x91\n\xcc\x0e\x00\x00\x00')
+
+assert p.msg[0].extlen is None
+assert p.msg[0].ext == []
+assert [type(x) for x in a.msg] == [TLSServerHello, TLSCertificate, TLSServerKeyExchange, TLSServerHelloDone]
 
 ###############################################################################
 ############################ Automaton behaviour ##############################

scapy-2.4.3.tar.gz/test/tls/example_client.py -> scapy-2.4.4.tar.gz/test/tls/example_client.py Changed

@@ -5,30 +5,102 @@
 
 """
 Basic TLS client. A ciphersuite may be commanded via a first argument.
-Default protocol version is TLS 1.2.
-
-For instance, "sudo ./client_simple.py c014" will try to connect to any TLS
-server at 127.0.0.1:4433, with suite TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA.
+Default protocol version is TLS 1.3.
 """
 
+import logging
 import os
+import socket
 import sys
 
+logger = logging.getLogger("scapy")
+logger.addHandler(logging.StreamHandler())
+
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__),"../../"))
 sys.path=[basedir]+sys.path
 
+from scapy.config import conf
+from scapy.utils import inet_aton
 from scapy.layers.tls.automaton_cli import TLSClientAutomaton
-from scapy.layers.tls.handshake import TLSClientHello
+from scapy.layers.tls.basefields import _tls_version_options
+from scapy.layers.tls.handshake import TLSClientHello, TLS13ClientHello
+
+from argparse import ArgumentParser
+
+psk = None
+parser = ArgumentParser(description='Simple TLS Client')
+parser.add_argument("--psk",
+                    help="External PSK for symmetric authentication (for TLS 1.3)")  # noqa: E501
+parser.add_argument("--no_pfs", action="store_true",
+                    help="Disable (EC)DHE exchange with PFS")
+parser.add_argument("--ciphersuite", help="Ciphersuite preference")
+parser.add_argument("--version", help="TLS Version", default="tls13")
+parser.add_argument("--ticket_in", dest='session_ticket_file_in',
+                    help="File to read a ticket from (for TLS 1.3)")
+parser.add_argument("--ticket_out", dest='session_ticket_file_out',
+                    help="File to write a ticket to (for TLS 1.3)")
+parser.add_argument("--res_master",
+                    help="Resumption master secret (for TLS 1.3)")
+parser.add_argument("--sni",
+                    help="Server Name Indication")
+parser.add_argument("--curve", help="ECC group to advertise")
+parser.add_argument("--debug", action="store_const", const=5, default=0,
+                    help="Enter debug mode")
+parser.add_argument("server", nargs="?", default="127.0.0.1",
+                    help="The server to connect to")
+parser.add_argument("port", nargs="?", type=int, default=4433,
+                    help="The TCP destination port")
+
+args = parser.parse_args()
 
+# By default, PFS is set
+if args.no_pfs:
+    psk_mode = "psk_ke"
+else:
+    psk_mode = "psk_dhe_ke"
+
+v = _tls_version_options.get(args.version, None)
+if not v:
+    sys.exit("Unrecognized TLS version option.")
+
+try:
+    socket.getaddrinfo(args.server, args.port)
+except socket.error as ex:
+    sys.exit("Could not resolve host server: %s" % ex)
 
-if len(sys.argv) == 2:
-    ch = TLSClientHello(ciphers=int(sys.argv[1], 16))
+if args.ciphersuite:
+    ciphers = int(args.ciphersuite, 16)
+    if ciphers not in list(range(0x1301, 0x1306)):
+        ch = TLSClientHello(ciphers=ciphers)
+    else:
+        ch = TLS13ClientHello(ciphers=ciphers)
 else:
     ch = None
 
-t = TLSClientAutomaton(client_hello=ch,
-                       version="tls13-d18",
+server_name = args.sni
+# If server name is unknown, try server
+if not server_name and args.server:
+    try:
+        inet_aton(args.server)
+    except socket.error:
+        server_name = args.server
+
+if args.debug == 5:
+    conf.logLevel = 10
+    conf.warning_threshold = 0
+
+t = TLSClientAutomaton(server=args.server, dport=args.port,
+                       server_name=server_name,
+                       client_hello=ch,
+                       version=args.version,
                        mycert=basedir+"/test/tls/pki/cli_cert.pem",
-                       mykey=basedir+"/test/tls/pki/cli_key.pem")
+                       mykey=basedir+"/test/tls/pki/cli_key.pem",
+                       psk=args.psk,
+                       psk_mode=psk_mode,
+                       resumption_master_secret=args.res_master,
+                       session_ticket_file_in=args.session_ticket_file_in,
+                       session_ticket_file_out=args.session_ticket_file_out,
+                       curve=args.curve,
+                       debug=args.debug)
 t.run()

scapy-2.4.3.tar.gz/test/tls/example_server.py -> scapy-2.4.4.tar.gz/test/tls/example_server.py Changed

@@ -13,20 +13,58 @@
 
 import os
 import sys
+import logging
+
+logger = logging.getLogger("scapy")
+logger.addHandler(logging.StreamHandler())
 
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__),"../../"))
 sys.path=[basedir]+sys.path
 
+from scapy.config import conf
 from scapy.layers.tls.automaton_srv import TLSServerAutomaton
+from argparse import ArgumentParser
 
+parser = ArgumentParser(description='Simple TLS Server')
+parser.add_argument("--psk",
+                    help="External PSK for symmetric authentication (for TLS 1.3)")  # noqa: E501
+parser.add_argument("--no_pfs", action="store_true",
+                    help="Disable (EC)DHE exchange with PFS")
+# args.curve must be a value in the dict _tls_named_curves (see tls/crypto/groups.py)
+parser.add_argument("--curve", help="ECC curve to advertise (ex: secp256r1...")
+parser.add_argument("--cookie", action="store_true",
+                    help="Send cookie extension in HelloRetryRequest message")
+parser.add_argument("--client_auth", action="store_true",
+                    help="Require client authentication")
+parser.add_argument("--handle_session_ticket", action="store_true",
+                    help="Use session tickets. Auto enabled if file provided (for TLS 1.3)")  # noqa: E501
+parser.add_argument("--ticket_file", dest='session_ticket_file',
+                    help="File to write/read a ticket to (for TLS 1.3)")
+parser.add_argument("--debug", action="store_const", const=5, default=0,
+                    help="Enter debug mode")
+args = parser.parse_args()
 
-if len(sys.argv) == 2:
-    pcs = int(sys.argv[1], 16)
+pcs = None
+# PFS is set by default...
+if args.no_pfs and args.psk:
+    psk_mode = "psk_ke"
 else:
-    pcs = None
+    psk_mode = "psk_dhe_ke"
+
+if args.debug == 5:
+    conf.logLevel = 10
+    conf.warning_threshold = 0
 
 t = TLSServerAutomaton(mycert=basedir+'/test/tls/pki/srv_cert.pem',
                        mykey=basedir+'/test/tls/pki/srv_key.pem',
-                       preferred_ciphersuite=pcs)
+                       preferred_ciphersuite=pcs,
+                       client_auth=args.client_auth,
+                       curve=args.curve,
+                       cookie=args.cookie,
+                       handle_session_ticket=args.handle_session_ticket,
+                       session_ticket_file=args.session_ticket_file,
+                       psk=args.psk,
+                       psk_mode=psk_mode,
+                       debug=args.debug)
 t.run()

scapy-2.4.3.tar.gz/test/tls/tests_tls_netaccess.uts -> scapy-2.4.4.tar.gz/test/tls/tests_tls_netaccess.uts Changed

@@ -7,14 +7,16 @@
 ############
 ############
 + TLS server automaton tests
-
-### DISCLAIMER: Those tests are slow ###
+~ server
 
 = Load server util functions
+~ client
 
 from __future__ import print_function
 
-import sys, os, re, time, multiprocessing, subprocess
+import sys, os, re, time, subprocess
+from scapy.modules.six.moves.queue import Queue
+import threading
 
 from ast import literal_eval
 import os
@@ -29,7 +31,7 @@
 
 conf.verb = 4
 conf.debug_tls = True  
-conf.debug_dissector = True
+conf.debug_dissector = 2
 load_layer("tls")
 
 @contextmanager
@@ -48,33 +50,48 @@
         return (False, errored)
     output = out.s.strip()
     if expected_data:
-        s = re.search("> Received: '([^']*)'", output)
-        if s:
-            data = s.group(1)
-            print("Test output: %s" % data)
-            if expected_data in data:
-                return (True, data)
+        expected_data = plain_str(expected_data)
+        print("Testing for output: '%s'" % expected_data)
+        p = re.compile(r"> Received: b?'([^']*)'")
+        for s in p.finditer(output):
+            if s:
+                data = s.group(1)
+                print("Found: %s" % data)
+                if expected_data in data:
+                    return (True, data)
         return (False, output)
     else:
         return (False, None)
 
-def run_tls_test_server(expected_data, q):
+def get_file(filename):
+    return os.path.abspath(os.getenv("SCAPY_ROOT_DIR")+filename if not os.path.exists(filename) else filename)
+
+
+def run_tls_test_server(expected_data, q, curve=None, cookie=False, client_auth=False,
+                        psk=None, handle_session_ticket=False):
     correct = False
     print("Server started !")
     with captured_output() as (out, err):
         # Prepare automaton
-        filename = "/test/tls/pki/srv_cert.pem"
-        mycert = os.getenv("SCAPY_ROOT_DIR")+filename if not os.path.exists(filename) else filename
-        filename = "/test/tls/pki/srv_key.pem"
-        mykey = os.getenv("SCAPY_ROOT_DIR")+filename if not os.path.exists(filename) else filename
+        mycert = get_file("/test/tls/pki/srv_cert.pem")
+        mykey = get_file("/test/tls/pki/srv_key.pem")
         print(os.environ["SCAPY_ROOT_DIR"])
         print(mykey)
         print(mycert)
         assert os.path.exists(mycert)
         assert os.path.exists(mykey)
+        kwargs = dict()
+        if psk:
+            kwargs["psk"] = psk
+            kwargs["psk_mode"] = "psk_dhe_ke"
         t = TLSServerAutomaton(mycert=mycert,
                                mykey=mykey,
-                               debug=5)
+                               curve=curve,
+                               cookie=cookie,
+                               client_auth=client_auth,
+                               handle_session_ticket=handle_session_ticket,
+                               debug=5,
+                               **kwargs)
         # Sync threads
         q.put(True)
         # Run server automaton
@@ -84,29 +101,34 @@
     # Return data
     q.put(res)
 
-def test_tls_server(suite="", version=""):
-    msg = ("TestS_%s_data" % suite).encode()
-    # Run server
-    q_ = multiprocessing.Manager().Queue()
-    th_ = multiprocessing.Process(target=run_tls_test_server, args=(msg, q_))
-    th_.start()
-    # Synchronise threads
-    q_.get()
-    time.sleep(1)
+def run_openssl_client(msg, suite="", version="", tls13=False, client_auth=False,
+                       psk=None, sess_out=None):
     # Run client
-    filename = "/test/tls/pki/ca_cert.pem"
-    filename = os.getenv("SCAPY_ROOT_DIR")+filename if not os.path.exists(filename) else filename
-    CA_f = os.path.abspath(filename)
+    CA_f = get_file("/test/tls/pki/ca_cert.pem")
+    mycert = get_file("/test/tls/pki/cli_cert.pem")
+    mykey = get_file("/test/tls/pki/cli_key.pem")
+    args = [
+        "openssl", "s_client",
+        "-connect", "127.0.0.1:4433", "-debug",
+        "-ciphersuites" if tls13 else "-cipher", suite,
+        version,
+        "-CAfile", CA_f
+    ]
+    if client_auth:
+        args.extend(["-cert", mycert, "-key", mykey])
+    if psk:
+        args.extend(["-psk", str(psk)])
+    if sess_out:
+        args.extend(["-sess_out", sess_out])
     p = subprocess.Popen(
-        ["openssl", "s_client", "-connect", "127.0.0.1:4433", "-debug", "-cipher", suite, version, "-CAfile", CA_f],
+        args,
         stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
     )
     msg += b"\nstop_server\n"
     out = p.communicate(input=msg)[0]
     print(out.decode())
     if p.returncode != 0:
-        th_.terminate()
-        raise RuntimeError("OpenSSL returned with error code")
+        raise RuntimeError("OpenSSL returned with error code %s" % p.returncode)
     else:
         p = re.compile(br'verify return:(\d+)')
         _failed = False
@@ -117,18 +139,33 @@
                 break
             else:
                 _one_success = True
+                break
         if _failed or not _one_success:
-            th_.terminate()
             raise RuntimeError("OpenSSL returned unexpected values")
+
+def test_tls_server(suite="", version="", tls13=False, client_auth=False, psk=None):
+    msg = ("TestS_%s_data" % suite).encode()
+    # Run server
+    q_ = Queue()
+    th_ = threading.Thread(target=run_tls_test_server, args=(msg, q_),
+                           kwargs={"curve": None, "cookie": False, "client_auth": client_auth, "psk": psk})
+    th_.setDaemon(True)
+    th_.start()
+    # Synchronise threads
+    q_.get()
+    time.sleep(1)
+    # Run openssl client
+    run_openssl_client(msg, suite=suite, version=version, tls13=tls13, client_auth=client_auth, psk=psk)
     # Wait for server
     th_.join(5)
     if th_.is_alive():
-        th_.terminate()
         raise RuntimeError("Test timed out")
     # Analyse values
     if q_.empty():
         raise RuntimeError("Missing return values")
-    print(q_.get())
+    ret = q_.get(timeout=5)
+    print(ret)
+    assert ret[0]
 
 
 = Testing TLS server with TLS 1.0 and TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
@@ -151,35 +188,75 @@
 
 test_tls_server("ECDHE-RSA-AES256-GCM-SHA384", "-tls1_2")
 
+= Testing TLS server with TLS 1.3 and TLS_AES_256_GCM_SHA384
+~ open_ssl_client
+
+test_tls_server("TLS_AES_256_GCM_SHA384", "-tls1_3", tls13=True)
+
+= Testing TLS server with TLS 1.3 and TLS_AES_256_GCM_SHA384 and client auth
+~ open_ssl_client
+
+test_tls_server("TLS_AES_256_GCM_SHA384", "-tls1_3", tls13=True, client_auth=True)
+
+= Testing TLS server with TLS 1.3 and ECDHE-PSK-AES256-CBC-SHA384 and PSK
+~ open_ssl_client
+
+test_tls_server("ECDHE-PSK-AES256-CBC-SHA384", "-tls1_3", tls13=False, psk="1a2b3c4d")
+
 + TLS client automaton tests
+~ client
 
 = Load client utils functions
 
 import sys, os, time, threading
 
 from scapy.layers.tls.automaton_cli import TLSClientAutomaton
-from scapy.layers.tls.handshake import TLSClientHello
+from scapy.layers.tls.handshake import TLSClientHello, TLS13ClientHello
 
 from scapy.modules.six.moves.queue import Queue
 
 send_data = cipher_suite_code = version = None
 
-def run_tls_test_client(send_data=None, cipher_suite_code=None, version=None):
+def run_tls_test_client(send_data=None, cipher_suite_code=None, version=None,
+                        client_auth=False, key_update=False, stop_server=True,
+                        session_ticket_file_out=None, session_ticket_file_in=None):
     print("Loading client...")
+    mycert = get_file("/test/tls/pki/cli_cert.pem") if client_auth else None
+    mykey = get_file("/test/tls/pki/cli_key.pem") if client_auth else None
+    commands = [send_data]
+    if key_update:
+        commands.append(b"key_update")
+    if stop_server:
+        commands.append(b"stop_server")
+    if session_ticket_file_out:
+        commands.append(b"wait")
+    commands.append(b"quit")
     if version == "0002":
-        t = TLSClientAutomaton(data=[send_data, b"stop_server", b"quit"], version="sslv2", debug=5)
+        t = TLSClientAutomaton(data=commands, version="sslv2", debug=5, mycert=mycert, mykey=mykey,
+                               session_ticket_file_in=session_ticket_file_in,
+                               session_ticket_file_out=session_ticket_file_out)
+    elif version == "0304":
+        ch = TLS13ClientHello(ciphers=int(cipher_suite_code, 16))
+        t = TLSClientAutomaton(client_hello=ch, data=commands, version="tls13", debug=5, mycert=mycert, mykey=mykey,
+                               session_ticket_file_in=session_ticket_file_in,
+                               session_ticket_file_out=session_ticket_file_out)
     else:
         ch = TLSClientHello(version=int(version, 16), ciphers=int(cipher_suite_code, 16))
-        t = TLSClientAutomaton(client_hello=ch, data=[send_data, b"stop_server", b"quit"], debug=5)
+        t = TLSClientAutomaton(client_hello=ch, data=commands, debug=5, mycert=mycert, mykey=mykey,
+                               session_ticket_file_in=session_ticket_file_in,
+                               session_ticket_file_out=session_ticket_file_out)
     print("Running client...")
     t.run()
 
-def test_tls_client(suite, version):
+def test_tls_client(suite, version, curve=None, cookie=False, client_auth=False,
+                    key_update=False, sess_in_out=False):
     msg = ("TestC_%s_data" % suite).encode()
     # Run server
     q_ = Queue()
     print("Starting server...")
-    th_ = threading.Thread(target=run_tls_test_server, args=(msg, q_))
+    th_ = threading.Thread(target=run_tls_test_server, args=(msg, q_),
+                           kwargs={"curve": None, "cookie": False, "client_auth": client_auth,
+                                   "handle_session_ticket": sess_in_out})
     th_.setDaemon(True)
     th_.start()
     # Synchronise threads
@@ -188,7 +265,14 @@
     time.sleep(1)
     print("Thread synchronised")
     # Run client
-    run_tls_test_client(msg, suite, version)
+    if sess_in_out:
+        file_sess = get_file("/test/session")
+        run_tls_test_client(msg, suite, version, client_auth, key_update, session_ticket_file_out=file_sess,
+                            stop_server=False)
+        run_tls_test_client(msg, suite, version, client_auth, key_update, session_ticket_file_in=file_sess,
+                            stop_server=True)
+    else:
+        run_tls_test_client(msg, suite, version, client_auth, key_update)
     # Wait for server
     print("Client running, waiting...")
     th_.join(5)
@@ -197,8 +281,9 @@
     # Return values
     if q_.empty():
         raise RuntimeError("Missing return value")
-    return q_.get(timeout=5)
-
+    ret = q_.get(timeout=5)
+    print(ret)
+    assert ret[0]
 
 = Testing TLS server and client with SSLv2 and SSL_CK_DES_192_EDE3_CBC_WITH_MD5
 
@@ -224,3 +309,61 @@
 
 test_tls_client("c016", "0303")
 
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_GCM_SHA256
+
+test_tls_client("1301", "0304")
+
+= Testing TLS server and client with TLS 1.3 and TLS_CHACHA20_POLY1305_SHA256
+~ crypto_advanced
+
+test_tls_client("1303", "0304")
+
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_CCM_8_SHA256
+~ crypto_advanced
+
+test_tls_client("1305", "0304")
+
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_CCM_8_SHA256 and x448
+~ crypto_advanced
+
+test_tls_client("1305", "0304", curve="x448")
+
+= Testing TLS server and client with TLS 1.3 and a retry
+~ crypto_advanced
+
+test_tls_client("1302", "0304", curve="secp256r1", cookie=True)
+
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_CCM_8_SHA256 and client auth
+~ crypto_advanced
+
+test_tls_client("1305", "0304", client_auth=True)
+
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_CCM_8_SHA256 and key update
+~ crypto_advanced
+
+test_tls_client("1305", "0304", key_update=True)
+
+= Testing TLS server and client with TLS 1.3 and TLS_AES_128_CCM_8_SHA256 and session resumption
+~ crypto_advanced
+
+test_tls_client("1305", "0304", client_auth=True, sess_in_out=True)
+
+# Automaton as Socket tests
+
++ TLSAutomatonClient socket tests
+~ netaccess
+
+= Connect to google.com
+
+load_layer("tls")
+load_layer("http")
+
+def _test_connection():
+    a = TLSClientAutomaton.tlslink(HTTP, server="www.google.com", dport=443,
+                                   server_name="www.google.com")
+    pkt = a.sr1(HTTP()/HTTPRequest(Host="www.google.com"),
+                session=TCPSession(app=True), timeout=2, retry=3)
+    assert HTTPResponse in pkt
+    assert b"</html>" in pkt[HTTPResponse].load
+
+retry_test(_test_connection)

scapy-2.4.3.tar.gz/test/tls13.uts -> scapy-2.4.4.tar.gz/test/tls13.uts Changed

@@ -619,6 +619,56 @@
 assert(isinstance(m, TLSApplicationData))
 assert(m.data == payload)
 
+= TLS_Ext_EncryptedServerName(), dissect
+~ crypto_advanced
+
+from scapy.layers.tls.extensions import TLS_Ext_EncryptedServerName
+
+clientHello3 = clean("""
+16030102c4010002c003034b1 40e7d15fc8db422cec056fbaf 0285d306df4eedad1bc6ea57d 5114e6bd52a20a5b9c7445955 e296b886469c974648cda0a68
+5d3c06d884e388f6475c32e03 2d0024130113031302c02bc02 fcca9cca8c02cc030c00ac009 c013c01400330039002f00350 00a0100025300170000ff0100
+0100000a000e000c001d00170 018001901000101000b000201 00002300000010000b0009086 87474702f312e310005000501 000000000033006b0069001d0
+02037adee0aacc37b08d47222 caf6a5097a800fcf8406ae118 38f6348294d2dde1200170041 048b127c905d6d487a40b8b19 c99c56aa1a8c208218c178dae
+02568547b2ce8f538a530b858 a7a2f608d66e148baa5693d03 c519b45017c63f48c5a4c1238 707bc002b0009080304030303 020301000d001800160403050
+3060308040805080604010501 060102030201002d00020101f fce016e1301001d0020912e86 b776ee552a6bb1e2c70d7b467 770b190432237cc743a93091d
+ce24623500208bc16fdcbbc7c 8756808c94f70464d68297975 f33be90e1a200633f5eb2d4c6 101249e073bff833782e57e88 2519a53ef8bde4c94a7878a2f
+8461aec57802440007c7b2dab 986d9bc79257ce00ca6a998b1 fadb0114161069d364ccebae8 dab6c88151f297daeaecfd2e1 a598a486e2efc9561298f8dd5
+f35d184f0e87768777d253e68 952b730a24b342fde10df4f8e 82afdc2f10c2481634d92015d 9d5e6a9566494735d9c079115 bdeb0cd019098d1cf847c53ef
+4aac41560cacdc7ce166399df 5b0c0af91d5be3f7d8224755a aa6046de52875f9ef9ac15372 7ce08019bc2648beb4b1418cb 4979ff7eaeedaec2b15695508
+4d5a480cb939fdc7f00e6cc6f c0f9675276a9d607686c4d779 d4bb7544fb60c7f3079afbc74 61ed67fd55a78c44d6f8d4eaf 386acc17dea11e37a09f63da3
+d059243b35f449e891255ac7b 4f631509d7060f001c0002400 1
+""")
+t = TLS(clientHello3)
+clientESNI = t.msg[0].ext[11]
+assert isinstance(clientESNI, TLS_Ext_EncryptedServerName) and clientESNI.cipher == 4865
+
+
+= TLS_Ext_EncryptedServerName(),  basic instantiation
+~ crypto_advanced
+
+esni = TLS_Ext_EncryptedServerName(key_exchange_group=29,encrypted_sni=clean("""
+ffce016e1301001d00209 12e86b776ee552a6bb1e2 c70d7b467770b19043223 7cc743a93091dce246235
+00208bc16fdcbbc7c8756 808c94f70464d68297975 f33be90e1a200633f5eb2 d4c6101249e073bff8337
+82e57e882519a53ef8bde 4c94a7878a2f8461aec57 802440007c7b2dab986d9 bc79257ce00ca6a998b1f
+adb0114161069d364cceb ae8dab6c88151f297daea ecfd2e1a598a486e2efc9 561298f8dd5f35d184f0e
+87768777d253e68952b73 0a24b342fde10df4f8e82 afdc2f10c2481634d9201 5d9d5e6a9566494735d9c
+079115bdeb0cd019098d1 cf847c53ef4aac41560ca cdc7ce166399df5b0c0af 91d5be3f7d8224755aaa6
+046de52875f9ef9ac1537 27ce08019bc2648beb4b1 418cb4979ff7eaeedaec2 b156955084d5a480cb939
+fdc7f00e6cc6fc0f96752 76a9d607686c4d779d4bb 7544fb60c7f3079afbc74 61ed67fd55a78c44d6f8d
+4eaf386acc17dea11e37a 09f63da3d059243b35f44 9e891255ac7b4f631509d 7060f
+"""))
+assert esni.key_exchange_group == 29 and esni.encrypted_sni==clean("""
+ffce016e1301001d00209 12e86b776ee552a6bb1e2 c70d7b467770b19043223 7cc743a93091dce246235
+00208bc16fdcbbc7c8756 808c94f70464d68297975 f33be90e1a200633f5eb2 d4c6101249e073bff8337
+82e57e882519a53ef8bde 4c94a7878a2f8461aec57 802440007c7b2dab986d9 bc79257ce00ca6a998b1f
+adb0114161069d364cceb ae8dab6c88151f297daea ecfd2e1a598a486e2efc9 561298f8dd5f35d184f0e
+87768777d253e68952b73 0a24b342fde10df4f8e82 afdc2f10c2481634d9201 5d9d5e6a9566494735d9c
+079115bdeb0cd019098d1 cf847c53ef4aac41560ca cdc7ce166399df5b0c0af 91d5be3f7d8224755aaa6
+046de52875f9ef9ac1537 27ce08019bc2648beb4b1 418cb4979ff7eaeedaec2 b156955084d5a480cb939
+fdc7f00e6cc6fc0f96752 76a9d607686c4d779d4bb 7544fb60c7f3079afbc74 61ed67fd55a78c44d6f8d
+4eaf386acc17dea11e37a 09f63da3d059243b35f44 9e891255ac7b4f631509d 7060f
+""")
+
 = Decrypt a TLS 1.3 session - Decrypt and parse server Application Data
 ~ crypto_advanced
 # Values from RFC8448, section 3
@@ -675,4 +725,458 @@
 m = t.inner.msg[0]
 assert(isinstance(m, TLSAlert))
 assert(m.level == 1)
-assert(m.descr == 0)
\ No newline at end of file
+assert(m.descr == 0)
+
+
+########### HelloRetryRequest ###############################################
++ Decrypt a TLS 1.3 session with a retry
+
+= Decrypt a TLS 1.3 session with a retry - Parse first ClientHello
+# Values from RFC8448, section 5
+x25519_clt_priv = clean("""
+         0e d0 2f 8e 81 17 ef c7 5c a7 ac 32 aa
+         7e 34 ed a6 4c dc 0d da d1 54 a5 e8 52 89 f9 59 f6 32 04
+   """)
+
+x25519_clt_pub = clean("""
+         e8 e8 e3 f3 b9 3a 25 ed 97 a1 4a 7d ca cb
+         8a 27 2c 62 88 e5 85 c6 48 4d 05 26 2f ca d0 62 ad 1f
+   """)
+
+clientHello1 = clean("""
+         16 03 01 00 b4 01 00 00 b0 03 03 b0
+         b1 c5 a5 aa 37 c5 91 9f 2e d1 d5 c6 ff f7 fc b7 84 97 16 94 5a
+         2b 8c ee 92 58 a3 46 67 7b 6f 00 00 06 13 01 13 03 13 02 01 00
+         00 81 00 00 00 0b 00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01
+         00 00 0a 00 08 00 06 00 1d 00 17 00 18 00 33 00 26 00 24 00 1d
+         00 20 e8 e8 e3 f3 b9 3a 25 ed 97 a1 4a 7d ca cb 8a 27 2c 62 88
+         e5 85 c6 48 4d 05 26 2f ca d0 62 ad 1f 00 2b 00 03 02 03 04 00
+         0d 00 20 00 1e 04 03 05 03 06 03 02 03 08 04 08 05 08 06 04 01
+         05 01 06 01 02 01 04 02 05 02 06 02 02 02 00 2d 00 02 01 01 00
+         1c 00 02 40 01
+   """)
+
+t = TLS(clientHello1)
+assert(len(t.msg) == 1)
+assert(t.msg[0].msgtype == 1)
+assert(t.msg[0].extlen == 129)
+assert(len(t.msg[0].ext) == 8)
+e = t.msg[0].ext
+assert(isinstance(e[0], TLS_Ext_ServerName))
+assert(isinstance(e[1], TLS_Ext_RenegotiationInfo))
+assert(isinstance(e[2], TLS_Ext_SupportedGroups))
+assert(isinstance(e[3],TLS_Ext_KeyShare_CH))
+assert(len(e[3].client_shares) == 1)
+assert(e[3].client_shares[0].group == 29)
+assert(e[3].client_shares[0].key_exchange == x25519_clt_pub)
+assert(isinstance(e[4], TLS_Ext_SupportedVersion_CH))
+assert(isinstance(e[5], TLS_Ext_SignatureAlgorithms))
+assert(isinstance(e[6], TLS_Ext_PSKKeyExchangeModes))
+assert(e[6].kxmodeslen == 1)
+assert(len(e[6].kxmodes) == 1)
+assert(e[6].kxmodes[0] == 1)
+assert(isinstance(e[7], TLS_Ext_RecordSizeLimit))
+
+
+
+secp256_srv_pub = clean("""
+         8c 51 06 01 f9 76 5b fb 8e d6 93 44 9a
+         48 98 98 59 b5 cf a8 79 cb 9f 54 43 c4 1c 5f f1 06 34 ed
+   """)
+
+secp256_srv_pub = clean("""
+         04 58 3e 05 4b 7a 66 67 2a e0 20 ad 9d 26
+         86 fc c8 5b 5a d4 1a 13 4a 0f 03 ee 72 b8 93 05 2b d8 5b 4c 8d
+         e6 77 6f 5b 04 ac 07 d8 35 40 ea b3 e3 d9 c5 47 bc 65 28 c4 31
+         7d 29 46 86 09 3a 6c ad 7d
+   """)
+
+
+
+= Decrypt a TLS 1.3 session with a retry - Parse ServerHelloRetryRequest
+from scapy.layers.tls.keyexchange_tls13 import TLS_Ext_KeyShare_HRR
+from scapy.layers.tls.extensions import TLS_Ext_Cookie
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+# Value from RFC8448, section 5
+helloRetryRequest = clean("""
+         16 03 03 00 b0 02 00 00 ac 03 03 cf
+         21 ad 74 e5 9a 61 11 be 1d 8c 02 1e 65 b8 91 c2 a2 11 16 7a bb
+         8c 5e 07 9e 09 e2 c8 a8 33 9c 00 13 01 00 00 84 00 33 00 02 00
+         17 00 2c 00 74 00 72 71 dc d0 4b b8 8b c3 18 91 19 39 8a 00 00
+         00 00 ee fa fc 76 c1 46 b8 23 b0 96 f8 aa ca d3 65 dd 00 30 95
+         3f 4e df 62 56 36 e5 f2 1b b2 e2 3f cc 65 4b 1b 5b 40 31 8d 10
+         d1 37 ab cb b8 75 74 e3 6e 8a 1f 02 5f 7d fa 5d 6e 50 78 1b 5e
+         da 4a a1 5b 0c 8b e7 78 25 7d 16 aa 30 30 e9 e7 84 1d d9 e4 c0
+         34 22 67 e8 ca 0c af 57 1f b2 b7 cf f0 f9 34 b0 00 2b 00 02 03
+         04
+   """)
+
+t = TLS(helloRetryRequest, tls_session=t.tls_session.mirror())
+assert(len(t.msg) == 1)
+assert(t.msg[0].msgtype == 2)
+digest = hashes.Hash(hashes.SHA256(), backend=default_backend())
+digest.update(b"HelloRetryRequest")
+assert(t.msg[0].random_bytes == digest.finalize())
+assert(t.msg[0].extlen == 132)
+assert(len(t.msg[0].ext) == 3)
+e = t.msg[0].ext
+assert(isinstance(e[0], TLS_Ext_KeyShare_HRR))
+assert(e[0].type == 51)
+assert(e[0].len == 2)
+assert(e[0].selected_group == 23)
+assert(isinstance(e[1], TLS_Ext_Cookie))
+assert(e[1].type == 44)
+assert(e[1].len == 116)
+assert(e[1].cookielen == 114)
+assert(e[1].cookie == b'q\xdc\xd0K\xb8\x8b\xc3\x18\x91\x199\x8a\x00\x00\x00\x00\xee\xfa\xfcv\xc1F\xb8#\xb0\x96\xf8\xaa\xca\xd3e\xdd\x000\x95?N\xdfbV6\xe5\xf2\x1b\xb2\xe2?\xcceK\x1b[@1\x8d\x10\xd17\xab\xcb\xb8ut\xe3n\x8a\x1f\x02_}\xfa]nPx\x1b^\xdaJ\xa1[\x0c\x8b\xe7x%}\x16\xaa00\xe9\xe7\x84\x1d\xd9\xe4\xc04"g\xe8\xca\x0c\xafW\x1f\xb2\xb7\xcf\xf0\xf94\xb0')
+assert(isinstance(e[2], TLS_Ext_SupportedVersion_SH))
+
+
+= Decrypt a TLS 1.3 session with a retry - Parse second ClientHello
+
+from scapy.layers.tls.extensions import TLS_Ext_Padding
+# Values from RFC8448, section 5
+secp256_clt_pub = clean("""
+         04 a6 da 73 92 ec 59 1e 17 ab fd 53 59 64
+         b9 98 94 d1 3b ef b2 21 b3 de f2 eb e3 83 0e ac 8f 01 51 81 26
+         77 c4 d6 d2 23 7e 85 cf 01 d6 91 0c fb 83 95 4e 76 ba 73 52 83
+         05 34 15 98 97 e8 06 57 80
+   """)
+
+secp256_clt_priv = clean("""
+         ab 54 73 46 7e 19 34 6c eb 0a 04 14 e4
+         1d a2 1d 4d 24 45 bc 30 25 af e9 7c 4e 8d c8 d5 13 da 39
+   """)
+
+clientHello2 = clean("""
+         16 03 03 02 00 01 00 01 fc 03 03 b0
+         b1 c5 a5 aa 37 c5 91 9f 2e d1 d5 c6 ff f7 fc b7 84 97 16 94 5a
+         2b 8c ee 92 58 a3 46 67 7b 6f 00 00 06 13 01 13 03 13 02 01 00
+         01 cd 00 00 00 0b 00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01
+         00 00 0a 00 08 00 06 00 1d 00 17 00 18 00 33 00 47 00 45 00 17
+         00 41 04 a6 da 73 92 ec 59 1e 17 ab fd 53 59 64 b9 98 94 d1 3b
+         ef b2 21 b3 de f2 eb e3 83 0e ac 8f 01 51 81 26 77 c4 d6 d2 23
+         7e 85 cf 01 d6 91 0c fb 83 95 4e 76 ba 73 52 83 05 34 15 98 97
+         e8 06 57 80 00 2b 00 03 02 03 04 00 0d 00 20 00 1e 04 03 05 03
+         06 03 02 03 08 04 08 05 08 06 04 01 05 01 06 01 02 01 04 02 05
+         02 06 02 02 02 00 2c 00 74 00 72 71 dc d0 4b b8 8b c3 18 91 19
+         39 8a 00 00 00 00 ee fa fc 76 c1 46 b8 23 b0 96 f8 aa ca d3 65
+         dd 00 30 95 3f 4e df 62 56 36 e5 f2 1b b2 e2 3f cc 65 4b 1b 5b
+         40 31 8d 10 d1 37 ab cb b8 75 74 e3 6e 8a 1f 02 5f 7d fa 5d 6e
+         50 78 1b 5e da 4a a1 5b 0c 8b e7 78 25 7d 16 aa 30 30 e9 e7 84
+         1d d9 e4 c0 34 22 67 e8 ca 0c af 57 1f b2 b7 cf f0 f9 34 b0 00
+         2d 00 02 01 01 00 1c 00 02 40 01 00 15 00 af 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+         00
+   """)
+
+t = TLS(clientHello2, tls_session=t.tls_session.mirror())
+assert(len(t.msg) == 1)
+assert(t.msg[0].msgtype == 1)
+assert(t.msg[0].extlen == 461)
+assert(len(t.msg[0].ext) == 10)
+e = t.msg[0].ext
+assert(isinstance(e[0], TLS_Ext_ServerName))
+assert(isinstance(e[1], TLS_Ext_RenegotiationInfo))
+assert(isinstance(e[2], TLS_Ext_SupportedGroups))
+assert(isinstance(e[3],TLS_Ext_KeyShare_CH))
+assert(len(e[3].client_shares) == 1)
+assert(e[3].client_shares[0].group == 23)
+assert(e[3].client_shares[0].key_exchange == secp256_clt_pub)
+assert(isinstance(e[4], TLS_Ext_SupportedVersion_CH))
+assert(isinstance(e[5], TLS_Ext_SignatureAlgorithms))
+assert(isinstance(e[6], TLS_Ext_Cookie))
+assert(e[6].cookie == b'q\xdc\xd0K\xb8\x8b\xc3\x18\x91\x199\x8a\x00\x00\x00\x00\xee\xfa\xfcv\xc1F\xb8#\xb0\x96\xf8\xaa\xca\xd3e\xdd\x000\x95?N\xdfbV6\xe5\xf2\x1b\xb2\xe2?\xcceK\x1b[@1\x8d\x10\xd17\xab\xcb\xb8ut\xe3n\x8a\x1f\x02_}\xfa]nPx\x1b^\xdaJ\xa1[\x0c\x8b\xe7x%}\x16\xaa00\xe9\xe7\x84\x1d\xd9\xe4\xc04"g\xe8\xca\x0c\xafW\x1f\xb2\xb7\xcf\xf0\xf94\xb0')
+assert(isinstance(e[7], TLS_Ext_PSKKeyExchangeModes))
+assert(e[7].kxmodeslen == 1)
+assert(len(e[7].kxmodes) == 1)
+assert(e[7].kxmodes[0] == 1)
+assert(isinstance(e[8], TLS_Ext_RecordSizeLimit))
+assert(isinstance(e[9], TLS_Ext_Padding))
+assert(e[9].len == 175)
+assert(e[9].padding == 175*b'\x00')
+
+= Decrypt a TLS 1.3 session with a retry - Parse ServerHello
+from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateNumbers
+pubnum = t.tls_session.tls13_client_pubshares["secp256r1"].public_numbers()
+privnum = EllipticCurvePrivateNumbers(pkcs_os2ip(secp256_clt_priv), pubnum)
+privkey = privnum.private_key(default_backend())
+t.tls_session.tls13_client_privshares["secp256r1"] = privkey
+
+serverHello = clean("""
+         16 03 03 00 7b 02 00 00 77 03 03 bb
+         34 1d 84 7f d7 89 c4 7c 38 71 72 dc 0c 9b f1 47 fc ca cb 50 43
+         d8 6c a4 c5 98 d3 ff 57 1b 98 00 13 01 00 00 4f 00 33 00 45 00
+         17 00 41 04 58 3e 05 4b 7a 66 67 2a e0 20 ad 9d 26 86 fc c8 5b
+         5a d4 1a 13 4a 0f 03 ee 72 b8 93 05 2b d8 5b 4c 8d e6 77 6f 5b
+         04 ac 07 d8 35 40 ea b3 e3 d9 c5 47 bc 65 28 c4 31 7d 29 46 86
+         09 3a 6c ad 7d 00 2b 00 02 03 04
+   """)
+
+t = TLS(serverHello, tls_session=t.tls_session.mirror())
+assert(len(t.msg) == 1)
+assert(isinstance(t.msg[0], TLS13ServerHello))
+assert(len(t.msg[0].ext) == 2)
+e = t.msg[0].ext
+assert(isinstance(e[0], TLS_Ext_KeyShare_SH))
+assert(e[0].server_share.group == 23)
+assert(e[0].server_share.key_exchange == secp256_srv_pub)
+assert(isinstance(e[1], TLS_Ext_SupportedVersion_SH))
+
+= Decrypt a TLS 1.3 session with a retry - Handshake traffic secret derivation
+
+# Values from RFC8448, section 5
+early_secret = clean("""
+         33 ad 0a 1c 60 7e c0 3b 09 e6 cd 98 93 68 0c
+         e2 10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a
+   """)
+
+ecdhe_secret = clean("""
+         c1 42 ce 13 ca 11 b5 c2 23 36 52 e6 3a d3 d9 78
+         44 f1 62 1f bf b9 de 69 d5 47 dc 8f ed ea be b4
+   """)
+
+handshake_secret = clean("""
+         ce 02 2e 5e 6e 81 e5 07 36 d7 73 f2 d3 ad fc
+         e8 22 0d 04 9b f5 10 f0 db fa c9 27 ef 42 43 b1 48
+   """)
+
+client_handshake_traffic_secret = clean("""
+         15 8a a7 ab 88 55 07 35 82 b4 1d 67 4b 40
+         55 ca bc c5 34 72 8f 65 93 14 86 1b 4e 08 e2 01 15 66
+   """)
+
+server_handshake_traffic_secret = clean("""
+         34 03 e7 81 e2 af 7b 65 08 da 28 57 4f 6e
+         95 a1 ab f1 62 de 83 a9 79 27 c3 76 72 a4 a0 ce f8 a1
+   """)
+
+assert(len(t.tls_session.tls13_derived_secrets) == 5)
+assert(t.tls_session.tls13_early_secret is not None)
+assert(t.tls_session.tls13_early_secret == early_secret)
+assert(t.tls_session.tls13_dhe_secret == ecdhe_secret)
+assert(t.tls_session.tls13_handshake_secret is not None)
+assert(t.tls_session.tls13_handshake_secret == handshake_secret)
+assert( 'client_handshake_traffic_secret' in t.tls_session.tls13_derived_secrets)
+assert( t.tls_session.tls13_derived_secrets['client_handshake_traffic_secret'] == client_handshake_traffic_secret)
+assert( 'server_handshake_traffic_secret' in t.tls_session.tls13_derived_secrets)
+assert(t.tls_session.tls13_derived_secrets['server_handshake_traffic_secret'] == server_handshake_traffic_secret)
+
+
+= Decrypt a TLS 1.3 session with a retry - Server handshake traffic key calculation
+# Values from RFC8448, section 5
+server_hs_traffic_key = clean("""
+         46 46 bf ac 17 12 c4 26 cd 78 d8 a2 4a
+         8a 6f 6b
+   """)
+server_hs_traffic_iv = clean("""
+         c7 d3 95 c0 8d 62 f2 97 d1 37 68 ea
+   """)
+
+assert(t.tls_session.prcs.cipher.key == server_hs_traffic_key)
+assert(t.tls_session.prcs.cipher.fixed_iv == server_hs_traffic_iv)
+
+
+= Decrypt a TLS 1.3 session with a retry - Decrypt and parse server handshake 
+# Values from RFC8448, section 5
+serverEncHS = clean("""
+         17 03 03 02 96 99 be e2 0b af 5b 7f
+         c7 27 bf ab 62 23 92 8a 38 1e 6d 0c f9 c4 da 65 3f 9d 2a 7b 23
+         f7 de 11 cc e8 42 d5 cf 75 63 17 63 45 0f fb 8b 0c c1 d2 38 e6
+         58 af 7a 12 ad c8 62 43 11 4a b1 4a 1d a2 fa e4 26 21 ce 48 3f
+         b6 24 2e ab fa ad 52 56 6b 02 b3 1d 2e dd ed ef eb 80 e6 6a 99
+         00 d5 f9 73 b4 0c 4f df 74 71 9e cf 1b 68 d7 f9 c3 b6 ce b9 03
+         ca 13 dd 1b b8 f8 18 7a e3 34 17 e1 d1 52 52 2c 58 22 a1 a0 3a
+         d5 2c 83 8c 55 95 3d 61 02 22 87 4c ce 8e 17 90 b2 29 a2 aa 0b
+         53 c8 d3 77 ee 72 01 82 95 1d c6 18 1d c5 d9 0b d1 f0 10 5e d1
+         e8 4a a5 f7 59 57 c6 66 18 97 07 9e 5e a5 00 74 49 e3 19 7b dc
+         7c 9b ee ed dd ea fd d8 44 af a5 c3 15 ec fe 65 e5 76 af e9 09
+         81 28 80 62 0e c7 04 8b 42 d7 f5 c7 8d 76 f2 99 d6 d8 25 34 bd
+         d8 f5 12 fe bc 0e d3 81 4a ca 47 0c d8 00 0d 3e 1c b9 96 2b 05
+         2f bb 95 0d f6 83 a5 2c 2b a7 7e d3 71 3b 12 29 37 a6 e5 17 09
+         64 e2 ab 79 69 dc d9 80 b3 db 9b 45 8d a7 60 31 24 d6 dc 00 5e
+         4d 6e 04 b4 d0 c4 ba f3 27 5d b8 27 db ba 0a 6d b0 96 72 17 1f
+         c0 57 b3 85 1d 7e 02 68 41 e2 97 8f bd 23 46 bb ef dd 03 76 bb
+         11 08 fe 9a cc 92 18 9f 56 50 aa 5e 85 d8 e8 c7 b6 7a c5 10 db
+         a0 03 d3 d7 e1 63 50 bb 66 d4 50 13 ef d4 4c 9b 60 7c 0d 31 8c
+         4c 7d 1a 1f 5c bc 57 e2 06 11 80 4e 37 87 d7 b4 a4 b5 f0 8e d8
+         fd 70 bd ae ad e0 22 60 b1 2a b8 42 ef 69 0b 4a 3e e7 91 1e 84
+         1b 37 4e cd 5e bb bc 2a 54 d0 47 b6 00 33 6d d7 d0 c8 8b 4b c1
+         0e 58 ee 6c b6 56 de 72 47 fa 20 d8 e9 1d eb 84 62 86 08 cf 80
+         61 5b 62 e9 6c 14 91 c7 ac 37 55 eb 69 01 40 5d 34 74 fe 1a c7
+         9d 10 6a 0c ee 56 c2 57 7f c8 84 80 f9 6c b6 b8 c6 81 b7 b6 8b
+         53 c1 46 09 39 08 f3 50 88 81 75 bd fb 0b 1e 31 ad 61 e3 0b a0
+         ad fe 6d 22 3a a0 3c 07 83 b5 00 1a 57 58 7c 32 8a 9a fc fc fb
+         97 8d 1c d4 32 8f 7d 9d 60 53 0e 63 0b ef d9 6c 0c 81 6e e2 0b
+         01 00 76 8a e2 a6 df 51 fc 68 f1 72 74 0a 79 af 11 39 8e e3 be
+         12 52 49 1f a9 c6 93 47 9e 87 7f 94 ab 7c 5f 8c ad 48 02 03 e6
+         ab 7b 87 dd 71 e8 a0 72 91 13 df 17 f5 ee e8 6c e1 08 d1 d7 20
+         07 ec 1c d1 3c 85 a6 c1 49 62 1e 77 b7 d7 8d 80 5a 30 f0 be 03
+         0c 31 5e 54
+   """)
+
+server_finished = clean("""
+         88 63 e6 bf b0 42 0a 92 7f a2 7f 34 33 6a
+         70 ae 42 6e 96 8e 3e b8 84 94 5b 96 85 6d ba 39 76 d1
+   """)
+
+t = TLS13(serverEncHS, tls_session=t.tls_session)
+assert(t.deciphered_len == 646)
+assert(len(t.inner.msg) == 4)
+m = t.inner.msg
+assert(isinstance(m[0], TLSEncryptedExtensions))
+assert(len(m[0].ext) == 3)
+assert(isinstance(m[0].ext[0], TLS_Ext_SupportedGroups))
+assert(isinstance(m[0].ext[1], TLS_Ext_RecordSizeLimit))
+assert(isinstance(m[0].ext[2], TLS_Ext_ServerName))
+assert(isinstance(m[1], TLS13Certificate))
+assert(isinstance(m[2], TLSCertificateVerify))
+assert(isinstance(m[3], TLSFinished))
+assert(m[3].vdata == server_finished)
+
+= Decrypt a TLS 1.3 session with a retry - Client handshake traffic key calculation
+# Values from RFC8448, section 5
+client_hs_traffic_key = clean("""
+         2f 1f 91 86 63 d5 90 e7 42 11 49 a2 9d
+         94 b0 b6
+   """)
+client_hs_traffic_iv = clean("""
+         41 4d 54 85 23 5e 1a 68 87 93 bd 74
+   """)
+
+assert(t.tls_session.pwcs.cipher.key == client_hs_traffic_key)
+assert(t.tls_session.pwcs.cipher.fixed_iv == client_hs_traffic_iv)
+
+
+= Decrypt a TLS 1.3 session with a retry - Decrypt and parse client finished
+# Values from RFC8448, section 5
+clientFinished = clean("""
+         23 f5 2f db 07 09 a5 5b d7 f7 9b 99 1f 25
+         48 40 87 bc fd 4d 43 80 b1 23 26 a5 2a 28 b2 e3 68 e1
+   """)
+
+clientEncHS = clean("""
+         17 03 03 00 35 d7 4f 19 23 c6 62 fd
+         34 13 7c 6f 50 2f 3d d2 b9 3d 95 1d 1b 3b c9 7e 42 af e2 3c 31
+         ab ea 92 fe 91 b4 74 99 9e 85 e3 b7 91 ce 25 2f e8 c3 e9 f9 39
+         a4 12 0c b2
+   """)
+
+t = TLS13(clientEncHS, tls_session=t.tls_session.mirror())
+assert(t.deciphered_len == 37)
+assert(len(t.inner.msg) == 1)
+assert(isinstance(t.inner.msg[0], TLSFinished))
+assert(t.inner.msg[0].vdata == clientFinished)
+assert(t.inner.type == 22)
+
+= Decrypt a TLS 1.3 session with a retry - Application traffic secret derivation 
+# Values from RFC8448, section 5
+master_secret = clean("""
+         11 31 54 5d 0b af 79 dd ce 9b 87 f0 69 45 78
+         1a 57 dd 18 ef 37 8d cd 20 60 f8 f9 a5 69 02 7e d8
+   """)
+
+client_application_traffic_secret_0 = clean("""
+         75 ec f4 b9 72 52 5a a0 dc d0 57 c9 94 4d
+         4c d5 d8 26 71 d8 84 31 41 d7 dc 2a 4f f1 5a 21 dc 51
+   """)
+
+server_application_traffic_secret_0 = clean("""
+         5c 74 f8 7d f0 42 25 db 0f 82 09 c9 de 64
+         29 e4 94 35 fd ef a7 ca d6 18 64 87 4d 12 f3 1c fc 8d
+   """)
+
+exporter_master_secret = clean("""
+      7c 06 d3 ae 10 6a 3a 37 4a ce 48 37 b3 98
+      5c ac 67 78 0a 6e 2c 5c 04 b5 83 19 d5 84 df 09 d2 23
+   """)
+
+resumption_master_secret = clean("""
+      09 17 0c 6d 47 27 21 56 6f 9c f9 9b 08 69
+      9d af f5 61 ec 8f b2 2d 5a 32 c3 f9 4c e0 09 b6 99 75
+   """)
+
+
+assert(t.tls_session.tls13_master_secret is not None)
+assert(t.tls_session.tls13_master_secret == master_secret)
+
+assert(len(t.tls_session.tls13_derived_secrets) == 9)
+assert('client_traffic_secrets' in  t.tls_session.tls13_derived_secrets)
+assert(len(t.tls_session.tls13_derived_secrets['client_traffic_secrets']) == 1)
+assert(t.tls_session.tls13_derived_secrets['client_traffic_secrets'][0] == client_application_traffic_secret_0)
+
+assert('server_traffic_secrets' in  t.tls_session.tls13_derived_secrets)
+assert(len(t.tls_session.tls13_derived_secrets['server_traffic_secrets']) == 1)
+assert(t.tls_session.tls13_derived_secrets['server_traffic_secrets'][0] == server_application_traffic_secret_0)
+
+assert('exporter_secret' in t.tls_session.tls13_derived_secrets)
+assert(t.tls_session.tls13_derived_secrets['exporter_secret'] == exporter_master_secret)
+
+assert('resumption_secret' in t.tls_session.tls13_derived_secrets)
+assert(t.tls_session.tls13_derived_secrets['resumption_secret'] == resumption_master_secret)
+
+= Decrypt a TLS 1.3 session with a retry - Application traffic keys calculation 
+# Values from RFC8448, section 5
+client_ap_traffic_key = clean("""
+         a7 eb 2a 05 25 eb 43 31 d5 8f cb f9 f7
+         ca 2e 9c
+   """)
+
+client_ap_traffic_iv = clean("""
+         86 e8 be 22 7c 1b d2 b3 e3 9c b4 44
+   """)
+
+server_ap_traffic_key = clean("""
+         f2 7a 5d 97 bd 25 55 0c 48 23 b0 f3 e5
+         d2 93 88
+   """)
+
+server_ap_traffic_iv = clean("""
+         0d d6 31 f7 b7 1c bb c7 97 c3 5f e7
+   """)
+
+assert(t.tls_session.rcs.cipher.key == client_ap_traffic_key)
+assert(t.tls_session.rcs.cipher.fixed_iv == client_ap_traffic_iv)
+assert(t.tls_session.wcs.cipher.key == server_ap_traffic_key)
+assert(t.tls_session.wcs.cipher.fixed_iv == server_ap_traffic_iv)
+
+= Decrypt a TLS 1.3 session with a retry - Decrypt and parse client Alert 
+# Values from RFC8448, section 5
+clientEncAlert = clean("""
+         17 03 03 00 13 2e a6 cd f7 49 19 60
+         23 e2 b3 a4 94 91 69 55 36 42 60 47
+   """)
+
+t = TLS13(clientEncAlert, tls_session = t.tls_session)
+assert(t.deciphered_len == 3)
+assert(len(t.inner.msg) == 1)
+assert(t.inner.type == 21)
+m = t.inner.msg[0]
+assert(isinstance(m, TLSAlert))
+assert(m.level == 1)
+assert(m.descr == 0)
+
+
+= Decrypt a TLS 1.3 session with a retry - Decrypt and parse server Alert 
+# Values from RFC8448, section 5
+serverEncAlert = clean("""
+         17 03 03 00 13 51 9f c5 07 5c b0 88
+         43 49 75 9f f9 ef 6f 01 1b b4 c6 f2
+   """)
+
+t = TLS13(serverEncAlert, tls_session = t.tls_session.mirror())
+assert(t.deciphered_len == 3)
+assert(len(t.inner.msg) == 1)
+assert(t.inner.type == 21)
+m = t.inner.msg[0]
+assert(isinstance(m, TLSAlert))
+assert(m.level == 1)
+assert(m.descr == 0)

scapy-2.4.3.tar.gz/test/tools/isotpscanner.uts -> scapy-2.4.4.tar.gz/test/tools/isotpscanner.uts Changed

@@ -6,10 +6,11 @@
 ~ conf
 
 = Imports
-load_layer("can")
-import threading, time, six, subprocess, sys
-from subprocess import call
+load_layer("can", globals_dict=globals())
 
+import threading, subprocess, sys
+import scapy.modules.six as six
+from subprocess import call
 
 = Definition of constants, utility functions and mock classes
 iface0 = "vcan0"
@@ -19,65 +20,63 @@
 ISOTP_KERNEL_MODULE_AVAILABLE = False
 def exit_if_no_isotp_module():
     if not ISOTP_KERNEL_MODULE_AVAILABLE:
-        err = "TEST SKIPPED: can-isotp not available"
-        subprocess.call("printf \"%s\r\n\" > /dev/stderr" % err, shell=True)
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
         warning("Can't test ISOTP native socket because kernel module is not loaded")
         exit(0)
 
 
 = Initialize a virtual CAN interface
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+if 0 != call(["cansend", iface0,  "000#"]):
     # vcan0 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface0)
-    if 0 != call("sudo ip link set dev %s up" % iface0, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
         raise Exception("could not bring up %s" % iface0)
 
-if 0 != call("cansend %s 000#" % iface0, shell=True):
+if 0 != call(["cansend", iface0,  "000#"]):
     raise Exception("cansend doesn't work")
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     # vcan1 is not enabled
-    if 0 != call("sudo modprobe vcan", shell=True):
+    if 0 != call(["sudo", "modprobe", "vcan"]):
         raise Exception("modprobe vcan failed")
-    if 0 != call("sudo ip link add name %s type vcan" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
         print("add %s failed: Maybe it was already up?" % iface1)
-    if 0 != call("sudo ip link set dev %s up" % iface1, shell=True):
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
         raise Exception("could not bring up %s" % iface1)
 
-if 0 != call("cansend %s 000#" % iface1, shell=True):
+if 0 != call(["cansend", iface1,  "000#"]):
     raise Exception("cansend doesn't work")
 
 print("CAN should work now")
 
 
-if six.PY3:
+if six.PY3 and not conf.use_pypy:
     from scapy.contrib.cansocket_native import *
 else:
     from scapy.contrib.cansocket_python_can import *
 
 
 if "python_can" in CANSocket.__module__:
-    import can as python_can
-    new_can_socket = lambda iface: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface, bitrate=250000))
-    new_can_socket0 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface0, bitrate=250000), timeout=0.01)
-    new_can_socket1 = lambda: CANSocket(iface=python_can.interface.Bus(bustype='socketcan', channel=iface1, bitrate=250000), timeout=0.01)
-    can_socket_string = "-i socketcan -c %s -b 250000" % iface0
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, timeout=0.01)
+    can_socket_string_list = ["-i", "socketcan", "-c", iface0, "-a", "bitrate=250000"]
 else:
     new_can_socket = lambda iface: CANSocket(iface)
     new_can_socket0 = lambda: CANSocket(iface0)
     new_can_socket1 = lambda: CANSocket(iface1)
-    can_socket_string = "-c %s" % iface0
+    can_socket_string_list = ["-c", iface0]
 
 # utility function for draining a can interface, asserting that no packets are there
 def drain_bus(iface=iface0, assert_empty=True):
-    s = new_can_socket(iface)
-    pkts = s.sniff(timeout=0.1)
-    if assert_empty:
-        assert len(pkts) == 0
-    s.close()
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
 
 print("CAN sockets should work now")
 
@@ -88,176 +87,260 @@
 
 
 = Check if can-isotp and can-utils are installed on this system
-p = subprocess.Popen('lsmod | grep "^can_isotp"', stdout=subprocess.PIPE, shell=True)
-if p.wait() == 0:
-    if b"can_isotp" in p.stdout.read():
-        p = subprocess.Popen("isotpsend -s1 -d0 %s" % iface0, stdin=subprocess.PIPE, shell=True)
-        p.stdin.write(b"01")
-        p.stdin.close()
-        r = p.wait()
-        if r == 0:
-            ISOTP_KERNEL_MODULE_AVAILABLE = True
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
 
 
 + Syntax check
 
 = Import isotp
-conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': False}
-load_contrib("isotp")
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+load_contrib("isotp", globals_dict=globals())
+
+ISOTPSocket = ISOTPSoftSocket
 
 
 + Usage tests
 
 = Test wrong usage
-print(sys.executable)
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py" % sys.executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-returncode = result.wait()
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
 std_out, std_err = result.communicate()
-if returncode:
+if result.returncode:
     print(std_out)
     print(std_err)
 
-assert returncode != 0
+assert result.returncode != 0
 
 expected_output = plain_str(b'usage:')
 assert expected_output in plain_str(std_err)
 
 
 = Test show help
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py --help" % sys.executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-if result.wait() == 0:
-    std_out, std_err = result.communicate()
-    assert std_err == None
-    expected_output = plain_str(b'Scan for open ISOTP-Sockets.')
-    print(std_out)
-    assert expected_output in plain_str(std_out)
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "--help"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+std_out, _ = result.communicate()
+expected_output = plain_str(b'Scan for open ISOTP-Sockets.')
+
+assert result.wait() == 0
+assert expected_output in plain_str(std_out)
 
 
 = Test wrong socket for Python2 or Windows
+
 if six.PY2:
-    version = subprocess.Popen("python --version", stdout=subprocess.PIPE, shell=True)
+    version = subprocess.Popen(["python2", "--version"], stdout=subprocess.PIPE)
     if 0 == version.wait():
         print(version.communicate())
-    result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py -c vcan0 -s 0x600 -e 0x600" % sys.executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-    if result.wait() == 0:
-        expected_output = plain_str(b'Wrong interface')
-        std_out, std_err = result.communicate()
-        assert std_err == None
-        print(std_out)
-        print(expected_output)
-        assert expected_output in plain_str(std_out)
+    result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "-c", iface0, "-s", "0x600", "-e", "0x600"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    expected_output = plain_str(b'Please provide all required arguments.')
+    std_out, std_err = result.communicate()
+    assert result.wait() == 1
+    assert expected_output in plain_str(std_err)
 
 
 = Test Python2 call
 
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py -i socketcan -c vcan0 -b 250000 -s 0x600 -e 0x600 -v" % sys.executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "-i", "socketcan", "-c", iface0, "-s", "0x600", "-e", "0x600", "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode = result.wait()
+expected_output = plain_str(b'Start scan')
+std_out, std_err = result.communicate()
+
+print(std_out)
+print("%s" % std_err)
+print(expected_output)
+
+assert returncode == 0
+assert expected_output in plain_str(std_out)
+
+= Test Python2 call with one python-can arg
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "-i", "socketcan", "-c", iface0, "-a", "bitrate=500000", "-s", "0x600", "-e", "0x600", "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 returncode = result.wait()
 print(returncode)
+expected_output = plain_str(b'Start scan')
+std_out, std_err = result.communicate()
+print(std_out)
+print("%s" % std_err)
+print(expected_output)
+
 assert returncode == 0
+assert expected_output in plain_str(std_out)
+
+
+= Test Python2 call with multiple python-can args
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "-i", "socketcan", "-c", iface0, "-a", "bitrate=500000 receive_own_messages=True", "-s", "0x600", "-e", "0x600", "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode = result.wait()
+print(returncode)
 expected_output = plain_str(b'Start scan')
 std_out, std_err = result.communicate()
 print(std_out)
+print("%s" % std_err)
 print(expected_output)
+
+assert returncode == 0
+assert expected_output in plain_str(std_out)
+
+= Test Python2 call with multiple python-can args 2
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "-i", "socketcan", "-c", iface0, "--python-can_args", "bitrate=500000 receive_own_messages=True", "-s", "0x600", "-e", "0x600", "-v"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode = result.wait()
+print(returncode)
+expected_output = plain_str(b'Start scan')
+std_out, std_err = result.communicate()
+print(std_out)
+print("%s" % std_err)
+print(expected_output)
+
+assert returncode == 0
 assert expected_output in plain_str(std_out)
 
 
 + Scan tests
 
 = Test standard scan
+
 drain_bus(iface0)
+started = threading.Event()
 
 def isotpserver():
-    with ISOTPSocket(new_can_socket(iface0), sid=0x700, did=0x600) as s:
-        s.sniff(timeout=100, count=1)
+    with new_can_socket(iface0) as isocan, ISOTPSocket(isocan, sid=0x700, did=0x600) as s:
+        s.sniff(timeout=200, count=1, started_callback=started.set)
 
 sniffer = threading.Thread(target=isotpserver)
 sniffer.start()
-time.sleep(0.1)
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py %s -s 0x600 -e 0x600" % (sys.executable, can_socket_string), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-returncode = result.wait()
-std_out, std_err = result.communicate()
+started.wait(timeout=10)
 
-print(std_out)
-print(std_err)
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x600", "-e", "0x600"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode1 = result.wait()
+std_out1, std_err1 = result.communicate()
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x600", "-e", "0x600"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode2 = result.wait()
+std_out2, std_err2 = result.communicate()
+
+send_returncode = subprocess.call(['cansend', iface0, '600#01aa'])
+sniffer.join(timeout=10)
+
+assert 0 == send_returncode
+assert returncode1 == 0
+assert returncode2 == 0
 
-send = subprocess.Popen(['cansend', 'vcan0', '600#01aa'])
-assert 0 == send.wait()
-assert returncode == 0
 
 expected_output = [b'0x600', b'0x700']
-print(std_out)
 for out in expected_output:
-    assert plain_str(out) in plain_str(std_out)
+    assert plain_str(out) in plain_str(std_out1 + std_out2)
 
 
 = Test extended scan
+
 drain_bus(iface0)
+started = threading.Event()
+
 def isotpserver():
-    with ISOTPSocket(new_can_socket(iface0), sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
-        s.sniff(timeout=100, count=1)
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
+        s.sniff(timeout=200, count=1, started_callback=started.set)
 
 sniffer = threading.Thread(target=isotpserver)
 sniffer.start()
-time.sleep(0.1)
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py %s -s 0x601 -e 0x601 -x" % (sys.executable, can_socket_string), stdout=subprocess.PIPE, shell=True)
-returncode = result.wait()
+started.wait(timeout=10)
 
-send = subprocess.Popen(['cansend', 'vcan0', '601#BB01aa'])
-assert 0 == send.wait()
-assert returncode == 0
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x"], stdout=subprocess.PIPE)
+returncode1 = result.wait()
+std_out1, std_err1 = result.communicate()
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x"], stdout=subprocess.PIPE)
+returncode2 = result.wait()
+std_out2, std_err2 = result.communicate()
+
+send_returncode = subprocess.call(['cansend', iface0, '601#BB01aa'])
+sniffer.join(timeout=10)
 
 expected_output = [b'0x601', b'0xbb', b'0x700', b'0xaa']
-std_out, std_err = result.communicate()
-assert std_err == None
-print(std_out)
-for out in expected_output:
-    assert plain_str(out) in plain_str(std_out)
+assert 0 == send_returncode
+assert returncode1 == 0
+assert returncode2 == 0
 
+for out in expected_output:
+    assert plain_str(out) in plain_str(std_out1 + std_out2)
 
 = Test extended only scan
+
 drain_bus(iface0)
+started = threading.Event()
+
 def isotpserver():
-    with ISOTPSocket(new_can_socket(iface0), sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
-        s.sniff(timeout=100, count=1)
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
+        s.sniff(timeout=200, count=1, started_callback=started.set)
 
 sniffer = threading.Thread(target=isotpserver)
 sniffer.start()
-time.sleep(0.1)
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py %s -s 0x601 -e 0x601 -x" % (sys.executable, can_socket_string), stdout=subprocess.PIPE, shell=True)
-returncode = result.wait()
+started.wait(timeout=10)
 
-send = subprocess.Popen(['cansend', 'vcan0', '601#BB01aa'])
-assert 0 == send.wait()
-assert returncode == 0
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x"], stdout=subprocess.PIPE)
+returncode1 = result.wait()
+std_out1, std_err1 = result.communicate()
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x"], stdout=subprocess.PIPE)
+returncode2 = result.wait()
+std_out2, std_err2 = result.communicate()
+
+send_returncode = subprocess.call(['cansend', iface0, '601#BB01aa'])
+sniffer.join(timeout=10)
 
 expected_output = [b'0x601', b'0xbb', b'0x700', b'0xaa']
-std_out, std_err = result.communicate()
-assert std_err == None
-print(std_out)
+assert 0 == send_returncode
+assert returncode1 == 0
+assert returncode2 == 0
+
 for out in expected_output:
-    assert plain_str(out) in plain_str(std_out)
+    assert plain_str(out) in plain_str(std_out1 + std_out2)
 
 
 = Test scan with piso flag
+
 drain_bus(iface0)
+started = threading.Event()
+
 def isotpserver():
-    with ISOTPSocket(new_can_socket(iface0), sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
-        s.sniff(timeout=100, count=1)
+    with new_can_socket0() as isocan, ISOTPSocket(isocan, sid=0x700, did=0x601, extended_addr=0xaa, extended_rx_addr=0xbb) as s:
+        s.sniff(timeout=200, count=1, started_callback=started.set)
 
 sniffer = threading.Thread(target=isotpserver)
 sniffer.start()
-time.sleep(0.1)
-result = subprocess.Popen("%s $PWD/scapy/tools/automotive/isotpscanner.py %s -s 0x601 -e 0x601 -x -C" % (sys.executable, can_socket_string), stdout=subprocess.PIPE, shell=True)
-returncode = result.wait()
+started.wait(timeout=10)
 
-send = subprocess.Popen(['cansend', 'vcan0', '601#BB01aa'])
-assert 0 == send.wait()
-assert returncode == 0
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x", "-C"], stdout=subprocess.PIPE)
+returncode1 = result.wait()
+std_out1, std_err1 = result.communicate()
+
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py"] + can_socket_string_list + ["-s", "0x601", "-e", "0x601", "-x", "-C"], stdout=subprocess.PIPE)
+returncode2 = result.wait()
+std_out2, std_err2 = result.communicate()
+
+send_returncode = subprocess.call(['cansend', iface0, '601#BB01aa'])
+sniffer.join(timeout=10)
+
+assert 0 == send_returncode
+assert returncode1 == 0 == returncode2
 
 expected_output = [b'sid=0x601', b'did=0x700', b'padding=False', b'extended_addr=0xbb', b'extended_rx_addr=0xaa']
-std_out, std_err = result.communicate()
-assert std_err == None
-print(std_out)
+
 for out in expected_output:
-    assert plain_str(out) in plain_str(std_out)
+    assert plain_str(out) in plain_str(std_out1 + std_out2)
+
+
++ Cleanup
+
+= Cleanup
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan0"]):
+        raise Exception("vcan0 could not be deleted")
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan1"]):
+        raise Exception("vcan1 could not be deleted")

scapy-2.4.4.tar.gz/test/tools/obdscanner.uts Added

@@ -0,0 +1,331 @@
+% Regression tests for obdscanner
+~ vcan_socket needs_root linux
+
++ Configuration
+~ conf
+
+= Imports
+load_layer("can", globals_dict=globals())
+import scapy.modules.six as six
+import subprocess, sys
+from subprocess import call
+from scapy.contrib.automotive.ecu import *
+
+print("Set delay to lower utilization")
+conf.contribs['ECU_am']['send_delay'] = 0.004
+= Definition of constants, utility functions and mock classes
+iface0 = "vcan0"
+iface1 = "vcan1"
+
+# function to exit when the can-isotp kernel module is not available
+ISOTP_KERNEL_MODULE_AVAILABLE = False
+def exit_if_no_isotp_module():
+    if not ISOTP_KERNEL_MODULE_AVAILABLE:
+        err = "TEST SKIPPED: can-isotp not available\n"
+        sys.__stderr__.write(err)
+        warning("Can't test ISOTP native socket because kernel module is not loaded")
+        exit(0)
+
+
+def temporary_skip_unstable_test():
+    err = "TEST SKIPPED: Unstable unit test. Stabilize me!\n"
+    sys.__stderr__.write(err)
+    warning("Unstable unit test. FIXME!")
+    exit(0)
+
+
+= Initialize a virtual CAN interface
+if 0 != call(["cansend", iface0,  "000#"]):
+    # vcan0 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface0, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface0)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface0, "up"]):
+        raise Exception("could not bring up %s" % iface0)
+
+if 0 != call(["cansend", iface0,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    # vcan1 is not enabled
+    if 0 != call(["sudo", "modprobe", "vcan"]):
+        raise Exception("modprobe vcan failed")
+    if 0 != call(["sudo", "ip", "link", "add", "name", iface1, "type", "vcan"]):
+        print("add %s failed: Maybe it was already up?" % iface1)
+    if 0 != call(["sudo", "ip", "link", "set", "dev", iface1, "up"]):
+        raise Exception("could not bring up %s" % iface1)
+
+if 0 != call(["cansend", iface1,  "000#"]):
+    raise Exception("cansend doesn't work")
+
+print("CAN should work now")
+
+
+if six.PY3 and not conf.use_pypy:
+    from scapy.contrib.cansocket_native import *
+else:
+    from scapy.contrib.cansocket_python_can import *
+
+
+if "python_can" in CANSocket.__module__:
+    new_can_socket = lambda iface: CANSocket(bustype='socketcan', channel=iface)
+    new_can_socket0 = lambda: CANSocket(bustype='socketcan', channel=iface0, timeout=0.01)
+    new_can_socket1 = lambda: CANSocket(bustype='socketcan', channel=iface1, timeout=0.01)
+    can_socket_string_list = ["-i", "socketcan", "-c", iface0]
+else:
+    new_can_socket = lambda iface: CANSocket(iface)
+    new_can_socket0 = lambda: CANSocket(iface0)
+    new_can_socket1 = lambda: CANSocket(iface1)
+    can_socket_string_list = ["-c", iface0]
+
+# utility function for draining a can interface, asserting that no packets are there
+def drain_bus(iface=iface0, assert_empty=True):
+    with new_can_socket(iface) as s:
+        pkts = s.sniff(timeout=0.1)
+        if assert_empty:
+            assert len(pkts) == 0
+
+= Verify that a CAN socket can be created and closed
+s = new_can_socket(iface0)
+s.close()
+
+
+= Check if can-isotp and can-utils are installed on this system
+p1 = subprocess.Popen(['lsmod'], stdout = subprocess.PIPE)
+p2 = subprocess.Popen(['grep', '^can_isotp'], stdout = subprocess.PIPE, stdin=p1.stdout)
+p1.stdout.close()
+if p1.wait() == 0 and p2.wait() == 0 and b"can_isotp" in p2.stdout.read():
+    p = subprocess.Popen(["isotpsend", "-s1", "-d0", iface0], stdin = subprocess.PIPE)
+    p.communicate(b"01")
+    if p.returncode == 0:
+        ISOTP_KERNEL_MODULE_AVAILABLE = True
+
+
++ Syntax check
+
+= Import isotp
+conf.contribs['ISOTP'] = {'use-can-isotp-kernel-module': ISOTP_KERNEL_MODULE_AVAILABLE}
+
+if six.PY3:
+    import importlib
+    if "scapy.contrib.isotp" in sys.modules:
+        importlib.reload(scapy.contrib.isotp)
+
+load_contrib("isotp", globals_dict=globals())
+
+if six.PY3 and ISOTP_KERNEL_MODULE_AVAILABLE:
+    assert ISOTPSocket == ISOTPNativeSocket
+else:
+    assert ISOTPSocket == ISOTPSoftSocket
+
++ Usage tests
+
+= Test wrong usage
+print(sys.executable)
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+returncode = result.wait()
+std_out, std_err = result.communicate()
+assert returncode != 0
+
+expected_output = plain_str(b'usage:')
+assert expected_output in plain_str(std_err)
+
+
+= Test show help
+result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py", "--help"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+assert result.wait() == 0
+std_out, std_err = result.communicate()
+expected_output = plain_str(b'Scan for all possible obd service classes and their subfunctions.')
+assert expected_output in plain_str(std_out)
+
+
+= Test wrong socket for Python2 or Windows
+if six.PY2:
+    version = subprocess.Popen(["python2", "--version"], stdout=subprocess.PIPE)
+    result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py", "-c", "vcan0", "-s", "0x600", "-d", "0x601", "-t", "0.001"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    assert result.wait() == 1
+    expected_output = plain_str(b'Please provide all required arguments.')
+    std_out, std_err = result.communicate()
+    assert expected_output in plain_str(std_err)
+
+= Test Python2 call
+if six.PY2:
+    result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py", "-i", "socketcan", "-c", "vcan0", "-s", "0x600", "-d", "0x601", "-v", "-t", "0.001"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    returncode = result.wait()
+    std_out, std_err = result.communicate()
+    assert returncode == 0
+    expected_output = plain_str(b'Starting OBD-Scan...')
+    assert expected_output in plain_str(std_out)
+
+= Test Python2 call with python-can args
+if six.PY2:
+    result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py", "-i", "socketcan", "-c", "vcan0", "-s", "0x600", "-d", "0x601", "-v", "-a", "bitrate=250000", "-t", "0.001"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    returncode = result.wait()
+    std_out, std_err = result.communicate()
+    assert returncode == 0
+    expected_output = plain_str(b'Starting OBD-Scan...')
+    assert expected_output in plain_str(std_out)
+
++ Scan tests
+
+= Load contribution layer
+
+from scapy.contrib.automotive.obd.obd import *
+
++ Simulate scanner
+
+= Test DTC scan
+
+drain_bus(iface0)
+
+s3 = OBD()/OBD_S03_PR(dtcs=[OBD_DTC()])
+
+example_responses = [ECUResponse(session=range(0,255), security_level=0, responses=s3)]
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, 0x7e0, 0x7e8, basecls=OBD, padding=True) as tester:
+    conf.verb = -1
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=OBD, verbose=False)
+    sim = threading.Thread(target=answering_machine, kwargs={'verbose': False, 'timeout': 15, 'stop_filter': lambda p: bytes(p) == b"\x01\xff\xff\xff\xff"})
+    sim.start()
+    try:
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out1, std_err1 = result.communicate()
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out2, std_err2 = result.communicate()
+    except Exception as e:
+        print(e)
+    finally:
+        tester.send(b"\x01\xff\xff\xff\xff")
+        sim.join(timeout=10)
+    expected_output = b"1 requests were sent, 1 answered"
+    assert bytes_encode(expected_output) in bytes_encode(std_out1) or bytes_encode(expected_output) in bytes_encode(std_out2) 
+
+= Test supported PIDs scan
+
+drain_bus(iface0)
+
+s1_pid00 = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID00(supported_pids="PID03+PID0B+PID0F")])
+s6_mid00 = OBD()/OBD_S06_PR(data_records=[OBD_S06_PR_Record()/OBD_MID00(supported_mids="")])
+s8_tid00 = OBD()/OBD_S08_PR(data_records=[OBD_S08_PR_Record()/OBD_TID00(supported_tids="")])
+s9_iid00 = OBD()/OBD_S09_PR(data_records=[OBD_S09_PR_Record()/OBD_IID00(supported_iids="")])
+
+s1_pid03 = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID03(fuel_system1=0, fuel_system2=2)])
+s1_pid0B = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID0B(data=100)])
+s1_pid0F = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID0F(data=50)])
+
+# Create answers for 'supported PIDs scan'
+example_responses = \
+    [ECUResponse(session=range(0, 255), security_level=0, responses=s3),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s6_mid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s8_tid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s9_iid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid03),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid0B),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid0F)]
+
+
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, 0x7e0, 0x7e8, basecls=OBD, padding=True) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=OBD, verbose=False)
+    sim = threading.Thread(target=answering_machine, kwargs={'verbose': False, 'timeout': 100, 'stop_filter': lambda p: bytes(p) == b"\x01\xff\xff\xff\xff"})
+    sim.start()
+    try:
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out1, std_err1 = result.communicate()
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out2, std_err2 = result.communicate()
+    except Exception as e:
+        print(e)
+    finally:
+        tester.send(b"\x01\xff\xff\xff\xff")
+        sim.join(timeout=10)
+    expected_output = ["5 requests were sent, 4 answered", "2 requests were sent, 1 answered", "1 requests were sent, 1 answered"]
+    for out in expected_output:
+        assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)  
+
+= Test only Service 01 PIDs scan
+
+drain_bus(iface0)
+
+s1_pid00 = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID00(supported_pids="PID03+PID0B+PID0F")])
+s6_mid00 = OBD()/OBD_S06_PR(data_records=[OBD_S06_PR_Record()/OBD_MID00(supported_mids="")])
+s8_tid00 = OBD()/OBD_S08_PR(data_records=[OBD_S08_PR_Record()/OBD_TID00(supported_tids="")])
+s9_iid00 = OBD()/OBD_S09_PR(data_records=[OBD_S09_PR_Record()/OBD_IID00(supported_iids="")])
+
+s1_pid03 = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID03(fuel_system1=0, fuel_system2=2)])
+s1_pid0B = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID0B(data=100)])
+s1_pid0F = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID0F(data=50)])
+
+# Create answers for 'supported PIDs scan'
+example_responses = \
+    [ECUResponse(session=range(0, 255), security_level=0, responses=s3),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s6_mid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s8_tid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s9_iid00),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid03),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid0B),
+     ECUResponse(session=range(0, 255), security_level=0, responses=s1_pid0F)]
+
+
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, 0x7e0, 0x7e8, basecls=OBD, padding=True) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=OBD, verbose=False)
+    sim = threading.Thread(target=answering_machine, kwargs={'verbose': False, 'timeout': 100, 'stop_filter':  lambda p: bytes(p) == b"\x01\xff\xff\xff\xff"})
+    sim.start()
+    try:
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30", "-1"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out1, std_err1 = result.communicate()
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30", "-1"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out2, std_err2 = result.communicate()
+    except Exception as e:
+        print(e)
+    finally:
+        tester.send(b"\x01\xff\xff\xff\xff")
+        sim.join(timeout=10)
+    expected_output = ["5 requests were sent, 4 answered"]
+    for out in expected_output:
+        assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)
+
+
+= Test full scan
+
+drain_bus(iface0)
+
+# Add unsupported PID
+s1_pid01 = OBD()/OBD_S01_PR(data_records=[OBD_S01_PR_Record()/OBD_PID01()])
+example_responses.append(ECUResponse(session=range(0,255), security_level=0, responses=s1_pid01))
+
+with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD, padding=True) as ecu, \
+        new_can_socket0() as isocan2, ISOTPSocket(isocan2, 0x7e0, 0x7e8, basecls=OBD, padding=True) as tester:
+    answering_machine = ECU_am(supported_responses=example_responses, main_socket=ecu, basecls=OBD, verbose=False)
+    sim = threading.Thread(target=answering_machine, kwargs={'verbose': False, 'timeout': 100, 'stop_filter': lambda p: bytes(p) == b"\x01\xff\xff\xff\xff"})
+    sim.start()
+    try:
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30", "-f", "-1", "-3"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out1, std_err1 = result.communicate()
+        result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py"] + can_socket_string_list + ["-s", "0x7e0", "-d", "0x7e8", "-t", "0.30", "-f", "-1", "-3"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        std_out2, std_err2 = result.communicate()
+    except Exception as e:
+        print(e)
+    finally:
+        tester.send(b"\x01\xff\xff\xff\xff")
+        sim.join(timeout=10)
+    expected_output = ["256 requests were sent", "1 requests were sent, 1 answered"]
+    for out in expected_output:
+        assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)
+
++ Cleanup
+
+= Cleanup
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan0"]):
+        raise Exception("vcan0 could not be deleted")
+
+if 0 != call(["sudo", "ip", "link", "delete", "vcan1"]):
+        raise Exception("vcan1 could not be deleted")

scapy-2.4.3.tar.gz/test/windows.uts -> scapy-2.4.4.tar.gz/test/windows.uts Changed

scapy-2.4.3.tar.gz/tox.ini -> scapy-2.4.4.tar.gz/tox.ini Changed

@@ -3,105 +3,61 @@
 
 
 [tox]
-envlist = py{27,34,35,36,37,py,py3}-{linux,bsd}_{non_root,root}, py{27,37}-windows, linux_warnings
+envlist = py{27,34,35,36,37,38,py,py3}-{linux,bsd}_{non_root,root},
+          py{27,34,25,36,37,38,py,py3}-windows,
 skip_missing_interpreters = true
 minversion = 2.9
 
+# Main tests
 
-[testenv:py27-pcapdnet_root]
-description = "Scapy unit tests - pcap & dnet"
-whitelist_externals = {[testenv]whitelist_externals}
-passenv = SCAPY_USE_PCAPDNET
+[testenv]
+description = "Scapy unit tests"
+whitelist_externals = sudo
+passenv = PATH PWD PROGRAMFILES WINDIR SYSTEMROOT
+          # Used by scapy
+          SCAPY_USE_PCAPDNET
 deps = mock
        # cryptography requirements
        setuptools>=18.5
        cryptography
        coverage
-       # Currently pcap & dnet are tested together. As pydumbnet does not
-       # support Python3 yet, both are currently disabled.
-       pcapy>=0.11.3
-       pydumbnet
+       python-can
+       brotli<1.0.8
+platform =
+  linux_non_root,linux_root: linux
+  bsd_non_root,bsd_root: darwin|freebsd|openbsd|netbsd
+  windows: win32
 commands =
-  sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/bsd.utsc -T test/bpf.uts -K manufdb -K tshark -K random_weird_py3 -K osx {posargs}
-
-
-[testenv:linux_warnings]
-description = "Scapy unit tests - health (garbage/deprecations) check"
-commands = sudo -E {envpython} -Werror -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
-deps = {[testenv]deps}
-platform = linux
-passenv = {[testenv]passenv}
-whitelist_externals = {[testenv]whitelist_externals}
+  linux_non_root: {envpython} {env:SCAPY_PY_OPTS:-m coverage run} -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -N {posargs}
+  linux_root: sudo -E {envpython} {env:SCAPY_PY_OPTS:-m coverage run} -m scapy.tools.UTscapy -c ./test/configs/linux.utsc {posargs}
+  bsd_non_root: {envpython} {env:SCAPY_PY_OPTS:-m coverage run} -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -N {posargs}
+  bsd_root: sudo -E {envpython} {env:SCAPY_PY_OPTS:-m coverage run} -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark {posargs}
+  windows: {envpython} {env:SCAPY_PY_OPTS:-m coverage run} -m scapy.tools.UTscapy -c test/configs/windows.utsc {posargs}
+  coverage combine
 
+# Variants of the main tests
 
-[testenv:py36-isotp_kernel_module]
+[testenv:py38-isotp_kernel_module]
 description = "Scapy unit tests - ISOTP Linux kernel module"
 whitelist_externals = sudo
                       git
                       bash
                       lsmod
                       modprobe
-
 passenv = PATH PWD PROGRAMFILES WINDIR SYSTEMROOT
-deps = mock
-       # cryptography requirements
-       setuptools>=18.5
-       cryptography
-       coverage
-       python-can
-
+deps = {[testenv]deps}
 commands =
   sudo -E modprobe can
   git clone --depth=1 https://github.com/linux-can/can-utils.git /tmp/can-utils
-  bash -c "cd /tmp/can-utils; autogen.sh; ./configure; make; sudo make install"
+  bash -c "cd /tmp/can-utils; ./autogen.sh; ./configure; make; sudo make install"
   git clone --depth=1 https://github.com/hartkopp/can-isotp.git /tmp/can-isotp
   bash -c "cd /tmp/can-isotp; make; sudo make modules_install; sudo modprobe can_isotp || sudo insmod ./net/can/can-isotp.ko" 
   bash -c "rm -rf /tmp/can-utils /tmp/can-isotp"
   lsmod
-  sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
-
-
-[testenv]
-description = "Scapy unit tests"
-whitelist_externals = sudo
-passenv = PATH PWD PROGRAMFILES WINDIR SYSTEMROOT
-deps = mock
-       # cryptography requirements
-       setuptools>=18.5
-       cryptography
-       coverage
-       python-can
-
-
-platform =
-  linux_non_root,linux_root: linux
-  bsd_non_root,bsd_root: darwin|freebsd|openbsd|netbsd
-  windows: win32
-
-commands =
-  linux_non_root: coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root {posargs}
-  linux_root: sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 {posargs}
-  bsd_non_root: coverage run -a -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 -K netaccess -K needs_root {posargs}
-  bsd_root: sudo -E {envpython} -m coverage run -a -m scapy.tools.UTscapy -c test/configs/bsd.utsc -K manufdb -K tshark -K random_weird_py3 {posargs}
-  windows: {envpython} -m coverage run -a -m scapy.tools.UTscapy -c test/configs/windows.utsc -K random_weird_py3 {posargs}
-  coverage combine
-
-
-[testenv:py27-linux_non_root_old-cryptography]
-description = "Scapy unit tests - old cryptography module"
-whitelist_externals = sudo
-passenv = PATH PWD PROGRAMFILES WINDIR SYSTEMROOT
-deps = mock
-       # cryptography requirements
-       setuptools>=18.5
-       cryptography==1.9
-       coverage
-       python-can
-
-commands =
-  coverage run -a -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -K random_weird_py3 -K netaccess -K needs_root -K crypto_advanced {posargs}
+  sudo -E {envpython} -m coverage run -m scapy.tools.UTscapy -c ./test/configs/linux.utsc {posargs}
   coverage combine
 
+# Specific functions or tests
 
 [testenv:codecov]
 description = "Upload coverage results to codecov"
@@ -110,11 +66,46 @@
 commands = codecov -e TOXENV
 
 
-[testenv:docs]
+# The files listed in thr sphinx-apidoc are ignored
+# (past the first argument)
+[testenv:apitree]
+description = "Regenerates the API reference doc tree"
+skip_install = true
 changedir = doc/scapy
 deps = sphinx
+commands =
+  sphinx-apidoc -f --no-toc --separate --module-first --output-dir api ../../scapy ../../scapy/modules/ ../../scapy/libs/ ../../scapy/tools/ ../../scapy/arch/ ../../scapy/contrib/cansocket* ../../scapy/contrib/scada/* ../../scapy/all.py ../../scapy/layers/all.py
+  python sphinx_apidoc_postprocess.py
+
+
+[testenv:mypy]
+description = "Check Scapy compliance against static typing"
+skip_install = true
+deps = mypy
+       typing
+commands = python .config/mypy/mypy_check.py
+
+
+[testenv:docs]
+description = "Build the docs"
+skip_install = true
+changedir = doc/scapy
+deps = sphinx>=2.4.2
        sphinx_rtd_theme
-commands = sphinx-build -q -W . _build/html
+commands =
+  sphinx-build -W --keep-going -b html . _build/html
+
+
+# Debug mode
+[testenv:docs2]
+description = "Build the docs without rebuilding the API tree"
+skip_install = true
+changedir = doc/scapy
+deps = {[testenv:docs]deps}
+setenv =
+  SCAPY_APITREE = 0
+commands =
+  sphinx-build -W --keep-going -b html . _build/html
 
 
 [testenv:spell]
@@ -122,7 +113,7 @@
 skip_install = true
 deps = codespell
 # inet6, dhcp6 and the ipynb files contains french: ignore them
-commands = codespell --ignore-words=.travis/codespell_ignore.txt --skip="*.pyc,*.png,*.jpg,*.ods,*.raw,*.pdf,*.pcap,*.js,*.html,*.der,*_build*,*inet6.py,*dhcp6.py,*.ipynb,*.svg,*.gif,*.obs" scapy/ doc/ test/ .github/
+commands = codespell --ignore-words=.config/codespell_ignore.txt --skip="*.pyc,*.png,*.jpg,*.ods,*.raw,*.pdf,*.pcap,*.js,*.html,*.der,*_build*,*inet6.py,*dhcp6.py,*.ipynb,*.svg,*.gif,*.obs,*.gz" scapy/ doc/ test/ .github/
 
 
 [testenv:twine]
@@ -145,6 +136,20 @@
 # flake8 configuration
 [flake8]
 ignore = E731, W504
+per-file-ignores =
+    scapy/all.py:F403,F401
+    scapy/contrib/automotive/obd/obd.py:F405,F403
+    scapy/contrib/automotive/obd/pid/pids.py:F405,F403
+    scapy/contrib/automotive/obd/scanner.py:F405,F403,E501
+    scapy/contrib/automotive/volkswagen/definitions.py:E501
+    scapy/contrib/eigrp.py:E501
+    scapy/contrib/geneve.py:E501
+    scapy/contrib/http2.py:F821
+    scapy/contrib/igmp.py:E501
+    scapy/contrib/scada/iec104/__init__.py:F405
+    scapy/layers/tls/all.py:F403
+    scapy/layers/tls/crypto/all.py:F403
+    scapy/libs/winpcapy.py:F405,F403,E501
+    scapy/tools/UTscapy.py:E501
 exclude = scapy/modules/six.py,
-          scapy/modules/winpcapy.py
-          scapy/modules/ethertypes.py
+          scapy/libs/ethertypes.py