Commit Graph

81 Commits

Author SHA1 Message Date
Graham Bloice 19895f31b5 Fixed wrong registration call causing compilation warnings.
svn path=/trunk/; revision=40129
2011-12-09 13:31:19 +00:00
Graham Bloice 9770256235 Added dissector registration for udp messages to permit use with a USER_DLT as per request from Chris Bontje
svn path=/trunk/; revision=40128
2011-12-09 13:08:50 +00:00
Graham Bloice 62ffea3b32 Added definition and handling for IIN Function Code Not Implemented bit.
svn path=/trunk/; revision=40127
2011-12-09 12:42:31 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier 94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly 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-10-04 22:44:31 +00:00
Anders Broman 03a6c7fe7d Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39151
2011-09-26 17:18:10 +00:00
Bill Meier e6bd9d1a8c Whitespace cleanup:
Use consistent indentation;
 Convert "4 space tabs" to spaces;
 Remove trailing whitespace.

svn path=/trunk/; revision=39082
2011-09-21 18:55:03 +00:00
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Graham Bloice 13743add73 Added code to distinguish conversations between different RTUs that happen 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-06-06 22:32:37 +00:00
Bill Meier 4f7a9174fe Fix Bug 5920: "DNP3 dissector incorrect constants AL_OBJ_FCTR_16NF _FDCTR_32NF _FDCTR_16NF"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5920

svn path=/trunk/; revision=37135
2011-05-13 22:01:22 +00:00
Chris Maynard 8e99ec73a2 From Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. I
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-05-12 20:32:28 +00:00
Stig Bjørlykke 2cc2403a33 Initialize al_cto before usage.
Coverity 808.

svn path=/trunk/; revision=36260
2011-03-22 18:42:02 +00:00
Stig Bjørlykke 84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Jeff Morriss b589c42fa3 Replace some duplicate blurbs with NULL
svn path=/trunk/; revision=35541
2011-01-15 18:18:13 +00:00
Graham Bloice 8e86e3dbbf Removed redundant comparison that caused compilation failure on OSX
svn path=/trunk/; revision=35536
2011-01-14 14:39:40 +00:00
Graham Bloice 1be12860e6 Updated dissector:
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
2011-01-14 12:15:10 +00:00
Jaap Keuter 720f40cd30 From Rob Casey:
Patch to add support for DNP3 protocol Binary Output Change object type.

svn path=/trunk/; revision=35227
2010-12-20 07:57:52 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
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-20 05:35:29 +00:00
Anders Broman ef35235e5a From Rob Casey:
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-12-10 15:32:47 +00:00
Anders Broman e1b1ef192c "Fill" value_strings.
svn path=/trunk/; revision=34888
2010-11-15 21:32:27 +00:00
Bill Meier c17c9fff87 Use value_string_ext fcns to access certain value_string arrays;
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-11-08 21:59:39 +00:00
Guy Harris 927b7da346 Have abs_time_to_str() and abs_time_to_str_secs() take an additional
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-21 06:33:25 +00:00
Jeff Morriss 729de1a635 As suggested in 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-05-13 18:28:34 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Guy Harris 500eb99cd9 Add a third date format, ABSOLUTE_TIME_DOY_UTC, to show UTC with the
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-27 19:01:27 +00:00
Stig Bjørlykke 539b558f8c Renamed some reassembled data texts.
Removed some check_col().

svn path=/trunk/; revision=31809
2010-02-06 18:20:21 +00:00
Stig Bjørlykke 47e732e29e Changed "reassembled_length" -> "reassembled.length".
svn path=/trunk/; revision=31776
2010-02-03 08:47:15 +00:00
Stig Bjørlykke 88b72356ad Introduce "Reassembled length" filter element for all protocols doing
reassembly.

svn path=/trunk/; revision=31767
2010-02-02 16:01:52 +00:00
Guy Harris 8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
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-19 03:17:44 +00:00
Guy Harris 4fde145bd2 Add an argument to abs_time_to_str() and abs_time_secs_to_str()
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-12-10 22:19:29 +00:00
Bill Meier e2379fb4a1 Fix memory leak; init fragment_table & reassembled_table in registered init fcn;
(Tables were being initted only at Wireshark startup in proto_register)

svn path=/trunk/; revision=30578
2009-10-16 21:35:39 +00:00
Anders Broman bc9a809b65 From Didier Gautheron:
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-10-06 19:15:58 +00:00
Stig Bjørlykke 448523881e Removed 'l' modifier for %g, as it will be ignored.
svn path=/trunk/; revision=30222
2009-09-30 19:48:10 +00:00
Kovarththanan Rajaratnam 124faf721c Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO
svn path=/trunk/; revision=30089
2009-09-23 14:52:01 +00:00
Anders Broman 8341ccabc6 From Xavier Laxa:
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-09-08 19:38:42 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Guy Harris 241aa76fc9 Saved by removing the bell.
svn path=/trunk/; revision=29181
2009-07-23 18:36:25 +00:00
Bill Meier 65faee6470 Set editor modelines to be consistent between emacs and vi/ex;
Indentation and whitespace cleanup;

svn path=/trunk/; revision=29180
2009-07-23 17:46:09 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(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-06-18 21:30:42 +00:00
Anders Broman c91a384702 Apply some of the patches from:
http://wiki.wireshark.org/Development/Optimization

svn path=/trunk/; revision=28356
2009-05-13 19:46:11 +00:00
Bill Meier 636147e417 FT_BOOLEAN fields with bitmask: Display is 'parent bitfield width' not BASE...
Also: Use global tfs_yes_no TFS structure in two cases (packet-ipv6.c)

svn path=/trunk/; revision=28311
2009-05-08 18:39:17 +00:00
Gerald Combs 2c74073079 Add a couple of size_t casts to packet-dnp.c.
Make the length arguments of format_text() and format_text_wsp()
size_t's, since it's natural to use strlen() for that.

svn path=/trunk/; revision=27891
2009-03-30 03:40:12 +00:00
Jaap Keuter 286e4ccd12 From Roy M. Silvernail:
Several command codes were missing, causing the dissector to abort decoding
on valid packets.  Those commands have been added in the attached patch.
The semantics of Variation 0 have been cleaned up.

svn path=/trunk/; revision=27162
2009-01-06 07:03:43 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Stig Bjørlykke d0e33bc3c5 Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26646
2008-10-31 14:07:23 +00:00
Bill Meier afd857957a Fix a few Emacs "file variables" to have "safe" values.
That is: indent-tabs-mode: tabs --> indent-tabs-mode: t
Also: fix a typo: set-tabs-mode --> indent-tabs-mode

svn path=/trunk/; revision=26113
2008-09-02 11:17:03 +00:00
Martin Mathieson b48ef500ee Squash uninitialised use warning.
svn path=/trunk/; revision=25434
2008-06-05 21:39:06 +00:00
Graham Bloice 814535f788 Added decoding of object 110 (Octet string), fixed reassembly if transport frame doesn't start with 0.
svn path=/trunk/; revision=25431
2008-06-05 10:32:51 +00:00