From 079d65896bf981360a5477a09002bbdf272463cd Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Fri, 12 Jul 2013 11:04:32 -0500
Subject: [PATCH] update device types list with more known types

---
 src/mod/endpoints/mod_skinny/skinny_tables.c | 61 ++++++++++++++++----
 src/mod/endpoints/mod_skinny/skinny_tables.h |  2 +-
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index 62c97aacf5..e896245955 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -115,18 +115,59 @@ SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
 		{1, "Cisco 30 SP+"},
 		{2, "Cisco 12 SP+"},
 		{3, "Cisco 12 SP"},
-		{4, "Cisco 12"},
+		{4, "Cisco 12 S"},
 		{5, "Cisco 30 VIP"},
-		{6, "Cisco IP Phone 7910"},
-		{7, "Cisco IP Phone 7960"},
-		{8, "Cisco IP Phone 7940"},
-		{9, "Cisco IP Phone 7935"},
+		{6, "Cisco 7910"},
+		{7, "Cisco 7960"},
+		{8, "Cisco 7940"},
+		{9, "Cisco 7935"},
+		{10, "Cisco VGC Phone"},
+		{11, "Cisco VGC Virtual Phone"},
 		{12, "Cisco ATA 186"},
-		{365, "Cisco IP Phone CP-7921G"},
-		{404, "Cisco IP Phone CP-7962G"},
-		{436, "Cisco IP Phone CP-7965G"},
-		{30018, "Cisco IP Phone CP-7961G"},
-		{30019, "Cisco IP Phone 7936"},
+		{30, "Cisco Analog Access"},
+		{40, "Cisco Digital Access"},
+		{42, "Cisco Digital Access+"},
+		{43, "Cisco Digital Access WS-X6608"},
+		{47, "Cisco Analog Access WS-X6624"},
+		{51, "Cisco Conference Bridge WS-X6608"},
+		{61, "Cisco H.323 Phone"},
+		{100, "Cisco Load Simulator"},
+		{111, "Cisco Media Termination Point Hardware"},
+		{115, "Cisco 7941"},
+		{115, "Cisco CP-7941G"},
+		{119, "Cisco 7971"},
+		{120, "Cisco MGCP Station"},
+		{121, "Cisco MGCP Trunk"},
+		{124, "Cisco 7914 14-Button Line Expansion Module"},
+		{302, "Cisco 7985"},
+		{307, "Cisco 7911"},
+		{308, "Cisco 7961G-GE"},
+		{309, "Cisco 7941G-GE"},
+		{335, "Cisco Motorola CN622"},
+		{348, "Cisco 7931"},
+		{358, "Cisco Unified Personal Communicator"},
+		{365, "Cisco 7921"},
+		{369, "Cisco 7906"},
+		{375, "Cisco TelePresence"},
+		{404, "Cisco 7962"},
+		{412, "Cisco 3951"},
+		{431, "Cisco 7937"},
+		{434, "Cisco 7942"},
+		{435, "Cisco 7945"},
+		{436, "Cisco 7965"},
+		{437, "Cisco 7975"},
+		{446, "Cisco 3911"},
+		{20000, "Cisco 7905"},
+		{30002, "Cisco 7920"},
+		{30006, "Cisco 7970"},
+		{30007, "Cisco 7912"},
+		{30008, "Cisco 7902"},
+		{30018, "Cisco 7961"},
+		{30019, "Cisco 7936"},
+		{30027, "Cisco Analog Phone"},
+		{30028, "Cisco ISDN BRI Phone"},
+		{30032, "Cisco SCCP gateway virtual phone"},
+		{30035, "Cisco IP-STE"},
 		{0, NULL}
 	};
 	SKINNY_DECLARE_ID2STR(skinny_device_type2str, SKINNY_DEVICE_TYPES, "UnknownDeviceType")
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index a35e4be18d..b4b1e1bb66 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -92,7 +92,7 @@ const char *skinny_message_type2str(uint32_t id);
 uint32_t skinny_str2message_type(const char *str);
 #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
 
-extern struct skinny_table SKINNY_DEVICE_TYPES[16];
+extern struct skinny_table SKINNY_DEVICE_TYPES[75];
 const char *skinny_device_type2str(uint32_t id);
 uint32_t skinny_str2device_type(const char *str);
 #define SKINNY_PUSH_DEVICE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_DEVICE_TYPES)