aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.common
AgeCommit message (Collapse)AuthorFilesLines
2014-05-31Move the definitions of OUI value_strings to epan/oui.c.Guy Harris1-0/+1
Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2 Reviewed-on: https://code.wireshark.org/review/1904 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-31Split off the dissectors for 802.3 "slow protocols".Guy Harris1-0/+1
Add a dissector table for the 802.3 "slow protocols" subtype, split the dissectors for those protocols into separate files, and have them register in that dissector table. Remove some unnecessary #includes while we're at it. Change-Id: Ic36c9c255efdd348055fa4f21fd6cc094f74e378 Reviewed-on: https://code.wireshark.org/review/1891 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23Add a dissector table for EAPOL Key Descriptor types.Guy Harris1-0/+1
Instead of having a switch statement in the EAPOL dissector for Key Descriptor types, have a dissector table, and: have the EAPOL dissector register with a dissector for the RC4 type; have the 802.11 dissector register with dissectors for WPA and RSN types. This means that ieee_80211_add_tagged_parameters() no longer needs to be public; make it static. Change-Id: I68e0592c3ea055c693d6d5d5a9eb88634ea37a95 Reviewed-on: https://code.wireshark.org/review/800 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-21Add debug printing functions for conversations, sip, sdp, rtpHadriel Kaplan1-0/+1
There have been enough gnarly bus in sip/sdp/rtp that it needs to have good debug printing. Using a debugger isn't good enough because there's interaction across multiple frames and it's too hard to follow what's going on without real printed data history. Change-Id: Ifb5bb1fb580be81f988569ece79d238a9c030c34 Reviewed-on: https://code.wireshark.org/review/688 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-12Fix indent (Remove space and use tabs)Alexis La Goutte1-3/+3
Change-Id: I9cc33a43e0f06dfad3f9fb53ad0df636f2ea7020 Reviewed-on: https://code.wireshark.org/review/615 Reviewed-by: Evan Huus <eapache@gmail.com>
2013-12-30Move tcap and camel "persistent data" functionality to the dissectors ↵Michael Mann1-4/+0
themselves instead of being part of epan directory. svn path=/trunk/; revision=54499
2013-12-21Move epan/base64.[ch] to wsutil/ with function name change.Jakub Zawadzki1-2/+0
svn path=/trunk/; revision=54326
2013-12-21Move base64_to_tvb() to tvbuff_base64.cJakub Zawadzki1-0/+1
svn path=/trunk/; revision=54325
2013-12-15Fix build with CMake (Missing dvb_chartbl.c...) Fix indent also in ↵Alexis La Goutte1-2/+2
Makefile.common svn path=/trunk/; revision=54126
2013-12-15as requested, move the functions/defines for DVB character tablesMartin Kaiser1-0/+2
to separate files svn path=/trunk/; revision=54113
2013-12-08Add more LINUX_AF_* values, create value_string_ext for them. Use it in ↵Jakub Zawadzki1-0/+1
netlink, nflog. svn path=/trunk/; revision=53852
2013-12-06Move tvb_uncompress() to tvbuff_zlib.cJakub Zawadzki1-0/+1
svn path=/trunk/; revision=53815
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris1-2/+0
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-12-01Move codecs.[ch] out of epan and into codecs directory.Michael Mann1-2/+0
This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs. See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) svn path=/trunk/; revision=53686
2013-11-20Provide "Decode As" functionality through dissectors themselves instead of ↵Michael Mann1-1/+3
the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog. This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI) svn path=/trunk/; revision=53445
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-2/+0
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-11-16Move bitswap.[ch] from epan to wsutil.Jakub Zawadzki1-2/+0
svn path=/trunk/; revision=53365
2013-11-09Move adler32 from epan/ to wsutil/Jakub Zawadzki1-2/+0
The same like done for crc* svn path=/trunk/; revision=53190
2013-11-09Put "private" to_str.c functions to to_str-int.hJakub Zawadzki1-0/+1
svn path=/trunk/; revision=53187
2013-10-23From Michal Labedzki viaEvan Huus1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818 Add support for dissection ELF files. It opens as a "capture" file via wiretap at the moment for simplicity's sake, but the intention is eventually to have this (and other file types we dissect) open through some other program sharing much of the libwireshark infrastructure. svn path=/trunk/; revision=52775
2013-10-18Forgot in the previous checkin.Jörg Mayer1-1/+1
svn path=/trunk/; revision=52668
2013-08-01Move a bunch of the crypt modules and pint.h into wsutil.Jeff Morriss1-1/+0
This means wsutil now links against libcrypt. Protect a bunch of the crypt header files from multiple inclusion. svn path=/trunk/; revision=51100
2013-07-31Move composite tvbuff to seperate file (with some subtle changes).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=51071
2013-07-30Add app_mem_usage.h.Guy Harris1-1/+2
Sort the headers while we're at it. svn path=/trunk/; revision=51034
2013-07-30Add missing includes.Anders Broman1-0/+1
svn path=/trunk/; revision=51028
2013-07-30Building app_mem_usage fails on *nix, missing include(s)?Anders Broman1-2/+0
Don't have the time to fix it at the moment. svn path=/trunk/; revision=51024
2013-07-30Add a routine to get application memory usage to epan.Anders Broman1-0/+2
svn path=/trunk/; revision=51023
2013-07-21Add helper function to epan_session which can be used to get absolute ↵Jakub Zawadzki1-0/+1
timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-2/+0
there and moving it avoids having to recompile the file for use in editcap and mergecap (which don't link against libwireshark). svn path=/trunk/; revision=50650
2013-07-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-2/+0
there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). svn path=/trunk/; revision=50598
2013-07-14Move tvb real and subset implementations to seperate files.Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=50569
2013-07-12ps.h got moved to epan.Guy Harris1-0/+1
svn path=/trunk/; revision=50531
2013-07-12Move the print modules into epan.Jeff Morriss1-3/+6
svn path=/trunk/; revision=50526
2013-07-12Move disabled_protos.{h,c} into epan.Jeff Morriss1-0/+2
svn path=/trunk/; revision=50521
2013-07-11Move some more modules into epan.Jeff Morriss1-0/+4
svn path=/trunk/; revision=50517
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-0/+2
make use of it in editcap and mergecap for listing encapsulation types. For example: Before: user0 - USER 0 user1 - USER 1 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 After: user0 - USER 0 user1 - USER 1 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 svn path=/trunk/; revision=50482
2013-06-26As pointed out by Guy: timestats uses packet_info so it belongs in epanJeff Morriss1-0/+2
not wsutil. svn path=/trunk/; revision=50159
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-2/+0
A bunch of files didn't really need to include these header files so remove the include line rather than changing it. svn path=/trunk/; revision=50154
2013-06-23Small whitespace fixesJörg Mayer1-14/+14
svn path=/trunk/; revision=50120
2013-05-06Add missing files.Anders Broman1-0/+1
svn path=/trunk/; revision=49185
2013-05-05Add the abillity to export PDU:s to file using a USER_DLT adding meta data ↵Anders Broman1-0/+1
before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector. This is prof-of-concept needs a bit of cleanup. svn path=/trunk/; revision=49177
2013-03-10Actually remove slab.h from the makefile.Evan Huus1-1/+0
svn path=/trunk/; revision=48231
2013-02-27Move show_exception() and show_reported_bounds_error() toGuy Harris1-0/+2
epan/show_exception.c, as it's used outside epan/dissectors/packet-frame.c. Update their callers to include <epan/show_exception.h> to get their declaration. Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if there's more stuff in the packet to dissect after the dissector call that threw the exception, doesn't mean you shouldn't go ahead and dissect that stuff. Use it in all those cases, including ones where BoundsError was inappropriately being caught (you want those passed up to the top level, so that the packet is reported as having been cut short in the capture process). Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that correspond to running past the end of the data for a tvbuff; use it rather than explicitly catching those exceptions individually, and rather than just catching all exceptions (the only place that DissectorError should be caught, for example, is at the top level, so dissector bugs show up in the protocol tree). Don't catch and then immediately rethrow exceptions without doing anything else; just let the exceptions go up to the final catcher. Use show_exception() to report non-fatal errors, rather than doing it yourself. If a dissector is called from Lua, catch all non-fatal errors and use show_exception() to report them rather than catching only ReportedBoundsError and adding a proto_malformed item. Don't catch exceptions when constructing a trailer tvbuff in packet-ieee8023.c - just construct it after the payload has been dissected, and let whatever exceptions that throws be handled at the top level. Avoid some TRY/CATCH/ENDTRY cases by using checks such as tvb_bytes_exist() before even looking in the tvbuff. svn path=/trunk/; revision=47924
2013-02-09Put NODIST_ at the beginning of macro names, as was done for the pluginsGuy Harris1-3/+3
directory. svn path=/trunk/; revision=47599
2013-02-05Fix for previous changes.Guy Harris1-2/+2
svn path=/trunk/; revision=47486
2013-02-05Don't distribute the results of running Lemon, as we distribute LemonGuy Harris1-27/+15
ourselves. Clean up various bits of "distribute" vs. "don't distribute" stuff in the process - use similar names, and make the "distribute vs. don't distribute" distinction the same as the "don't clean with "make distclean" vs. clean with "make distclean"" distinction. svn path=/trunk/; revision=47485
2012-08-03Move the list of AX.25 protocol IDs to epan/ax25_pids.h. Use it inGuy Harris1-0/+1
packet-ax25.c and packet-arp.c. Add an "ax25.pid" dissector table for those protocol IDs, use it in the AX.25 dissector, and have dissectors register in that table with their protocol IDs. Get rid of some unneeded includes. Clean up some "AX25"s in user-visible strings - say "AX.25" instead. Clean up some indentation. svn path=/trunk/; revision=44235
2012-05-23Add conv_id.hAnders Broman1-2/+3
svn path=/trunk/; revision=42810
2012-01-14Ed Beroset <beroset@mindspring.com> via bug 5531Jörg Mayer1-1/+1
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including gas, water and electric. The dissector implemented in the patch file includes full support for all EPSEM (Extended Protocol Specification for Electricity Metering) services and includes a full implementation of the C12.22 security modes. [...] To decrypt the attached sample file, you need to set up the key table in the preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44. Me: Fixes for: [ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’: ../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable] [ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o ../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable] svn path=/trunk/; revision=40500