Commit Graph

88 Commits

Author SHA1 Message Date
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 cca6984ab9 Do some more conversions of proto_tree_add_item() 'encoding' arg
(previously missed).

svn path=/trunk/; revision=39450
2011-10-18 00:17:48 +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 78c5c20d08 Don't assign to a proto_item* if the value won't be used: Coverity 1155-1156;
Also:
  - Fix a few cases of SET_HIDDEN on the wrong item. (The SET_HIDDEN was being
    done on an already hidden item).
  - Minor indentation cleanup;

svn path=/trunk/; revision=36315
2011-03-24 21:19:39 +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
Ronnie Sahlberg 875abf1deb dont assign to a proto_item* unless we are going to use the value
coverity 1157

svn path=/trunk/; revision=36276
2011-03-23 05:18:26 +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
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +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
Guy Harris ac3ac6c476 Plugins are not shared libraries, so:
1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
2010-09-24 20:41:34 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jaap Keuter eb6efdc4a4 Synchronize Makefiles even more.
svn path=/trunk/; revision=32808
2010-05-14 16:48:17 +00:00
Jeff Morriss 54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +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
Bill Meier beb8d29ad6 From Richard Kümmel: Added the bitmasks for port 10 and port 11.
From me: As per Richard: Fix definitions of the bitfield for hf_esl_crcerror and
hf_esl_alignerror.

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3677#c10


svn path=/trunk/; revision=32324
2010-03-29 16:52:47 +00:00
Jörg Mayer 96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Jörg Mayer 67072286bf - Remove the lib prefix for plugin names.
- Remove a (resolved) comment.
- Add a commented out line how to add version infos to the
  plugin's file name.

svn path=/trunk/; revision=31995
2010-02-24 22:32:10 +00:00
Bill Meier de767f7dea Do some cleanup:
- Separate .h file not req'd since not used elsewhere;
- Use bitmasks instead of using non-portable bitfields;
- Note possible incorrect display of crcError and alignError flags;
- Clean up spacing.

svn path=/trunk/; revision=31412
2010-01-02 22:00:30 +00:00
Gerasimos Dimitriadis c840cdd5a0 Remove the address operator from value_string arrays fed to VALS()
svn path=/trunk/; revision=30995
2009-11-17 18:35:27 +00:00
Jörg Mayer d2cc318f4f Beginnings of enabling static builds. Still to do:
* Add -static
* Registration may need different handling
* Add plugins
* Build error in wslua

svn path=/trunk/; revision=30987
2009-11-17 11:58:36 +00:00
Jörg Mayer 9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Kovarththanan Rajaratnam 8b8399b711 Use register_dissector_files in the plugins dissectors
svn path=/trunk/; revision=30435
2009-10-09 16:39:34 +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
Stig Bjørlykke cf85342eec Build plugins with cmake on OSX.
svn path=/trunk/; revision=30373
2009-10-06 18:58:09 +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
Jörg Mayer 95182116aa CMake:
- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Jörg Mayer 5a2247f5a3 Build a few more plugins
svn path=/trunk/; revision=29942
2009-09-16 06:30:03 +00:00
Jeff Morriss 4661aad9a4 Run checkapi on the dissector header files
svn path=/trunk/; revision=29883
2009-09-13 19:48:22 +00:00
Kovarththanan Rajaratnam 2547ce21bf We no longer support the old plugin API so remove it completely from the build system
svn path=/trunk/; revision=29821
2009-09-09 14:01:57 +00:00
Bill Meier 6f87844d0a (Minor) Remove unneeded #includes.
svn path=/trunk/; revision=29492
2009-08-21 14:36:27 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +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
Kovarththanan Rajaratnam 2dfa5ccebe From Artem Tamazov via. 3899:
Remove superfluous /MP

svn path=/trunk/; revision=29410
2009-08-14 10:17:13 +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
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
Anders Broman 91caa01090 Add /MP flag to make use of multi cores.
svn path=/trunk/; revision=29104
2009-07-15 20:55:31 +00:00
Bill Meier 4a3f420843 Fix the esl protocol enable/disable handling issue introduced in SVN #28986:
Use the standard "if (!initialized)..." logic in proto_reg_handoff().
Also: use "true_false_string flags_yes_no" as in the original patch.

svn path=/trunk/; revision=28994
2009-07-07 17:03:11 +00:00
Bill Meier eac1f47fad Various fixes:
1. For some reason: using an using the external tfs_yes_no doesn't work in a plugin;
2. proto_reg_handoff: remove unneeded code;
3. Change the prefs callback to call a function which just enables/disables
   the protocol; (using proto_reg_handoff means that the dissector
   was re-registered each time the pref was changed);
4. packet-esl.h: use #if 0 instead of /* ... */ to comment out code;

svn path=/trunk/; revision=28986
2009-07-07 14:26:38 +00:00
Stig Bjørlykke 09218f7338 From Richard Kummel:
- New dissector for EtherCAT Switch Link Header added to EtherCAT plugin
- Changed filtering of EtherCAT commands to the abbreviated form:
  e.g. ecat.cmd = APWR

From me:
- Mark unused variables
- Fixed a string warning
- Do not initialize a static struct
- Use tfs_yes_no
- Reorder files in Makefile

svn path=/trunk/; revision=28976
2009-07-07 11:13:22 +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