From shivesh83@gmail.com:

Enhancement to dissect EAP/AKA'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4426
I also updated some PPP and EAP numbers.

svn path=/trunk/; revision=31704

1 files changed, 66 insertions, 62 deletions

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 948372466b..7887030f5a 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -258,31 +258,32 @@ const value_string ppp_vals[] = {
 	{PPP_ROHC_LCID,	"ROHC large-CID" },
 	{PPP_IP,        "IP"             },
 	{PPP_OSI,       "OSI"            },
-	{PPP_DEC4,	"DECnet Phase IV" },
+	{PPP_DEC4,      "DECnet Phase IV" },
 	{PPP_AT,        "Appletalk"      },
 	{PPP_IPX,       "Netware IPX/SPX"},
 	{PPP_VJC_COMP,	"VJ compressed TCP"},
 	{PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
 	{PPP_BCP,       "Bridging Control Protocol"},
-	{PPP_ST,	"Stream Protocol (ST-II)" },
+	{PPP_ST,        "Stream Protocol (ST-II)" },
 	{PPP_VINES,     "Vines"          },
 	{PPP_AT_EDDP,	"AppleTalk EDDP" },
-	{PPP_AT_SB,	"AppleTalk SmartBuffered" },
-	{PPP_MP,	"Multilink"},
-	{PPP_NB,	"NETBIOS Framing" },
-	{PPP_CISCO,	"Cisco Systems" },
-	{PPP_ASCOM,	"Ascom Timeplex" },
-	{PPP_LBLB,	"Fujitsu Link Backup and Load Balancing" },
-	{PPP_RL,	"DCA Remote Lan" },
-	{PPP_SDTP,	"Serial Data Transport Protocol" },
-	{PPP_LLC,	"SNA over LLC" },
-	{PPP_SNA,	"SNA" },
+	{PPP_AT_SB,	    "AppleTalk SmartBuffered" },
+	{PPP_MP,	    "Multilink"},
+	{PPP_NB,	    "NETBIOS Framing" },
+	{PPP_CISCO,	    "Cisco Systems" },
+	{PPP_ASCOM,	    "Ascom Timeplex" },
+	{PPP_LBLB,	    "Fujitsu Link Backup and Load Balancing" },
+	{PPP_RL,	    "DCA Remote Lan" },
+	{PPP_SDTP,	    "Serial Data Transport Protocol" },
+	{PPP_LLC,	    "SNA over LLC" },
+	{PPP_SNA,	    "SNA" },
 	{PPP_IPV6HC,	"IPv6 Header Compression " },
-	{PPP_KNX,	"KNX Bridging Data" },
+	{PPP_KNX,	    "KNX Bridging Data" },
 	{PPP_ENCRYPT,	"Encryption" },
-	{PPP_ILE,	"Individual Link Encryption" },
+	{PPP_ILE,	    "Individual Link Encryption" },
 	{PPP_IPV6,      "IPv6"           },
-        {PPP_MUX,       "PPP Multiplexing"},
+    {PPP_MUX,       "PPP Multiplexing"},
+    {PPP_VSNP,      "Vendor-Specific Network Protocol"},
 	{PPP_RTP_FH,	"RTP IPHC Full Header" },
 	{PPP_RTP_CTCP,	"RTP IPHC Compressed TCP" },
 	{PPP_RTP_CNTCP,	"RTP IPHC Compressed Non TCP" },
@@ -292,88 +293,91 @@ const value_string ppp_vals[] = {
 	{PPP_MPPLUS,	"MP+ Protocol" },
 	{PPP_NTCITS_IPI,"NTCITS IPI" },
 	{PPP_ML_SLCOMP,	"single link compression in multilink" },
-	{PPP_COMP,	"compressed packet" },
+	{PPP_COMP,	    "compressed packet" },
 	{PPP_STP_HELLO,	"802.1D Hello Packet" },
 	{PPP_IBM_SR,	"IBM Source Routing BPDU" },
 	{PPP_DEC_LB,	"DEC LANBridge100 Spanning Tree"},
 	{PPP_CDP,       "Cisco Discovery Protocol" },
-	{PPP_NETCS,	"Netcs Twin Routing" },
+	{PPP_NETCS,     "Netcs Twin Routing" },
 	{PPP_STP,       "Scheduled Transfer Protocol" },
 	{PPP_EDP,       "Extreme Discovery Protocol" },
-	{PPP_OSCP,	"Optical Supervisory Channel Protocol" },
-	{PPP_OSCP2,	"Optical Supervisory Channel Protocol" },
+	{PPP_OSCP,	    "Optical Supervisory Channel Protocol" },
+	{PPP_OSCP2,	    "Optical Supervisory Channel Protocol" },
 	{PPP_LUXCOM,	"Luxcom" },
-	{PPP_SIGMA,	"Sigma Network Systems" },
-	{PPP_ACSP,	"Apple Client Server Protocol" },
+	{PPP_SIGMA,     "Sigma Network Systems" },
+	{PPP_ACSP,      "Apple Client Server Protocol" },
 	{PPP_MPLS_UNI,  "MPLS Unicast"},
 	{PPP_MPLS_MULTI, "MPLS Multicast"},
 	{PPP_P12844,	"IEEE p1284.4 standard - data packets" },
-	{PPP_ETSI,	"ETSI TETRA Networks Protocol Type 1" },
-	{PPP_MFTP,	"Multichannel Flow Treatment Protocol" },
+	{PPP_ETSI,      "ETSI TETRA Networks Protocol Type 1" },
+	{PPP_MFTP,      "Multichannel Flow Treatment Protocol" },
 	{PPP_RTP_CTCPND,"RTP IPHC Compressed TCP No Delta" },
 	{PPP_RTP_CS,	"RTP IPHC Context State" },
 	{PPP_RTP_CUDP16,"RTP IPHC Compressed UDP 16" },
 	{PPP_RTP_CRDP16,"RTP IPHC Compressed RTP 16" },
-	{PPP_CCCP,	"Cray Communications Control Protocol" },
+	{PPP_CCCP,		"Cray Communications Control Protocol" },
 	{PPP_CDPD_MNRP,	"CDPD Mobile Network Registration Protocol" },
 	{PPP_EXPANDAP,	"Expand accelerator protocol" },
 	{PPP_ODSICP,	"ODSICP NCP" },
 	{PPP_DOCSIS,	"DOCSIS DLL" },
-	{PPP_LZS,	"Stacker LZS" },
+	{PPP_LZS,		"Stacker LZS" },
 	{PPP_REFTEK,	"RefTek Protocol" },
-	{PPP_FC,	"Fibre Channel" },
-	{PPP_EMIT,	"EMIT Protocols" },
-	{PPP_IPCP,	"IP Control Protocol" },
+	{PPP_FC,		"Fibre Channel" },
+	{PPP_EMIT,		"EMIT Protocols" },
+	{PPP_VSP,		"Vendor-Specific Protocol" },
+	{PPP_IPCP,		"IP Control Protocol" },
 	{PPP_OSICP,     "OSI Control Protocol" },
 	{PPP_XNSIDPCP,	"Xerox NS IDP Control Protocol" },
 	{PPP_DECNETCP,	"DECnet Phase IV Control Protocol" },
-	{PPP_ATCP,	"AppleTalk Control Protocol" },
-	{PPP_IPXCP,	"IPX Control Protocol" },
+	{PPP_ATCP,		"AppleTalk Control Protocol" },
+	{PPP_IPXCP,		"IPX Control Protocol" },
 	{PPP_BRIDGENCP,	"Bridging NCP" },
-	{PPP_SPCP,	"Stream Protocol Control Protocol" },
-	{PPP_BVCP,	"Banyan Vines Control Protocol" },
-	{PPP_MLCP,	"Multi-Link Control Protocol" },
-	{PPP_NBCP,	"NETBIOS Framing Control Protocol" },
+	{PPP_SPCP,		"Stream Protocol Control Protocol" },
+	{PPP_BVCP,		"Banyan Vines Control Protocol" },
+	{PPP_MLCP,		"Multi-Link Control Protocol" },
+	{PPP_NBCP,		"NETBIOS Framing Control Protocol" },
 	{PPP_CISCOCP,	"Cisco Systems Control Protocol" },
 	{PPP_ASCOMCP,	"Ascom Timeplex" },
 	{PPP_LBLBCP,	"Fujitsu LBLB Control Protocol" },
-	{PPP_RLNCP,	"DCA Remote Lan Network Control Protocol" },
-	{PPP_SDCP,	"Serial Data Control Protocol" },
-	{PPP_LLCCP,	"SNA over LLC Control Protocol" },
-	{PPP_SNACP,	"SNA Control Protocol" },
-	{PPP_KNXCP,	"KNX Bridging Control Protocol" },
-	{PPP_ECP,	"Encryption Control Protocol" },
-	{PPP_ILECP,	"Individual Encryption Control Protocol" },
+	{PPP_RLNCP,		"DCA Remote Lan Network Control Protocol" },
+	{PPP_SDCP,		"Serial Data Control Protocol" },
+	{PPP_LLCCP,		"SNA over LLC Control Protocol" },
+	{PPP_SNACP,		"SNA Control Protocol" },
+	{PPP_KNXCP,		"KNX Bridging Control Protocol" },
+	{PPP_ECP,		"Encryption Control Protocol" },
+	{PPP_ILECP,		"Individual Encryption Control Protocol" },
 	{PPP_IPV6CP,	"IPv6 Control Protocol" },
 	{PPP_MUXCP,     "PPPMux Control Protocol"},
+	{PPP_VSNCP,     "Vendor-Specific Network Control Protocol"},
 	{PPP_STAMPEDECP,"Stampede Bridging Control Protocol" },
-	{PPP_MPPCP,	"MP+ Control Protocol" },
-	{PPP_IPICP,	"NTCITS IPI Control Protocol" },
-	{PPP_SLCC,	"single link compression in multilink control" },
-	{PPP_CCP,	"Compression Control Protocol" },
-	{PPP_CDPCP,	"CDP Control Protocol" },
+	{PPP_MPPCP,		"MP+ Control Protocol" },
+	{PPP_IPICP,		"NTCITS IPI Control Protocol" },
+	{PPP_SLCC,		"single link compression in multilink control" },
+	{PPP_CCP,		"Compression Control Protocol" },
+	{PPP_CDPCP,		"CDP Control Protocol" },
 	{PPP_NETCSCP,	"Netcs Twin Routing" },
-	{PPP_STPCP,	"STP - Control Protocol" },
-	{PPP_EDPCP,	"EDP Control Protocol" },
-	{PPP_ACSPC,	"Apple Client Server Protocol Control" },
+	{PPP_STPCP,		"STP - Control Protocol" },
+	{PPP_EDPCP,     "EDP Control Protocol" },
+	{PPP_ACSPC,     "Apple Client Server Protocol Control" },
 	{PPP_MPLSCP,	"MPLS Control Protocol" },
 	{PPP_P12844CP,	"IEEE p1284.4 standard - Protocol Control" },
 	{PPP_ETSICP,	"ETSI TETRA TNP1 Control Protocol" },
 	{PPP_MFTPCP,	"Multichannel Flow Treatment Protocol" },
-	{PPP_LCP,	"Link Control Protocol" },
-	{PPP_PAP,	"Password Authentication Protocol"  },
-	{PPP_LQR,	"Link Quality Report protocol" },
-	{PPP_SPAP,	"Shiva Password Authentication Protocol" },
-	{PPP_CBCP,	"Callback Control Protocol" },
-	{PPP_BACP,	"Bandwidth Allocation Control Protocol" },
-	{PPP_BAP,	"Bandwidth Allocation Protocol" },
+	{PPP_LCP,		"Link Control Protocol" },
+	{PPP_PAP,		"Password Authentication Protocol"  },
+	{PPP_LQR,		"Link Quality Report protocol" },
+	{PPP_SPAP,		"Shiva Password Authentication Protocol" },
+	{PPP_CBCP,		"Callback Control Protocol" },
+	{PPP_BACP,		"Bandwidth Allocation Control Protocol" },
+	{PPP_BAP,		"Bandwidth Allocation Protocol" },
+	{PPP_VSAP,		"Vendor-Specific Authentication Protocol" },
 	{PPP_CONTCP,	"Container Control Protocol" },
-	{PPP_CHAP,	"Challenge Handshake Authentication Protocol" },
-	{PPP_RSAAP,	"RSA Authentication Protocol" },
-	{PPP_EAP,	"Extensible Authentication Protocol" },
-	{PPP_SIEP,	"Mitsubishi Security Information Exchange Protocol"},
-	{PPP_SBAP,	"Stampede Bridging Authorization Protocol" },
-	{PPP_PRPAP,	"Proprietary Authentication Protocol" },
+	{PPP_CHAP,		"Challenge Handshake Authentication Protocol" },
+	{PPP_RSAAP,		"RSA Authentication Protocol" },
+	{PPP_EAP,		"Extensible Authentication Protocol" },
+	{PPP_SIEP,		"Mitsubishi Security Information Exchange Protocol"},
+	{PPP_SBAP,		"Stampede Bridging Authorization Protocol" },
+	{PPP_PRPAP,		"Proprietary Authentication Protocol" },
 	{PPP_PRPAP2,	"Proprietary Authentication Protocol" },
 	{PPP_PRPNIAP,	"Proprietary Node ID Authentication Protocol" },
 	{0,             NULL            }