Commit Graph

195 Commits

Author SHA1 Message Date
Anders Broman 78afe3fa82 Add a routine to get application memory usage to epan.
svn path=/trunk/; revision=51023
2013-07-30 05:49:58 +00:00
Graham Bloice 2f6ee944d8 Added more build artefacts to the clean target
svn path=/trunk/; revision=50977
2013-07-28 14:40:56 +00:00
Guy Harris 0ca2dd85ae Build tvbtest the same way we build reassemble_test; see whether that
fixes the build errors we're seeing, with complaints about

	tvbtest.obj : warning LNK4217: locally defined symbol tvb_XX imported in function test
	tvbtest.obj : error LNK2019: unresolved external symbol __imp_tvb_XXX referenced in function run_tests
	tvbuff.obj : error LNK2019: unresolved external symbol tvb_XXX referenced in function tvb_new_YYY

svn path=/trunk/; revision=50573
2013-07-14 10:19:12 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +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
Guy Harris 65a6e05827 Add exntest.c and tvbtest.c to the set of test program source files.
svn path=/trunk/; revision=48515
2013-03-23 22:05:24 +00:00
Guy Harris 31a61c521f Build reassembly_test.c *without* -DWS_BUILD_DLL, as it's not part of
the library, it's a test program that links with the library and imports
stuff from the library.

svn path=/trunk/; revision=48514
2013-03-23 21:02:39 +00:00
Pascal Quantin eb9e18a8be Fix copy-paste error introduced in r48021
svn path=/trunk/; revision=48027
2013-03-02 23:30:21 +00:00
Pascal Quantin fc9156a8a0 Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
2013-03-02 22:19:33 +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
Guy Harris c225aafb8c Pull in a comment from the MATE plugin Makefile.nmake.
Pull in a change from that Makefile.nmake to keep us from trying to hand
a header file to the compiler as if it were a C source file.

svn path=/trunk/; revision=47600
2013-02-09 23:41:43 +00:00
Guy Harris a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Guy Harris d4f5a36ae7 dtd_parse.obj depends on dtd_grammar.h, but you can't build
dtd_parse.obj by handing dtd_parse.c *and* dtd_grammar.h to the C
compiler - dtd_grammar.h gets included by dtd_parse.c.

svn path=/trunk/; revision=47488
2013-02-05 08:57:58 +00:00
Guy Harris ace7556d5f dtd_parse.c includes dtd_grammar.h; make sure we build dtd_grammar.h
before trying to compile dtd_parse.c

svn path=/trunk/; revision=47487
2013-02-05 08:42:27 +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
Evan Huus 84cc3daa3b Basic skeleton for wmem.
https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html

svn path=/trunk/; revision=45746
2012-10-24 02:04:40 +00:00
Jeff Morriss ef756b397c Fix the *test_install targets so they put the test tools in the right directory (wireshark-gtk2 is one dir up from here).
svn path=/trunk/; revision=42659
2012-05-16 16:36:32 +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
Jeff Morriss fe57fc8553 Another try: we're in epan here so getting to libwsutil and wiretap requires going up a directory; getting to epan things does not require 'epan' in the path.
svn path=/trunk/; revision=41225
2012-02-28 16:08:47 +00:00
Jeff Morriss 63b4dc2593 Remove an extraneous backslash
svn path=/trunk/; revision=41224
2012-02-28 15:04:45 +00:00
Guy Harris b252f2e632 OK, to heck with it - link reassemble_test with libwireshark. Trying to
selectively pick up particular object files is just too much of a mess.

Alas, this requires that we add some additional symbols to the list
exported by libwireshark; the DCE RPC ones shouldn't be global, but
reassemble_test uses them, so....

Get rid of stubs in reassemble_test.c - they just stub out routines from
libwireshark, but that's not necessary any more.

svn path=/trunk/; revision=41223
2012-02-28 09:00:05 +00:00
Guy Harris bf0275b5b3 reassemble_test now requires mark_frame_as_depended_upon(), so it
requires packet.c.  (If it requires any more, we should just make it
link with libwireshark in its entirety.)

svn path=/trunk/; revision=41219
2012-02-28 07:06:59 +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
Anders Broman 84370fffcb Add *.sbr files to the clean target.
svn path=/trunk/; revision=40762
2012-01-29 20:21:30 +00:00
Stig Bjørlykke cd5cb315d5 And fix distclean and maintainer-clean.
svn path=/trunk/; revision=38813
2011-08-31 09:27:25 +00:00
Stig Bjørlykke e1e7ec4b33 Fixed clean rule after crc move.
svn path=/trunk/; revision=38811
2011-08-31 09:11:16 +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
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Jakub Zawadzki ea06298d76 Fix one more undefined reference to `EBCDIC_to_ASCII'
svn path=/trunk/; revision=37883
2011-07-03 21:18:22 +00:00
Jakub Zawadzki 6667b33f3f Fix: tvbuff.obj : error LNK2019: unresolved external symbol _EBCDIC_to_ASCII referenced in function _tvb_get_ephemeral_string_enc
Remove duplicated EBCDIC_to_ASCII from libwireshark.def

svn path=/trunk/; revision=37879
2011-07-03 18:59:41 +00:00
Guy Harris 1edc5f8e19 Just as with autoconf, we need to include the Python cflags when
building libwireshark.

svn path=/trunk/; revision=37653
2011-06-11 20:24:24 +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 c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Anders Broman 0761f82755 If the html dir exist remove it and its subdirectories.
svn path=/trunk/; revision=34614
2010-10-22 05:43:12 +00:00
Jeff Morriss 4584a81149 Revert 34081 and 34093 in preparation for a cleaner fix.
svn path=/trunk/; revision=34121
2010-09-15 15:13:17 +00:00
Jeff Morriss a81a10a63a From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's.  This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.

svn path=/trunk/; revision=34093
2010-09-10 13:52:42 +00:00
Guy Harris 4b6f53894a There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

svn path=/trunk/; revision=33534
2010-07-15 03:31:51 +00:00
Gerald Combs fe79af8f42 From Kovarththanan Rajaratnam via bug 3500:
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
2010-06-01 22:20:15 +00:00
Jeff Morriss 47e2d75820 Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
2010-05-28 20:19:55 +00:00
Bill Meier 0303dfbf9f Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
2010-04-22 19:35:47 +00:00
Guy Harris ceb816e721 Put the object file lists for various test programs into variables, and
use the variables, so the list of dependencies and the list of object
files used in the link command are the same (and so that they're
complete; the dependencies were, the link command lists weren't).

svn path=/trunk/; revision=32067
2010-03-01 19:17:05 +00:00
Guy Harris 47ec37c44e tvbtest needs bytes_to_str() and bytes_to_str_punct(), and they're now
in to_str.c.

svn path=/trunk/; revision=32040
2010-02-27 22:42:01 +00:00
Kovarththanan Rajaratnam 70590c7613 Add new to_str.o/obj dependency to reassemble_test target
svn path=/trunk/; revision=31976
2010-02-24 08:13:58 +00:00
Kovarththanan Rajaratnam e6486705f7 Move make-sminmpec.pl to tools directory
svn path=/trunk/; revision=30511
2009-10-11 14:39:14 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
svn path=/trunk/; revision=29580
2009-08-27 05:04:29 +00:00
Gerald Combs bfa7074d82 mkstemp cleanups.
svn path=/trunk/; revision=28923
2009-07-02 19:50:35 +00:00
Gerald Combs e2cd2bf4f2 Don't assemble asm_utils_win32_x86 on x64. Export a dummy read_keytab_file
if we're not using any encryption libraries on Windows.

This fixes the last Win64 compilation problems in epan.

svn path=/trunk/; revision=28008
2009-04-08 19:15:10 +00:00