Commit Graph

17049 Commits

Author SHA1 Message Date
Guy Harris 94c71f063d Fix the loop that checks $PATH for the binary to actually step from one
element of the path to the next element.

svn path=/trunk/; revision=17298
2006-02-14 09:08:12 +00:00
Guy Harris 58ed459c33 Have the emem.c memdup routines accept and return "void *", as
"memcpy()" does; that eliminates some compiler warnings ("void *" is the
type usually used for "generic pointer").

svn path=/trunk/; revision=17297
2006-02-14 08:34:20 +00:00
Luis Ontanon 0980473a80 - fix a sure crash after an error in lua code lua_tap_draw.
- make sure no reference to a Tvb in lua is used after the lua dissector has returned.


svn path=/trunk/; revision=17296
2006-02-14 01:29:55 +00:00
Luis Ontanon ad9da9fccb add missing emem functions
svn path=/trunk/; revision=17295
2006-02-14 00:56:29 +00:00
Ulf Lamping d350736e0b add missing #include "tempfile.h"
svn path=/trunk/; revision=17294
2006-02-13 23:52:11 +00:00
Luis Ontanon 8e121c003c Don't se_leak expert_info records.
se_alloc them where and if  needed, not every time expert_set_info_vformat is called.


svn path=/trunk/; revision=17293
2006-02-13 23:20:38 +00:00
Gerald Combs a086a018dc Remove unneeded right justification.
svn path=/trunk/; revision=17292
2006-02-13 23:16:55 +00:00
Gerald Combs ee12c30d2c Add a manifest, so that styled widgets are drawn correcltly. The
"version" field in the manifest is picky about formatting, so setting
a custom version in config.nmake (e.g. "0.10.14-test") will probably
break the Windows build.

svn path=/trunk/; revision=17291
2006-02-13 23:09:51 +00:00
Luis Ontanon 184349063f - disable print
- add a log facility to lua (so far just prints to stderr)
- add settings to disable lua even if installed, to load or not to load user scripts when superuser
- create a default /usr/local/share/ethereal/init.lua that blocks all the io/system calls when running as superuser



svn path=/trunk/; revision=17290
2006-02-13 22:13:31 +00:00
Ulf Lamping 82f80a6daa add missing #include "tempfile.h"
svn path=/trunk/; revision=17289
2006-02-13 22:10:42 +00:00
Jörg Mayer a6d35abcae Make the files at least compile. While testing them as plugins they
caused tethereal to abort during startup.

svn path=/trunk/; revision=17288
2006-02-13 22:08:36 +00:00
Jörg Mayer 924cd79279 Add original files for oracle dissection from the ClearSight
archive.

svn path=/trunk/; revision=17287
2006-02-13 21:54:42 +00:00
Gerald Combs 0e32e17152 Add a placeholder for integrating with the display filter dialog.
svn path=/trunk/; revision=17286
2006-02-13 21:54:05 +00:00
Gerald Combs 80e5e0fb15 Copy over the file open/save code from the Win32 native branch.
The Windows-native routines were integrated by inserting

#if GTK_MAJOR_VERSION >= 2 && _WIN32
  win32_native_routine(GDK_WINDOW_HWND(top_level->window));
  return;
#endif

at the beginning of each GTK+ file routine.  There's probably a prettier
way to do this.

Some of the sizes need to be tweaked in win32-file-dlg.rc, but everything
seems to work.

Fix up whitespace.

svn path=/trunk/; revision=17285
2006-02-13 21:25:43 +00:00
Gerald Combs 22b9245605 Add redirects to the ICMP filter.
svn path=/trunk/; revision=17284
2006-02-13 20:11:43 +00:00
Gerald Combs e455cea864 Remove a couple of unused variables.
svn path=/trunk/; revision=17283
2006-02-13 20:10:23 +00:00
Anders Broman 4621cc9150 From Mike Duigou:
- Improves ability of dissector to find conversations without seeing 
whole stream.

- Fixes some issues with dissection of data which requires reassembly.

- Adds the ability to dissect jxta conversations from SCTP streams.

- Better handling of welcome message.

- Adds direct dissection of compressed SRDI data.

- Has been run through extensive fuzz testing.

- Fixes compiler warnings with previous patch 17141

svn path=/trunk/; revision=17282
2006-02-13 19:45:38 +00:00
Jörg Mayer 36bad901af Paolo Abeni
the attached patch fix a couple of possible memory leak in the ssl
decryption code, add some indentation fix, more comments and add the
preference to select the debug output (missing in previous patch)



svn path=/trunk/; revision=17281
2006-02-13 17:06:41 +00:00
Guy Harris c32311dcd5 Add tempfile.h to the list of headeer files. That was the problem, not
the pathname in the #include.

svn path=/trunk/; revision=17280
2006-02-13 01:30:03 +00:00
Guy Harris 3674669ad6 Look for "tempfile.h" in the top-level directory.
svn path=/trunk/; revision=17279
2006-02-12 23:48:34 +00:00
Guy Harris 4d8d477018 Move create_tempfile() to tempfile.c out of util.c. This means dumpcap
no longer needs util.c, so it no longer includes routines that use
host_ip_af(), so it no longer needs to define its own host_ip_af().

That also means dumpcap.c no longer needs to include <sys/socket.h>.

svn path=/trunk/; revision=17278
2006-02-12 21:52:18 +00:00
Guy Harris 4d94f994b5 At least on UN*X, the first argument - argv[0] - is supposed to be the
name of the program as used to run it (command name/path name).  Pass
that - otherwise, we pass "-i" as argv[0], and dumpcap ignores it and
treats the capture device as the first argument and doesn't handle it
correctly (i.e., it doesn't capture on that device).

svn path=/trunk/; revision=17277
2006-02-12 20:55:11 +00:00
Guy Harris 3607862994 Distinguish between pipe_read_block() returning 0 (EOF) or a negative
value (error reading).

svn path=/trunk/; revision=17276
2006-02-12 20:41:28 +00:00
Guy Harris 6009f7c549 Instead of using (commented-out) g_warning() calls to log errors reading
and writing the sync pipe, using g_log() calls at the G_LOG_LEVEL_DEBUG
or G_LOG_LEVEL_WARNING levels, so we can get at them if necessary.  Add
some messages for errors for which we had no logging.

svn path=/trunk/; revision=17275
2006-02-12 20:35:15 +00:00
Guy Harris 501dced966 Send LOG_DOMAIN_CAPTURE_CHILD messages to our log handler, so they don't
go to the standard output (as is the case for some such messages,
including the "child is sending an error message to the parent" message,
which shows up if we fail to exec dumpcap).  *Anything* other than an
official capture-child message written to the standard output by the
capture child confuses the heck out of the parent, and can cause it to
think the child closed the pipe (resulting, in the case described in the
previous parenthetical note, in no dialog box being displayed for
dumpcap not being executed).

svn path=/trunk/; revision=17274
2006-02-12 20:17:55 +00:00
Lars Roland 3aebb783ff fuzz testing revealed that an infinite loop in the uma dissector was only partly fixed in revision 17119.
This will fix the infinite loop and bug 738.

svn path=/trunk/; revision=17273
2006-02-12 14:29:41 +00:00
Ronnie Sahlberg a1c15f7ab2 add rfc1964 stuff and (incomplete) KRB_CRED support.
KRB_CRED does not currently even try to decrypt EncKrbCredPart   but it is better than no KRB_CRED dissection at all.



svn path=/trunk/; revision=17272
2006-02-12 13:18:48 +00:00
Jörg Mayer e7fc7a29ac Well, it doesn't help to apply patches and then forget to actually
commit them.
Patch by Paolo Abeni: remove some commented out code.

svn path=/trunk/; revision=17271
2006-02-12 12:48:01 +00:00
Ulf Lamping d595d6a8da add a minor comment
svn path=/trunk/; revision=17270
2006-02-12 12:04:17 +00:00
Ulf Lamping 1a7d4a9bf9 freebsd needs to define AF_INET6, seems to need sys/socket.h
svn path=/trunk/; revision=17269
2006-02-12 11:35:02 +00:00
Guy Harris 73756bdc30 Export get_progfile_dir() and init_progfile_dir().
svn path=/trunk/; revision=17268
2006-02-12 04:35:15 +00:00
Guy Harris b8136fbfa9 Add a routine to attempt to get the absolute pathname of the executable
file, strip off the last component to get the pathname of the directory
containing the executable file, and save it for future use.  On Windows,
you can get that from the OS, but, on UN*X, you have to look at argv[0]
and derive the absolute path from that (argv[0] is not guaranteed to be
an absolute path, or even a path at all).  (In addition, if you're
running from the build directory, you might have to strip off a ".libs/"
added to argv[0] as an artifact of the libtoolizing script.)

Use that in the About dialog, and use it to construct the path of
dumpcap.

Don't put quotes into the path of dumpcap; you don't have to quote
strings with spaces in them when handing them to execvp and, in fact,
you *mustn't* quote them, as the quotes will be treated as part of the
pathname.

svn path=/trunk/; revision=17267
2006-02-12 03:15:29 +00:00
Guy Harris 9bc8780a66 Re-UTF-8-ify.
svn path=/trunk/; revision=17266
2006-02-12 02:04:23 +00:00
Ulf Lamping d17c135324 "default on" for dumpcap generation (it's required at least for Ethereal's capturing now)
svn path=/trunk/; revision=17265
2006-02-12 01:45:58 +00:00
Ulf Lamping 02885fd76d add generation of dumpcap manpage
svn path=/trunk/; revision=17264
2006-02-12 01:40:20 +00:00
Ulf Lamping 4d81998607 mark an unused parameter
svn path=/trunk/; revision=17263
2006-02-12 01:38:02 +00:00
Guy Harris 9077412e85 Fix up indentation.
svn path=/trunk/; revision=17262
2006-02-12 00:59:34 +00:00
Guy Harris ea82d47d0c Add userdata arguments to a bunch of stat initialization routines to
squelch compiler warnings.  Tag one existing such argument as unused to
squelch another warning.

Fix up some indentation.

svn path=/trunk/; revision=17261
2006-02-12 00:54:56 +00:00
Ulf Lamping 2af7f6b948 we still need sync_pipe_errmsg_to_parent() for the *NIX build
svn path=/trunk/; revision=17260
2006-02-12 00:03:10 +00:00
Ulf Lamping 40632cc673 add dumpcap.exe and the corresponding HTML manpage to the distribution
svn path=/trunk/; revision=17259
2006-02-11 23:58:07 +00:00
Ulf Lamping ca152df284 various capture child related minor cleanups
svn path=/trunk/; revision=17258
2006-02-11 23:47:03 +00:00
Ulf Lamping 6bb67a3510 font_init don't need to know if running as a capture_child, this will simply no longer happen.
svn path=/trunk/; revision=17257
2006-02-11 23:35:31 +00:00
Ulf Lamping cf94760fa4 the point of no return ...
using dumpcap as the capture child for Ethereal.

dumpcap is a plain console application now, even for Win32 (so no WinMain, create_console and special piping stuff reguired). The undocumented command line option -Z will switch dumpcap into "child mode", using binary instead of plain text output messages to communicate with a parent Ethereal.

Ethereal's main.c no longer needs to distinguish between child mode or not, so some simplifying here.

capture_sync.c has to call dumpcap in a "hidden window" mode using CreateProcess instead of spawnvp, otherwise an uggly console window would appear. The handles created by _pipe doesn't seem to be inheritable for this function, using CreatePipe instead.

The file capture_loop.c is only needed by dumpcap, removed from Ethereal link objects.

Some debugging aid added and other minor cleanup done.

svn path=/trunk/; revision=17256
2006-02-11 23:25:11 +00:00
Ulf Lamping ec37501696 minor bugfix: restore the Ethereal icon (after capturing) at the right places
svn path=/trunk/; revision=17255
2006-02-11 17:08:32 +00:00
Luis Ontanon 1e1f260d26 This was missing from last check-in
svn path=/trunk/; revision=17254
2006-02-11 15:22:43 +00:00
Jörg Mayer b55002ab8d Paolo Abeni:
The attached patch cleanup the debug infrastructure for ssl dissector.
Debug messages are by default off and can be enabled via the ssl
dissector preference. Debug output can be directed to stderr or file.


svn path=/trunk/; revision=17253
2006-02-11 13:41:17 +00:00
Luis Ontanon fcf7b3789c add an userdata argument to register_stat_cmd_arg() and its callback to use the callback for multiple registrations.
svn path=/trunk/; revision=17252
2006-02-11 13:05:24 +00:00
Guy Harris ca970e3757 In "Save As", support only file types we can write to; that simplifies
the logic, making it easier to get it right (fewer interactions between
components of the dialog - the file type doesn't affect whether we can
save some but not all packets).  It also means we don't offer a file
type for saving, only to take it away if you choose anything other than
saving all packets.

If the capture file is a temporary file from a capture done in the
current Ethereal session, it's libpcap format, which we can write to, so
you would be able to save it.

If it's a saved file we read in, saving the file in its entirety in its
own format is just copying the file, and it's not clear supporting that
adds enough useful functionality to justify the extra complication.

Fix "range_update_dynamics()" to update all the rows of the range
button/count table properly (make the button active iff there's
a non-zero count in the currently-selected column, make a count active
iff the column is selected), to select the "Captured" column if the
count of displayed packets goes to zero, and to select the "Save all
packets" row if the count of packets in the currently-selected row and
column goes to zero.  (XXX - we should perhaps do that with the
"user-defined range" counts as well, which would involve updating the
counts on every change to the range field.)

svn path=/trunk/; revision=17251
2006-02-11 11:21:38 +00:00
Guy Harris 83aad499b4 Squelch some compiler warnings.
svn path=/trunk/; revision=17250
2006-02-11 09:54:10 +00:00
Guy Harris b912db17b3 Squelch some compiler warnings by declaring RADIUS AVP dissectors to
return pointers to const strings.

svn path=/trunk/; revision=17249
2006-02-11 09:50:11 +00:00