Commit Graph

52 Commits

Author SHA1 Message Date
Alexis La Goutte 9d8cb74abf iec104: Missing break in switch (CID 280459)
Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc
Reviewed-on: https://code.wireshark.org/review/5656
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:10:19 +00:00
Bill Meier 24d50bc290 Adjust indentation to match editor modelines; Do other minor whitespace changes.
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353
Reviewed-on: https://code.wireshark.org/review/4502
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 17:12:33 +00:00
Michael Mann 3635d7bed7 Eliminate proto_tree_add_text from some dissectors.
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-08-10 21:39:20 +00:00
Michael Mann e8a8d62dc3 proto_tree_add_subtree[_format]
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332
Reviewed-on: https://code.wireshark.org/review/2694
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 14:52:33 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Sean O. Stalley 33ae4cb024 Fixed mausb valid bit & added invalid_valid TFS
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-05-24 06:51:17 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(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-03-04 14:27:33 +00:00
Jiri Engelthaler 458b835683 IEC60870-5-104: Added decoding of integrated totals without time tag, fixed inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes.
Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a
2014-01-30 12:00:46 +00:00
Evan Huus 5fdb822101 Dissect the remainder of IEC104 integrated totals, including the binary counter
reading and the various flags.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596

svn path=/trunk/; revision=54600
2014-01-05 14:58:07 +00:00
Evan Huus 7af0e2a446 Add partial dissection of IEC104 M_IT_TB_1.
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596

Also add modelines.

svn path=/trunk/; revision=54583
2014-01-03 15:09:24 +00:00
Jakub Zawadzki c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Jakub Zawadzki e0e86bab5a Fix const warnings.
svn path=/trunk/; revision=54092
2013-12-14 14:33:46 +00:00
Michael Mann 8081cf1d90 Add data parameter to tcp_dissect_pdus() as well as convert it to using "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-09 17:46:28 +00:00
Jakub Zawadzki 0b0bbf0965 Replace STRINGIFY with glib version.
svn path=/trunk/; revision=53193
2013-11-09 14:37:13 +00:00
Bill Meier 2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Pascal Quantin 9486a3d974 More wmem conversion (leaving uat related functions aside)
svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
Michael Mann 9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Pascal Quantin 7dfc77adcd From Jiri Engelthaler via 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-08-27 14:56:00 +00:00
Michael Mann 18ea28c45e Improve iec104 dissector. Bug 8849 (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-07-16 14:01:45 +00:00
Michael Mann 1d5f640230 Bugfix iec104 dissector, bug 8849 (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-06-25 19:32:39 +00:00
Michael Mann 5bc22a25df Batch of filterable expert infos.
svn path=/trunk/; revision=49584
2013-05-26 03:29:07 +00:00
Michael Mann 8591b0b374 General cleanup.
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-04-21 23:20:10 +00:00
Anders Broman 6bde918078 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
Bill Meier 96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Bill Meier 638d74d43f Use val_to_str_const() where appropriate;
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-08-10 22:55:02 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +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
Chris Maynard df3cd034b8 Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
svn path=/trunk/; revision=36997
2011-05-05 14:20:22 +00:00
Jaap Keuter 226a722600 From Jiří Engelthaler:
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-22 23:28:23 +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
Bill Meier 93b94a23ca Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h not req'd.
svn path=/trunk/; revision=34464
2010-10-10 23:28:40 +00:00
Jeff Morriss 0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
Bill Meier dac0bf77ed Fix cases where the type of a for loop variable is smaller than the type of 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-08-02 13:09:01 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Jaap Keuter fe2a12d423 Clean up header fields.
svn path=/trunk/; revision=30395
2009-10-08 05:43:19 +00:00
Jaap Keuter 1da709093c From Kjell Hultman:
IEC104 Signal dissection added - not complete (only implemented what I needed for the moment).

svn path=/trunk/; revision=30026
2009-09-20 21:08:04 +00:00
Kovarththanan Rajaratnam ac463d2697 Don't guard col_clear with col_check
svn path=/trunk/; revision=29346
2009-08-09 08:14:59 +00:00
Kovarththanan Rajaratnam 6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Anders Broman 889d1f124e From Joan Ramio:
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-10 05:40:02 +00:00
Anders Broman c0e6bc1eca Small editorial changes.
svn path=/trunk/; revision=28953
2009-07-06 14:09:52 +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
Bill Meier 871c9c7152 ep_strbuf usage: ep_strbuf_new_label("") --> ep_strbuf_new_label(NULL);
ep_strbuf_append() --> ep_strbuf_append_c() in a few cases.

svn path=/trunk/; revision=28052
2009-04-14 18:31:02 +00:00
Gerald Combs c3befe3a37 From Jakub Zawadzki: Fix a logic error.
svn path=/trunk/; revision=28047
2009-04-14 17:52:22 +00:00
Guy Harris 2776974a35 Get rid of val_to_strlen() - strlen() on the results of val_to_str()
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-31 07:10:17 +00:00
Gerald Combs 7247fa0b45 More Win64 fixes.
svn path=/trunk/; revision=27903
2009-03-30 20:52:25 +00:00
Bill Meier d830d2884e #include prefs.h not req'd
svn path=/trunk/; revision=27321
2009-01-28 20:10:12 +00:00
Sake Blok b49434dcd2 From SUZUKI, Shinsuke <suz@kame.net> (bug 2956):
Remove non-ascii characters to prevent compilation failure on
non-european windows.


svn path=/trunk/; revision=26420
2008-10-12 09:38:40 +00:00
Bill Meier a7e61da1b3 Minor cleanup related to proto_register and/or proto_reg_handoff
ep_alloc + memset --> ep_alloc0 (teamspeak2)

svn path=/trunk/; revision=26356
2008-10-05 23:08:54 +00:00