Commit graph

64 commits

Author SHA1 Message Date
Stig Bjørlykke
cb56e84556 Removed unused parameter to parseServiceNodeId.
Coverity 596.

svn path=/trunk/; revision=36283
2011-03-23 08:03:02 +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
d9af8b16ba Added opcua_extensionobjecttable.c from revision 34906.
svn path=/trunk/; revision=35177
2010-12-11 21:40:01 +00:00
Jeff Morriss
64a099a652 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5429 :
Until now the info column only shows the OPC UA transport protocol type (Hello,
Ack, Secure Conversion message).
After connections establishment has finished this column shows only Secure
Conversion message, because every service is sent over the secure channel.

This patch adds the useful support of displaying the service type in the info
column. This makes it easier to find specific service calls in huge capture
files.

svn path=/trunk/; revision=35119
2010-12-04 02:54:59 +00:00
Jeff Morriss
4f6ea6ef47 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5427 :
This patch adds support for dissecting all Extension Objects types defined by
the OPC Foundation.

svn path=/trunk/; revision=35118
2010-12-04 02:54:25 +00:00
Anders Broman
a06eef00b8 From Gerhard Gappmeier:
Fix mapping of datatype strings in opcua plugin
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5428

svn path=/trunk/; revision=35105
2010-12-02 20:44:18 +00:00
Jeff Morriss
3c7ac06886 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5410 :
This patch adds support for displaying OPC UA ExtensionObjects.

An ExtensionObject is a mechanism to transport user defined structures as
serialized blobs. Some types of ExtensionObjects are already defined by the OPC
Foundation's OPC UA Specifications.
These types can be implemented by this dissector, because they are well-known.

Real user-defined or vendor-defined types are unlikely to be implemented by a
passive dissector, because this would require browsing of the UA server's
address space to retrieve the type information.

Currently only the following types are supported:

 * DataChangeNotification
 * EventNotification

Others OPC defined types will follow.


From me: fix warnings: "format not a string literal and no format arguments"

svn path=/trunk/; revision=34906
2010-11-16 17:00:50 +00:00
Jeff Morriss
b7b98d4315 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5409 :
This patch fixes displaying OPCUA Strings and ByteStrings.

From me: fix warnings: "format not a string literal and no format arguments"

svn path=/trunk/; revision=34905
2010-11-16 16:45:22 +00:00
Jeff Morriss
987e35df39 From Gerhard Gappmeier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5406 :
I attached a patch which fixes some problems in the array handling of OPC UA 
data when the array length is zero or -1 which is a Null-Array.

svn path=/trunk/; revision=34880
2010-11-15 18:52:41 +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
Jeff Morriss
d85cc79af1 Add some information about how/why this dissector is (partially) machine-generated and what that means to Wireshark maintainers.
svn path=/trunk/; revision=32577
2010-04-27 13:50:43 +00:00
Jeff Morriss
85885007ef Make the OpcUa plugin's fields filterable (by giving them abbreviations).
(Thank you, sed, for doing the 90% of the work for me.)

Note that two of these files says "do not modify" implying that they are
machine generated but AFAIK we don't have the means to rebuild them.

svn path=/trunk/; revision=32561
2010-04-26 00:15:30 +00:00
Bill Meier
5ccee6196a Remove some uneeded #includes
svn path=/trunk/; revision=32419
2010-04-07 18:24:18 +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
Bill Meier
1341fcd87e Fix some gcc -Wshadow warnings.
svn path=/trunk/; revision=31722
2010-01-28 21:49:30 +00:00
Guy Harris
8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display
the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL ==
(int)BASE_NONE, so there's no source or binary compatiblity issue,
although we might want to eliminate BASE_NONE at some point and have the
BASE_ values used with integral types start at 0, so that you can't
specify BASE_NONE for an integral field.

svn path=/trunk/; revision=31319
2009-12-19 03:17:44 +00:00
Bill Meier
9587938020 From Martin Lutz: Patch tvb_memeql return check;
... tvb_memeql returns 0 for truth.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3986#c7

svn path=/trunk/; revision=31294
2009-12-17 16:22:50 +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
Jeff Morriss
762af05327 Don't call PROTO_ITEM_SET_GENERATED(proto_tree_add[...]): that will end up adding the item to the tree multiple times.
svn path=/trunk/; revision=30635
2009-10-20 14:03: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
Stig Bjørlykke
c8605cc746 Don't include config.h in header files.
svn path=/trunk/; revision=30382
2009-10-07 06:28:36 +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
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
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
Gerald Combs
ffd3a72374 Check our array lengths and refuse to process them if they're too large.
Fixes bug 3986. Use tvb_memeql and proto_tree_add_item instead of
digging around in tvb->real_data.

svn path=/trunk/; revision=29813
2009-09-09 00:18:15 +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
Stig Bjørlykke
7f77783e20 From Kovarththanan Rajaratnam:
More header field info cleanup in plugins/* and epan/dissectors/*

svn path=/trunk/; revision=28811
2009-06-22 18:23:58 +00:00
Stig Bjørlykke
f8c959dc8c From Kovarththanan Rajaratnam:
Move header field info declarations into function scope.

This is the first step. Another patch will be submitted which actually scrubs
the header field info declarations (remove empty blurbs, etc.)

svn path=/trunk/; revision=28797
2009-06-22 04:58:08 +00:00
Jörg Mayer
c321f29518 Trivial warning fixes:
- Might be used uninitialized
- not a prototype
- comma at end of enum


svn path=/trunk/; revision=28730
2009-06-15 02:34:53 +00:00
Jaap Keuter
664ab35c79 Add missing header file of OpcUa plugin update.
svn path=/trunk/; revision=27978
2009-04-06 20:29:01 +00:00
Jaap Keuter
8ecf459611 From Gerhard Gappmeier:
This patch updates the plugin to fit the released OPCUA protocol version.

svn path=/trunk/; revision=27974
2009-04-06 18:30:04 +00:00
Gerald Combs
07e5df616e Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
2009-03-02 18:57:35 +00:00
Ulf Lamping
043532d63e add missing mt.exe calls, to include manifest files into exe / dll files
svn path=/trunk/; revision=27357
2009-02-02 23:09:36 +00:00
Bill Meier
9a3563e807 Fix some typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27085
2008-12-22 15:24:18 +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
Jeff Morriss
b4d2c37635 Allow checkapis target to work in out-of-tree builds (s#../../#$(top_srcdir)).
Also use $(top_builddir) instead of ../../ in a couple of other spots.

svn path=/trunk/; revision=25863
2008-07-29 22:06:37 +00:00
Guy Harris
a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Guy Harris
b6e20d89be Put printf into a separate "termoutput" API group. For most files,
check for it - but not for TShark plugins, as they are expected to
print to the standard output.

svn path=/trunk/; revision=25653
2008-07-01 21:13:32 +00:00
Gerald Combs
83aacf0a09 Add support for "API groups" in checkAPIs.pl. Make the "prohibited"
and "deprecated" groups the default. Add an "abort" group for code that
shouldn't exit the program. Update the makefiles to call "checkAPIs.pl
-g abort" for dissectors. Remove a dependency on "cat" in checkAPIs.pl.

svn path=/trunk/; revision=25614
2008-06-26 22:20:05 +00:00
Jeff Morriss
a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Anders Broman
023a81709a Make it possible to run checkapi on all plugins trough makefile.nmake
Note: Commented out in the plugins giving errors for now.

svn path=/trunk/; revision=25231
2008-05-05 16:55:19 +00:00
Jaap Keuter
b704bdcbc5 Remove the pre-release flag from FILEFLAGS in the resource file.
svn path=/trunk/; revision=24757
2008-03-29 23:04:33 +00:00