aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-llc.c
AgeCommit message (Collapse)AuthorFilesLines
2014-11-09Create a subdissector table for juniper payload protocols.Michael Mann1-0/+4
Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee Reviewed-on: https://code.wireshark.org/review/5204 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-06Adjust indentation to match editor modelines; Do other minor whitespace changes.Bill Meier1-3/+3
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353 Reviewed-on: https://code.wireshark.org/review/4502 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-15paacket-llc.c: Minor changesBill Meier1-2/+14
- Remove unneeded '#include <epan/conversation.h>'; - tvb_length_remaining() --> tvb_reported_length_remaining(); - Add editor modelines. Change-Id: I8410a1286238c0fa1ec9f6b680ab0eb2665672f9 Reviewed-on: https://code.wireshark.org/review/3621 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-14Eliminate proto_tree_add_text from some dissectors.Michael Mann1-44/+31
Other minor cleanup while in the neighborhood. Change-Id: If73a029f564219782c313d4154c24c7ce7458b52 Reviewed-on: https://code.wireshark.org/review/3574 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-1/+1
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-1/+1
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-01Just have one value_string table for OUIs.Guy Harris1-1/+1
While we're at it, get rid of duplicate #defines for some OUIs, sort the OUI #defines, and fix some routine names. Change-Id: I8f4e5408b44896c3629a0014299b060ebc15bab6 Reviewed-on: https://code.wireshark.org/review/1906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-31Move the definitions of OUI value_strings to epan/oui.c.Guy Harris1-55/+0
Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2 Reviewed-on: https://code.wireshark.org/review/1904 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespace.Bill Meier1-3/+3
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6 Reviewed-on: https://code.wireshark.org/review/372 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2013-12-18Remove unneeded #include epan/dissectors/packet-scsi.hAlexis La Goutte1-1/+0
svn path=/trunk/; revision=54234
2013-12-18Fix [-Wmissing-prototypes]Anders Broman1-0/+1
svn path=/trunk/; revision=54209
2013-12-15Fix [-Wmissing-prototypes]Jakub Zawadzki1-0/+3
svn path=/trunk/; revision=54135
2013-12-14Add a cast to silence an unnecessary warning.Evan Huus1-1/+1
svn path=/trunk/; revision=54093
2013-12-14From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158Evan Huus1-15/+61
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit and SSAP CR bit as separate items in the proto tree. This gives an impression that these entries are separate fields in the LLC header while in reality, they are only the least significant bits in DSAP/SSAP octets. In addition, the importance of these bits is relatively low in today's LLC-based protocols (they are mostly set to 0), so having them always displayed in the proto tree is somewhat of a luxury. Modify the LLC dissector by having added a subtree to both DSAP and SSAP items that displays the IG and CR bits as bits in a bitfield, and moved the display of IG and CR bits into these subtrees. It may seem that adding a text item instead of a FT_UINT8 value is not a sensible approach because such item is not filterable. However, if filtering by the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this value is always added to the tree in its entirety and indexed by "llc.dsap" and "llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig" and "llc.ssap.cr" filter strings are available. Searching for the value of the DSAP/SSAP & 0xFE which would be the value currently added by the proto_tree_add_text() is not done and should not be done, as IEEE stipulates: "An individual actual address value does not necessarily have any relationship with a group address of the same actual address value." (http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this consideration, the choice of displaying the SAP "actual address" using proto_tree_add_text() is acceptable. svn path=/trunk/; revision=54091
2013-11-29Avoid including <wiretap/wtap.h> in dissectors.Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=53655
2013-11-29Rename some of pint.h macros to match common style (bits number on the end).Jakub Zawadzki1-1/+1
pntohs -> pntoh16 pntohl -> pntoh32 pletohs -> pletoh16 pletohl -> pletoh32 phtons -> phton16 phtonl -> phton32 svn path=/trunk/; revision=53652
2013-11-09include <wsutil/pint.h> only when needed.Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53196
2013-09-11Instead of prepending "LLC " to the UI table name, just modify the table name. Chris Maynard1-3/+1
svn path=/trunk/; revision=51952
2013-09-09Change some internal dissector table UI names so it's clear which protocol ↵Chris Maynard1-1/+3
they pertain to and it's easier to find in the list. svn path=/trunk/; revision=51904
2013-06-14Removed check_col() and the occasional tree.Michael Mann1-15/+7
svn path=/trunk/; revision=49938
2013-04-07Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=48783
2013-03-19From beroset:Anders Broman1-3/+3
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48425
2013-03-18From Michal Labedzki:Anders Broman1-1/+1
Fix issues discovered by cppcheck Also use global OUI array in AVRCP. Thanks to Evan Huus for cppcheck. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=48387
2012-11-04From Andrei Emeltchenko: Add OUI_BLUETOOTH part of ↵Anders Broman1-0/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633 bt-oui: Add decoding Bluetooth High Speed over wireless svn path=/trunk/; revision=45887
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-08-10Use val_to_str_const() where appropriate;Bill Meier1-1/+1
Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-02-28From Mijo Safradin:Anders Broman1-0/+1
Add ECP VDP TLV dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6849 Fixed encoding arguments, removed unused variables checkapi errors etc. svn path=/trunk/; revision=41221
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
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-17/+17
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-11-02From Daniel Ginsburg:Jaap Keuter1-0/+1
draft-ietf-isis-ext-eth specifies an extension to current Ethernet Frame specifications for hardware and frame format to support payloads greater than 1500 Bytes for Type interpretation and Length interpretation frames. The extension introduced by draft-ietf-isis-ext-eth is currently used by Cisco Systems' IS-IS routing protocol implementation when running IS-IS over Ethernet links with large MTU. svn path=/trunk/; revision=34748
2010-10-10Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h ↵Bill Meier1-2/+2
not req'd. svn path=/trunk/; revision=34464
2010-09-12Decode SLL payloads using a dissector table based on sll.ltype.Balint Reczey1-0/+2
The idea and the original patch came from Sebastian Reichel <elektranox@gmail.com> in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594390 svn path=/trunk/; revision=34101
2010-08-16Modernize the SONMP ("SynOptics Network Management Protocol") dissector by ↵Stephen Fisher1-1/+1
renaming it to NDP ("Nortel Discovery Protocol") and do some basic cleanup. svn path=/trunk/; revision=33815
2010-02-03Try to get rid of unused code warnings.Anders Broman1-2/+3
svn path=/trunk/; revision=31778
2010-01-29Add 3GPP2 OUI.Anders Broman1-23/+24
svn path=/trunk/; revision=31726
2009-09-24Don't guard col_append_str with check_colKovarththanan Rajaratnam1-3/+1
svn path=/trunk/; revision=30125
2009-08-16Switch a bunch of dissectors over to using tvb_new_subset_remaining()Kovarththanan Rajaratnam1-21/+16
svn path=/trunk/; revision=29446
2009-08-09Don't guard col_clear with col_checkKovarththanan Rajaratnam1-6/+2
svn path=/trunk/; revision=29346
2009-08-09Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-6/+2
svn path=/trunk/; revision=29345
2009-07-13Fix for bug 3710:Jaap Keuter1-2/+2
Use the derived length of the control field i.s.o. assuming its size. svn path=/trunk/; revision=29087
2009-07-07Changed flags_set_truth -> tfs_set_notsetStig Bjørlykke1-4/+4
svn path=/trunk/; revision=28989
2009-06-23From Nathan Hartwell:Jaap Keuter1-0/+14
This patch attempt should more closely align with the Wireshark "layout" of using a dissector rather than a "hack" to the packet-llc dissector. svn path=/trunk/; revision=28823
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-2/+2
(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-08Clean up header fields.Jaap Keuter1-26/+26
svn path=/trunk/; revision=28298
2009-05-05Get rid of some other uses of ethertype() for protocols that don't haveGuy Harris1-12/+17
a trailer. Clean up the NHRP dissector's handling of the protocol ID to fully implement RFC 2332 (and mention that 2332 is the RFC for NHRP). Don't compute the checksum unless we have all the packet data, and don't use the captured length as the actual packet length. Check for an invalid extension offset value. Get rid of some unneeded tvb_ensure_bytes_exist() calls. Dissect - and set the columns - regardless of whether we're building the protocol tree. Mark the packet in error reports as an error packet. svn path=/trunk/; revision=28273
2009-05-03Don't use ethertype() - it's a bit of overkill.Guy Harris1-10/+18
svn path=/trunk/; revision=28254
2009-05-02Add the mesh header dissector for OLPC mesh network packets, and haveGuy Harris1-0/+45
the LLC dissector recognize and handle those packets. svn path=/trunk/; revision=28253
2009-05-01Clean up white space.Guy Harris1-22/+22
svn path=/trunk/; revision=28236
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 00:04:03 +0000