aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-iec104.c
AgeCommit message (Collapse)AuthorFilesLines
2014-12-23Deleting unnecessary #includes from dissectors.Martin Mathieson1-2/+0
Third batch (packet-icmpv6.c -> packet-mac-lte.c). Will look at cleaning up and committing script afterwards. Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640 Reviewed-on: https://code.wireshark.org/review/6018 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-3/+1
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-12-07iec104: Missing break in switch (CID 280459)Alexis La Goutte1-0/+1
Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc Reviewed-on: https://code.wireshark.org/review/5656 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-06Adjust indentation to match editor modelines; Do other minor whitespace changes.Bill Meier1-207/+207
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353 Reviewed-on: https://code.wireshark.org/review/4502 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-10Eliminate proto_tree_add_text from some dissectors.Michael Mann1-1/+6
Other minor cleanup while in the neighborhood. Change-Id: Ib76f4a9f89b5933425760af0a980c6a549031b8f Reviewed-on: https://code.wireshark.org/review/3537 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-06-29proto_tree_add_subtree[_format]Michael Mann1-2/+2
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-4/+4
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-4/+4
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-24Fixed mausb valid bit & added invalid_valid TFSSean O. Stalley1-1/+0
Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit is active low (ie: valid = 0, invalid = 1). I noticed Some other dissectors also defined an tfs_invalid_valid, so got rid of their local definitions & added it to epan/tfs.c. Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286 Reviewed-on: https://code.wireshark.org/review/1766 Reviewed-by: Alexis La Goutte <alexis.lagoutte@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>
2014-01-30IEC60870-5-104: Added decoding of integrated totals without time tag, fixed ↵Jiri Engelthaler1-28/+32
inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes. Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a
2014-01-05Dissect the remainder of IEC104 integrated totals, including the binary counterEvan Huus1-8/+44
reading and the various flags. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596 svn path=/trunk/; revision=54600
2014-01-03Add partial dissection of IEC104 M_IT_TB_1.Evan Huus1-0/+17
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596 Also add modelines. svn path=/trunk/; revision=54583
2013-12-15Fix [-Wmissing-prototypes]Jakub Zawadzki1-0/+4
svn path=/trunk/; revision=54135
2013-12-14Fix const warnings.Jakub Zawadzki1-2/+2
svn path=/trunk/; revision=54092
2013-11-09Add data parameter to tcp_dissect_pdus() as well as convert it to using ↵Michael Mann1-6/+7
"new" style dissectors. Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. svn path=/trunk/; revision=53198
2013-11-09Replace STRINGIFY with glib version.Jakub Zawadzki1-2/+2
svn path=/trunk/; revision=53193
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-12/+12
svn path=/trunk/; revision=52591
2013-09-15More wmem conversion (leaving uat related functions aside)Pascal Quantin1-24/+25
svn path=/trunk/; revision=52055
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-1/+1
svn path=/trunk/; revision=51852
2013-08-27From Jiri Engelthaler via ↵Pascal Quantin1-18/+22
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849 : IEC104: fix dissection of VTI Value and Normalised value svn path=/trunk/; revision=51536
2013-07-16Improve iec104 dissector. Bug 8849 ↵Michael Mann1-389/+544
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849) 1) Decoding type 70 - End of initialization 2) Decoding qualifier of interrogation for type 100 3) Table of data length for all object types => checking length on one place 4) Setting correct number of selected bytes for IOA From Jiří Engelthaler svn path=/trunk/; revision=50664
2013-06-25Bugfix iec104 dissector, bug 8849 ↵Michael Mann1-39/+32
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849) From Jiří Engelthaler 1) Wrong bits definitions for SIQ.BL, SIQ.SB, SIQ.NT, SIQ.IV, QDS.BL, QDS.SB, QDS.NT, QDS.IV 2) Invalid field abbrev for VTI Transient 3) Wrong bit size for SCO.QU, DCO.QU, RCO.QU 4) Changes from BASE_DEC to BASE_HEX 5) Several code style changes svn path=/trunk/; revision=50145
2013-05-26Batch of filterable expert infos.Michael Mann1-33/+45
svn path=/trunk/; revision=49584
2013-04-21General cleanup.Michael Mann1-723/+597
Converted to proto_tree_add_text to proto_tree_add_item/expert_info Allow columns/tree/(sub)dissectors/expert_info to be called at all of the proper times. COL_INFO data still seems a bit verbose when errors occur, but I left it alone, just cleaning up the sequence of events. Removed some structure definitions where the variables that used them were effectively "useless" once proto_tree_add_item was added (although they weren't that useful before that) svn path=/trunk/; revision=48958
2013-03-19From beroset:Anders Broman1-2/+2
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48426
2013-02-26Fix spelling/typos found using a list of commonly misspelled words.Bill Meier1-17/+17
The misspellings were mostly in comments but some were in text strings visible to the user. svn path=/trunk/; revision=47899
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45017
2012-08-10Use val_to_str_const() where appropriate;Bill Meier1-3/+3
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
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-4/+4
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-05-05Fix decoding of CP56Time2a timestamp. Resolves bug 5889.Chris Maynard1-2/+2
svn path=/trunk/; revision=36997
2010-12-22From Jiří Engelthaler:Jaap Keuter1-16/+186
Fixes computing of milliseconds in CP56time2a and add "bitstring of 32 bits" and "step position" support (ASDU types 5,7,32,33,47,51,60 and 64). svn path=/trunk/; revision=35249
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-1/+1
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-10-10Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h ↵Bill Meier1-18/+24
not req'd. svn path=/trunk/; revision=34464
2010-09-23Replace blurbs that match the name (case insensitive) with NULL.Jeff Morriss1-106/+106
svn path=/trunk/; revision=34227
2010-08-02Fix cases where the type of a for loop variable is smaller than the type of ↵Bill Meier1-3/+3
the "end" variable. In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable. However, on general principles, all the usages have been fixed. svn path=/trunk/; revision=33692
2010-04-03Remove unneeded #include <stdio.h>Bill Meier1-1/+0
svn path=/trunk/; revision=32367
2009-10-08Clean up header fields.Jaap Keuter1-2/+2
svn path=/trunk/; revision=30395
2009-09-20From Kjell Hultman:Jaap Keuter1-1/+840
IEC104 Signal dissection added - not complete (only implemented what I needed for the moment). svn path=/trunk/; revision=30026
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-10From Joan Ramio:Anders Broman1-4/+6
IEC 60870-5-104 dissector decodes nothing (new_tvb reported length bug) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3650 svn path=/trunk/; revision=29048
2009-07-06Small editorial changes.Anders Broman1-3/+7
svn path=/trunk/; revision=28953
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-5/+5
(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-04-14ep_strbuf usage: ep_strbuf_new_label("") --> ep_strbuf_new_label(NULL);Bill Meier1-8/+8
ep_strbuf_append() --> ep_strbuf_append_c() in a few cases. svn path=/trunk/; revision=28052
2009-04-14From Jakub Zawadzki: Fix a logic error.Gerald Combs1-0/+1
svn path=/trunk/; revision=28047
2009-03-31Get rid of val_to_strlen() - strlen() on the results of val_to_str()Guy Harris1-41/+27
suffices (and 100 is an odd choice of failure), and it shouldn't return a guint8 in any case. Don't use tvb_length() to determine how big a packet is - you want the real size, not the possibly-shortened-by-a-snapshot-length size. Don't make things guint8 if they're not guaranteed to be one byte long. Use an ep_strbuf in another case. svn path=/trunk/; revision=27908
2009-03-30More Win64 fixes.Gerald Combs1-19/+18
svn path=/trunk/; revision=27903
2009-01-28#include prefs.h not req'dBill Meier1-1/+0
svn path=/trunk/; revision=27321
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 08:50:52 +0000