aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nflog.c
AgeCommit message (Collapse)AuthorFilesLines
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-3/+1
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-2/+2
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-1/+1
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14register_dissector -> new_register_dissectorMichael Mann1-4/+5
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I25fe6a0aac93980333217d007702799d16946563 Reviewed-on: https://code.wireshark.org/review/11816 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-15Remove unneeded #include <epan/prefs.h>; As needed: Add editor-modelines & ↵Bill Meier1-1/+0
adjust whitespaxcce. Change-Id: I6f79357e0f3906f6ccc5b68eb451b69b68636335 Reviewed-on: https://code.wireshark.org/review/3613 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-14Remove more now-unused stuff.Guy Harris1-4/+0
Change-Id: I8f65ed38e0b5f8923b7c273c2fca4c2b57c5af9c Reviewed-on: https://code.wireshark.org/review/659 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-14Get rid of a no-longer used preference.Guy Harris1-17/+0
We no longer need a preference to determine the byte order of the T and L in the TLVs, as libpcap and libwiretap both, when reading a file, translate from the file's byte order to the reading host's byte order and, in fact, currently don't use the variable in which the preference is stored; eliminate the preference. Change-Id: Id06a6284960c1ac77028af07f3937eb4a7b0acaa Reviewed-on: https://code.wireshark.org/review/656 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-14Fix indent (use 4 spaces) and add ModelinesAlexis La Goutte1-209/+221
Change-Id: I50c66638d48a6579b50204769bd27210d9d6c228 Reviewed-on: https://code.wireshark.org/review/655 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-14Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I688509fff7d5b663f2ff54b42a80c52592613213 Reviewed-on: https://code.wireshark.org/review/654 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-14Fix -Wunused-const-variable found by Clang 3.5Alexis La Goutte1-7/+0
Change-Id: Idf5ac9e067a647d3e1be82df352d956c87d6050c Reviewed-on: https://code.wireshark.org/review/653 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-06Have NFLOG TLV type and length be in host byte order.Guy Harris1-78/+5
When capturing, they'll be in host byte order. The top of the libpcap trunk and 1.5 branch, when reading a file, will, if necessary, byte-swap the type and length values so that they're in the byte order of the host reading the file (rather than the host that wrote the file). Do the same when we read a file, and have the NFLOG dissector assume host byte order for those fields. Change-Id: I493aed1e07b626af1157d75f3bc293b0a694ad07 Reviewed-on: https://code.wireshark.org/review/148 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>
2013-12-21Add missing includesJakub Zawadzki1-0/+1
svn path=/trunk/; revision=54332
2013-12-14Rework code slightly to prevent VS Code Analysis warning:Bill Meier1-3/+5
C6326: Potential comparison of a constant with another constant svn path=/trunk/; revision=54107
2013-12-14Fix some trivial warnings.Jakub Zawadzki1-0/+3
svn path=/trunk/; revision=54085
2013-12-08Add more LINUX_AF_* values, create value_string_ext for them. Use it in ↵Jakub Zawadzki1-7/+1
netlink, nflog. svn path=/trunk/; revision=53852
2013-11-07Add infrastructure for section-initializing protocol hfis (without array).Jakub Zawadzki1-0/+2
configure implementation later. svn path=/trunk/; revision=53146
2013-08-17Fix few concept of new api tree:Jakub Zawadzki1-18/+23
- (for now) keep ABI, restore prototype of old proto_tree_add_item, add new proto_tree_add_item_new - add few helpers for boolean, time, string which will do ->id - don't use HFI_INIT directly, use it by another macro (MSVC has very small limit for section name) svn path=/trunk/; revision=51401
2013-08-16Convert my dissectors to new proto API.Jakub Zawadzki1-78/+79
svn path=/trunk/; revision=51397
2013-07-15Fix warnings: comma at end of enumerator list.Chris Maynard1-1/+1
svn path=/trunk/; revision=50640
2012-12-26Another 64-bit-to-32-bit warning that shows up in 32-bit environments.Guy Harris1-1/+1
svn path=/trunk/; revision=46766
2012-11-29Make all enum_val_t's const.Jeff Morriss1-1/+1
svn path=/trunk/; revision=46292
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-06-09Do not use BASE_NONE for FT_*INT* types.Chris Maynard1-1/+1
svn path=/trunk/; revision=43177
2012-05-22Suppress a (legitimate) compiler warning for now, and leave a commentGuy Harris1-1/+2
indicating that we should do *something* about nanoseconds values >= 1 billion. svn path=/trunk/; revision=42796
2012-05-22nflog dissector:Jakub Zawadzki1-4/+24
- dissect NFULA_TIMESTAMP as 16B time. - fix byte_order_types (selecting BE selected little endian) svn path=/trunk/; revision=42793
2012-04-27nflog: add BYTE_ORDER_HOST, fix conflicting ENC_BIG_ENDIAN, ENC_NA ↵Jakub Zawadzki1-2/+9
value_string entries. svn path=/trunk/; revision=42287
2012-04-24Add svn:eol-style property; reformat a few long lines.Bill Meier1-49/+59
svn path=/trunk/; revision=42223
2012-04-05Some fixes for nflog. Fix bug #7036Jakub Zawadzki1-13/+33
svn path=/trunk/; revision=41956
2012-03-31Fix off by one shift errors introduced in r39530 where it seemed proper[1]Jakub Zawadzki1-1/+1
[1] I'm unsure of packet-dtpt, so I haven't patch it. svn path=/trunk/; revision=41873
2012-03-31Add initial support for dissecting packets encapsulated in Netfilter LOG ↵Jakub Zawadzki1-0/+348
(DLT_NFLOG=239). svn path=/trunk/; revision=41872