diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-04-14 09:29:23 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-04-14 09:29:23 +0000 |
| commit | 7cac2e619ccdd4560764c60409a03fe29a588e08 (patch) | |
| tree | 1167c6d6ba565c793563930edd02f738bf13db65 | |
| parent | a5863ec066cc91e790bf839b3eb40eff451d80fd (diff) | |
From packetsteve :
CDMA2000 A10 uses a 4 byte gre key
svn path=/trunk/; revision=14076
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gre.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -2431,6 +2431,8 @@ Anton Ivanov <anthony_johnson [AT] mail.ru> Ilya Konstantinov <future [AT] shiny.co.il> Neil Kettle <njk4 [AT] kent.ac.uk> Steve Karg <skarg [AT] users.sourceforge.net> +Steve Packet <packetsteve [AT] hotmail.com> + 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/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index def1e5c29e..0c6baa5a68 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -197,7 +197,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (flags_and_ver & GH_B_K) { - if (is_ppp) { + if (is_ppp && type!=ETHERTYPE_CDMA2000_A10_UBS) { if (tree) { proto_tree_add_text(gre_tree, tvb, offset, 2, "Payload length: %u", tvb_get_ntohs(tvb, offset)); |