Commit Graph

39 Commits

Author SHA1 Message Date
Michael Mann 7c33631d69 Remove setting of pinfo->private_data to ETHERCAT_MBOX_HEADER structure as it's not used anywhere in the Wireshark source.
If it's used by a third-party plugin, please submit a patch that passes the ETHERCAT_MBOX_HEADER structure through the data parameter of the "new" style dissector function.

svn path=/trunk/; revision=53094
2013-11-05 20:00:57 +00:00
Bill Meier f784806968 Comment out numerous unused hf_.... instances found by checkhf.
svn path=/trunk/; revision=47617
2013-02-10 20:52:21 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +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 128c4266a0 Attempt to fix display of "eoe macfilter header".
Among other things: fix incorrect 'display' value in several hf[] entries.
(See XXX coments in source for further details).
Attempt to fix use of incorrect value in hf[] entry 'display' fields


svn path=/trunk/; revision=43149
2012-06-07 20:16:28 +00:00
Guy Harris 0e1de63173 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42583
2012-05-11 18:54:32 +00:00
Alexis La Goutte e3d0d4bd8f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40474
2012-01-13 16:37:04 +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 94e9c99b3f Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
svn path=/trunk/; revision=39490
2011-10-20 14:30:27 +00:00
Bill Meier 782cc6e3c3 Convert plugin files proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).

svn path=/trunk/; revision=39429
2011-10-15 19:58:31 +00:00
Bill Meier 9eb54292d3 Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugins/*:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in an earlier SVN)

svn path=/trunk/; revision=39329
2011-10-10 00:53:55 +00:00
Bill Meier 02065b0981 Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugin dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39292
2011-10-06 14:46:34 +00:00
Bill Meier ef8009abe3 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|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39262
2011-10-05 01:00:06 +00:00
Jeff Morriss 1229678a46 Use the return value of proto_item_add_subtree(): put the filter masks in their own subtree (as it appears was intended).
svn path=/trunk/; revision=36811
2011-04-22 14:48:10 +00:00
Anders Broman 645cfe9ef2 Add a missing break.
CID 487

svn path=/trunk/; revision=36403
2011-03-29 21:20:36 +00:00
Bill Meier b9331456e9 Don't assign to a proto_item* if the value won't be used: Coverity 1151-1154;
svn path=/trunk/; revision=36312
2011-03-24 17:37:07 +00:00
Stephen Fisher f749439b71 Remove some of the many dead assignments found by clang
svn path=/trunk/; revision=35982
2011-02-17 18:45:45 +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
Stig Bjørlykke 763e03b407 Removed unused hf_ecat_mailbox.
svn path=/trunk/; revision=34543
2010-10-17 16:43:07 +00:00
Anders Broman 7cfa27b04b Get rid of a bunch of check_col().
svn path=/trunk/; revision=32388
2010-04-05 20:04:52 +00:00
Anders Broman 4d2e653901 From Didier Gautheron:
Dissectors using call_dissector() function inside a 'if (tree) {}' block.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4107

svn path=/trunk/; revision=30415
2009-10-09 07:24:33 +00:00
Kovarththanan Rajaratnam 00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Bill Meier 6f87844d0a (Minor) Remove unneeded #includes.
svn path=/trunk/; revision=29492
2009-08-21 14:36:27 +00:00
Kovarththanan Rajaratnam 197d30a3b8 Use HFILL instead of hard coding the values
svn path=/trunk/; revision=29431
2009-08-15 11:21:36 +00:00
Stig Bjørlykke 2bba6be84f From Kovarththanan Rajaratnam via bug 3548:
Cleanup header_field_info in plugins.

svn path=/trunk/; revision=28771
2009-06-18 23:22:10 +00:00
Gerald Combs 17f0d877fa Fix Win64 compilation problems in the plugins directory.
svn path=/trunk/; revision=28064
2009-04-16 03:38:23 +00:00
Stig Bjørlykke 94e9e2b1ec Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26652
2008-10-31 17:27:51 +00:00
Bill Meier 05c1929f1d proto_register/proto_reg_handoff; Various small cleanup and bug-fixing
remove unnecessary #include prefs.f and emem.h in a few cases...

svn path=/trunk/; revision=26554
2008-10-25 20:24:31 +00:00
Anders Broman db6d0b9a4c Run checkAPI in plugins dir.
svn path=/trunk/; revision=25259
2008-05-08 18:24:08 +00:00
Stephen Fisher 9ef2001f7b Fix the declaration of a true_false_string
svn path=/trunk/; revision=24572
2008-03-05 22:28:51 +00:00
Anders Broman 7a5b90df34 From Peter Johansson :
Support for EtherCAT subdissectors.

svn path=/trunk/; revision=24566
2008-03-05 20:42:58 +00:00
Stig Bjørlykke cfc7b3276c Rewrote some prohibited APIs in plugins/ (sprintf, strcpy, strcat).
svn path=/trunk/; revision=24274
2008-02-05 22:30:32 +00:00
Jeff Morriss 283ddb3d0c Fix http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2186 (many unnamed structs in packet-ecatmb.h) by adding predictable (but not very descriptive) struct names
svn path=/trunk/; revision=24061
2008-01-10 22:19:53 +00:00
Jeff Morriss 0918c7159b sizeof() returns a 64-bit number when compiling for 64-bit (and a 32-bit number when compiling for 32-bit) so cast sizeof() values that are passed to g_snprintf() to guint (since that appears to be the intent of the display).
svn path=/trunk/; revision=23205
2007-10-16 14:54:51 +00:00
Jörg Mayer 4604a19971 Fix a warning about different variable sizes that prevented compilation
with gcc.

svn path=/trunk/; revision=23204
2007-10-16 14:30:41 +00:00
Stig Bjørlykke fe8e1e3fbc Fixed compiler errors.
svn path=/trunk/; revision=23196
2007-10-15 21:46:08 +00:00
Anders Broman 407faa6a2d Try to fix the buildbot.
svn path=/trunk/; revision=23193
2007-10-15 20:12:02 +00:00
Anders Broman 3238f6b87a Ethercat plugin
Author :
Richard Kuemmel <r.kuemmel[AT]beckhoff.de>

Updates and bugfixes:
Peter Johansson <peterjohansson73[AT]gmail.com>

svn path=/trunk/; revision=23173
2007-10-14 15:44:05 +00:00