added new VIDs

2 files changed, 48 insertions, 37 deletions

diff --git a/src/pluto/vendor.c b/src/pluto/vendor.c
index 7fd24a073..4638d1745 100644
--- a/src/pluto/vendor.c
+++ b/src/pluto/vendor.c
@@ -161,6 +161,9 @@ static struct vid_struct _vid_tab[] = {
 	{ VID_CISCO3K, VID_KEEP | VID_SUBSTRING_MATCH,
           NULL, "Cisco VPN 3000 Series" , "\x1f\x07\xf7\x0e\xaa\x65\x14\xd3\xb0\xfa\x96\x54\x2a\x50", 14},
 
+	{ VID_CISCO_IOS, VID_KEEP | VID_SUBSTRING_MATCH, 
+	  NULL, "Cisco IOS Device", "\x3e\x98\x40\x48", 4},
+
 	/*
 	 * Timestep VID seen:
 	 *   - 54494d455354455020312053475720313532302033313520322e303145303133
@@ -257,6 +260,12 @@ static struct vid_struct _vid_tab[] = {
 	
 	DEC_MD5_VID(INITIAL_CONTACT, "Vid-Initial-Contact")
 
+	/**
+	 * Cisco VPN 3000
+	 */
+	{ VID_MISC_FRAGMENTATION, VID_MD5HASH | VID_SUBSTRING_DUMPHEXA,
+	    "FRAGMENTATION", NULL, NULL, 0 },
+
 	/* -- */
 	{ 0, 0, NULL, NULL, NULL, 0 }
 
diff --git a/src/pluto/vendor.h b/src/pluto/vendor.h
index 1161b8673..29f50c7db 100644
--- a/src/pluto/vendor.h
+++ b/src/pluto/vendor.h
@@ -45,42 +45,43 @@ enum known_vendorid {
   VID_SSH_IPSEC_4_2_0		= 24,
   VID_CISCO_UNITY		= 25,
   VID_CISCO3K			= 26,
-  VID_TIMESTEP			= 27,
-  VID_SAFENET			= 28,
-  VID_MACOSX			= 29,
-  VID_OPENSWAN2			= 30,
-  VID_NCP_SERVER		= 31,
-  VID_NCP_CLIENT		= 32,
-  VID_STRONGSWAN		= 33,
-  VID_STRONGSWAN_2_2_0		= 34,
-  VID_STRONGSWAN_2_2_1		= 35,
-  VID_STRONGSWAN_2_2_2		= 36,
-  VID_STRONGSWAN_2_3_0		= 37,
-  VID_STRONGSWAN_2_3_1		= 38,
-  VID_STRONGSWAN_2_3_2		= 39,
-  VID_STRONGSWAN_2_4_0		= 40,
-  VID_STRONGSWAN_2_4_1		= 41,
-  VID_STRONGSWAN_2_4_2		= 42,
-  VID_STRONGSWAN_2_4_3		= 43,
-  VID_STRONGSWAN_2_4_4		= 44,
-  VID_STRONGSWAN_2_5_0		= 45,
-  VID_STRONGSWAN_2_5_1		= 46,
-  VID_STRONGSWAN_2_5_2		= 47,
-  VID_STRONGSWAN_2_5_3		= 48,
-  VID_STRONGSWAN_2_5_4		= 49,
-  VID_STRONGSWAN_2_5_5		= 50,
-  VID_STRONGSWAN_2_5_6		= 51,
-  VID_STRONGSWAN_2_5_7		= 52,
-  VID_STRONGSWAN_2_6_0		= 53,
-  VID_STRONGSWAN_2_6_1		= 54,
-  VID_STRONGSWAN_2_6_2		= 55,
-  VID_STRONGSWAN_2_6_3		= 56,
-  VID_STRONGSWAN_2_6_4		= 57,
-  VID_STRONGSWAN_2_7_0		= 58,
-  VID_STRONGSWAN_2_7_1		= 59,
-  VID_STRONGSWAN_2_7_2		= 60,
-  VID_STRONGSWAN_2_7_3		= 61,
-  VID_STRONGSWAN_2_8_0		= 62,
+  VID_CISCO_IOS         	= 27,
+  VID_TIMESTEP			= 28,
+  VID_SAFENET			= 29,
+  VID_MACOSX			= 30,
+  VID_OPENSWAN2			= 31,
+  VID_NCP_SERVER		= 32,
+  VID_NCP_CLIENT		= 33,
+  VID_STRONGSWAN		= 34,
+  VID_STRONGSWAN_2_2_0		= 35,
+  VID_STRONGSWAN_2_2_1		= 36,
+  VID_STRONGSWAN_2_2_2		= 37,
+  VID_STRONGSWAN_2_3_0		= 38,
+  VID_STRONGSWAN_2_3_1		= 39,
+  VID_STRONGSWAN_2_3_2		= 40,
+  VID_STRONGSWAN_2_4_0		= 41,
+  VID_STRONGSWAN_2_4_1		= 42,
+  VID_STRONGSWAN_2_4_2		= 43,
+  VID_STRONGSWAN_2_4_3		= 44,
+  VID_STRONGSWAN_2_4_4		= 45,
+  VID_STRONGSWAN_2_5_0		= 46,
+  VID_STRONGSWAN_2_5_1		= 47,
+  VID_STRONGSWAN_2_5_2		= 48,
+  VID_STRONGSWAN_2_5_3		= 49,
+  VID_STRONGSWAN_2_5_4		= 50,
+  VID_STRONGSWAN_2_5_5		= 51,
+  VID_STRONGSWAN_2_5_6		= 52,
+  VID_STRONGSWAN_2_5_7		= 53,
+  VID_STRONGSWAN_2_6_0		= 54,
+  VID_STRONGSWAN_2_6_1		= 56,
+  VID_STRONGSWAN_2_6_2		= 56,
+  VID_STRONGSWAN_2_6_3		= 57,
+  VID_STRONGSWAN_2_6_4		= 58,
+  VID_STRONGSWAN_2_7_0		= 59,
+  VID_STRONGSWAN_2_7_1		= 60,
+  VID_STRONGSWAN_2_7_2		= 61,
+  VID_STRONGSWAN_2_7_3		= 62,
+  VID_STRONGSWAN_2_8_0		= 63,
 
   VID_STRONGSWAN_4_0_0		= 70,
   VID_STRONGSWAN_4_0_1		= 71,
@@ -104,7 +105,8 @@ enum known_vendorid {
   VID_MISC_DPD			=202,
   VID_MISC_HEARTBEAT_NOTIFY	=203,
   VID_MISC_FRAGMENTATION	=204,
-  VID_INITIAL_CONTACT		=205
+  VID_INITIAL_CONTACT		=205,
+  VID_CISCO3K_FRAGMENTATION	=206
 };
 
 void init_vendorid(void);