Skip to content

Commit

Permalink
Fix wrong values in snmp_sysdescr.xml (#286)
Browse files Browse the repository at this point in the history 
* fixed wrong os.device values

* Revert "fixed wrong os.device values"

This reverts commit 79fd417.

* fixed wrong os.device values

* Changed OS fields

Co-authored-by: Nimrod Roimy <[email protected]>
  • Loading branch information
@nstylepro
nstylepro and Nimrod Roimy authored Sep 9, 2020
1 parent 5d375c2 commit b6889a7
Showing 1 changed file with 38 additions and 25 deletions.
63 changes: 38 additions & 25 deletions xml/snmp_sysdescr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6318,10 +6318,12 @@ Copyright (c) 1995-2005 by Cisco Systems
<example>Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
<example>Siemens, SIMATIC HMI, KTP600 Basic color PN, 6AV6 647-0AD11-3AX0, HW:1, FW:V11.00.02.00</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic HMI"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.device" value="HMI Controller"/>
<param pos="0" name="hw.device" value="Simatic HMI"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="os.version" value="CE"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*SW:\s*V\s*(\d+ \d+ \d+).*$">
Expand All @@ -6332,10 +6334,12 @@ Copyright (c) 1995-2005 by Cisco Systems
<example>Siemens, SIMATIC HMI, unknown, 6AV2 124-0GC01-0AX0, HW: 0, SW: V 11 0 2</example>
<example>Siemens, SIMATIC HMI, unknown, 6AV2 124-0JC01-0AX0, HW: 0, SW: V 11 0 0</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic HMI"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.device" value="HMI Controller"/>
<param pos="0" name="hw.device" value="Simatic HMI"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="os.version" value="CE"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
Expand All @@ -6347,19 +6351,23 @@ Copyright (c) 1995-2005 by Cisco Systems
<example os.product="Scalance S612" os.version="T03.00.00.00_25.00.00.01">Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version T03.00.00.00_25.00.00.01, VPB9542952</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic NET"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="os.version" value="7"/>
<param pos="0" name="hw.family" value="Simatic NET"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC NET (\S+) FW V (\S+)$">
<description>Siemens NET</description>
<example>Siemens, SIMATIC NET CP1613 FW V 06.33</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic NET"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="os.version" value="7"/>
<param pos="0" name="hw.family" value="Simatic NET"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+).*$">
Expand All @@ -6369,9 +6377,10 @@ Copyright (c) 1995-2005 by Cisco Systems
<example os.product="IM151-8" os.version="3.2.3">Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB01-0AB0 , HW: 2, FW: V3.2.3, S C-B3UC78192011</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic S7"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="hw.family" value="Simatic S7"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
Expand All @@ -6381,18 +6390,20 @@ Copyright (c) 1995-2005 by Cisco Systems
<example>Siemens, SIMATIC S7, CPU-1200, 6ES7 214-1BE30-0XB0 SZVA2YYY007305 , 1, V.1.0.2, SZVA2YYY007305</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic S7"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="hw.family" value="Simatic S7"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Siemens, SIMATIC, (\S+)$">
<description>Siemens S7 - model only variant</description>
<example>Siemens, SIMATIC, S7-300</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic S7"/>
<param pos="1" name="os.product"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="hw.family" value="Simatic S7"/>
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="^Siemens, SINUMERIK, solution line ([^,]+),.*?FW:V([^,]+).*$">
Expand All @@ -6401,9 +6412,11 @@ Copyright (c) 1995-2005 by Cisco Systems
<example>Siemens, SINUMERIK, solution line PCU50.3B-P 1GB XP, 6FC5210-0DF33-2AB0, HW:A, FW:V00.00.00, ST-BN2040231</example>
<param pos="0" name="os.vendor" value="Siemens"/>
<param pos="0" name="os.device" value="Monitoring"/>
<param pos="0" name="os.family" value="Simatic Sinumerik"/>
<param pos="1" name="os.product"/>
<param pos="2" name="os.version"/>
<param pos="0" name="os.family" value="Windows"/>
<param pos="0" name="os.version" value="10"/>
<param pos="0" name="hw.family" value="Simatic Sinumerik"/>
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
</fingerprint>

<fingerprint pattern="^Name:(ReliantUNIX)-. release:(\S+) version:(\S+) machine:(\S+)$">
Expand Down

0 comments on commit b6889a7

Please sign in to comment.