Commit Graph

204 Commits

Author SHA1 Message Date
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
Anders Broman dd43cbec82 From Robert Groenenberg:
Assert when using ASN.1 dissector with loading a 'type table'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5447

svn path=/trunk/; revision=35055
2010-11-28 21:03:43 +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 d2b84da490 prefs_register_string_preference() overwrites the given value pointer with a copy of the string. Since the string this dissector passes in is mallocated, keep a pointer to it and then free it after the pointer has been overwritten.
svn path=/trunk/; revision=33872
2010-08-21 03:44:36 +00:00
Stig Bjørlykke aa6dc5e692 Fixed warning "Field width should have type 'int'".
svn path=/trunk/; revision=32909
2010-05-20 14:53:29 +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
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 2ea1e1962f Fix gcc -Wshadow warning.
svn path=/trunk/; revision=31721
2010-01-28 19:58:48 +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
Stig Bjørlykke ce502fc59b Added cast to (void *) for pointers used in printf format %p.
svn path=/trunk/; revision=30614
2009-10-19 13:24:54 +00:00
Kovarththanan Rajaratnam 6d93ca7c96 Use register_dissector_files in asn1 plugin
svn path=/trunk/; revision=30434
2009-10-09 16:33:16 +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 6a2f689235 Fix build of make and asn1 plugins.
svn path=/trunk/; revision=30144
2009-09-25 15:17:45 +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
Bill Meier ed8483ae98 Save some memory: Don't statically allocate ett[] arrays used "dynamically".
svn path=/trunk/; revision=29934
2009-09-15 18:20:56 +00:00
Jörg Mayer 24fb135ffe Build the asn1 plugin. The only problem(?) is, that it is
name libasn1.so instead of asn1.so

svn path=/trunk/; revision=29919
2009-09-15 12:22:13 +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 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Gerald Combs 5bbd304601 Add some null checks.
svn path=/trunk/; revision=29285
2009-08-03 23:49:05 +00:00
Jaap Keuter f6122af9be From Reinhard Speyerer:
This patch fixes several misspellings/typos in Wireshark SVN revision 28201.

svn path=/trunk/; revision=28205
2009-05-01 06:59:37 +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
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
Jaap Keuter ace93cb4bb From Robert Groenenberg:
As of version 0.99.8, there has been an annoying problem in the ASN.1 dissector: 
when using a 'type table' which discribes the ASN.1 syntax of the traced packets, 
wireshark would crash on the very first packet. The cause for the crash is an out-of-
boundry write, detected by g_free().

svn path=/trunk/; revision=27507
2009-02-22 12:22:28 +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
Gerald Combs 6d04f793f0 Back out r27047 and r27053.
svn path=/trunk/; revision=27062
2008-12-19 17:39:52 +00:00
Gerald Combs fc71188963 Update calls to proto_tree_add_bytes_format to reflect r27047.
svn path=/trunk/; revision=27053
2008-12-18 20:19:49 +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 54b25b075a #include <emem.h>
svn path=/trunk/; revision=26602
2008-10-28 17:35:38 +00:00
Bill Meier 9c7e579d89 Minor cleanup for proto_register & proto_reg_handoff ...
svn path=/trunk/; revision=26601
2008-10-28 17:31:51 +00:00
Bill Meier 4aa1788a3b #include <emem.h> not req'd
svn path=/trunk/; revision=26095
2008-08-26 03:19:29 +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
Tomas Kukosa 1e82573549 fix missing brackets causing uninitialized hidden_item
svn path=/trunk/; revision=25300
2008-05-14 10:48:59 +00:00
Tomas Kukosa 19c327d160 From Anders Broman:
Patches for broken build

svn path=/trunk/; revision=25298
2008-05-14 10:21:41 +00:00
Anders Broman 8db8e90221 Use PROTO_ITEM_SET_HIDDEN().
Fix ID marking
Add checkapi to makefiles

svn path=/trunk/; revision=25260
2008-05-09 07:07:50 +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
Jörg Mayer 46efef6b04 Get rid of some unused functions to prevent -Werror from causing the compile to fail
svn path=/trunk/; revision=25026
2008-04-14 21:24:12 +00:00
Stephen Fisher 13802b1d84 Remove GTK1 code.
svn path=/trunk/; revision=24827
2008-04-07 04:34:54 +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
Jaap Keuter fcf8509f69 Create proper dependancies for plugin.c
svn path=/trunk/; revision=24520
2008-03-01 12:31:01 +00:00
Stig Bjørlykke fc5527ef6c Quote argument to test in plugins Makefiles, as proposed by Greg A. Woods.
svn path=/trunk/; revision=24488
2008-02-27 16:18:30 +00:00
Gerald Combs 7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Stig Bjørlykke cfc7b3276c Rewrote some prohibited APIs in plugins/ (sprintf, strcpy, strcat).
svn path=/trunk/; revision=24274
2008-02-05 22:30:32 +00:00
Bill Meier 516ca59b99 Add .c.obj:: inference rule (to cause "batch compile")
svn path=/trunk/; revision=22696
2007-08-27 22:56:27 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Guy Harris 1c202d544c Clean up white space.
svn path=/trunk/; revision=21962
2007-05-27 18:44:22 +00:00
Guy Harris 9f2381e128 Get rid of trailing blank lines.
svn path=/trunk/; revision=21961
2007-05-27 18:35:55 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Gerald Combs 5620d4fa15 Add the make-dissector-reg scripts to the dependency list for each copy
of plugin.c.

svn path=/trunk/; revision=21342
2007-04-05 23:23:06 +00:00
Stephen Fisher 8fd3ee0560 Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it.


svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
Stephen Fisher 43a98f8fb8 From Sebastien Tandel:
fixes gcc warnings and get rid of declaration after statements


svn path=/trunk/; revision=21159
2007-03-23 23:47:41 +00:00
Stephen Fisher 2896811274 Fix about 150 warnings new to gcc 4.0 in the error on warning directories.
Comment out -Werror in plugins/asn1/ until warnings can be fixed.


svn path=/trunk/; revision=21158
2007-03-23 22:49:23 +00:00
Stephen Fisher 62f88a4a04 From Sebastien Tandel:
(Temporarily disable the warnings as errors default on Unix to get
to get the buildbots and people with gcc40 going again until those
additional warnings gcc40 generates can be fixed-I'm working on it
ASAP)

   Patch for configure.in which disables by default the treatment of
warnings as errors.
It can be enabled with './configure --with-warnings-as-errors'.
The macro will test first if GCC is present. If it's the case,
HAVE_WARNINGS_AS_ERRORS is defined. All the USING_GCC have been replaced
by HAVE_WARNINGS_AS_ERRORS.
With this switch, people won't suffer from unexpected warnings when
downloading svn sources during the transition time ;)


svn path=/trunk/; revision=21153
2007-03-23 17:49:59 +00:00
Stephen Fisher cdf47e536b Add -Werror when using GCC only to the Makefile.am of the base
directory and most of the plugins to match the same command 
put in the Makefile.nmake files for Windows compliations.  Fix
a few warnings when compiling under gcc 3.4.4 on FreeBSD.  Create
new automake file variable called USING_GCC in configure.in and
wiretap/configure.in to acomplish the above -Werror addition. 


svn path=/trunk/; revision=21127
2007-03-22 23:03:39 +00:00
Ulf Lamping af9ae7eebb set CFLAGS to block new warnings for all plugins (except for giop and h223, which has remaining issues - for now)
svn path=/trunk/; revision=21102
2007-03-21 23:59:41 +00:00
Ulf Lamping 1de801962f fix two MSVC warnings
svn path=/trunk/; revision=21101
2007-03-21 23:58:14 +00:00
Jaap Keuter cf13f56dc8 -Add the compiler version to the plugin resource
-Remove the SPECIAL_BUILD tag
-Set to OS type to NT_WINDOWS32

svn path=/trunk/; revision=20934
2007-02-26 20:39:38 +00:00
Ulf Lamping 2cbce84d41 Win32: MSVC > 6 doesn't work well with Unicode filenames!
fix this, by providing required functions in the new file file_util.c - it's mostly copied from GLib (g_open alike - that take UTF8 as filename format but don't use msvcrt.dll V6 for this as the glib files do) 

"link" to these functions in file_util.h: #define eth_open eth_stdio_open

revert changes (from SVN 20282) throughout the code related to these file functions which were introduced with the first tries of MSVC 2005 ...

Hopefully I've done everything right with the new file_util.c ...

svn path=/trunk/; revision=20402
2007-01-12 03:05:28 +00:00
Jaap Keuter d2d3148e00 Trying to get buildbot Ubuntu-5.10-x86 distcheck to build again.
Adding asn1.[ch] to the correct makefile symbols.

svn path=/trunk/; revision=20379
2007-01-10 20:19:16 +00:00
Tomas Kukosa a68f0224c3 move asn1.c/.h files into plugins/asn1 directory as just this plugin uses it now
svn path=/trunk/; revision=20372
2007-01-10 07:09:30 +00:00
Ulf Lamping cc164653a0 add experimental support for some more of the MSVC_VARIANTs:
- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
2007-01-06 01:05:59 +00:00
Ulf Lamping d53f947b16 clean should also remove generated plugin.c and manifest files
svn path=/trunk/; revision=20291
2007-01-03 06:06:53 +00:00
Jaap Keuter b050c8facc Add Windows version info resource.
svn path=/trunk/; revision=20157
2006-12-19 22:23:22 +00:00
Ulf Lamping 647533a5ef put every python script name into "" so the call won't fail on Win32 native python.
The problem is the slash in e.g.:

 @$(PYTHON) ../../tools/make-dissector-reg.py

is interpreted as an option instead of being part of the path.

I didn't wanted to use backslashes as this might introduce new problems with cygwin's python port.

svn path=/trunk/; revision=19730
2006-10-29 17:19:52 +00:00
Anders Broman 4647b593ee Use #defines from packet-ber.h rather than asn1.h change default ports to Zero.
svn path=/trunk/; revision=19367
2006-09-29 21:27:58 +00:00
Gerald Combs 20093fdaa4 snprintf -> g_snprintf. Fix up whitespace.
svn path=/trunk/; revision=18776
2006-07-20 21:29:45 +00:00
Jörg Mayer 299ac5e8bc remove plugin.c in distlclean
svn path=/trunk/; revision=18312
2006-06-02 06:53:30 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Anders Broman db57e7b724 Ethereal->Wireshark
svn path=/trunk/; revision=18231
2006-05-28 16:32:49 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Gerald Combs c23899620f It looks like g_fopen() in the version of GLib that we ship with Windows
sets errno to 0 when we can't open a file.  This resurrected the annoying
"C:\Program Files\Ethereal\asn1/default.tt" error in the ASN.1 plugin,
since we depended on errno being set to ENOENT.  Move some logic around
to account for this.

svn path=/trunk/; revision=18073
2006-05-02 18:21:42 +00:00
Guy Harris 5199671441 Convert most other plugin dissectors to use the make-dissector-reg
scripts.

svn path=/trunk/; revision=17961
2006-04-22 20:26:16 +00:00
Gerald Combs 4ea62e57b0 Continue to play whack-a-mole with null dereferences. Fixes CID 146.
svn path=/trunk/; revision=17770
2006-03-30 15:34:18 +00:00
Gerald Combs 1b468857b8 Be more paranoid about dereferencing pointers (and improve readability
IMHO).  This should hopefully take care of bug 826 / CID 42.

svn path=/trunk/; revision=17744
2006-03-27 19:43:17 +00:00
Gerald Combs 642706ce97 Remove some unused #defines.
svn path=/trunk/; revision=17736
2006-03-27 16:57:05 +00:00
Gerald Combs 6be7d55c40 Further refinements for Coverity CID 42. Make some "0"s (which were
confusing my feeble mind) NULLs.  Fix up whitespace.

svn path=/trunk/; revision=17710
2006-03-23 20:13:00 +00:00
Ronnie Sahlberg f331077a60 waste a couple of bytes per tcp conversation and make the tree for acked_packets (i.e. packets that have interesting tcp properties such as being retransmissions etc) hang off the per conversation tcpd struct instead of being global.
while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling. 

this also means that if you include packet-tcp.h   you also need to include emem.h .




svn path=/trunk/; revision=17681
2006-03-20 10:52:53 +00:00
Ronnie Sahlberg c1aa2aef89 coverity bug 43
svn path=/trunk/; revision=17624
2006-03-14 07:38:43 +00:00
Ronnie Sahlberg 726471b25f coverity bug#42
dereverencing a null variable


svn path=/trunk/; revision=17548
2006-03-09 12:11:21 +00:00
Guy Harris db9fba20b4 Use <wiretap/file_util.h> to include "file_util.h"; otherwise, the
include fails as we don't do -Iwiretap.

If we have it, include <sys/stat.h> in epan/filesystem.c - we need it
for stat() and the macros and structures it uses.

svn path=/trunk/; revision=16410
2005-11-07 02:47:09 +00:00
Ulf Lamping c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Ronnie Sahlberg b177f170eb convert to g_snprintf()
also make range_convert_range() return an emem allocated string


svn path=/trunk/; revision=15660
2005-09-01 19:05:00 +00:00
Ulf Lamping 0dc9fb3d4a various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants

svn path=/trunk/; revision=15264
2005-08-08 18:50:39 +00:00
Anders Broman 6f022ad796 From Thomas Steffen:
Fix a copy-paste error in the prefs. code

svn path=/trunk/; revision=15225
2005-08-05 19:32:26 +00:00
Guy Harris a58c119084 Register the port range preferences as such, rather than doing our own
range implementation.

Make string preferences "const", to squelch compiler warnings, and make
other variables and arguments "const" to match.

Port numbers are unsigned; display them as such.

svn path=/trunk/; revision=15037
2005-07-24 11:14:13 +00:00
Jörg Mayer cb4ac62893 'char*' -> 'const char*' to fix warnings
svn path=/trunk/; revision=15014
2005-07-23 08:18:44 +00:00
Jörg Mayer 5b442f2279 After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"
returned quite a list of files. Add them to MAINTAINERCLEANFILES.

Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.


svn path=/trunk/; revision=14891
2005-07-10 08:04:27 +00:00
Guy Harris 802859d3fd Call the "new-style init" routine for plugins a "register" routine, as
it serves the same purpose as the register routine in a built-in
dissector, and don't require all dissectors to have one, as they might
just be taps.

Get rid of the stats tree's init routine, as it's just a tap, and as it
doesn't do anything.

Update the idl2eth Python script to generate plugins with register routines.

svn path=/trunk/; revision=13644
2005-03-07 02:44:41 +00:00
Lars Roland 00273300e7 Preparations for dropping the old plugin api.
Introduce a new init routine for plugins, 
which does not take the plugin api table as an 
argument and allows etheral to distinguish 
between plugins using the old and the new api.

Update README.plugins accordingly

Change all g_warnings() in epan/plugins.c to report_failue().
On windows we do not have a log console open while
loading the plugins, because a log console cannot be opened before the prefs have been read. Thus g_warnings()
does not work for reporting problems with plugins.

svn path=/trunk/; revision=13596
2005-03-05 06:28:10 +00:00