From Deepak Jain: L2TP v3 (draft 15) support.

Add VENDOR_IETF to <epan/sminmpec.h>, and add an entry for it to
sminmpec_values[], so that the L2TP dissector can use them rather than
defining its own copy of the private enterprise number values and table
- and make it do so.

svn path=/trunk/; revision=12999

AUTHORS

@@ -2273,6 +2273,10 @@ Mike Duigou		<bondolo [AT] jxta.org> {
 	Dissector for JXTA protocol
 }
 
+Deepak Jain		<jain1971 [AT] yahoo.com> {
+	L2TP v3 support
+}
+
 And assorted fixes and enhancements by the people listed above
 and by:
 

epan/sminmpec.c

@@ -40,14 +40,14 @@
  *	VENDOR          Cisco           9
  */
 const value_string sminmpec_values[] = {
-  {0,				"None"},
+  {VENDOR_IETF,			"IETF (reserved)"},
   {VENDOR_ACC,			"ACC"},
   {VENDOR_CISCO,		"Cisco"},
   {VENDOR_HEWLETT_PACKARD,	"Hewlett Packard"},
   {VENDOR_SUN_MICROSYSTEMS,	"Sun Microsystems"},
-  {VENDOR_MERIT,			"Merit"},
-  {VENDOR_SHIVA,			"Shiva"},
-  {VENDOR_ERICSSON,			"Ericsson AB"},
+  {VENDOR_MERIT,		"Merit"},
+  {VENDOR_SHIVA,		"Shiva"},
+  {VENDOR_ERICSSON,		"Ericsson AB"},
   {VENDOR_CISCO_VPN5000,	"Cisco VPN 5000"},
   {VENDOR_LIVINGSTON,		"Livingston"},
   {VENDOR_MICROSOFT,		"Microsoft"},

epan/sminmpec.h

@@ -33,6 +33,7 @@
  *
  * for a list.
  */
+#define VENDOR_IETF			0	/* reserved - used by the IETF in L2TP? */
 #define VENDOR_ACC			5
 #define VENDOR_CISCO			9
 #define VENDOR_HEWLETT_PACKARD		11
@@ -40,7 +41,7 @@
 #define VENDOR_MERIT			61
 #define VENDOR_SHIVA			166
 #define VENDOR_ERICSSON			193
-#define VENDOR_CISCO_VPN5000	255
+#define VENDOR_CISCO_VPN5000		255
 #define VENDOR_LIVINGSTON		307
 #define VENDOR_MICROSOFT		311
 #define VENDOR_3COM			429