Skip to content

Commit

Permalink
Land #13, @mdobskra-r7's Cisco TelePresence/Tandberg improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@jhart-r7
jhart-r7 committed Jan 8, 2015
2 parents 29d2f24 + c4767fe commit e1e95eb
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 33 deletions.
2 changes: 1 addition & 1 deletion lib/recog/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Recog
VERSION = "1.0.7"
VERSION = '1.0.8'
end
13 changes: 13 additions & 0 deletions xml/ftp_banners.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,4 +808,17 @@ against these patterns to fingerprint FTP servers.
<param pos="1" name="host.name"/>
<param pos="2" name="service.version"/>
</fingerprint>
<fingerprint pattern="^Welcome to the (?:Cisco )?(?:TelePresence) ([a-zA-Z\s]*?) ((?:MSE )?\d+), version (\d+.\d+\(\d+.\d+\)).*?" flags="REG_ICASE">
<description>Cisco TelePresence</description>
<example os.device="AM GW" os.version="1.1(1.34)" hw.series="3610">Welcome to the Cisco TelePresence AM GW 3610, version 1.1(1.34) </example>
<example os.device="IP GW" os.version="2.0(3.32)" hw.series="3510">Welcome to the Cisco TelePresence IP GW 3510, version 2.0(3.32) </example>
<example os.device="MCU" os.version="4.3(2.18)" hw.series="4210">Welcome to the Cisco TelePresence MCU 4210, version 4.3(2.18) </example>
<example os.device="MCU" os.version="4.3(1.68)" hw.series="MSE 8420">Welcome to the Cisco TelePresence MCU MSE 8420, version 4.3(1.68) </example>
<example os.device="Server" os.version="2.1(1.18)" hw.series="7010">Welcome to the Telepresence Server 7010, version 2.1(1.18) </example>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="1" name="os.device"/>
<param pos="2" name="hw.series"/>
<param pos="3" name="os.version"/>
</fingerprint>
</fingerprints>
12 changes: 11 additions & 1 deletion xml/sip_banners.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<!--
SIP Server header values are matched against these patterns to fingerprint SIP devices.
-->

<fingerprints matches="sip_header.server">
<fingerprint pattern="^Cisco-SIPGateway/IOS-([\d\.x]+)$">
<description>Cisco SIPGateway</description>
Expand All @@ -11,4 +10,15 @@ SIP Server header values are matched against these patterns to fingerprint SIP d
<param pos="0" name="os.product" value="IOS"/>
<param pos="1" name="os.version"/>
</fingerprint>
<fingerprint pattern="^TANDBERG/\d+ \(([a-zA-Z]+\d+(?:\.\d+)+).*\)">
<description>Cisco TelePresence</description>
<example os.version="X8.2.1">TANDBERG/4130 (X8.2.1)</example>
<example os.version="XC2.2.1">TANDBERG/4353 (XC2.2.1-b2bua-1.0)</example>
<example os.version="TC5.1.4.295090">TANDBERG/516 (TC5.1.4.295090)</example>
<example os.version="TCNC5.1.4.295090">TANDBERG/517 (TCNC5.1.4.295090)</example>
<example os.version="S5.30">TANDBERG/80 (S5.30)</example>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="1" name="os.version"/>
</fingerprint>
</fingerprints>
80 changes: 49 additions & 31 deletions xml/snmp_sysdescr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,28 +1527,66 @@
<!--======================================================================
CISCO
=======================================================================-->
<fingerprint pattern="^(?:Cisco|TANDBERG) Codec SoftW: (.*\d+[\.\d+]*) MCU: Cisco TelePresence ([A-Z]+\d+).*">
<fingerprint pattern="^(?:Cisco|TANDBERG) Codec SoftW: (.*\d+[\.\d+]+)(?:(?: )?Beta\d)? (?:\w* )?MCU: (?:Cisco|TANDBERG) (?:\w* )?(\d+MXP|[A-Z]+\d+) .*?">
<description>Cisco TelePresence</description>
<example os.version="TC5.1.0.280662" hw.product="SX20">Cisco Codec SoftW: TC5.1.0.280662 MCU: Cisco TelePresence SX20 Date: 2012-02-14 S/N: FTT16070041 BootSW: Board: 101790-6 [28]</example>
<example os.version="TE4.1.3.292001" hw.product="SX20">Cisco Codec SoftW: TE4.1.3.292001 MCU: Cisco TelePresence SX20 Date: 2012-06-21 S/N: FTT1625007Z BootSW: Board: 101790-6 [B0]</example>
<example os.version="TC4.2.0.259927" hw.product="MX200">TANDBERG Codec SoftW: TC4.2.0.259927 MCU: Cisco TelePresence MX200 Date: 2011-06-30 S/N: FTT1530000O BootSW: Board: 101770-4 [20]</example>
<example os.version="TC5.1.3.292001" hw.product="MX300">TANDBERG Codec SoftW: TC5.1.3.292001 MCU: Cisco TelePresence MX300 Date: 2012-06-21 S/N: FTT16030013 BootSW: Board: 101770-5 [22]</example>
<example os.version="TC5.1.0.280662" hw.series="SX20">Cisco Codec SoftW: TC5.1.0.280662 MCU: Cisco TelePresence SX20 Date: 2012-02-14 S/N: FTT16070041 BootSW: Board: 101790-6 [28]</example>
<example os.version="TC4.2.0.259927" hw.series="MX200">TANDBERG Codec SoftW: TC4.2.0.259927 MCU: Cisco TelePresence MX200 Date: 2011-06-30 S/N: FTT1530000O BootSW: Board: 101770-4 [20]</example>
<example os.version="TC5.1.3.292001" hw.series="MX300">TANDBERG Codec SoftW: TC5.1.3.292001 MCU: Cisco TelePresence MX300 Date: 2012-06-21 S/N: FTT16030013 BootSW: Board: 101770-5 [22]</example>
<example os.version="TC5.1.0.279658" hw.series="SX20">Cisco Codec SoftW: TC5.1.0.279658Beta7 MCU: Cisco TelePresence SX20 Date: 2012-02-03 S/N: FTT1616005D BootSW: Board: 101790-6 [B0]</example>
<example os.version="TC6.0.0" hw.series="SX20">Cisco Codec SoftW: TC6.0.0 Beta7 MCU: Cisco TelePresence SX20 Date: 2012-09-17 S/N: FTT163100A3 BootSW: Board: 101790-6 [B0]</example>
<example os.version="TC4.2.0.255978" hw.series="MX200">TANDBERG Codec SoftW: TC4.2.0.255978Beta2 MCU: Cisco TelePresence MX200 Date: 2011-05-23 S/N: FTT1524000I BootSW: Board: 101770-4 [00]</example>
<example os.version="TCNC5.0.1.275220" hw.series="MX200">TANDBERG Codec SoftW: TCNC5.0.1.275220 MCU: Cisco TelePresence MX200 Date: 2011-12-19 S/N: FTT1615003S BootSW: Board: 101770-5 [22]</example>
<example os.version="TCNC5.1.0.280662" hw.series="SX20">Cisco Codec SoftW: TCNC5.1.0.280662 MCU: Cisco TelePresence SX20 Date: 2012-02-14 S/N: FTT161300A0 BootSW: Board: 101790-6 [A0]</example>
<example os.version="F8.1" hw.series="6000MXP">TANDBERG Codec SoftW: F8.1 PAL MCU: TANDBERG Profile 6000MXP Date: 2009-09-07 S/N: 25A46936 BootSW: Rev. 1.15, 2008-01-04 Board: 100670 rev. 07</example>
<example os.version="F9.1" hw.series="6000MXP">TANDBERG Codec SoftW: F9.1 NTSC MCU: TANDBERG 6000MXP PORTABLE Date: 2011-06-08 S/N: 25A07029 BootSW: Rev. 1.16, 2009-01-21 Board: 100670 rev. 07</example>
<example os.version="TC4.2.0.260857" hw.series="C40">TANDBERG Codec SoftW: TC4.2.0.260857 MCU: TANDBERG Codec C40 Date: 2011-07-11 S/N: B1AV02D00182 BootSW: Board: 101681-1 [04]</example>
<example os.version="TC4.2.1.265253" hw.series="EX60">TANDBERG Codec SoftW: TC4.2.1.265253 MCU: TANDBERG EX60 Date: 2011-09-06 S/N: A1AZ02E00212 BootSW: Board: 101620-6 [22]</example>
<example os.version="TE1.0.0.175435" hw.series="E20">TANDBERG Codec SoftW: TE1.0.0.175435 MCU: TANDBERG E20 Date: 2009-02-09 S/N: A1AA11B00658 BootSW: Board: 101390-6</example>
<param pos="0" name="os.certainty" value="0.85"/>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="0" name="os.device" value="Codec"/>
<param pos="1" name="os.version"/>
<param pos="2" name="hw.product"/>
<param pos="2" name="hw.series"/>
</fingerprint>

<fingerprint pattern="^Cisco TelePresence (Conductor|MCU (?:MSE )?\d+)">
<fingerprint pattern="^Cisco TelePresence (?:(?:HD )?MCU) ((?:MSE )?\d+)">
<description>Cisco TelePresence</description>
<example hw.product="Conductor">Cisco TelePresence Conductor</example>
<example hw.product="MCU 4205">Cisco TelePresence MCU 4205</example>
<example hw.product="MCU MSE 8420">Cisco TelePresence MCU MSE 8420</example>
<example hw.series="4205">Cisco TelePresence MCU 4205</example>
<example hw.series="MSE 8420">Cisco TelePresence MCU MSE 8420</example>
<example hw.series="4520">Cisco TelePresence HD MCU 4520</example>
<param pos="0" name="os.certainty" value="0.85"/>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="1" name="hw.product"/>
<param pos="0" name="os.device" value="Bridge"/>
<param pos="1" name="hw.series"/>
</fingerprint>

<fingerprint pattern="^Cisco TelePresence (Conductor|Supervisor)(?: (MSE \d+))?">
<description>Cisco TelePresence</description>
<example os.device="Conductor">Cisco TelePresence Conductor</example>
<example os.device="Supervisor" hw.series="MSE 8050">Cisco TelePresence Supervisor MSE 8050</example>
<param pos="0" name="os.certainty" value="0.85"/>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="1" name="os.device"/>
<param pos="2" name="hw.series"/>
</fingerprint>

<fingerprint pattern="^TANDBERG Codec$">
<description>Tandberg videoconferencing device</description>
<example>TANDBERG Codec</example>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="TelePresence"/>
<param pos="0" name="os.device" value="Codec"/>
</fingerprint>

<fingerprint pattern="^TANDBERG MPS-MCU$">
<description>Tandberg videoconferencing bridge</description>
<example>TANDBERG MPS-MCU</example>
<param pos="0" name="os.vendor" value="Cisco"/>
<param pos="0" name="os.product" value="MPS-MCU"/>
<param pos="0" name="os.device" value="VOIP"/>
</fingerprint>

<fingerprint pattern="^Cisco Adaptive Security Appliance Version (\d+\.\d+\(\d+\)\d*)">
Expand Down Expand Up @@ -7820,26 +7858,6 @@ Copyright (c) 1995-2005 by Cisco Systems
<param pos="2" name="os.version"/>
</fingerprint>


<!--======================================================================
TANDBERG
=======================================================================-->

<fingerprint pattern="^TANDBERG Codec$">
<description>Tandberg videoconferencing device</description>
<example>TANDBERG Codec</example>
<param pos="0" name="os.vendor" value="Tandberg"/>
<param pos="0" name="os.device" value="Web cam"/>
</fingerprint>

<fingerprint pattern="^TANDBERG MPS-MCU$">
<description>Tandberg videoconferencing bridge</description>
<example>TANDBERG MPS-MCU</example>
<param pos="0" name="os.vendor" value="Tandberg"/>
<param pos="0" name="os.product" value="MPS-MCU"/>
<param pos="0" name="os.device" value="VOIP"/>
</fingerprint>

<!--======================================================================
TEKTRONIX
=======================================================================-->
Expand Down

0 comments on commit e1e95eb

Please sign in to comment.