Commit graph

43 commits

Author SHA1 Message Date
Ulf Lamping
b0dd8e1e49 use sed to create a temporary doxygen config file,
to get the version number from ..\config.nmake

svn path=/trunk/; revision=10865
2004-05-13 10:10:28 +00:00
Ulf Lamping
576c374213 adding a doxygen target
svn path=/trunk/; revision=10842
2004-05-11 00:53:12 +00:00
Guy Harris
cb6f40213b From Lars Roland: fix some MSVC build problems.
svn path=/trunk/; revision=10835
2004-05-09 18:54:00 +00:00
Guy Harris
15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Olivier Biot
388aaadcb7 Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.

svn path=/trunk/; revision=10807
2004-05-06 20:48:36 +00:00
Gerald Combs
233dadebd3 From Lars Roland: Fix a couple of MSVC build problems.
svn path=/trunk/; revision=10439
2004-03-22 20:35:07 +00:00
Olivier Biot
11f9232336 From Lars Roland: Move timestamp_type into libethereal and provide accessor
methods for getting and setting the timestamp type.

This is a move towards a real libethereal shared library.

svn path=/trunk/; revision=10402
2004-03-18 19:04:33 +00:00
Guy Harris
27656155b7 Add routines to process IPv{4,6}-address-and-prefix-length pairs,
masking out the appropriate bits in the address.

Use them in the BGP and EIGRP dissectors.

svn path=/trunk/; revision=10327
2004-03-06 03:25:10 +00:00
Ulf Lamping
f1df01f866 from Lars Roland: fix Makefiles.nmake after changes from Joerg
svn path=/trunk/; revision=10277
2004-03-02 18:55:30 +00:00
Jörg Mayer
4a6e73c84a Move the dissectors into libethereal (no static/shared lib changes):
- Create epan/Makefile.common
- Move dissector_src and helper files from Makefile.common to
  epan/Makefile.common
- Create register.c in epan/
- link all the files into libethereal
- put plugin_src into epan/Makefile.am

Try to make rpms build with rpm v4 again (sorry, I've forgotten who to
attribute this to).

svn path=/trunk/; revision=10273
2004-03-02 01:21:56 +00:00
Ulf Lamping
cd85423556 epan don't need GTK_CFLAGS as GTK isn't used,
GLIB_CFLAGS are just enough

svn path=/trunk/; revision=9779
2004-01-22 19:27:59 +00:00
Gerald Combs
409948eced Add PCRE support to the Windows build.
svn path=/trunk/; revision=9185
2003-12-07 00:04:32 +00:00
Guy Harris
be4197e744 From Ulf Lamping: add some missing "cd .."s. (I guess the current
directory in nmake files persists across targets; presumably all
commands, or, at least, all "cd" commands, are run in the same process.)

svn path=/trunk/; revision=8682
2003-10-13 19:04:56 +00:00
Guy Harris
02e1d2680a Give every Makefile.nmake file a "distclean" rule, and have "distclean"
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672
2003-10-10 21:31:53 +00:00
Guy Harris
0bdb498bdb Do all the tests for whether ADNS_DIR is defined or not in
"config.nmake", and just use the variables set based on the results of
those tests in various "Makefile.nmake" files.

svn path=/trunk/; revision=7891
2003-06-15 23:04:47 +00:00
Guy Harris
8178db4980 Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate libraries for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7885
2003-06-14 20:45:29 +00:00
Guy Harris
71424053cd Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based on
variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7884
2003-06-14 20:36:04 +00:00
Guy Harris
117cd421e4 From Lars Roland: don't use ADNS_DIR if it's not defined.
svn path=/trunk/; revision=7881
2003-06-13 22:45:15 +00:00
Guy Harris
ec5499613d Don't wire into "config.h.win32" files an indication of whether we have
GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".

Note in "config.nmake" that:

	if you have GNU ADNS, ADNS_DIR should be defined as the
	directory in which the ADNS .lib file resides;

	if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.

svn path=/trunk/; revision=7860
2003-06-12 09:45:42 +00:00
Gerald Combs
f755cf5034 Add GNU ADNS to the Windows build environment. A precompiled DLL can be
found at

	http://adns.jgaa.com/

and

	http://www.ethereal.com/distribution/win32/development/

The modifications to the root-level config.h.win32 and Makefile.nmake
may not be neccessary.

svn path=/trunk/; revision=7769
2003-06-02 18:40:02 +00:00
Guy Harris
28c1a65e85 Add in a notion of "circuits", which are for virtual circuit-oriented
protocols (where there's a virtual circuit ID of some sort in packets)
what conversations are for protocols ultimately running atop
connectionless network layers.  Have circuit type and ID values in the
"packet_info" structure.

Have the Frame Relay dissector set the circuit type and ID values, and
have the Wellfleet compression protocol set up circuit information and
store compression information with the circuit.

svn path=/trunk/; revision=6469
2002-10-22 08:22:07 +00:00
Guy Harris
b4971b39bf From Joerg Mayer:
In the "configure.in" files, add

		-D_U_="__attribute__((unused))"

	to CFLAGS if we're using GCC, and add

		-D_U_=""

	otherwise, so _U_ can be used to mark arguments as unused.

Add -D_U_="" arguments to the Makefile.nmake files as well, so _U_ works
with Microsoft Visual C++ as well.

Add comments and RCS IDs to the Makefile.nmake files that don't already
have them.

svn path=/trunk/; revision=4824
2002-02-27 09:42:52 +00:00
Guy Harris
39362af814 From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

svn path=/trunk/; revision=4385
2001-12-12 01:29:13 +00:00
Guy Harris
e6f82792a9 Update the Makefile.nmake files to reflect the move of "int-64bit.c" to
the "epan" subdirectory.

Include "strptime.obj" in the list of object files used to build
"text2pcap.exe".

svn path=/trunk/; revision=4258
2001-11-24 21:51:40 +00:00
Gilbert Ramirez
8743a4a8a7 Remove the global packet_info called "pi". Dissectors now only
access their own "pinfo". A packet_info is stored in epan_dissect_t,
which is created for the dissection of a single packet.

GUI functions which need to access the packet_info of the currently
selected packet used to use "pi"; now they use cfile.edt->pi. cfile's
"edt" member is the epan_dissect_t of the currently-selected packet.

The functionality of blank_packetinfo() was moved into
dissect_packet(), as that's the only place that called blank_packetinfo(),
after a spurious call to blank_packetinfo() was removed from
packet_list_select_cb().

svn path=/trunk/; revision=4246
2001-11-21 23:16:26 +00:00
Guy Harris
facce7278a "ftypes" and "dfilter" should depend on "config.h", so that if it
doesn't exist, or is out of date with respect to "config.h.win32", it's
remade - stuff in "ftypes" and "dfilter" includes "config.h", and it
should get the "config.h" in "epan".

svn path=/trunk/; revision=4091
2001-10-28 00:52:28 +00:00
Gilbert Ramirez
b6bd7af57a Improvement of 'make clean' targets.
svn path=/trunk/; revision=3297
2001-04-12 18:07:22 +00:00
Gilbert Ramirez
a8d864bca7 Use sed in the Win32 build to place the version in various files.
We us $(VERSION), defined in the top-level config.nmake, to replace
@VERSION@ in various files. $(RC_VERSION) and $(WTAP_VERSION) are
similarly used.

svn path=/trunk/; revision=3258
2001-04-05 04:39:29 +00:00
Guy Harris
d2de258acb Get rid of a tab after a backslash - Microsoft Visual C++ 6.0's "nmake"
doesn't seem to treat backslash-tab as an end-of-line escape, the
backslash has to be at the end of the line.

svn path=/trunk/; revision=3239
2001-04-02 09:21:31 +00:00
Ed Warnicke
cd6ad9d4c0 Moved the the remaining column related routines out of packet.{c,h}
and into column-utils{c,h}.

svn path=/trunk/; revision=3231
2001-04-01 07:32:35 +00:00
Ed Warnicke
3bf0b09117 Added osi-utils.obj to epan/Makefile.nmake
svn path=/trunk/; revision=3227
2001-04-01 05:49:31 +00:00
Ed Warnicke
dd54ba9396 Moved the packet_info structure and supporting functions out of
packet.{h,c} and into a separate packet_info{h,c}.

svn path=/trunk/; revision=3225
2001-04-01 04:50:42 +00:00
Ed Warnicke
13cfdd7b71 Added frame_data.obj
svn path=/trunk/; revision=3224
2001-04-01 04:13:14 +00:00
Ed Warnicke
c832ac2c35 Moved the value_string structures and function from packet.{c,h} into
a separate value_string.{c,h}.

svn path=/trunk/; revision=3221
2001-04-01 03:18:41 +00:00
Ed Warnicke
7e26a1681c Added to_str.obj
svn path=/trunk/; revision=3220
2001-04-01 02:52:10 +00:00
Gilbert Ramirez
e108afe2bb The Win32 build builds wiretap as a DLL and requires WinPcap 2.1.
svn path=/trunk/; revision=3163
2001-03-23 02:05:29 +00:00
Gilbert Ramirez
4b6b3da4e7 Add some win32-specific targets in .cvsignore's.
Replace 'nmake' with $(MAKE) /$(MAKEFLAGS), from Mike Frisch.

svn path=/trunk/; revision=3108
2001-03-06 13:08:13 +00:00
Gilbert Ramirez
95e09f5ac3 Add Makefile.nmake files for new subdirs.
Add them to EXTRA_DIST in corresponding Makefile.am's so that they
get packaged with the distribution.

svn path=/trunk/; revision=2979
2001-02-02 04:03:43 +00:00
Guy Harris
2fa39ce7d3 Move the table of bit-swapped byte values to "epan/bitswap.c", and
declare it, and define a "BIT_SWAP" macro that uses it, in
"epan/bitswap.h".

Use that macro to bit-swap bytes in the IEEE 802.11 dissector, rather
than the macro that was used (said macro used GCCisms and didn't compile
on Windows).

Make an "init_plugin()" routine to enable a plugin and call its init
routine, and call it from "check_plugin_status()" and
"plugins_enable_cb()", rather than having very similar code in two
places; "patable" is now part of libethereal, and, at least on Windows,
attempts to refer to it from "libui" failed.  Make "patable" static to
"epan/plugins.c".  (This may still not work, as now "libui" is calling a
routine in "libethereal"; if that fails, perhaps it's time to get rid of
the "enable/disable plugins" stuff completely, as new-style plugins, at
least, register themselves as protocols and should be controllable from
the "Edit->Protocols" window just as built-in dissectors are.)

svn path=/trunk/; revision=2649
2000-11-15 09:37:53 +00:00
Guy Harris
2030dba693 Make the top-level "config.h.win32" more closely resemble the top-level
"config.h", and update it to include stuff added to "config.h" and
remove stuff removed from "config.h".

Give libethereal a "config.h.win32" and make its "Makefile.nmake" file
copy it to "config.h".

svn path=/trunk/; revision=2504
2000-10-17 09:25:37 +00:00
Gilbert Ramirez
26bda31ed9 Move inet_*.[ch] files to epan.
svn path=/trunk/; revision=2494
2000-10-14 04:31:26 +00:00
Gilbert Ramirez
aff507ff0a While keeping the directory named 'epan' and the symbols in the library
starting with "epan_", change the name of the library from libepan.a to
libethereal.a, and from libepan.lib to ethereal.lib.

svn path=/trunk/; revision=2492
2000-10-14 03:53:25 +00:00
Guy Harris
faf70584f2 Fix it to build on Windows.
svn path=/trunk/; revision=2488
2000-10-11 07:35:02 +00:00