Commit Graph

52 Commits

Author SHA1 Message Date
Bill Meier c0e92cbc04 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27065
2008-12-20 00:09:02 +00:00
Bill Meier 33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Guy Harris 33c1d1206e The PPP protocol type of 0031 is for the PPP Bridging Control Protocol;
it's not the "Bridge Control Protocol", and the packets aren't "BPDU"s
in the sense of Spanning Tree Protocol packets.

svn path=/trunk/; revision=25732
2008-07-13 19:04:53 +00:00
Guy Harris 2509b0e0c9 Dissect the PPP Bridge Control Protocol header. Hand Ethernet packets
to the "no FCS" dissector if the "FCS present" flag isn't set.  Strip
off padding.  Don't hand non-Ethernet packets to the Ethernet dissector.

Update the RFC number for the PPP Multilink protocol.  Add a preference
for short sequence numbers.  Check only the "first fragment" and "last
fragment" flags when constructing the summary description for the flags
field.  Use the global "tfs_yes_no" true_false_string structure rather
than defining our own "Yes"/"No" true_false_string structure.

svn path=/trunk/; revision=25729
2008-07-13 17:11:02 +00:00
Martin Mathieson 38d450159f Only show direction field when its set to a valid value.
svn path=/trunk/; revision=23498
2007-11-19 19:04:19 +00:00
Martin Mathieson 970854aa6d Add ppp.direction field.
svn path=/trunk/; revision=23481
2007-11-17 22:08:27 +00:00
Gerald Combs c2d537141a Fix a buffer overflow in the PPP dissector. Try to fix uninitialized
variable warnings turned up by Valgrind.

svn path=/trunk/; revision=23475
2007-11-16 23:56:18 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- 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-10-23 05:50:00 +00:00
Stephen Fisher 4d185950d7 From Donald White:
A partial RFC 2508 dissector for packet-ppp.c


svn path=/trunk/; revision=21304
2007-04-02 23:45:38 +00:00
Anders Broman c16a3fa90a From Donald White:
An enhancement to the PPP multiplexing protocol 
dissector in protocol-ppp.c.  There are two changes:

     The protocol id field of the multiplexed sub-frame is added
     to the protocol tree using a header field.  This allows
     filters to select the protocol as is the case when it is not
     multiplexed.  I think this fixes a small bug as the ability to
     filter for a protocol should not depend on the lower level
     protocol.

     When the protocol id of the subframe is not present, the
     appropriate default protocol is displayed with the standard
     indication that Wireshark generated the value.

svn path=/trunk/; revision=19488
2006-10-11 06:11:54 +00:00
Jaap Keuter 6f7f25b8d5 From Donald White:
First, the length of the header of a sub-frame may be miscalculated if
if the PID field is not present, but was present in a previous
sub-frame.  The calculation of the header length will use the value from
the previous sub-frame.

Second, correct the typo "ength" to "length".

Third, the length of the current sub-frame was not passed as the
reported length to a sub-dissector.  When the sub-dissector calls
tvb_reported_length(), the function returns the length of the complete
frame and not the length of the sub-frame to be dissected.

svn path=/trunk/; revision=19132
2006-09-04 14:12:26 +00:00
Jörg Mayer 79221e2d94 Donald White <donald_white@qwest.net>
There is a small bug in the function dissect_ppp() which prevents proper
demuxing of packets.  Patch is attached.



svn path=/trunk/; revision=19061
2006-08-28 16:55:03 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Anders Broman f4ef555b75 From Ravi Valmikam:
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-27 16:23:00 +00:00
Ronnie Sahlberg 5ddde8e4fe from kirby files
ppp/bpdu update


svn path=/trunk/; revision=17367
2006-02-22 08:39:06 +00:00
Jörg Mayer 1900bf87fc done:
packet-ntp.c: Rather confused and incorrect use of g_snprintf return value
packet-pim.c: whitespace change
packet-icmpv6.c: g_snprintf takes trailing \0 into account, fix off by 1 error
packet-clnp.c: Fix incorrect use of g_snprintf return value
packet-isakmp.c: g_snprintf takes trailing \0 into account
packet-tr.c: Fix incorrect use of g_snprintf return value
packet-radius.c: Fix incorrect use of g_snprintf return value
packet-radius.h: constify a string variable
packet-ldap.c: The return value isn't needed, so don't use it incorrectly
packet-tcp.c: Fix incorrect use of g_snprintf return value
packet-windows-common.c: Remove unneeded DISSECTOR_ASSERT
packet-smb-sidsnooping.c: g_snprintf takes trailing \0 into account
packet-pvfs2.c: g_snprintf takes trailing \0 into account
packet-ptp.c: Remove #include snprintf
packet-ppp.c: Fix incorrect use of g_snprintf return value
packet-ospf.c: Fix incorrect use of g_snprintf return value
packet-mip6.c: snprintf -> g_snprintf
packet-bootp.c: Remove a commented out bad use of g_snprintf
packet-ber.c: snprintf -> g_snprintf, g_snprintf takes trailing \0 into account

2do:

     52 packet-ieee80211.c: 2DO
      2 packet-nfs.c: 2DO - too many side effects
     33 packet-bgp.c: 2DO
     18 packet-dns.c: 2DO
     14 packet-dcm.c: 2DO
     13 packet-x11.c: 2DO
     11 packet-kerberos.c: 2DO
     10 packet-diameter.c: 2DO
      9 packet-snmp.c: 2DO
      9 packet-pgm.c: 2DO
      7 packet-nbns.c: 2DO
      6 packet-fcswils.c: 2DO
      5 packet-wccp.c: 2DO
      5 packet-cops.c: 2DO
      4 packet-wtp.c: 2DO


svn path=/trunk/; revision=17038
2006-01-16 07:59:44 +00:00
Jörg Mayer f9a57f08d1 Bill Meier:
Spelling fixes.

svn path=/trunk/; revision=16956
2006-01-05 13:01:08 +00:00
Ronnie Sahlberg a9a437d64a From Martin M various updates and fixes
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-12-07 00:35:16 +00:00
Guy Harris b7853e1285 Give the RFC number for CHAP.
Don't fetch CHAP fields until we need them, so that we can at least
partially dissect a short frame.

Even if the CHAP length is wrong, put it into the protocol tree using
the registered field.

Use "tvb_format_text()" to put text into the Info column, so we handle
non-printable characters by escaping them.

svn path=/trunk/; revision=16616
2005-11-28 10:26:21 +00:00
Ronnie Sahlberg 91126d392b from Martin M
ppp chap updates


svn path=/trunk/; revision=16608
2005-11-26 22:49:18 +00:00
Ronnie Sahlberg e876bc7d68 remove some strcpy
svn path=/trunk/; revision=16337
2005-10-27 09:26:35 +00:00
Anders Broman 118236bacc From Ignacio Goyret
correct a bug in parsing Lucent/Ascend PPP dumps. Basically, blobs with "PPP-OUT" should be labelled "PPP transmit" while blobs with "PPP-IN" should be labelled "PPP receive". The current code labels them the other way around.

packet-ppp.c
- Properly decode option to enable ECRTP (it wasn't decoded).
- Use the ipv6 knob to control ipv6 decoding (previously, it
  was using the ipv4 knob).

svn path=/trunk/; revision=16194
2005-10-11 19:55:55 +00:00
Guy Harris f6ef22c553 Have show_exception() take a "const char *" as its exception message,
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-28 16:16:37 +00:00
Guy Harris b7b80d94be Move a pile of protocol-related headers from the top-level source
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-09-17 00:02:31 +00:00
Gerald Combs e0331bbb1c Fix more problems found by Steve Grubb, along with other changes:
Camel: Fix an off-by-one error.  Don't alloc and free where it's not
needed.  Remove an unused variable.

PPP and K12: Fix memory leaks.

svn path=/trunk/; revision=15725
2005-09-08 15:01:16 +00:00
Jörg Mayer 7949c7f31c char -> const char warning fixes
svn path=/trunk/; revision=15079
2005-07-26 08:01:16 +00:00
Ulf Lamping 2c30357c48 checksum messages: use "[correct]" instead of "(correct)" and other "alike" messages
svn path=/trunk/; revision=14880
2005-07-08 22:11:13 +00:00
Guy Harris 4841b02c60 The data in an Identification packet is a message intended to be
human-readable; displayh it with "tvb_format_text()".

svn path=/trunk/; revision=14752
2005-06-25 19:14:17 +00:00
Ulf Lamping fdb5b1af02 just to get things straight: a dissector should *never* do any g_assert() calls!
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
2005-06-10 18:28:22 +00:00
Jörg Mayer b6db235c77 Change 802.11f -> F, 802.1d -> D, 802.1x -> X, 802.1q -Q, 802.1P -> p
svn path=/trunk/; revision=14321
2005-05-05 17:07:58 +00:00
Ulf Lamping de77acf875 buildbot bugfix: add another tvb_ensure_bytes_exist (tvb,offset,length);
svn path=/trunk/; revision=13927
2005-03-27 01:02:29 +00:00
Ulf Lamping 9fe9c6826f buildbot bugfix: another (un-)signed problem and a problem with the offset (fixed by calling tvb_ensure...)
svn path=/trunk/; revision=13921
2005-03-26 12:10:58 +00:00
Guy Harris 67c8764353 Add some length checks to the CHAP dissector.
Use %u, not %d, to display unsigned values.

svn path=/trunk/; revision=13908
2005-03-26 00:15:19 +00:00
Ulf Lamping 29b948e907 buildbot bugfix: and again, a guint16 will never become lower than zero
svn path=/trunk/; revision=13906
2005-03-25 23:12:07 +00:00
Guy Harris f981bb3341 For the Bandwidth Allocation Protocol Phone Delta option:
the length of a suboption must be at least 2;

	the length of the Unique Digit option must be 3, and its name is
	"Unique Digit", not "Uniq Digit";

	the length of the other suboptions must be at least 3.

svn path=/trunk/; revision=13901
2005-03-25 20:12:27 +00:00
Guy Harris 525396b959 In the cases fixed by the two previous fixes, check to make sure the
items don't run past the length left in the option, and, if they do, put
an indication into the protocol tree that they did.

The length returned by "tvb_strsize()" includes the terminating null
character.

svn path=/trunk/; revision=13900
2005-03-25 19:52:51 +00:00
Ulf Lamping a52bb15613 bugfix: similar problem than the previous one fixed by Gerald
svn path=/trunk/; revision=13898
2005-03-25 17:24:48 +00:00
Gerald Combs c0ce016153 Keep the length value from rolling over in CBCP. Add a comment asking if
there's a better way to do this.

svn path=/trunk/; revision=13897
2005-03-25 17:04:00 +00:00
Guy Harris 36e8efcbca From Hannes Gredler: support for Juniper's DLT_JUNIPER_ATM{1,2} values.
svn path=/trunk/; revision=13130
2005-01-20 05:40:56 +00:00
Guy Harris 685b736c0b From Rene Pilz:
- Fix partly wrong cause values in the gmm (found by Miklos Szurdi)
	- Fix high/low nibble swap of the force to standby field (found by
	  Miklos Szurdi)
	- Dissect all elements

svn path=/trunk/; revision=13030
2005-01-14 11:40:05 +00:00
Guy Harris 21a206c37f In the "PPP in HDLC-Like Framing" items, consider the starting delimiter
part of the packet's data.

If a packet has a starting and ending frame delimiter - i.e., the
delimiter at the end is followed by another delimiter - consider the
ending delimiter part of the first packet's raw data.

svn path=/trunk/; revision=12749
2004-12-14 08:15:13 +00:00
Anders Broman 6ced79161a Don't display the end delimiter as a fragment and change the bytes higligted with "PPP DATA" to exclude
the delimiters(or shold they both be included?)

svn path=/trunk/; revision=12748
2004-12-13 22:19:03 +00:00
Guy Harris 3f0412a729 Add a protocol layer for the raw byte stream for PPP in HDLC-like
framing, and put the raw packet and fragment data at that layer.

Add a common routine to dissect un-escaped PPP data that might have 0xff
0x03, and use it both for the raw PPP in HDLC-like framing and for
processing un-escaped data.

Check for an escape byte not followed by another byte (e.g., because the
packet is too short).

Handle the case where a chunk of that raw byte data doesn't begin with
0x7e, but starts with cruft from a previous PPP packet split across
lower-level packets.

svn path=/trunk/; revision=12741
2004-12-13 10:10:51 +00:00
Guy Harris b14f3dbba8 Get rid of an unused parameter.
svn path=/trunk/; revision=12736
2004-12-13 01:34:35 +00:00
Anders Broman d44941ac8d Dissect PPP messages of ethertype 0x8881
svn path=/trunk/; revision=12730
2004-12-12 20:28:18 +00:00
Gerald Combs ced793054b Add more suboption length checks to dissect_bap_phone_delta_opt().
svn path=/trunk/; revision=12672
2004-12-06 23:12:32 +00:00
Guy Harris 117d9d7ee4 Tag the compression protocol item as such.
The compression option isn't just the compression protocol, it can
include options for the protocol, so name the ett_ variable for its tree
appropriately.

svn path=/trunk/; revision=12572
2004-11-22 02:12:43 +00:00
Guy Harris 0284f4d4f5 From Ignacio Goyret: decode RFC 2509 and RFC 3544 IPCP options.
Fix up the AUTHORS file.

svn path=/trunk/; revision=12514
2004-11-12 10:17:13 +00:00
Guy Harris 212015b7ff The length of the protocol tree item passed to "dissect_ppp_common()"
should be the length of the packet being dissected, so that if we throw
an exception dissecting it, the item covers the entire packet (because
it's incomplete, and thus *all* of it is the beginning of the header).

Instead, we should pass the length of the part of the header prior to
the protocol field as an argument to "dissect_ppp_common()", and it
should use that to set the length of that item.

svn path=/trunk/; revision=12441
2004-10-30 08:45:10 +00:00
Guy Harris ac98f225a8 Move various checksum routines and headers to epan.
svn path=/trunk/; revision=12117
2004-09-28 00:06:32 +00:00