Commit Graph

217 Commits

Author SHA1 Message Date
Balint Reczey 70dce86ab3 Set and use TMPDIR for ABI dump generation when using CMake
svn path=/trunk/; revision=52688
2013-10-19 14:55:12 +00:00
Gerald Combs be9eedeb8c Make sure LIBGCRYPT_CFLAGS is added to AM_CPPFLAGS.
svn path=/trunk/; revision=52672
2013-10-18 16:32:43 +00:00
Balint Reczey 8956ee2a56 Factor out common parts of ABI checks to UseABICheck.cmake
svn path=/trunk/; revision=52614
2013-10-15 07:30:05 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Gerald Combs 73353437ce Another Solaris Studio C++ fix.
svn path=/trunk/; revision=52561
2013-10-12 03:00:04 +00:00
Jörg Mayer 30f8fb14df Undo r52382 for this file: We use a different solution on Windows
svn path=/trunk/; revision=52422
2013-10-06 21:07:58 +00:00
Jörg Mayer 32efaf8ac9 Add $Id$
svn path=/trunk/; revision=52421
2013-10-06 21:05:47 +00:00
Jörg Mayer fb0af7e2d4 config.h.win32 used another solution
svn path=/trunk/; revision=52410
2013-10-06 18:15:43 +00:00
Jörg Mayer eb1ee413e3 editcap and capinfos compile now with cmake
svn path=/trunk/; revision=52382
2013-10-05 20:49:44 +00:00
Jörg Mayer afb568c549 libwsutil needs to link against libgmodule2
svn path=/trunk/; revision=52371
2013-10-04 22:08:46 +00:00
Chris Maynard 6a1bd211fd Trivial: Fix typo.
svn path=/trunk/; revision=52101
2013-09-16 16:49:17 +00:00
Evan Huus 304bbabbbe From Jiri Engelthaler via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9055

Add support for bitmask set for signed integer types.

svn path=/trunk/; revision=51522
2013-08-26 16:23:55 +00:00
Alexis La Goutte ef56cd2c0a Fix (-W)documentation error found by Clang
./str_util.h:72:11: error: parameter 'str' not found in the function declaration [-Werror,-Wdocumentation]
 * @param str The string to be checked
          ^~~
./str_util.h:72:11: note: did you mean 'string'?
 * @param str The string to be checked
          ^~~
          string
./str_util.h:80:11: error: parameter 'str' not found in the function declaration [-Werror,-Wdocumentation]
 * @param str The string to be checked
          ^~~
./str_util.h:80:11: note: did you mean 'string'?
 * @param str The string to be checked
          ^~~
          string

svn path=/trunk/; revision=51252
2013-08-10 21:27:42 +00:00
Alexis La Goutte 1ef2d9fd58 Fix (-W)documentation error found by Clang
../wsutil/crc16.h:68:11: error: parameter 'pBuffer' not found in the function declaration [-Werror,-Wdocumentation]
 * @param pBuffer a pointer to a buffer of the given length
          ^~~~~~~
../wsutil/crc16.h:68:11: note: did you mean 'buf'?
 * @param pBuffer a pointer to a buffer of the given length
          ^~~~~~~
          buf
../wsutil/crc16.h:77:11: error: parameter 'pBuffer' not found in the function declaration [-Werror,-Wdocumentation]
 * @param pBuffer a pointer to a buffer of the given length
          ^~~~~~~
../wsutil/crc16.h:77:11: note: did you mean 'buf'?
 * @param pBuffer a pointer to a buffer of the given length
          ^~~~~~~
          buf

svn path=/trunk/; revision=51251
2013-08-10 21:27:34 +00:00
Jeff Morriss 99050171cb Keep checkAPIs happy (even though it's just test code). Get that test code
compiling again (warning free).

Fix the checkapi target in automake.

svn path=/trunk/; revision=51114
2013-08-02 02:34:13 +00:00
Jeff Morriss 2b69003dc0 Link wsutil with gnutls on Windows too.
svn path=/trunk/; revision=51109
2013-08-02 01:11:08 +00:00
Jeff Morriss 95b4443aeb LIBGCRYPT_CFLAGS is not set in Windows builds, use GNUTLS_CFLAGS instead.
svn path=/trunk/; revision=51108
2013-08-02 00:52:13 +00:00
Jeff Morriss 1248db2ad6 pint.h is in wsutil now.
svn path=/trunk/; revision=51107
2013-08-02 00:31:37 +00:00
Jeff Morriss 9d0bcc9d09 Include LIBGCRYPT_CFLAGS in wsutil (but not in epan/crypt).
svn path=/trunk/; revision=51103
2013-08-01 23:56:09 +00:00
Jeff Morriss 2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
Jörg Mayer f833e8e59d Looks like building with -Werror in wsutil was forgotten with
cmake.

svn path=/trunk/; revision=50788
2013-07-22 14:43:17 +00:00
Martin Kaiser b8cc7b5239 make getopt_long() available on systems that don't have it natively
svn path=/trunk/; revision=50677
2013-07-16 20:15:02 +00:00
Jeff Morriss 56735f8c16 Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
Jeff Morriss 2d30d5beb1 Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
Jeff Morriss a8ad045a77 Add report_err.c to cmake build.
svn path=/trunk/; revision=50600
2013-07-15 03:12:02 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Bill Meier 828d4e89f6 Define certain 'const char *...' arrays as static.
(That is: Don't create the array on the stack each time
  the function is called).

 Reduces code memory usage and execution time.
 (See SVN #50271)


svn path=/trunk/; revision=50300
2013-07-01 15:41:05 +00:00
Michael Mann 6e1f213fca openSAFETY: CRC Maintenance, new CRC, new expert interface implemented. Bug 8847 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8847)
From Roland Knall

svn path=/trunk/; revision=50166
2013-06-26 12:11:08 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
Jeff Morriss 74dc568ef1 As pointed out by Guy: timestats uses packet_info so it belongs in epan
not wsutil.

svn path=/trunk/; revision=50159
2013-06-26 00:18:44 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Evan Huus 6c65dd2b30 Add a few of our headers to code generated by pycrc (their faq says we can do
basically whatever we want with it, and this cleans up a couple of licensecheck
errors).

Fix FSF address in one dissector.

svn path=/trunk/; revision=50080
2013-06-20 16:54:13 +00:00
Jeff Morriss 8e7abd9871 From Anders:
Check Header CRC of SYNC protocol.

svn path=/trunk/; revision=50062
2013-06-19 22:28:58 +00:00
Guy Harris 4422348ebc Add some comments to #else and #endif to make it clearer what's going
on.

svn path=/trunk/; revision=49223
2013-05-10 02:41:22 +00:00
Jörg Mayer 7e51c9713b dumpabi: This would create the directories in the sourcedir instead
of the binary dir. Fixed that.
  NOTE: It fails with and without this patch for out of tree builds:

jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi
[  1%] Built target wsutil
[  1%] Generating libwsutil.abi.tar.gz
ERROR: can't find modules
cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory
make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1
make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2
make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2
make: *** [dumpabi] Error 2
jmayer@egg:~/work/wireshark/svn/build/qt-gtk3>


svn path=/trunk/; revision=49014
2013-04-24 12:57:56 +00:00
Evan Huus d0bd2097f0 Fix another dozen or so files with bad FSF addresses as caught by licensecheck.
svn path=/trunk/; revision=48869
2013-04-16 00:00:09 +00:00
Gerald Combs e96673d549 Add links to Google Breakpad and other possible solutions.
svn path=/trunk/; revision=48863
2013-04-15 23:02:34 +00:00
Guy Harris b6ee206d2f Distribute CMakeLists.txt.
svn path=/trunk/; revision=48716
2013-04-03 07:38:44 +00:00
Stig Bjørlykke ca5516c665 Use pragma diagnostic also when compiling with clang.
svn path=/trunk/; revision=48295
2013-03-14 08:42:51 +00:00
Jaap Keuter 827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Gerald Combs a79e5d5b94 Check to see if GLib's printf routines support the X/Open / POSIX
thousands grouping (') flag and use it in format_size if it's available.
As far as I can tell this translates to "everywhere except Windows and
OpenBSD". According to the various build logs at

https://build.opensuse.org/package/show?package=mingw32-glib2&project=windows%3Amingw%3Awin32

the OBS GLib packages enable GLib's internal printf implementation from
Gnulib which means we *should* be able to enable this on Windows.
Unfortunately this doesn't appear to be the case.

svn path=/trunk/; revision=48042
2013-03-03 19:34:58 +00:00
Anders Broman 85973068cc From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48038
2013-03-03 17:14:19 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Jeff Morriss 98ea7d3a8d From Anders: revert r47934: it doesn't work everywhere.
See email discussion on -dev.

svn path=/trunk/; revision=47940
2013-02-28 15:16:46 +00:00
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
Gerald Combs 2f47e63a88 str_util.c: Although the glib documentation doesn't explicitly say so,
it looks like the thousands grouping (') modifier is supported so use it
in format_size.

capinfos.c: Set our locale.

svn path=/trunk/; revision=47934
2013-02-28 04:44:38 +00:00
Gerald Combs 0645396514 Print human-readable statistics by default. Raw values can be printed
using "-M". Based on a suggestion by Hansang Bae.

svn path=/trunk/; revision=47900
2013-02-26 06:40:25 +00:00
Balint Reczey 82843905c5 ABI dumps don't have to depend on config.h directly
They depend on libs which need config.h already.

svn path=/trunk/; revision=47883
2013-02-25 21:27:07 +00:00
Balint Reczey d2e0724afc Add dumpabi targets to CMake builds
Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879
2013-02-25 18:12:20 +00:00