aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pppoe.c
AgeCommit message (Collapse)AuthorFilesLines
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-2/+2
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-5/+5
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
2011-10-10 Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-1/+1
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-35/+35
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-17/+17
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-21/+21
svn path=/trunk/; revision=39084
2011-07-18Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.Bill Meier1-4/+0
svn path=/trunk/; revision=38095
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-05-14Fix a few usages of "" in the hfp] array 'blurb' field.Bill Meier1-20/+20
svn path=/trunk/; revision=32811
2009-11-09Decode Circuit ID and Remote ID DSL Forum TR-101 PPPoE tags.Balint Reczey1-20/+42
Based on patch from Stefan Puiu <stefan.puiu@gmail.com>. This fixes bug 3113. svn path=/trunk/; revision=30908
2009-10-25Decode DSL Forum TR-101 PPPoE tags.Balint Reczey1-5/+332
This fixes bug 3113. svn path=/trunk/; revision=30697
2009-10-18From Kip McAtee:Jaap Keuter1-7/+17
Suppress spurious packet length error message for LCP or IPCP in PPPoE. svn path=/trunk/; revision=30594
2009-08-10For TLV items that are a single integral value and thus must have aGuy Harris1-8/+21
certain length: attach the expert item to the length field if we're showing it, otherwise put in a text item for the malformed TLV and attach the expert item to that; don't give up, as we'll just skip the bad item and move on to the next item. svn path=/trunk/; revision=29373
2009-08-10Initialize a variable to keep GCC happy ....Bill Meier1-1/+1
svn path=/trunk/; revision=29372
2009-08-10Validate two tag field lengths before attempting to do proto_tree_add_item();Bill Meier1-5/+25
Fixes bug #3841. svn path=/trunk/; revision=29371
2009-08-09Don't guard col_clear with col_checkKovarththanan Rajaratnam1-8/+2
svn path=/trunk/; revision=29346
2009-08-09Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-8/+2
svn path=/trunk/; revision=29345
2009-06-21From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-39/+39
More header_field_info cleanup. From me: Don't fix the empty name for hf_nisplus_dummy. svn path=/trunk/; revision=28792
2009-06-19From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-6/+6
More header_field_info cleanup. svn path=/trunk/; revision=28772
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-5/+5
(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
2009-05-01From Reinhard Speyerer:Jaap Keuter1-1/+1
This patch fixes several misspellings/typos in Wireshark SVN revision 28201. svn path=/trunk/; revision=28220
2009-02-25Put in a comment discussing ways of better handling the FCS in variousGuy Harris1-2/+40
protocols. Clean up white space. svn path=/trunk/; revision=27542
2009-02-23From Kip McAtee (bug 3274):Stig Bjørlykke1-7/+10
Don't indicate incorrect Payload Length when having trailing FCS. svn path=/trunk/; revision=27528
2008-08-26#include <emem.h> not req'dBill Meier1-1/+0
svn path=/trunk/; revision=26091
2008-08-13From Edward J. Paradise:Jaap Keuter1-38/+141
rfc4938 defines two credit granting mechanisms, out-of-band and inband. The current decoding mechanism in packet-pppoe.c only decodes out-of-band credit grants. This patches addresses decoding of inband credit as well. In addition, I added filters for these tags in the pppoes packets. Previously, the common pppoe filters were under the pppoed filter registration, but now since there are pppoed and pppoes filters, I moved them out on their own. svn path=/trunk/; revision=26009
2008-07-19From Edward J. Paradise viaJeff Morriss1-9/+95
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2693 : The rfc4938bis draft extends the Point-to-Point over Ethernet (PPPoE) protocol with an optional credit-based flow control mechanism and an optional Link Quality Metric report. These optional extensions improve the performance of PPPoE over media with variable bandwidth and limited buffering, such as mobile point-to-point radio links. Support for rfc4938 already exists in wireshark, but rfc4938bis specifies a new credit scale factor TLV and the use of the reserved field of the PADQ to specify max and current data-rate scaling. svn path=/trunk/; revision=25768
2008-07-18From Edward J. Paradise:Jaap Keuter1-3/+3
The #defines for PADG, PADC, and PADQ are incorrect and these packets are showing up as unknown. I would be happy to fix this bug as I would like to enhance the current support for rfc4938 and rfc4938bis to include filtering and inband credit grant decoding. svn path=/trunk/; revision=25766
2008-04-16Remove (no longer needed) forward declaration of handoff functionJeff Morriss1-4/+1
svn path=/trunk/; revision=25079
2008-04-14Fix for bug 2458:Jaap Keuter1-18/+191
Adding dissection for more recent PPPoE tags. svn path=/trunk/; revision=25031
2008-02-02Fix for bug 2202, when an ethernet frame with padding is encountered, theSake Blok1-1/+1
reported length is 46, so there was a one-off error in the code. svn path=/trunk/; revision=24244
2007-10-23Apply the small performance enhancment patches for:Anders Broman1-2/+2
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster. Replace - col_append_fstr() with faster col_append_str() - col_add_str() with col_set_str() when it's safe svn path=/trunk/; revision=23252
2007-09-02tvb_reported_length() returns a gint, so assign its value to a gint.Guy Harris1-1/+2
svn path=/trunk/; revision=22773
2007-09-02The actual length of the PPPoE payload is returned byGuy Harris1-9/+27
tvb_reported_length_remaining(), not by tvb_length_remaining() - tvb_length_remaining() shows only the amount of *captured* data remaining, but the capture might have been done with a snapshot length that cut the packet data short. The payload length from the PPPoE header could legitimately be different from the actual length of the PPPoE payload if there's not enough PPPoE payload to avoid padding at the E(thernet) level. Only complain if there shouldn't have been any padding. Report an "expert" warning if the payload length looks wrong. Update a comment to reflect current reality (as of many many years ago, when we went all-tvbuff). svn path=/trunk/; revision=22770
2007-08-15- s/ntohs/g_ntohsJeff Morriss1-5/+5
- s/ntohl/g_ntohl - s/free/g_free - Change some tvb_get_string()+g_free()'s into tvb_get_ephemeral_string() - Change some tvb_fake_unicode()+g_free()'s into tvb_get_ephemeral_faked_unicode() - Change some tvb_get_string() calls that were clearly memory leaks (like atoi(tvb_get_string(...))) into tvb_get_ephemeral_string() svn path=/trunk/; revision=22515
2006-12-22Report inaccurate PPPoE Session payload length when detected to aid in theStephen Fisher1-12/+16
troubleshooting of malformed packets. svn path=/trunk/; revision=20203
2006-05-21change a whole bunch of ethereal into wiresharkRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18196
2005-12-07From Martin M various updates and fixesRonnie Sahlberg1-2/+5
Hi, Some tiddly changes: pppoe- don't create an empty discovery tags tree when the payload length is 0 chap- make chap.value work as a filterable field rtcp- append the packet type to the protocol tree name  svn path=/trunk/; revision=16712
2005-11-28Don't show the tag twice.Guy Harris1-2/+5
svn path=/trunk/; revision=16612
2005-11-28Host-Uniq is binary, not text.Guy Harris1-3/+3
FT_BYTES items don't have a base - the bytes are always dumped in hex - so use BASE_NONE with them. svn path=/trunk/; revision=16611
2005-11-25From Martin Mathieson:Anders Broman1-140/+321
Here is a patch to the PPPoED and PPPoES dissectors. - All fields are now filterable - General prettification - I've added a preference to PPoED to set whether or not tag values and data lengths should be shown in the tree (default is OFF) svn path=/trunk/; revision=16582
2005-09-28Have show_exception() take a "const char *" as its exception message,Guy Harris1-0/+1
and not free the string to which it points. Pass to REPORT_DISSECTOR_BUG() strings allocated with ep_strdup_printf(), so that they're freed automatically. svn path=/trunk/; revision=16039
2005-09-17Move a pile of protocol-related headers from the top-level sourceGuy Harris1-1/+1
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-06-26Get rid of the private "my_match_strval()" routine in many dissectors;Guy Harris1-2/+2
add a "match_strval_idx()" routine that does the same thing, and have "match_strval()" call it. Make those routines, and "val_to_str()", return a "const" pointer. Update dissectors as necessary to squelch compiler warnings produced by that. Use "val_to_str()" rather than using "match_strval()" and then, if the result is null, substituting a specific string. Clean up some other "match_strval()"/"val_to_str()" usages. Add a null pointer check in the NDPS dissector's "attribute_value()" routine, as it's not clear that "global_attribute_name" won't be null at that point. Make some global variables in the AFS4INT dissector local. Make some routines not used outside the module they're in static. Make some tables "static const". Clean up white space. Fix Gerald's address in some files. svn path=/trunk/; revision=14786
2005-06-10just to get things straight: a dissector should *never* do any g_assert() calls!Ulf Lamping1-2/+2
in a simple approach, I've replaced all g_assert() and g_assert_not_reached() calls by their exception throwing counterparts DISSECTOR_ASSERT() and DISSECTOR_ASSERT_NOT_REACHED() this will replace application crash by showing a dissector bug, which is the desired behaviour there were some g_assert calls in the protocol registering functions, which might not be acting as expected now, but to be able to simply search for g_assert in the future I've replaced that calls too one g_assert remained, the one when someone throws an unknown exception "into" packet_frame.c, but IMHO this one should remain. svn path=/trunk/; revision=14608
2004-07-18Move dissectors to epan/dissectors directory.Gilbert Ramirez1-0/+309
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