aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dnp.c
AgeCommit message (Collapse)AuthorFilesLines
2012-09-26replaced decode_boolean_bitfield calls with itemized filtersMichael Mann1-22/+52
svn path=/trunk/; revision=45152
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-09-10Initial commit to support yet another method of passing data between dissectors.Jakub Zawadzki1-2/+2
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-07From Robert Bullen via ↵Jeff Morriss1-5/+7
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 : The reassembled fragments tree in the Packet Details view is awesome, but it lacks one thing: a field that exposes the reassembled data. tcp.data already exists for exposing a single TCP segment's payload as a byte array. It would be handy to have something similar for a single application layer PDU when TCP segment reassembly is involved. I propose tcp.reassembled.data, named and placed after the already existing field tcp.reassembled.length. My primary use case for this feature is outputting tcp.reassembled.data with tshark for further processing with a script. The attached patch implements this very feature. Because the reassembled fragment tree code is general purpose, i.e. not specific to just TCP, any dissector that relies upon it can add a similar field very cheaply. In that vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which expose reassembled fragment data as a single byte stream for IPv4 and IPv6, respectively. All other protocols that use the reassembly code have been left alone, other than inserting NULL into their initializer lists for the newly introduced struct field reassemble.h:fragment_items.hf_reassembled_data. svn path=/trunk/; revision=44802
2012-08-14Various DNP3 cleanups and fixes:Graham Bloice1-25/+38
1. Fix time displayed in object values when using relative time from a CTO. 2. Fix some text for IIN flags regarding Outputs in local control 3. Try out DNP3 as a heuristic dissector. svn path=/trunk/; revision=44486
2012-07-18Fix non-proto_tree_add_item() calls passing an ENC_ value as the lastGuy Harris1-1/+1
argument. svn path=/trunk/; revision=43804
2012-07-17From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7491 :Pascal Quantin1-0/+1
DNP3 protocol dissector does not fully decode application layer object 50 variation 3 svn path=/trunk/; revision=43772
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-04-30Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+1
svn path=/trunk/; revision=42362
2011-12-09Fixed wrong registration call causing compilation warnings.Graham Bloice1-1/+1
svn path=/trunk/; revision=40129
2011-12-09Added dissector registration for udp messages to permit use with a USER_DLT ↵Graham Bloice1-0/+3
as per request from Chris Bontje svn path=/trunk/; revision=40128
2011-12-09Added definition and handling for IIN Function Code Not Implemented bit.Graham Bloice1-20/+27
svn path=/trunk/; revision=40127
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-1/+1
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-2/+2
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-26Get rid of check_col() and use ENC.Anders Broman1-110/+102
svn path=/trunk/; revision=39151
2011-09-21Whitespace cleanup:Bill Meier1-31/+31
Use consistent indentation; Convert "4 space tabs" to spaces; Remove trailing whitespace. svn path=/trunk/; revision=39082
2011-09-21Fix ex "modeline" so it works;Bill Meier1-1/+1
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748 svn path=/trunk/; revision=39081
2011-06-06Added code to distinguish conversations between different RTUs that happen ↵Graham Bloice1-9/+69
to use the same address\port pair. Based on patch supplied by Kelvin Proctor. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3626 svn path=/trunk/; revision=37584
2011-05-13Fix Bug 5920: "DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF ↵Bill Meier1-3/+3
_FDCTR_32NF _FDCTR_16NF" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5920 svn path=/trunk/; revision=37135
2011-05-12From Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. IChris Maynard1-10/+5
committed a variation of his patch that deleted unused variables rather than #if 0'ing them out, and I also kept dissect_dnp3_al()'s return values, even if it's not currently being checked, just in case the commented code is ever uncommented and the return value ends up being checked later on. Lastly, I also added what appeared to be some missing DNP3_AL_UNS's. svn path=/trunk/; revision=37100
2011-03-22Initialize al_cto before usage.Stig Bjørlykke1-0/+1
Coverity 808. svn path=/trunk/; revision=36260
2011-01-30Introduce "Fragment count" filter element for all protocols doing reassembly.Stig Bjørlykke1-0/+6
svn path=/trunk/; revision=35705
2011-01-15Replace some duplicate blurbs with NULLJeff Morriss1-19/+19
svn path=/trunk/; revision=35541
2011-01-14Removed redundant comparison that caused compilation failure on OSXGraham Bloice1-1/+1
svn path=/trunk/; revision=35536
2011-01-14Updated dissector:Graham Bloice1-35/+408
Additional function codes: Disable unsolicited messages, Open\Close\Delete file Additional data objects: Analog output events, File objects and Octet string events. Improved Info column display for reassembled fragments. Changed all event timestamps to be UTC as per protocol spec. svn path=/trunk/; revision=35533
2010-12-20From Rob Casey:Jaap Keuter1-1/+18
Patch to add support for DNP3 protocol Binary Output Change object type. svn path=/trunk/; revision=35227
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-12-10From Rob Casey:Anders Broman1-1/+19
Addition of support for DNP3 Analog Input Deadband object type https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5471 svn path=/trunk/; revision=35171
2010-11-15"Fill" value_strings.Anders Broman1-0/+1
svn path=/trunk/; revision=34888
2010-11-08Use value_string_ext fcns to access certain value_string arrays;Bill Meier1-32/+33
Sort a few value_string arrays to be in ascending order by value; Do minor reformatting and whitespace cleanup. svn path=/trunk/; revision=34813
2010-05-21Have abs_time_to_str() and abs_time_to_str_secs() take an additionalGuy Harris1-5/+5
argument indicating whether to include the time zone in the string. If we're constructing a display filter, don't include the time zone, otherwise do. Fixes bug 4756. svn path=/trunk/; revision=32913
2010-05-13As suggested in ↵Jeff Morriss1-13/+6
http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-04-03Remove unneeded #include <stdio.h>Bill Meier1-1/+0
svn path=/trunk/; revision=32367
2010-02-27Add a third date format, ABSOLUTE_TIME_DOY_UTC, to show UTC with theGuy Harris1-5/+5
date as YYYY/DDD, where DDD is a 1-origin day of year. Move the formats to a "time_fmt.h" file, included by the headers that use it. Have abs_time_to_str() and abs_time_secs_to_str() take the date format value, rather than a Boolean "show this as UTC" flag, as an argument. Document the ABSOLUTE_TIME_ formats a bit better. Use that format in the CCSDS and VCDU dissectors, rather than having those dissectors do the formatting themselves. svn path=/trunk/; revision=32034
2010-02-06Renamed some reassembled data texts.Stig Bjørlykke1-1/+1
Removed some check_col(). svn path=/trunk/; revision=31809
2010-02-03Changed "reassembled_length" -> "reassembled.length".Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=31776
2010-02-02Introduce "Reassembled length" filter element for all protocols doingStig Bjørlykke1-1/+7
reassembly. svn path=/trunk/; revision=31767
2009-12-19For fields of type FT_ABSOLUTE_TIME, have the "display" value be one ofGuy Harris1-1/+1
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL == (int)BASE_NONE, so there's no source or binary compatiblity issue, although we might want to eliminate BASE_NONE at some point and have the BASE_ values used with integral types start at 0, so that you can't specify BASE_NONE for an integral field. svn path=/trunk/; revision=31319
2009-12-10Add an argument to abs_time_to_str() and abs_time_secs_to_str()Guy Harris1-5/+5
indicating whether the time should be shown as local time or UTC. For now, always pass FALSE, meaning "show as local time". Clean up some stuff in the SNMP dissector, use abs_time_secs_to_str() for times with one-second resolution, and update a comment in various macros in the WSP dissector, while we're at it. svn path=/trunk/; revision=31227
2009-10-16Fix memory leak; init fragment_table & reassembled_table in registered init fcn;Bill Meier1-10/+5
(Tables were being initted only at Wireshark startup in proto_register) svn path=/trunk/; revision=30578
2009-10-06From Didier Gautheron:Anders Broman1-1/+3
ep memory can't be used for tvbs defined as data_source. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4054 svn path=/trunk/; revision=30376
2009-09-30Removed 'l' modifier for %g, as it will be ignored.Stig Bjørlykke1-3/+3
svn path=/trunk/; revision=30222
2009-09-23Use col_set_str instead of col_add_fstr/col_add_str when adding constant ↵Kovarththanan Rajaratnam1-2/+1
strings to COL_INFO svn path=/trunk/; revision=30089
2009-09-08From Xavier Laxa:Anders Broman1-2/+10
UNS bit not correctly parsed in DNP APP Layer. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3318 svn path=/trunk/; revision=29807
2009-08-09Don't guard col_clear with col_checkKovarththanan Rajaratnam1-4/+2
svn path=/trunk/; revision=29344
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-2/+1
svn path=/trunk/; revision=29340
2009-07-23Saved by removing the bell.Guy Harris1-1/+1
svn path=/trunk/; revision=29181
2009-07-23Set editor modelines to be consistent between emacs and vi/ex;Bill Meier1-4/+4
Indentation and whitespace cleanup; svn path=/trunk/; revision=29180
2009-07-07From Kovarththanan Rajaratnam:Stig Bjørlykke1-4/+4
More FT_XXX cleanup. svn path=/trunk/; revision=28971
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-71/+71
(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