Commit Graph

1804 Commits

Author SHA1 Message Date
Guy Harris c521263a6b Put NODIST_ at the beginning of macros containing NODIST, paralleling
the nodist_ convention for Automake variables.

Regularize the lists of source files, dividing them according to several
attributes.  Build composite lists in a plugins/Makefile.common.inc
file, to be included by plugin Makefile.common files, and use the
composite lists as appropriate in Makefile.am and Makefile.nmake.

svn path=/trunk/; revision=47502
2013-02-05 21:10:56 +00:00
Guy Harris 618e732f98 Don't forget the .c files that we *don't* distribute.
svn path=/trunk/; revision=47491
2013-02-05 09:11:37 +00:00
Guy Harris 68b610c304 mate_parser.c includes mate_grammar.h, so make mate_parser.obj depend on
mate_grammar.h.

svn path=/trunk/; revision=47490
2013-02-05 09:09:12 +00:00
Guy Harris 9eba2ea90a Don't distribute the results of running Lemon, as we distribute Lemon
ourselves.

Clean up various bits of "distribute" vs. "don't distribute" stuff in
the process - use similar names, and make the "distribute vs. don't
distribute" distinction the same as the "don't clean with "make
distclean" vs. clean with "make distclean"" distinction.

svn path=/trunk/; revision=47485
2013-02-05 06:09:17 +00:00
Gerald Combs 5130da6935 More silent build support.
svn path=/trunk/; revision=47472
2013-02-04 17:49:54 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Gerald Combs 8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs 34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Gerald Combs 9296fcc310 Fix more dependencies.
svn path=/trunk/; revision=47371
2013-01-30 20:32:44 +00:00
Jaap Keuter f75e904ecc Fix for CID 280529 and 280530.
Check the validity of the TLV before using its retreived data.

svn path=/trunk/; revision=47294
2013-01-26 11:34:55 +00:00
Michael Mann 8a18cb574b guint16 needed to prevent rollover. Bug 8199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8199)
#BACKPORT

svn path=/trunk/; revision=47045
2013-01-13 02:03:55 +00:00
Michael Mann 86d690880f replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.
bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)

svn path=/trunk/; revision=46928
2013-01-04 05:22:43 +00:00
Guy Harris 3dfac15921 Another 64-bit-to-32-bit warning on 32-bit platforms.
svn path=/trunk/; revision=46781
2012-12-26 12:28:40 +00:00
Guy Harris ef175a2208 Squelch some more discarding-qualifiers warnings.
svn path=/trunk/; revision=46770
2012-12-26 11:24:39 +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
Bill Meier 5a8c275b26 General cleanup:
- Localize some variables; remove unneeded initializers;
- Reformat some hf[] entries;
- Whitespace; style; long lines.

svn path=/trunk/; revision=46529
2012-12-13 18:17:47 +00:00
Bill Meier e790f93057 Remove some commented out code as per Wido Kelling:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002#c9

svn path=/trunk/; revision=46527
2012-12-13 16:27:40 +00:00
Bill Meier 53eccd2b40 General cleanup:
- Don't call expert...() under 'if (tree)';
- Make some functions static;
- Localize some variables; remove some uneeded initializers;
- Reformat some hf[] entries;
- Do whitespace fixes (including "4 space tabs").

svn path=/trunk/; revision=46523
2012-12-12 21:40:35 +00:00
Bill Meier 708e463c47 From Wido Kelling: [Profinet] Updated disecction regarding the IEC 61158
(with a few minor fixes by me).

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

major change:
 reassembling of PNIO fragments (only works if OpenSafty dissector is disabled)

minor changes:
 improved handling of DFP Frames

added / updated
 MRP Block decoding
 ARServerBlock
 ARVendorBlock
 PDInterfaceDataReal
 PDInterfaceAdjust
 PDPortStatistic
 SubdirFrameData corrected display and subblocks added
 PDIRGlobalData complete dissection
 decoding of FrameDataProperties and ARTypes updated to conform the STD
 removed now usuported RTC2 ranges


svn path=/trunk/; revision=46522
2012-12-12 18:47:59 +00:00
Bill Meier a4128c56b9 General cleanup:
- Use/create extended value strings as appropriate;
- Reformat hf[] entries;
- Do whitespace, & etc changes to use a consistent formatting style;
- Reformat some long lines;
- Localize some variables; remove some unneeded initializers;
- expert...() shouldnt be called under 'if (tree)' (packet-wimaxasncp);
- Move proto_register...() & etc to the end of the file (packet-ieee80211);
- Misc.

svn path=/trunk/; revision=46489
2012-12-10 14:50:32 +00:00
Anders Broman 8f3f87a931 Bump revission.
svn path=/trunk/; revision=46447
2012-12-07 19:15:34 +00:00
Anders Broman 5505655199 From hannes:
'Fix for displaying the payload of the first chunk correctly.

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

svn path=/trunk/; revision=46445
2012-12-07 16:57:14 +00:00
Anders Broman e7c9ade670 From hannes:
Enable the plugin to detect and reassemble chunked UA messages for displaying them correctly.

From me:
- Partly applied by hand.
- move hf and ett asignments inseide the register routine as per convention.

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

svn path=/trunk/; revision=46436
2012-12-07 09:33:40 +00:00
Bill Meier 7cd0417af5 Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402
2012-12-05 15:56:36 +00:00
Jeff Morriss 366fe213a2 Add a checkapi target.
svn path=/trunk/; revision=46296
2012-11-29 21:44:38 +00:00
Bill Meier 0a94d24771 Fix several [-Wshadow] warnings.
svn path=/trunk/; revision=46287
2012-11-29 16:22:54 +00:00
Bill Meier 40a2218110 Fix [-Wshadow] warning;
Also:
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46272
2012-11-28 23:53:25 +00:00
Alexis La Goutte cf50d93510 Fix :
CMake Warning (dev) at CMakeLists.txt:476 (add_subdirectory):
  The source directory

    /home/wireshark/plugins/wimaxmacphy

  does not contain a CMakeLists.txt file.

  CMake does not support this case but it used to work accidentally and is
  being allowed for compatibility.

  Policy CMP0014 is not set: Input directories must have CMakeLists.txt.  Run
  "cmake --help-policy CMP0014" for policy details.  Use the cmake_policy
  command to set the policy and suppress this warning.
This warning is for project developers.  Use -Wno-dev to suppress it.

svn path=/trunk/; revision=46267
2012-11-28 22:50:33 +00:00
Anders Broman fa4c9734ea Revert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46140
looks like the worong variables may be used in the for loops.

../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataAdjust_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4420:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataReal_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4542:5: error: suggest parentheses around assignment used as truth value [-Werror=parentheses]
../../../plugins/profinet/packet-dcerpc-pn-io.c:4491:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataCheck_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:4570:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_MrpInstanceDataCheck_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:5426:160: error: unused parameter 'u16BodyLength' [-Werror=unused-parameter]
../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_ARBlockReq_block':
../../../plugins/profinet/packet-dcerpc-pn-io.c:6873:9: error: format '%x' expects a matching 'unsigned int' argument [-Werror=format]
../../../plugins/profinet/packet-dcerpc-pn-io.c:6811:13: warning: variable 'u16ARDevAccess' set but not used [-Wunused-but-set-variable]
../../../plugins/profinet/packet-dcerpc-pn-io.c: At top level:
../../../plugins/profinet/packet-dcerpc-pn-io.c:7628:1: error: 'dissect_IRTFrameBlock_block' defined but not used [-Werror=unused-function]
cc1: all warnings being treated as errors

svn path=/trunk/; revision=46142
2012-11-22 12:45:50 +00:00
Anders Broman 79974a41b0 From Wido Kelling:
Updates to conform IEC 61158.
major change:
reassembling of PNIO fragments (only works if OpenSafty dissector is disabled)
see Bug 7997

minor changes:
improved handling of DFP Frames

added / updated 
MRP Block decoding
ARServerBlock
ARVendorBlock
PDInterfaceDataReal
PDInterfaceAdjust
PDPortStatistic
SubdirFrameData corrected display and subblocks added
PDIRGlobalData complete dissection 
decoding of FrameDataProperties and ARTypes updated to conform the STD
removed now usuported RTC2 ranges

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

svn path=/trunk/; revision=46140
2012-11-22 12:12:12 +00:00
Michael Mann 4b0a6ca955 Add CRC verification to Modbus RTU dissector. CRC algorithm is the same as the "crc16-plain" with a different initial CRC (0xFFFF instead of 0). Created crc16_plain_tvb_offset_seed to "replace" crc16_plain_tvb_offset, but didn't remove crc16_plain_tvb_offset for backwards compatibility worries. Updated only dissector that used crc16_plain_tvb_offset (profinet/packet-pn-rt.c) to use crc16_plain_tvb_offset_seed(..., 0)
svn path=/trunk/; revision=45854
2012-10-31 20:09:05 +00:00
Evan Huus 361aedec1f Create SET_ADDRESS_HF that takes an additional hf_ value that can be
used to override the filter generated from the address column.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728 (again).

svn path=/trunk/; revision=45792
2012-10-26 01:59:17 +00:00
Evan Huus c6b522bc70 Revert revision 44921.
See discussion on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728

svn path=/trunk/; revision=45791
2012-10-26 00:42:34 +00:00
Guy Harris 5ba1ad12cc Based on patch from Bill Parker, check for ws_fopen() failing.
The rest of the code already checks for namelist being null, so it's OK
to call build_tree_view() - and it may be necessary to do so, as the
code below might assume that's worked.

However, we should not call fclose() on namelist if it's null; the C89
standard, at least, does *not* assert that fclose(NULL) is a no-op.

Clean up indentation a little bit.

Last part of fix for bug 7824.

svn path=/trunk/; revision=45455
2012-10-10 19:50:37 +00:00
Alexis La Goutte 26f28b0427 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45219
2012-09-30 11:06:28 +00:00
Alexis La Goutte 84f7a07047 From Yu Zhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7769
Add Dissector for SuboptionDeviceInstance under DevicePropertiesOption in PROFINET DCP

In PROFINET DCP dissector, current build didn't have SuboptionDeviceInstance
(0x07) under DevicePropertiesOption (0x02). This patch add the support of
SuboptionDeviceInstance

svn path=/trunk/; revision=45218
2012-09-30 11:02:56 +00:00
Michael Mann 8dcfa4214c replace unnecessary decode_numeric_bitfield calls
svn path=/trunk/; revision=45154
2012-09-26 18:33:10 +00:00
Jaap Keuter d249038a65 Implement and document the Custom plugin system. Create relevant example files and add them to the distribution. Rewrite README.plugins to describe how to use this system.
svn path=/trunk/; revision=45142
2012-09-25 21:02:13 +00:00
Jakub Zawadzki 72ca9d0e61 Store pointers to previously displayed and captured packet, not nstime_t deltas.
This commit reduces size (from 144B to 128B on AMD64) of frame_data structure.

Part of bug 5821: Reduce per-packet memory requirements.

svn path=/trunk/; revision=45071
2012-09-23 16:25:28 +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
Evan Huus 826bba705b From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728
Make right-click + apply-as-filter work in the packet list for non-ethernet
frames (such as ieee 802.11 frames).

svn path=/trunk/; revision=44921
2012-09-15 20:16:14 +00:00
Jakub Zawadzki dee4443809 Add data parameter to dissector_try_heuristic
svn path=/trunk/; revision=44871
2012-09-11 08:26:48 +00:00
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Bill Meier 0fbdec6d83 Fix a trivial typo.
svn path=/trunk/; revision=44660
2012-08-24 20:56:23 +00:00
Jörg Mayer b43901043a Remove commented out rules
Whitespace fixes

svn path=/trunk/; revision=44629
2012-08-23 10:34:45 +00:00
Chris Maynard b1aba30a79 Fix Coverity CID's 712344-712345: Unused pointer value.
svn path=/trunk/; revision=44135
2012-07-30 13:24:27 +00:00
Jörg Mayer 3bfda44ae0 Fix two "set but unused variable" warnings turning errors:
- Comment out hdrbits, it's retrieved but not used (slightly different
  approach to overwritten patch)
- Change two instances of pt to tree as this *may* have been
  the intention

svn path=/trunk/; revision=44061
2012-07-27 07:23:01 +00:00
Anders Broman fc192f4c57 Remove unused variable, use the created subtree. Found by buildbot.
svn path=/trunk/; revision=44059
2012-07-27 07:12:55 +00:00
Jeff Morriss 0183bd93fc You can't (well, shouldn't) reference and modify a given variable multiple
times in one C statement: the order of references and modifications is
undefined.  Anyway I don't think the modification is intentional: just divide
instead of divide-and-assign.

Also remove what looks to be some test code (only executed for frame number
11).

svn path=/trunk/; revision=44056
2012-07-26 20:57:42 +00:00
Michael Mann 44aabbdf14 Converted many proto_tree_add_text -> proto_tree_add_item (or at least something that's filterable). since Gryphon is used as the flagship example for plugins, I don't want developers to get the impression proto_tree_add_text is the way to add fields in Wireshark. Hopefully this will reduce the number of dissectors submitted with too many proto_tree_add_text()s.
svn path=/trunk/; revision=44055
2012-07-26 20:14:53 +00:00
Bill Meier b53d5078d9 - Call dissector_add-handle() so protocol is
available under UDP 'decode as';
- Back out use of extended value strings (added in SVN #43942);
   'tshark -G values' on Windows gives a warning as
   to 'Invalid value_string_ext ptr'.
   Issue: On Windows, value_string_ext validation code always
         fails for extended value strings in plugins.
         (Something todo with the linkage mechanism).

svn path=/trunk/; revision=44011
2012-07-25 20:37:47 +00:00
Bill Meier 4b9a0b0767 Cleanup:
- don't call col_...() and expert...() fcns under 'if (tree)';
- create/use extended value strings in a few cases;
- use val_to_str_ext_const();
- Don't increment offset if not used afterwards [set but unused];
- do whitespace cleanup (indentation, trailing, ...).


svn path=/trunk/; revision=43942
2012-07-23 18:17:38 +00:00
Jörg Mayer 26cbfc1be1 Fix a bit too much copy paste
svn path=/trunk/; revision=43853
2012-07-20 11:04:18 +00:00
Jörg Mayer 1cedb69de7 Add missing CMakeLists.txt
svn path=/trunk/; revision=43851
2012-07-20 10:33:21 +00:00
Pascal Quantin 8b883f5d9f Add SVN eol-style and keywords properties
svn path=/trunk/; revision=43848
2012-07-20 05:46:45 +00:00
Evan Huus 99f7759357 Fix some misplaced tree items, as caught by cppcheck (as unused variables).
svn path=/trunk/; revision=43845
2012-07-20 01:55:26 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
Stephen Fisher a3d1900fbd Fix compilation error seen with gcc on Unix:
pinfo_stats_tree.c:234:2: error: no newline at end of file


svn path=/trunk/; revision=43755
2012-07-16 18:07:08 +00:00
Anders Broman 5d9d9b8221 From Wonil Kim: Enable statistics menu register for the tap plug-in. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7466
svn path=/trunk/; revision=43726
2012-07-15 16:24:35 +00:00
Anders Broman 1ae38887b6 From Evan Huus:
Grab-bag of unused variables.

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

svn path=/trunk/; revision=43616
2012-07-09 01:49:02 +00:00
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Guy Harris 85f219be2e From Michael Mann:
Add a preference for the packet length statistics.

Fixes bug 3239.

svn path=/trunk/; revision=43597
2012-07-07 08:15:41 +00:00
Pascal Quantin a0c01750b8 From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7439 :
Add support for DOCSIS 3.0 AES keys

svn path=/trunk/; revision=43573
2012-07-05 19:10:46 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +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
Jeff Morriss 4fdc3c3cc2 Create, and start using, file name preferences.
File name preferences are basically just string preferences except that the
GUI will present a "Browse" button that allows the user to go and find the
file s/he wants (rather than having to blindly type in the full path).

svn path=/trunk/; revision=43228
2012-06-13 01:13:12 +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
Jeff Morriss 8204b904b3 Fix Coverity 702421: Handle the possibility that fvalue_to_string_repr()
may return NULL.

svn path=/trunk/; revision=43114
2012-06-05 15:20:31 +00:00
Alexis La Goutte 7174762b51 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=43088
2012-06-04 22:25:10 +00:00
Pascal Quantin 797b83c838 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7322 :
Add a missing break in packet-bpkmattr.c (CID 280484)

svn path=/trunk/; revision=43007
2012-06-02 19:15:07 +00:00
Guy Harris 533f70aca2 No more GIOP plugins, so get rid of the directory for the former plugins.
svn path=/trunk/; revision=42978
2012-06-01 17:08:32 +00:00
Anders Broman ffec8d8a78 Make packet-coseventcomm.c a bultin dissector
svn path=/trunk/; revision=42976
2012-06-01 15:58:30 +00:00
Anders Broman a8e8234831 Make packet-coseventcomm.c a bultin dissector
svn path=/trunk/; revision=42974
2012-06-01 15:57:05 +00:00
Bill Meier 3d4b3f2784 Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if Makefile.common is changed
svn path=/trunk/; revision=42972
2012-06-01 14:44:35 +00:00
Bill Meier 1caa79ad80 Windows: Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if Makefile.common is changed
ToDo: ditto for Makefile.am ?

svn path=/trunk/; revision=42971
2012-06-01 14:08:12 +00:00
Anders Broman c8625796f1 Make the cosnaming dissector a builtin dissector.
svn path=/trunk/; revision=42968
2012-06-01 12:27:04 +00:00
Anders Broman b42bbc2cd6 Make the tango dissector a builtin dissector.
svn path=/trunk/; revision=42967
2012-06-01 10:31:34 +00:00
Anders Broman 5959f75518 parlay changes to Cmake
svn path=/trunk/; revision=42965
2012-06-01 09:04:28 +00:00
Anders Broman 5ef6c6d08a Make the parlay dissector a buil tin dissector.
svn path=/trunk/; revision=42964
2012-06-01 08:48:31 +00:00
Anders Broman d98be8ecf6 Dissable -Werror
svn path=/trunk/; revision=42928
2012-05-30 20:51:36 +00:00
Anders Broman 224daf8cd4 Forgot to change the name to giop
svn path=/trunk/; revision=42927
2012-05-30 19:51:54 +00:00
Anders Broman d8b0471ded Add files to use 'new plugin build style'
svn path=/trunk/; revision=42924
2012-05-30 19:01:29 +00:00
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
Guy Harris 944ae5ae49 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42590
2012-05-11 20:02:52 +00:00
Guy Harris 0adedfaaee Show m2m.fch_burst_tlv_value in decimal.
svn path=/trunk/; revision=42589
2012-05-11 19:53:43 +00:00
Guy Harris 0fb9759eec Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Add hf[] entries for some fields that didn't have them.

svn path=/trunk/; revision=42588
2012-05-11 19:27:59 +00:00
Guy Harris 4217008691 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42587
2012-05-11 19:22:25 +00:00
Guy Harris 90f564717f Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Clean up indentation.

svn path=/trunk/; revision=42586
2012-05-11 19:20:23 +00:00
Guy Harris 7962b11c0f Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Also, fix the type of what appears to be a 24-bit integral field
(cut-and-pasteo?).

svn path=/trunk/; revision=42585
2012-05-11 19:08:31 +00:00
Guy Harris 774028e5fc Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42584
2012-05-11 18:57:51 +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
Guy Harris ccb24a5ab7 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

svn path=/trunk/; revision=42582
2012-05-11 18:52:36 +00:00
Gerald Combs dedd0eadd0 Better fixes for the last commit.
svn path=/trunk/; revision=42529
2012-05-10 00:21:40 +00:00
Gerald Combs 4d30e72575 Fix a few scan-build warnings.
svn path=/trunk/; revision=42528
2012-05-09 23:08:47 +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
pascal 48f4ae6e3b From Nhi Nguyen:
OPC UA bytestring node id decoding is wrong
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7226

svn path=/trunk/; revision=42437
2012-05-05 04:57:40 +00:00
Anders Broman 2311c797b2 From Gabor Somlai:
Decoding DOCSIS 3.0 Isolation DATA frames (FC_TYPE=10).

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

svn path=/trunk/; revision=42382
2012-05-02 10:49:03 +00:00
Guy Harris 66ee0608c7 The message length isn't needed in cmd_sched_rep() - it's just the
containing packet length, so if we go past it, we'll get an exception
thrown.  Get rid of it.

The answer to "Should msglen be returned instead of offset?" is "no" -
the command dissectors return the new offset.

Get rid of an unused - and unnecessary - variable.

svn path=/trunk/; revision=42367
2012-04-30 23:03:51 +00:00
Gerald Combs c40f94895d Fix a couple of clang warnings and adjust capitalization.
svn path=/trunk/; revision=42358
2012-04-30 20:15:46 +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
Jeff Morriss 6aa32cb03a As suggested in http://www.wireshark.org/lists/wireshark-dev/201204/msg00062.html :
Don't use ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN with ENC_ASCII: ASCII has no
endianism, so ENC_NA is more appropriate.

svn path=/trunk/; revision=42300
2012-04-27 19:45:35 +00:00
Anders Broman 8a4268505b Fix Malformed packet AMS for Read Device Info Read State Request.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6710

check if data exists.

svn path=/trunk/; revision=42292
2012-04-27 14:13:06 +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
Jakub Zawadzki 8a1dc57c03 Remove doubled semicolons and semicolons outside function.
svn path=/trunk/; revision=42053
2012-04-13 20:22:31 +00:00
Anders Broman b1b0af6e66 From Pascal Quantin:
Fix Bug 6793  Some WiMAX messages decoded incorrectly

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

svn path=/trunk/; revision=42045
2012-04-13 13:02:57 +00:00
Jakub Zawadzki 8fca2eb7e5 Add missing consts.
svn path=/trunk/; revision=42004
2012-04-10 10:20:20 +00:00
Jakub Zawadzki a3aa2b7d7c Add missing consts in opcua plugin.
svn path=/trunk/; revision=42000
2012-04-09 20:06:27 +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
Stig Bjørlykke 1fd4eaaa88 Removed unused pdu_length in pdu_burst_decoder to avoid a warning from clang.
svn path=/trunk/; revision=41794
2012-03-27 06:57:39 +00:00
Stig Bjørlykke caf4761202 Added a check for a valid pointer to avoid a warning from clang.
svn path=/trunk/; revision=41793
2012-03-27 06:57:30 +00:00
Jeff Morriss 90df1a9d94 Set eol-style to native (just to make these files readable on *NIX).
svn path=/trunk/; revision=41654
2012-03-19 01:46:24 +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
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +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 48ca3d4742 Use GSlice API instead of GMemChunk API for some memory allocation.
svn path=/trunk/; revision=40547
2012-01-16 19:05:32 +00:00
Bill Meier 49eff359e1 Fix a typo in an error message.
svn path=/trunk/; revision=40546
2012-01-16 18:12:18 +00:00
Alexis La Goutte 125725fb0c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40475
2012-01-13 16:37:21 +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
Anders Broman 160d5ad55f From Yi Zhang:
DSG_DA_TO_DSID_ASSOCIATION_DA/DSID is not correctly parsed in DOCSIS MDD packet.

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

svn path=/trunk/; revision=40450
2012-01-13 06:34:07 +00:00
Anders Broman 21c58470e4 From Yi Zhang:
The DCD_CLID_BCAST_ID TLV is not supported in DOCSIS plugin.

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

svn path=/trunk/; revision=40449
2012-01-13 06:29:03 +00:00
Chris Maynard 5debb5c5e3 Fix memory leaks involving tvb_get_string[z]().
svn path=/trunk/; revision=40312
2011-12-28 16:36:57 +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
Bill Meier d57950889e tvb_free() can (now) be called from plugins on Windows
svn path=/trunk/; revision=40201
2011-12-14 18:33:00 +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
Alexis La Goutte 022a45e0d9 From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement 

Patch 2 : create a defaulf field hf_operationrequest which provides the requested operation on both the resquest and the reply messages.

From me : 
Regenerate GIOP Plugins

svn path=/trunk/; revision=40038
2011-11-29 19:36:53 +00:00
Alexis La Goutte 557a841313 From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement 

Patch 1 : field names is used in dissection instead of "enum value" which is not clear

From me : 
Regenerate GIOP Plugins

svn path=/trunk/; revision=40037
2011-11-29 19:22:35 +00:00
Alexis La Goutte 9eb1835a10 Regenerate GIOP dissector plugins (after change in generator !) for fix Warning found by Clang (>100 !)
svn path=/trunk/; revision=39934
2011-11-18 12:39:35 +00:00
Alexis La Goutte 331fa3af93 Regenerate GIOP dissector plugins (after change in generator !) with following commmands :
:~/wireshark/tools$ ../idl2wrs ../idl/cosnaming.idl > ../plugins/giop/packet-cosnaming.c
:~/wireshark/tools$ ../idl2wrs ../idl/coseventcomm.idl > ../plugins/giop/packet-coseventcomm.c
:~/wireshark/tools$ ../idl2wrs ../idl/parlay/Parlay.idl > ../plugins/giop/packet-parlay.c
:~/wireshark/tools$ ../idl2wrs ../idl/tango.idl > ../plugins/giop/packet-tango.c 

For packet-cosnaming.c, only some white return change
For packet-parley.c, lot of change but only the functions is not in the same order...?! (Order change in 17911)

svn path=/trunk/; revision=39932
2011-11-18 12:34:16 +00:00
Chris Maynard f20ad40ea9 Append a path-separator to the plugins directory so xcopy doesn't get confused as to whether it's copying each plugin to a file or a directory. I.e., hopefully to avoid this situation:
Does wireshark-gtk2\plugins\1.7.1-SVN-39918 specify a file name
or directory name on the target
(F = file, D = directory)?


svn path=/trunk/; revision=39922
2011-11-18 01:08:20 +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 7ad9251beb Fix some additional [-Wunused-but-set-variable]
Fix some spelling typos

svn path=/trunk/; revision=39805
2011-11-12 19:17:21 +00:00
Anders Broman 0f0f260fb4 fix [-Wunused-but-set-variable]
svn path=/trunk/; revision=39802
2011-11-12 11:49:37 +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 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
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