From Hannes Gredler:

support for support for DLT_JUNIPER_MLPPP

svn path=/trunk/; revision=14994
This commit is contained in:
Anders Broman 2005-07-22 15:55:06 +00:00
parent 5800e255ef
commit bd12fbef7f
3 changed files with 7 additions and 3 deletions

View File

@ -307,9 +307,9 @@ static const struct {
{ 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */ { 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */
{ 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */ { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */
{ 129, WTAP_ENCAP_ARCNET_LINUX }, { 129, WTAP_ENCAP_ARCNET_LINUX },
{ 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */
/* /*
* Values 130 through 137 not listed here are reserved for use * Values 131-134, 136 not listed here are reserved for use
* in Juniper hardware. * in Juniper hardware.
*/ */
{ 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */ { 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */

View File

@ -300,6 +300,9 @@ static const struct encap_type_info {
/* WTAP_ENCAP_NETTL_X25 */ /* WTAP_ENCAP_NETTL_X25 */
{ "X25 with nettl headers", "x25-nettl" }, { "X25 with nettl headers", "x25-nettl" },
/* WTAP_ENCAP_JUNIPER_MLPPP */
{ "Juniper MLPPP", "juniper-mlppp" },
}; };
/* Name that should be somewhat descriptive. */ /* Name that should be somewhat descriptive. */

View File

@ -170,8 +170,9 @@
#define WTAP_GCOM_SERIAL 79 #define WTAP_GCOM_SERIAL 79
#define WTAP_ENCAP_NETTL_X25 80 #define WTAP_ENCAP_NETTL_X25 80
#define WTAP_ENCAP_K12 81 #define WTAP_ENCAP_K12 81
#define WTAP_ENCAP_JUNIPER_MLPPP 82
/* last WTAP_ENCAP_ value + 1 */ /* last WTAP_ENCAP_ value + 1 */
#define WTAP_NUM_ENCAP_TYPES 82 #define WTAP_NUM_ENCAP_TYPES 83
/* File types that can be read by wiretap. /* File types that can be read by wiretap.
We support writing some many of these file types, too, so we We support writing some many of these file types, too, so we