diff options
| author | Evan Huus <eapache@gmail.com> | 2013-03-23 02:42:12 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-03-23 02:42:12 +0000 |
| commit | b8ae49755d03fd5652bc7414c8ffb4179636e453 (patch) | |
| tree | ff6ee28c298424a52392cc69067a1a86e146be3b /wiretap | |
| parent | 3850405411122077669b54180ade2b70a4dc5b8a (diff) | |
| download | wireshark-b8ae49755d03fd5652bc7414c8ffb4179636e453.tar.gz | |
From Prafulla Harpanhalli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8513
Add support for encapsulation 136, Juniper service PIC cookie.
svn path=/trunk/; revision=48494
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 12f3423225..435d4f561a 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -235,10 +235,11 @@ static const struct { { 131, WTAP_ENCAP_JUNIPER_MLFR }, /* Juniper MLFR (FRF.15) on ML-, LS-, AS- PICs */ { 133, WTAP_ENCAP_JUNIPER_GGSN}, /* - * Values 132-134, 136 not listed here are reserved for use + * Values 132 and 134 not listed here are reserved for use * in Juniper hardware. */ { 135, WTAP_ENCAP_JUNIPER_ATM2 }, /* various encapsulations captured on the ATM2 PIC */ + { 136, WTAP_ENCAP_JUNIPER_SVCS }, /* various encapsulations captured on the services PIC */ { 137, WTAP_ENCAP_JUNIPER_ATM1 }, /* various encapsulations captured on the ATM1 PIC */ { 138, WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 }, diff --git a/wiretap/wtap.h b/wiretap/wtap.h index a52e6a5e03..d55b53503e 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -242,6 +242,7 @@ extern "C" { #define WTAP_ENCAP_AX25 149 #define WTAP_ENCAP_SCTP 150 #define WTAP_ENCAP_INFINIBAND 151 +#define WTAP_ENCAP_JUNIPER_SVCS 152 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |