/* ringbuffer.c
* Routines for packet capture windows
*
- * $Id: ringbuffer.c,v 1.8 2004/02/25 05:21:08 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include <fcntl.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <time.h>
#include <errno.h>
-#ifdef NEED_SNPRINTF_H
-#include "snprintf.h"
-#endif
-
-#include "wiretap/wtap.h"
+#include <wiretap/wtap.h>
#include "ringbuffer.h"
/* Win32 needs the O_BINARY flag for open() */
/* Ringbuffer data structure */
typedef struct _ringbuf_data {
rb_file *files;
- guint num_files; /* Number of ringbuffer files */
- guint curr_file_num; /* Number of the current file */
+ guint num_files; /* Number of ringbuffer files (1 to ...) */
+ guint curr_file_num; /* Number of the current file (ever increasing) */
gchar *fprefix; /* Filename prefix */
gchar *fsuffix; /* Filename suffix */
gboolean unlimited; /* TRUE if unlimited number of files */
int filetype;
int linktype;
int snaplen;
- guint16 number;
+
int fd; /* Current ringbuffer file descriptor */
wtap_dumper *pdh;
} ringbuf_data;
static ringbuf_data rb_data;
+
+/*
+ * create the next filename and open a new binary file with that name
+ */
static int ringbuf_open_file(rb_file *rfile, int *err)
{
char filenum[5+1];
#endif
current_time = time(NULL);
- rb_data.number++;
-
- snprintf(filenum, sizeof(filenum), "%05d", rb_data.number);
+ g_snprintf(filenum, sizeof(filenum), "%05d", rb_data.curr_file_num + 1 /*.number*/);
strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", localtime(¤t_time));
rfile->name = g_strconcat(rb_data.fprefix, "_", filenum, "_", timestr,
rb_data.fsuffix, NULL);
ringbuf_init(const char *capfile_name, guint num_files)
{
unsigned int i;
- char *pfx;
+ char *pfx, *last_pathsep;
gchar *save_file;
rb_data.files = NULL;
rb_data.unlimited = FALSE;
rb_data.fd = -1;
rb_data.pdh = NULL;
- rb_data.number = 0;
/* just to be sure ... */
if (num_files <= RINGBUFFER_MAX_NUM_FILES) {
/* set file name prefix/suffix */
save_file = g_strdup(capfile_name);
+ last_pathsep = strrchr(save_file, G_DIR_SEPARATOR);
pfx = strrchr(save_file,'.');
- if (pfx != NULL) {
+ if (pfx != NULL && (last_pathsep == NULL || pfx > last_pathsep)) {
+ /* The pathname has a "." in it, and it's in the last component
+ of the pathname (because there is either only one component,
+ i.e. last_pathsep is null as there are no path separators,
+ or the "." is after the path separator before the last
+ component.
+
+ Treat it as a separator between the rest of the file name and
+ the file name suffix, and arrange that the names given to the
+ ring buffer files have the specified suffix, i.e. put the
+ changing part of the name *before* the suffix. */
pfx[0] = '\0';
rb_data.fprefix = g_strdup(save_file);
pfx[0] = '.'; /* restore capfile_name */
rb_data.fsuffix = g_strdup(pfx);
} else {
+ /* Either there's no "." in the pathname, or it's in a directory
+ component, so the last component has no suffix. */
rb_data.fprefix = g_strdup(save_file);
rb_data.fsuffix = NULL;
}
return rb_data.fd;
}
+
+const gchar *ringbuf_current_filename(void)
+{
+ return rb_data.files[rb_data.curr_file_num % rb_data.num_files].name;
+}
+
/*
* Calls wtap_dump_fdopen() for the current ringbuffer file
*/
rb_data.linktype = linktype;
rb_data.snaplen = snaplen;
- rb_data.pdh = wtap_dump_fdopen(rb_data.fd, filetype, linktype, snaplen, err);
+ rb_data.pdh = wtap_dump_fdopen(rb_data.fd, filetype, linktype, snaplen, FALSE /* compressed */, err);
return rb_data.pdh;
}
* Switches to the next ringbuffer file
*/
gboolean
-ringbuf_switch_file(capture_file *cf, wtap_dumper **pdh, int *err)
+ringbuf_switch_file(wtap_dumper **pdh, gchar **save_file, int *save_file_fd, int *err)
{
int next_file_num;
rb_file *next_rfile = NULL;
/* close current file */
if (!wtap_dump_close(rb_data.pdh, err)) {
- close(rb_data.fd);
+ close(rb_data.fd); /* XXX - the above should have closed this already */
+ rb_data.pdh = NULL; /* it's still closed, we just got an error while closing */
rb_data.fd = -1;
return FALSE;
}
/* get the next file number and open it */
- next_file_num = (rb_data.curr_file_num + 1) % rb_data.num_files;
+ rb_data.curr_file_num++ /* = next_file_num*/;
+ next_file_num = (rb_data.curr_file_num) % rb_data.num_files;
next_rfile = &rb_data.files[next_file_num];
if (ringbuf_open_file(next_rfile, err) == -1) {
}
/* switch to the new file */
- rb_data.curr_file_num = next_file_num;
- cf->save_file = next_rfile->name;
- cf->save_file_fd = rb_data.fd;
+ *save_file = next_rfile->name;
+ *save_file_fd = rb_data.fd;
(*pdh) = rb_data.pdh;
return TRUE;
* Calls wtap_dump_close() for the current ringbuffer file
*/
gboolean
-ringbuf_wtap_dump_close(capture_file *cf, int *err)
+ringbuf_wtap_dump_close(gchar **save_file, int *err)
{
gboolean ret_val = TRUE;
- /* close current file */
+ /* close current file, if it's open */
+ if (rb_data.pdh != NULL) {
+ if (!wtap_dump_close(rb_data.pdh, err)) {
+ close(rb_data.fd);
+ ret_val = FALSE;
+ }
- if (!wtap_dump_close(rb_data.pdh, err)) {
- close(rb_data.fd);
- ret_val = FALSE;
+ rb_data.pdh = NULL;
+ rb_data.fd = -1;
}
- rb_data.pdh = NULL;
- rb_data.fd = -1;
-
- cf->save_file = rb_data.files[rb_data.curr_file_num].name;
+ /* set the save file name to the current file */
+ *save_file = rb_data.files[rb_data.curr_file_num % rb_data.num_files].name;
return ret_val;
}
}
/* close directly if still open */
+ /* XXX - it shouldn't still be open; "wtap_dump_close()" should leave the
+ file closed even if it fails */
if (rb_data.fd != -1) {
close(rb_data.fd);
rb_data.fd = -1;
git.samba.org / metze / wireshark / wip.git / blobdiff