aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gre.c
AgeCommit message (Collapse)AuthorFilesLines
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-17General Cleanup including:Bill Meier1-495/+532
- Remove unneeded #include <stdlib.h>; - Remove "README.developer" comments; - Reformat hf[] entries; - Remove unneeded variable initialization; - "localize" some variables; - Whitespace/indentation/long lines/formatting - (In one case) proto_tree_add_uint returns a proto_item* (not a proto_tree *); svn path=/trunk/; revision=42678
2011-11-29ArubaOS 6.x use a new GRE ID (0x9000) for communication between controller ↵Alexis La Goutte1-0/+1
and AP Add this new ID in GRE dissector The frame with the new GRE ID is not 802.11 frame such as 80XX GRE ID but a 802.3 frame with curious ethertype (8211 the same id with PAPI Protocol...) svn path=/trunk/; revision=40039
2011-11-08Improve ICMP conversation tracking, especially when capturing on multiple ↵Chris Maynard1-0/+1
interfaces and one of them is a GRE tunnel. Resolves bug 5770, which was reopened. svn path=/trunk/; revision=39757
2011-10-16Do some conversions of proto_tree_add_item() 'encoding' arg.Bill Meier1-1/+1
(previously missed). 57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN 31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN 10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA 1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA 21 FT_BYTES: FALSE-->ENC_NA 2 FT_BYTES: TRUE-->ENC_NA 2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA 6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA 1 FT_IPv6: FALSE-->ENC_NA 6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA 19 FT_NONE: FALSE-->ENC_NA 3 FT_NONE: TRUE-->ENC_NA 1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA 1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA 5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA 1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA 4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA 8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA 1 FT_INT32: FALSE-->ENC_BIG_ENDIAN 1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN 11 FT_UINT8: 0-->ENC_BIG_ENDIAN 111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN 17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT16: 0-->ENC_BIG_ENDIAN 68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN 18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN 70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN svn path=/trunk/; revision=39442
2011-10-10 Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-11/+11
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
2011-10-06Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-21/+21
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-5/+5
reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN svn path=/trunk/; revision=39260
2011-09-21(Trivial) Remove trailing whitespace from lines for a few files.Bill Meier1-33/+33
svn path=/trunk/; revision=39084
2011-07-09Per README.developer, we must call subdissectors regardless of whether "tree"Chris Maynard1-1/+7
is NULL or not. With this change, GRE-encapsulated packets (such as IP) should now appear in then endpoint and conversation lists. This was essentially the request made at Sharkfest '11. The actual request was for a "GRE" tab to be added, but that doesn't really make much sense to me. I believe this change should fulfill that request. svn path=/trunk/; revision=37945
2011-05-06 VALS(& -> VALS(Anders Broman1-1/+1
svn path=/trunk/; revision=37009
2011-04-17Using the routing subtree (Miss in my last patch)Alexis La Goutte1-5/+5
Fix a typo error (shoubl => should) svn path=/trunk/; revision=36674
2011-01-21Adress => Address corrections (also in comments).Sake Blok1-1/+1
(see bug 5600) svn path=/trunk/; revision=35600
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-2/+2
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-10-19From Alexis La Goutte:Anders Broman1-255/+354
GRE Enhancements https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5314 svn path=/trunk/; revision=34573
2010-09-23Jason Masker <jason at masker.net>:Jörg Mayer1-1/+2
Updates for the Cisco ERSPAN type III (version 2) protocol. svn path=/trunk/; revision=34209
2009-08-16Switch a bunch of dissectors over to using tvb_new_subset_remaining()Kovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29446
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-2/+1
svn path=/trunk/; revision=29340
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-7/+7
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2008-12-10From Alexis La Goutte:Jaap Keuter1-1/+25
I do not know if I have to reopen this ticket or create a new ticket. But with last SVN, when i dissector Aruba GRE, i get In GRE line, it is find to unknown protocol (0x8200 - unknown) We need to create a new patch to not show "unknown". svn path=/trunk/; revision=26962
2007-12-16For captures on a Linux GRE interface, put a field into the protocolGuy Harris1-4/+5
tree with the GRE protocol type value. svn path=/trunk/; revision=23894
2007-04-14Beginnings of a Cisco ERSPAN dissector - the only thing missing is the codeJörg Mayer1-0/+1
to actually call this (aka to handle the ambiguities of DLT values). svn path=/trunk/; revision=21427
2006-05-21change a whole bunch of ethereal into wiresharkRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18196
2006-03-29sccp - fix a typoAnders Broman1-12/+36
gre - fix a length error, and change the way to display 3GPP atributes. svn path=/trunk/; revision=17757
2006-03-27From Ravi Valmikam:Anders Broman1-26/+73
a minor fix for 3GPP2 A11 Session Updat From me: a fix to packet-ppp.c to dissect the payload and some changes in the gre dissector to display the 3GPP values. svn path=/trunk/; revision=17733
2006-03-24From Ravi ValmikamAnders Broman1-0/+90
1. Decode A11 Session Update message 2. Decode A10 3GPP2 (GRE Payload Type 0x88D2) packets with the following attributes - Flow Control - Segmentation - SDI Indicator - Flow Discriminator svn path=/trunk/; revision=17717
2005-12-09From: Deepak JainAnders Broman1-8/+9
changes/addition to support decode for Next Hop Resolution Protocol svn path=/trunk/; revision=16744
2005-09-17Move a pile of protocol-related headers from the top-level sourceGuy Harris1-3/+3
directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-07-08checksum messages: use "[correct]" instead of "(correct)" and other "alike" ↵Ulf Lamping1-2/+2
messages svn path=/trunk/; revision=14880
2005-04-14From packetsteve :Ronnie Sahlberg1-1/+1
CDMA2000 A10 uses a 4 byte gre key svn path=/trunk/; revision=14076
2004-12-12Dissect PPP messages of ethertype 0x8881Anders Broman1-0/+5
svn path=/trunk/; revision=12730
2004-12-01Fix a typo.Guy Harris1-1/+1
svn path=/trunk/; revision=12644
2004-12-01Add some ethertypesAnders Broman1-1/+2
svn path=/trunk/; revision=12643
2004-09-29Move various tables into the epan directory.Guy Harris1-1/+1
svn path=/trunk/; revision=12130
2004-09-28Move various checksum routines and headers to epan.Guy Harris1-1/+1
svn path=/trunk/; revision=12117
2004-09-25From packet steve: label the GRE key as "GRE Key", so thatGuy Harris1-1/+1
post-processing scripts can more easily distinguish it from other keys. svn path=/trunk/; revision=12096
2004-09-23From packet steve: add a filterable field for the GRE key.Guy Harris1-4/+7
svn path=/trunk/; revision=12069
2004-07-18Move dissectors to epan/dissectors directory.Gilbert Ramirez1-0/+388
Also move ncp222.py, x11-fields, process-x11-fields.pl, make-reg-dotc, and make-reg-dotc.py. Adjust #include lines in files that include packet-*.h files. svn path=/trunk/; revision=11410