From 9862c76215c6401dca4e504fa02cb18ae5ade53b Mon Sep 17 00:00:00 2001
From: Martin Votruba <144109301+martinvotruba-r7@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:08:05 +0200
Subject: [PATCH] Update SIP banner to be backward compatible (#628)

* Update SIP banner to be backward compatible

* Update sip_banners.xml

* Update sip_banners.xml

* remove XC SIP record

* Update sip_banners.xml

* remove Conductor

* Eat the Cisco prefix for hw.product
---
 identifiers/os_product.txt |  1 -
 xml/sip_banners.xml        | 28 ++++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/identifiers/os_product.txt b/identifiers/os_product.txt
index 501743ab..96a7ac9a 100644
--- a/identifiers/os_product.txt
+++ b/identifiers/os_product.txt
@@ -47,7 +47,6 @@ Cobalt RaQ
 Collaboration Endpoint
 CommandPost
 Comware
-Conductor
 ConnectUPS
 Cumulus Linux
 D2D Backup System
diff --git a/xml/sip_banners.xml b/xml/sip_banners.xml
index d37bc7ff..b31a8493 100644
--- a/xml/sip_banners.xml
+++ b/xml/sip_banners.xml
@@ -176,17 +176,6 @@
     <param pos="3" name="hw.model"/>
   </fingerprint>
 
-  <fingerprint pattern="^TANDBERG\/(\d+) \((XC\d+\S*).*\) ?(.*)$">
-    <description>Cisco TelePresence Conductor</description>
-    <example os.version="XC2.2.1-b2bua-1.0" tandberg.model="4353" hw.model="">TANDBERG/4353 (XC2.2.1-b2bua-1.0)</example>
-    <param pos="0" name="os.vendor" value="Cisco"/>
-    <param pos="0" name="os.family" value="TelePresence"/>
-    <param pos="0" name="os.product" value="Conductor"/>
-    <param pos="1" name="tandberg.model"/>
-    <param pos="2" name="os.version"/>
-    <param pos="3" name="hw.model"/>
-  </fingerprint>
-
   <fingerprint pattern="^TANDBERG\/(\d+) \((ce\d+\S*).*\) ?(.*)$">
     <description>Cisco TelePresence Collaboration Endpoint (RoomOS)</description>
     <example os.version="ce9.15.0.d97b604b745" tandberg.model="529" hw.model="Cisco-RoomKit">TANDBERG/529 (ce9.15.0.d97b604b745) Cisco-RoomKit</example>
@@ -199,16 +188,23 @@
     <param pos="3" name="hw.model"/>
   </fingerprint>
   
-  <fingerprint pattern="^(TANDBERG/(\d+)) \((TC\d+\S*|TCNC\d+\S*).*\)$">
+  <fingerprint pattern="^(TANDBERG\/(\d+)) \(((?:[abd-zA-WZ]|XC)*\d+\S*).*\) ?(?:Cisco-)?(.*)$">
     <description>Cisco/Tandberg TelePresence</description>
-    <example os.version="TC7.0.2.aecf2d9" tandberg.model="519" hw.product="TANDBERG/519">TANDBERG/519 (TC7.0.2.aecf2d9)</example>
-    <example os.version="TC5.1.4.295090" hw.product="TANDBERG/516" tandberg.model="516">TANDBERG/516 (TC5.1.4.295090)</example>
-    <example os.version="TCNC5.1.4.295090" hw.product="TANDBERG/517" tandberg.model="517">TANDBERG/517 (TCNC5.1.4.295090)</example>
+    <example os.version="TC7.0.2.aecf2d9" tandberg.model="519" hw.product="TANDBERG/519" hw.series="">TANDBERG/519 (TC7.0.2.aecf2d9)</example>
+    <example os.version="TC5.1.4.295090" hw.product="TANDBERG/516" tandberg.model="516" hw.series="">TANDBERG/516 (TC5.1.4.295090)</example>
+    <example os.version="TCNC5.1.4.295090" hw.product="TANDBERG/517" tandberg.model="517" hw.series="">TANDBERG/517 (TCNC5.1.4.295090)</example>
+    <example os.version="TE4.2.0.259927" hw.product="TANDBERG/517" tandberg.model="517" hw.series="">TANDBERG/517 (TE4.2.0.259927)</example>
+    <example os.version="F9.1" hw.product="TANDBERG/517" tandberg.model="517" hw.series="">TANDBERG/517 (F9.1)</example>
+    <example os.version="2.3(1.31)" hw.product="TANDBERG/517" tandberg.model="517" hw.series="RoomKit">TANDBERG/517 (2.3(1.31)) Cisco-RoomKit</example>
+    <example os.version="6.0(.5)(6)" hw.product="TANDBERG/517" tandberg.model="517" hw.series="">TANDBERG/517 (6.0(.5)(6))</example>
+    <example os.version="2.3.1.31" hw.product="TANDBERG/517" tandberg.model="517" hw.series="RoomKit">TANDBERG/517 (2.3.1.31) RoomKit</example>
+    <example os.version="XC2.2.1-b2bua-1.0" tandberg.model="4353" hw.series="">TANDBERG/4353 (XC2.2.1-b2bua-1.0)</example>
     <param pos="0" name="os.vendor" value="Tandberg"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="2" name="tandberg.model"/>
     <param pos="3" name="os.version"/>
+    <param pos="4" name="hw.series"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="TelePresence"/>
     <param pos="0" name="hw.device" value="Video Conferencing"/>
@@ -742,4 +738,4 @@
     <param pos="0" name="hw.device" value="Router"/>
   </fingerprint>
 
-</fingerprints>
\ No newline at end of file
+</fingerprints>