Commit Graph

198 Commits

Author SHA1 Message Date
Guy Harris c33cad6b43 More white space cleanup.
We need the PDU length to find stuff at the end; use
tvb_reported_length(), *not* tvb_length(), to get it, so we're not
confused by a snapshot length.  Rename it "pdu_len" to make that clear.

svn path=/trunk/; revision=39162
2011-09-26 21:48:54 +00:00
Guy Harris 8e7403464e The fragment data is almost certainly not a text string, so don't make
it an FT_STRING.

svn path=/trunk/; revision=39160
2011-09-26 20:46:09 +00:00
Guy Harris a15d409cbf Use ENC_ values in proto_tree_add_item() calls.
Get rid of the code that attempts to deal with the FCS; if the
link-layer dissector hasn't removed the FCS, either:

	1) the link-layer dissector is buggy and should be fixed;

or

	2) the link-layer dissector doesn't know whether there's an FCS
	   and you have to tell it by setting a preference (and if there
	   is no such preference, one needs to be added).

The code in question was causing errors when the link-layer dissector
was removing the FCS when it's known to be present, as it should do.

Get rid of 4-space tabs in favor of spaces.

svn path=/trunk/; revision=39158
2011-09-26 20:33:35 +00:00
Stig Bjørlykke 5359494b1f Second try to move crc routines to libwsutil.
This time keep the tvb routines in epan.

Now we can use common crc routines outside epan.

svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
Stig Bjørlykke 71f903b956 Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
2011-08-30 14:17:40 +00:00
Stig Bjørlykke 4132d40e50 Move all crc routines to libwsutil.
This way we can use the crc routines in wiretap.

svn path=/trunk/; revision=38800
2011-08-30 13:46:42 +00:00
Bill Meier 869b51db0e Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38321
2011-08-03 16:06:00 +00:00
Stig Bjørlykke 8c48b5f932 Make it compile.
svn path=/trunk/; revision=38254
2011-07-29 10:53:51 +00:00
Guy Harris eaecea41a3 Get rid of non-ASCII characters.
Clean up white space.

Clean up capitalization a bit.

svn path=/trunk/; revision=38253
2011-07-29 10:28:29 +00:00
Michael Tüxen c6b79979c2 Get it compiling.
svn path=/trunk/; revision=38250
2011-07-29 07:24:15 +00:00
Anders Broman bbf4437af0 From Wido Kelling:
Add Dissection of newly released PNIO IEC 61158 Version 2.3.
From me use ENC_BIG_ENDIAN.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6154

svn path=/trunk/; revision=38249
2011-07-29 05:36:57 +00:00
Guy Harris c34b796445 Add a DREP_LITTLE_ENDIAN for the DCE RPC endianness bit in the data
representation.  Use it rather than a raw 0x10.

Add a DREP_ENC_INTEGER() macro that takes a pointer to the data
representation and returns either ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN;
use it for the encoding argument to proto_tree_add_item(), rather than
just the AND of drep[0] and DREP_LITTLE_ENDIAN, as it's not a boolean
any more, and for string values we'll be supporting character encodings
as well and thus won't be able to trust that the 0x10 bit will mean
"little endian".

Use ENC_NA for some other encoding values, i.e. for FT_BYTES and the
like.

Fix a couple of places in the DCOM dissector where we were passing the
byte-order bit rather than the field value to
proto_tree_add_uint_format().

Clean up white space.

svn path=/trunk/; revision=38128
2011-07-19 23:02:02 +00:00
Anders Broman 3826755b0a From Roland Knall:
implement a named dissector for the PN/IO sub-protocol for
Profinet, as well as a heuristic dissector ("pn_io"), other protocols can
attach too.

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

svn path=/trunk/; revision=37882
2011-07-03 19:25:34 +00:00
Gerald Combs b223e99e5a get_host_ipaddr() was returning numeric addresses in host byte order
and hostnames in network byte order. Have it return everything in
network byte order.

svn path=/trunk/; revision=36873
2011-04-26 17:13:37 +00:00
Alexis La Goutte ed3a223400 From http://www.wireshark.org/lists/wireshark-dev/201104/msg00231.html
Always use the returned tree value of proto_tree_add_subtree (and not the item!)

svn path=/trunk/; revision=36801
2011-04-22 13:07:11 +00:00
Alexis La Goutte 83aea790d4 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=36772
2011-04-21 16:01:03 +00:00
Alexis La Goutte ab38454697 Fix Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36754
2011-04-21 13:32:11 +00:00
Jörg Mayer 4b87a3d770 CID 1161: Not really used variable
svn path=/trunk/; revision=36725
2011-04-19 21:20:15 +00:00
Jörg Mayer 8efd127f31 CID 1162: Not really used variable
svn path=/trunk/; revision=36724
2011-04-19 21:15:58 +00:00
Stig Bjørlykke 888880eb25 Rewrote check for szStr in dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst.
Coverity 535.

svn path=/trunk/; revision=36282
2011-03-23 07:34:00 +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
Jeff Morriss f53744b59d There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
   
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string().

svn path=/trunk/; revision=35603
2011-01-21 03:00:31 +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 333ef8b5b7 Removed unused hf_pn_dcp and hf_pn_ptcp.
svn path=/trunk/; revision=34544
2010-10-17 16:49:10 +00:00
Jeff Morriss 7502bd4a8f From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :
In the profinet plugin, the decoding of the MRP LinkUp and MRP LinkDown
messages is missing the MRP_SA field which garbles the decode of the rest of
the packet.

This fix adds the decoding of the MRP_SA field to the MRP LinkUp and MRP
LinkDown dissectors.

svn path=/trunk/; revision=34524
2010-10-15 17:17:04 +00:00
Jeff Morriss 2d9d0900c5 From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :
In profinet plugin, there is a dissection based on whether the read data
returned is expected to contain a single or multiple blocks. Currently, the
I&M0FilterData case assumes only a single block is returned. Profinet specifies
two optional additional blocks.

This change moves I&M0FilterData to expect multiple blocks to correct decode
the optional information.

svn path=/trunk/; revision=34523
2010-10-15 17:10:29 +00:00
Anders Broman 5984fb4888 From Yu Zhang:
MRP packet is not correctly parsed in PROFINET multiple write record request.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5267

svn path=/trunk/; revision=34358
2010-10-04 06:16:45 +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
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 e611923124 Get rid of check_col().
svn path=/trunk/; revision=32428
2010-04-08 15:51:44 +00:00
Bill Meier 5ccee6196a Remove some uneeded #includes
svn path=/trunk/; revision=32419
2010-04-07 18:24:18 +00:00
Anders Broman 846eed1d9e Get rid of check_col
svn path=/trunk/; revision=32401
2010-04-06 16:13:09 +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
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
Stig Bjørlykke 25dcd066b6 From Hannes Diethelm via bug 4525:
Corrected values for IdentInfo (which was obviously wrong)

svn path=/trunk/; revision=31978
2010-02-24 08:22:33 +00:00
Bill Meier c033a08313 Fix some gcc -Wshadow warnings.
svn path=/trunk/; revision=31724
2010-01-28 23:53:27 +00:00
Anders Broman 440c3f9261 From Didier Gautheron:
check_col.diff
Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31519
2010-01-13 20:32:01 +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
Ulf Lamping 06e6441c9e add "reserved for profiles" comments
svn path=/trunk/; revision=30811
2009-11-04 00:07:54 +00:00
Anders Broman 03c3b66945 From Benjamin Meyer:
UserData in Profinet ProcessAlarm declared as UserStructIdentifier
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4195

svn path=/trunk/; revision=30808
2009-11-03 20:11:19 +00:00
Anders Broman ecbe3c28f3 From Matthias FRANK:
PROFIDrive parameter requests not decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4193

svn path=/trunk/; revision=30804
2009-11-03 12:30:59 +00:00
Anders Broman d0a15b4473 From Matthias FRANK:
PROFISafe F-Parameter record not decoded in PROFINET dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4192
From me remove check_col();

svn path=/trunk/; revision=30801
2009-11-02 18:09:46 +00:00
Stig Bjørlykke 8248955d7d Renamed tvb_new -> new_tvb to avoid name collision.
svn path=/trunk/; revision=30617
2009-10-19 14:36:26 +00:00
Stig Bjørlykke d7ca2a6444 Initialize variables which may be used uninitialized.
svn path=/trunk/; revision=30535
2009-10-12 14:13:01 +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
Stig Bjørlykke cf85342eec Build plugins with cmake on OSX.
svn path=/trunk/; revision=30373
2009-10-06 18:58:09 +00:00
Anders Broman b95ab896f7 From Benjamin Meyer:
Profinet PDIRFrameData field FrameDetails not decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4091

svn path=/trunk/; revision=30321
2009-10-04 19:34:48 +00:00