diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-07-16 07:15:09 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-07-16 07:15:09 +0000 |
| commit | 44d19627efccd1b7461d38a6ba6eb25a98ed66ac (patch) | |
| tree | 9a9121589e31a5c3981ca9d943da7f385c731afd /wiretap/lanalyzer.c | |
| parent | 41dc7b1b59bef7521b9e6febc7a482e2f32017fe (diff) | |
From Graeme Hewson:
Allow "-" as the output file name in Wiretap, referring to the
standard error.
Optimize the capture loop.
Fix some of the error-message printing code in Ethereal and Tethereal.
Have Wiretap check whether it can seek on a file descriptor, and pass
the results of that test to the file-type-specific "open for output"
routine. Have the "open for output" routines for files where we need to
seek when writing the file return an error if seeks don't work.
svn path=/trunk/; revision=5884
Diffstat (limited to 'wiretap/lanalyzer.c')
| -rw-r--r-- | wiretap/lanalyzer.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 18b8571c05..095f9d5e0c 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -1,6 +1,6 @@ /* lanalyzer.c * - * $Id: lanalyzer.c,v 1.34 2002/06/27 22:46:48 guy Exp $ + * $Id: lanalyzer.c,v 1.35 2002/07/16 07:15:08 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -594,12 +594,18 @@ int lanalyzer_dump_can_write_encap(int encap) * Returns TRUE on success, FALSE on failure; sets "*err" to an * error code on failure *---------------------------------------------------*/ -gboolean lanalyzer_dump_open(wtap_dumper *wdh, int *err) +gboolean lanalyzer_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err) { int jump; void *tmp; - /* This is a LANalyzer file */ + /* This is a LANalyzer file. We can't fill in some fields in the + header until all the packets have been written, so we can't + write to a pipe. */ + if (cant_seek) { + *err = WTAP_ERR_CANT_WRITE_TO_PIPE; + return FALSE; + } tmp = g_malloc(sizeof(LA_TmpInfo)); if (!tmp) { |