Commit Graph

204 Commits

Author SHA1 Message Date
Guy Harris 6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Guy Harris 7e58bd88ca Cast the values passed to the <ctype.h> macros so as to avoid
sign-extending 8-bit characters.

svn path=/trunk/; revision=12922
2005-01-02 00:23:50 +00:00
Ulf Lamping 78ff68d4b5 a lot of warnings removed, most of them about pointer to int casts without using the appropriate GLib macros
svn path=/trunk/; revision=12832
2004-12-25 13:49:30 +00:00
Guy Harris 017d788da0 From Lars Roland: we need to define _NEED_VAR_IMPORT_ in plugins if we
link the plugins with libethereal, so do so.

svn path=/trunk/; revision=12176
2004-10-01 19:50:03 +00:00
Guy Harris 99392257b7 In "plugins/plugin_api.h", don't include stuff required for the plugin
address table if we don't need the plugin address table, so as to catch
plugin dissectors that don't directly include stuff they need -
eventually, the plugin address table stuff should completely go away, so
we don't want dissectors depending on it.

Fix those dissectors caught by this.

Don't include "simple_dialog.h" in the ASN.1 dissector - it doesn't use
it.

svn path=/trunk/; revision=12140
2004-09-29 22:20:21 +00:00
Guy Harris 444119dbcb From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table.

svn path=/trunk/; revision=12139
2004-09-29 19:30:10 +00:00
Guy Harris eaadcc4c62 Move various tables into the epan directory.
svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris fdfdd39080 Routines called by "g_node_traverse()" return a Boolean - FALSE to
continue traversing, TRUE to stop traversing - so make
"free_node_data()" return FALSE.

svn path=/trunk/; revision=12110
2004-09-27 08:30:25 +00:00
Guy Harris 97cd8040a8 Preference strings don't remain null pointers for long - they get
converted to pointers to null strings (see prefs.c for an explanation). 
Initialize "current_asn1" to a mallocated null string.

That lets us use "strcmp()" to compare asn1_filename and current_asn1. 
We already do that with asn1_pduname and current_pduname, so use
"strcmp()" for them as well.

Call "build_pdu_tree()" if we haven't yet built a PDU tree, even if the
PDU type preference hasn't changed.

Don't register with any of the ports unless we have a PDU tree, so we
don't try to dissect with a null PDU tree pointer.

Before constructing a PDU tree, if we already have a PDU tree, free it.

When we free data_nodes, free the data attached to the nodes.

Make a bunch of stuff static.

svn path=/trunk/; revision=12045
2004-09-19 03:00:00 +00:00
Guy Harris f23f4ecf04 Use _WIN32 rather than WIN32 to determine if we're compiling on Win32;
according to Gisle Vanem, WIN32 isn't a built-in in MSVC, but _WIN32 is.

svn path=/trunk/; revision=11972
2004-09-11 23:03:36 +00:00
Guy Harris e6bc3872b0 From Lars Roland: don't link with GTK+, as it's not necessary to do so,
and as plugin dissectors shouldn't be linked with GTK+ (so that they
don't depend on Ethereal being built with a particular version of GTK+ -
Ethereal is packaged for Windows in both GTK+ 1.3[.x] and 2.x versions -
and so that they can work with Tethereal, which doesn't use GTK+).

svn path=/trunk/; revision=11840
2004-08-26 22:46:32 +00:00
Guy Harris 42b915674b Map the old one-port "generic ASN.1" TCP/UDP/SCTP port-number
preferences to the new multi-port ones, so that, instead of complaining
when the old preferences were seen, we make the port be the one port in
the new preference.

Make the "message_win" "generic ASN.1" preference an obsolete
preference, so we silently ignore it rather than complaining about it.

svn path=/trunk/; revision=11623
2004-08-08 01:20:26 +00:00
Guy Harris 3a583aeb59 From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).

svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
Jörg Mayer 0ca5d06e2e Change // to C90 style comment
svn path=/trunk/; revision=11576
2004-07-31 22:02:20 +00:00
Guy Harris 0ee683e0b8 From Matthijs Melchior:
add SCTP support;

	allow more than one port number to be specified;

	add recovery from garbled or incomplete ASN.1 messages.

svn path=/trunk/; revision=11572
2004-07-30 07:28:31 +00:00
Jörg Mayer fd24ad7d92 .cvsignore is dead
it has been replaced by
svn proplist -v <dir/file>
and
svn propedit <dir/file>

svn path=/trunk/; revision=11422
2004-07-18 23:44:34 +00:00
Jörg Mayer 56c759212f Add epan/dissectors/.cvsignore
Add tags and TAGS to all .cvsignore files

svn path=/trunk/; revision=11419
2004-07-18 22:51:50 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 911bad80f0 Have two strings in an enum_val_t - one that's a short string that is
convenient to put into a command line (no capital letters, no spaces to
require quotes), and one that's a detailed description for use in the
UI.  Allow either of them in the preferences file or "-o" option; use
the detailed description in the UI, and also use it when writing the
preferences out, so that the preference will be readable by older
versions of Ethereal (assuming the preference existed in that version).

Update "README.developer" to give more detail about an enum_val_t (and
to put the _t in), and to give a more detailed description of the
"radio_buttons" argument to "prefs_register_enum_preference()".

svn path=/trunk/; revision=10982
2004-05-24 02:25:21 +00:00
Olivier Biot 93751c8e32 Replace the plugin linkage libs into PLUGIN_LIBS which is generated from the
top-level configure.in when running configure.

svn path=/trunk/; revision=10699
2004-04-25 21:10:20 +00:00
Olivier Biot 4459d9f0a9 Add support for plugin dissectors on cygwin builds, by adding the following
line to every Makefile.am file for a given plugin XXX:

	XXX_la_LIBADD = -L../../epan -lethereal @GLIB_LIBS@

This way symbols defined in libethereal and GLib are resolved when linking
the plugin dissector modules.

svn path=/trunk/; revision=10601
2004-04-14 22:13:28 +00:00
Guy Harris 121f06fab7 Make "epan_init()" take, as additional arguments, pointers to routines
that dissectors should call to report file open and read errors, and
have "report_open_failure()" and "report_read_failure()" call through
those pointers, rather than being defined and exported by the
application using libethereal - instead, the application would define
those functions and pass pointers to them to 'epan_init()".

Move "report_err.h" to the epan directory, as the functions it declares
are now part of the libethereal API.

svn path=/trunk/; revision=10470
2004-03-23 21:19:58 +00:00
Jörg Mayer 12a17e8f96 Note to self: If you update the code, you should update the docs too.
Update README.plugins to use ENABLE_STATIC instead of __ETHEREAL_STATIC__
Update some plugins, that were created after my changes according to the
outdated docs.
Changed occurrences of
G_MODULE_EXPORT void plugin_reg_handoff(void)
into
G_MODULE_EXPORT void
plugin_reg_handoff(void)

as the one line Python version doesn't work with the Python of Suse 9.0

svn path=/trunk/; revision=10281
2004-03-02 23:45:34 +00:00
Guy Harris 07a989fbc6 Make the default ASN.1 file be "no file", not {Ethereal install
directory}/asn1/default.tt.

svn path=/trunk/; revision=10192
2004-02-22 23:53:57 +00:00
Guy Harris 83634f54c7 Add routines that can be called from dissectors to report file open and
read errors; there are separate implementations for Ethereal (pops up an
alert box) and Tethereal (prints an error message).

Use those routines in the ASN.1 dissector.

svn path=/trunk/; revision=10152
2004-02-21 02:15:07 +00:00
Guy Harris 0a8db3ba32 Fix a typo.
svn path=/trunk/; revision=10141
2004-02-20 22:14:12 +00:00
Guy Harris 3b1a2d094f On Win32, don't treat "file not found" as an error when trying to load
the ASN.1 file if the pathname is the old default file pathname, with
the last component preceded by "/" rather than "\", to suppress
complaints if you have a preferences file saved under the old regime.

svn path=/trunk/; revision=10118
2004-02-20 02:57:08 +00:00
Gerald Combs 037c2c12e4 From Lars Roland: Add support for a combined GTK1/2 Windows installer.
svn path=/trunk/; revision=10098
2004-02-18 20:45:54 +00:00
Ulf Lamping 5297f06717 replaced every appearance of gtk_scrolled_window_new() with
scrolled_window_new().
added gtk_scrolled_window_set_policy(AUTOMATIC,AUTOMATIC) to
scrolled_window_new()
added GTK2's gtk_scrolled_window_set_shadow(GTK_SHADOW_IN)
to every place needed

svn path=/trunk/; revision=9999
2004-02-06 19:19:12 +00:00
Ulf Lamping 064d5e5e07 Added the ability to compile both GTK versions 1 and 2 at the same time.
svn path=/trunk/; revision=9827
2004-01-24 20:01:36 +00:00
Jörg Mayer aa411b1861 Fix warnings found by -Wstrict-prototypes
svn path=/trunk/; revision=9721
2004-01-18 15:57:47 +00:00
Jörg Mayer ab37702076 Remove unused rule to build packet-asn1-static.o
svn path=/trunk/; revision=9718
2004-01-18 14:08:28 +00:00
Guy Harris 9dac6d42d5 From Matthijs Melchior: allow an absent or empty file name to mean "no
type table".

svn path=/trunk/; revision=9650
2004-01-13 02:36:51 +00:00
Jörg Mayer 56f992a47f warning: ISO C does not allow extra ; outside of a function
svn path=/trunk/; revision=9386
2003-12-21 05:29:26 +00:00
Jörg Mayer b8923a41e8 warning: comma at end of enumerator list
svn path=/trunk/; revision=9384
2003-12-21 04:38:41 +00:00
Ulf Lamping a3d0e32a0b using G_DIR_SEPARATOR_S instead of hardcoded slash
(not suitable on win32 platforms)

svn path=/trunk/; revision=9299
2003-12-16 21:02:11 +00:00
Guy Harris 2428266b1d From some reason, at least on Mac OS X 10.3, the change to have the
protocol tree stuff not use GNodes means that the ASN.1 plugin now needs
to be explicitly linked against GLib in order to get access to the GNode
routines, otherwise you get errors from the run-time linker.

svn path=/trunk/; revision=9173
2003-12-04 22:37:52 +00:00
Guy Harris 7952d0627a Fix the copyright notices (Gerald has the copyright on Ethereal).
svn path=/trunk/; revision=8991
2003-11-17 22:34:25 +00:00
Guy Harris be2f2a2432 Get rid of carriage returns in source files.
svn path=/trunk/; revision=8942
2003-11-11 20:08:13 +00:00
Guy Harris 6b163ce479 From Albert Chin: the HP-UX 10.20 C compiler doesn't allow
typedef enum _foo foo;
	enum _foo {
		...
	};

You have to define the enum before using it in a typedef.  (If I had my
ANSI C89 standard handy, I could say whether that was legal ANSI C or
not.)

svn path=/trunk/; revision=8918
2003-11-09 22:15:29 +00:00
Guy Harris cbfc93b82e Use "$(OBJECTS)" whenever a complete list of .obj files appears, rather
than repeating the list from the setting of OBJECTS.

svn path=/trunk/; revision=8893
2003-11-06 09:05:14 +00:00
Guy Harris 07697e98d3 From Masaki Chikama: fix static compilation of "generic ASN.1" and
Gryphon plugins.

svn path=/trunk/; revision=8878
2003-11-04 18:38:53 +00:00
Gerald Combs af59706124 #ifdef out "#include <gtk/gtk.h>", so that --disable-ethereal works again.
svn path=/trunk/; revision=8877
2003-11-04 16:44:25 +00:00
Gerald Combs 031db8b9c8 From Gisle Vanem:
* Added a new function get_file_in_temp() to
  epan/filesystem.c. This because of asn1.dll plugin which
  had code to write to a log-file "c:\temp\ethereal.log". I feel
  this patch makes this safer; I don't even have a c:\temp dir.

* Patched packet-asn1.c to use get_file_in_temp().

* Added some #undef to packet-snmp.c to silence gcc.

* Changed "%u" -> "%lu" formats in util.c

Rename get_file_in_temp() to get_tempfile_path() to match other function
names.

svn path=/trunk/; revision=8859
2003-11-02 23:12:35 +00:00
Guy Harris 44590a655c "strchr()" and the like would be compared against NULL; "strcmp()",
however, is compared against 0.

svn path=/trunk/; revision=8833
2003-10-30 11:56:36 +00:00
Guy Harris ca1f1c7f2a From Matthijs Melchior: #ifdef out the GUI code, for now.
svn path=/trunk/; revision=8812
2003-10-29 10:54:17 +00:00
Guy Harris fc43317556 Use "get_datafile_path()", rather than constructing the default ASN.1
file path by hand.

Set "default_asn1_filename", not "asn1_filename", to the default path.

svn path=/trunk/; revision=8810
2003-10-28 21:47:32 +00:00
Guy Harris 8a3e69d832 "get_datafile_dir()" is now in the plugin table.
svn path=/trunk/; revision=8808
2003-10-28 21:04:16 +00:00
Guy Harris 7b0e35379f As we don't supply a default ASN.1 SNACC output file, if we get an
ENOENT when trying to open the SNACC file, and the file we're trying to
open is the default file, don't print a warning.

Fix some typoes.

svn path=/trunk/; revision=8806
2003-10-28 20:53:37 +00:00
Guy Harris dc1da82c41 This dissector uses GTK+ calls (which no dissector should); until that's
fixed, use GTK_CFLAGS and GTK_LIBS rather than GLIB_CFLAGS and
GLIB_LIBS.

svn path=/trunk/; revision=8805
2003-10-28 20:44:51 +00:00
Guy Harris 32975a11e6 Fix the Makefile to match other plugin Makefiles.
svn path=/trunk/; revision=8804
2003-10-28 19:27:49 +00:00
Guy Harris c68a7d7cb1 From Matthias Melchior: plugin to decode BER-encoded ASN.1 messages,
given a type-table from "snacc" as a protocol description.

svn path=/trunk/; revision=8799
2003-10-28 07:02:38 +00:00