Patch from Motonori Shindo, adding

 1) Shiva PAP (SPAP) and Extensible Authentication Protocol (EAP)

 2) CBCP negotiation in LCP Callback Operation Field

to the PPP dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3826 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index b98f2545cc0c26aa47051886aa597eec6eacbdb8..e255d9572cee4afbaaefd4ee8a76b757653ae93c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -755,6 +755,11 @@ Lee Berger <lberger[AT]roy.org> {
        Fix to FT_UINT_STRING handling
 }
 
+Motonori Shindo <mshindo[AT]mshindo.net> {
+       Shiva PAP, EAP, and CBCP negotiation in LCP Callback Operation
+           support in PPP dissector
+}
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 7221f9290387bcef01a8aa6842e6c7ac4de1a58d..ef627279d1120ddf8ab7fd55eabccf766979ccca 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1150,6 +1150,7 @@ B<http://www.ethereal.com>.
   Steve Dickson            <steved[AT]talarian.com>
   Markus Seehofer          <mseehofe[AT]nt.hirschmann.de>
   Lee Berger               <lberger[AT]roy.org>
+  Motonori Shindo          <mshindo[AT]mshindo.net>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.

diff --git a/packet-ppp.c b/packet-ppp.c
index 12bdcebde51c20534515e6384b16df03f845a406..4068b6ba421b076ec3954169074d162e52b9833c 100644 (file)
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
 /* packet-ppp.c
  * Routines for ppp packet disassembly
  *
- * $Id: packet-ppp.c,v 1.68 2001/06/18 02:17:50 guy Exp $
+ * $Id: packet-ppp.c,v 1.69 2001/08/05 10:09:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -122,7 +122,9 @@ static const value_string ppp_vals[] = {
        {PPP_LCP,       "Link Control Protocol" },
        {PPP_PAP,       "Password Authentication Protocol"  },
        {PPP_LQR,       "Link Quality Report protocol" },
+       {PPP_SPAP,      "Shiva Password Authentication Protocol" },
        {PPP_CHAP,      "Cryptographic Handshake Auth. Protocol" },
+       {PPP_EAP,       "Extensible Authentication Protocol" },
        {PPP_CBCP,      "Callback Control Protocol" },
        {0,             NULL            }
 };
@@ -829,6 +831,8 @@ static const value_string callback_op_vals[] = {
        {2, "Message is location identifier" },
        {3, "Message is E.164" },
        {4, "Message is distinguished name" },
+       {5, "unassinged"},
+       {6, "Location is determined during CBCP negotiation" },
        {0, NULL }
 };
 

diff --git a/ppptypes.h b/ppptypes.h
index 01a13866a13af5a943b6c1b4fe4c0b48606ab1da..e46467827b8c0f8a8b5f2032a32d9ccf67aaa10e 100644 (file)
--- a/ppptypes.h
+++ b/ppptypes.h
@@ -1,7 +1,7 @@
 /* ppptypes.h
  * Defines PPP packet types.
  *
- * $Id: ppptypes.h,v 1.8 2001/04/16 10:04:30 guy Exp $
+ * $Id: ppptypes.h,v 1.9 2001/08/05 10:09:38 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -53,7 +53,9 @@
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQR                0xc025  /* Link Quality Report protocol */
+#define PPP_SPAP       0xc027  /* Shiva Password Authentication Protocol */
 #define PPP_CHAP       0xc223  /* Cryptographic Handshake Auth. Protocol */
+#define PPP_EAP                0xc227  /* Extensible Authentication Protocol */
 #define PPP_CBCP       0xc029  /* Callback Control Protocol */
 
 #endif /* ppptypes.h */