Commit graph

215 commits

Author SHA1 Message Date
Bill Meier
78a170a506 Cleanup whitespace;
Reformat hf[] entries.

svn path=/trunk/; revision=42748
2012-05-21 16:12:56 +00:00
Bill Meier
a729320b0a Init some variables to prevent scan-build "Function call argument is an uninitialized value" messages.
(Not actually a bug due to the way the code works ?)

svn path=/trunk/; revision=42747
2012-05-21 15:56:26 +00:00
Bill Meier
1783543e92 AFAICT '#include sys/types.h' is not needed for these files.
svn path=/trunk/; revision=42446
2012-05-05 21:29:13 +00:00
Chris Maynard
7655cb2f5a Initialize u32RecDataLen to 0 to avoid a clang warning and in the event it never gets initialized in either dissect_IODWriteReqHeader_block() or dissect_IODReadReqHeader_block().
svn path=/trunk/; revision=42325
2012-04-28 18:50:20 +00:00
Jakub Zawadzki
aec21991ec Fix value of "Error in Parameter API"
References: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3753#c3

svn path=/trunk/; revision=42285
2012-04-27 08:41:44 +00:00
Jeff Morriss
75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Bill Meier
2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Jeff Morriss
bc57b2c8b4 From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6819 :
Patch to fix channelproperty Maintanance decode.

svn path=/trunk/; revision=40943
2012-02-09 19:02:28 +00:00
Anders Broman
8e97665863 Add *.sbr files to the clean target.
svn path=/trunk/; revision=40761
2012-01-29 20:03:39 +00:00
Bill Meier
ee3936cd48 (Trivial) remove commented out calls to tvb_free().
svn path=/trunk/; revision=40202
2011-12-14 18:40:03 +00:00
Jörg Mayer
5a04ff0438 Fix:
trunk/plugins/profinet/packet-pn-rt.c: In function ‘IsDFP_Frame’:
trunk/plugins/profinet/packet-pn-rt.c:182:9: error: ‘u8SFCycleCounter’ undeclared (first use in this function)
trunk/plugins/profinet/packet-pn-rt.c:182:9: note: each undeclared identifier is reported only once for each function it appears in


svn path=/trunk/; revision=40063
2011-12-01 14:35:29 +00:00
Anders Broman
819f2fd1ac packet-dcerpc-pn-io.c:8735: warning: unused variable 'iSubFrameLen'
packet-dcerpc-pn-io.c:8734: warning: unused variable 'iTotalLen'

svn path=/trunk/; revision=40061
2011-12-01 06:35:02 +00:00
Anders Broman
28b32b9b81 From Wido Kelling:
Enhancements to profinet decoding (IEC 61158) V2.3.

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

svn path=/trunk/; revision=40058
2011-12-01 05:58:55 +00:00
Guy Harris
e600a12538 OK, *that's* what Clang Cat was going on about:
packet-dcerpc-pn-io.c:8438:17: warning: Although the value
	stored to 'prm_flag2' is used in the enclosing expression, the
	value is never actually read from 'prm_flag2'

OK, thanks for telling me that, technically,

	prm_flag1 = prm_flag2 = 0;

can be implemented by storing the 0 into prm_flag1 directly rather than
storing 0 into prm_flag2 and copying it to prm_flag1.  Yes, you can haz
cheeseburger.

I guess it would matter if we were actually depending on some
side-effect of fetching prm_flag2, but we're not.  Rewrite this one to
squelch the complaint.

svn path=/trunk/; revision=39841
2011-11-15 05:37:56 +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
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
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