*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
# include "config.h"
#endif
+#include <stdlib.h> /* for exit() */
#include <glib.h>
#include <string.h>
#include "capture-wpcap.h"
#endif
+#include "sync_pipe.h"
+
#include "capture.h"
#include "capture_loop.h"
#include "capture_sync.h"
#include "file_util.h"
+/*#define DEBUG_DUMPCAP*/
-gboolean capture_child = FALSE; /* FALSE: standalone call, TRUE: this is an Ethereal capture child */
+gboolean capture_child = FALSE; /* FALSE: standalone call, TRUE: this is an Wireshark capture child */
static void
console_log_handler(const char *log_domain, GLogLevelFlags log_level,
fprintf(output,
"Dumpcap " VERSION "%s\n"
"Capture network packets and dump them into a libpcap file.\n"
- "See http://www.ethereal.com for more information.\n",
+ "See http://www.wireshark.org for more information.\n",
svnversion);
} else {
output = stderr;
"%s\n"
"%s\n"
"%s\n"
- "See http://www.ethereal.com for more information.\n",
+ "See http://www.wireshark.org for more information.\n",
svnversion, get_copyright_info() ,comp_info_str->str, runtime_info_str->str);
}
BOOL WINAPI ConsoleCtrlHandlerRoutine(DWORD dwCtrlType)
{
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO,
- "Console: Ctrl+C");
+ "Console: Control signal");
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
- "Console: Ctrl+C CtrlType: %u", dwCtrlType);
-
- capture_loop_stop();
+ "Console: Control signal, CtrlType: %u", dwCtrlType);
- return TRUE;
+ /* Keep capture running if we're a service and a user logs off */
+ if (capture_child || (dwCtrlType != CTRL_LOGOFF_EVENT)) {
+ capture_loop_stop();
+ return TRUE;
+ } else {
+ return FALSE;
+ }
}
#endif
#ifdef _WIN32
/* Shutdown windows sockets */
WSACleanup();
-#endif
/* can be helpful for debugging */
#ifdef DEBUG_DUMPCAP
_getch();
#endif
+#endif /* _WIN32 */
+
exit(status);
}
int opt;
extern char *optarg;
gboolean arg_error = FALSE;
- GString *comp_info_str;
- GString *runtime_info_str;
#ifdef _WIN32
WSADATA wsaData;
SetConsoleCtrlHandler(&ConsoleCtrlHandlerRoutine, TRUE);
#endif /* _WIN32 */
- /* Assemble the compile-time version information string */
- comp_info_str = g_string_new("Compiled ");
- g_string_append(comp_info_str, "with ");
- get_compiled_version_info(comp_info_str);
-
- /* Assemble the run-time version information string */
- runtime_info_str = g_string_new("Running ");
- get_runtime_version_info(runtime_info_str);
/* the default_log_handler will use stdout, which makes trouble in */
/* capture child mode, as it uses stdout for it's sync_pipe */
by the command line parameters. */
capture_opts_init(capture_opts, NULL);
- capture_opts->snaplen = MIN_PACKET_SIZE;
+ /* Default to capturing the entire packet. */
+ capture_opts->snaplen = WTAP_MAX_PACKET_SIZE;
+
+ /* We always save to a file - if no file was specified, we save to a
+ temporary file. */
+ capture_opts->saving_to_file = TRUE;
capture_opts->has_ring_num_files = TRUE;
/* Now get our args */
exit_main(0);
break;
case 'v': /* Show version and exit */
+ {
+ GString *comp_info_str;
+ GString *runtime_info_str;
+ /* Assemble the compile-time version information string */
+ comp_info_str = g_string_new("Compiled with ");
+ get_compiled_version_info(comp_info_str, NULL);
+
+ /* Assemble the run-time version information string */
+ runtime_info_str = g_string_new("Running ");
+ get_runtime_version_info(runtime_info_str, NULL);
show_version(comp_info_str, runtime_info_str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
exit_main(0);
break;
+ }
/*** capture option specific ***/
case 'a': /* autostop criteria */
case 'b': /* Ringbuffer option */
exit_main(status);
}
break;
- /*** hidden option: Ethereal child mode (using binary output messages) ***/
+ /*** hidden option: Wireshark child mode (using binary output messages) ***/
case 'Z':
capture_child = TRUE;
#ifdef _WIN32
if (argc != 0) {
/*
* Extra command line arguments were specified; complain.
+ * XXX - interpret as capture filter, as tcpdump and tshark do?
*/
cmdarg_err("Invalid argument: %s", argv[0]);
arg_error = TRUE;
/* Let the user know what interface was chosen. */
/* get_interface_descriptive_name() is not available! */
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_MESSAGE, "Interface: %s\n", capture_opts->iface);
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Interface: %s\n", capture_opts->iface);
if (list_link_layer_types) {
status = capture_opts_list_link_layer_types(capture_opts);
const char *level;
- if(capture_child) {
- return;
- }
-
/* ignore log message, if log_level isn't interesting */
if( !(log_level & G_LOG_LEVEL_MASK & ~(G_LOG_LEVEL_DEBUG|G_LOG_LEVEL_INFO))) {
#ifndef DEBUG_DUMPCAP
time(&curr);
today = localtime(&curr);
- switch(log_level & G_LOG_LEVEL_MASK) {
- case G_LOG_LEVEL_ERROR:
- level = "Err ";
- break;
- case G_LOG_LEVEL_CRITICAL:
- level = "Crit";
- break;
- case G_LOG_LEVEL_WARNING:
- level = "Warn";
- break;
- case G_LOG_LEVEL_MESSAGE:
- level = "Msg ";
- break;
- case G_LOG_LEVEL_INFO:
- level = "Info";
- break;
- case G_LOG_LEVEL_DEBUG:
- level = "Dbg ";
- break;
- default:
- fprintf(stderr, "unknown log_level %u\n", log_level);
- level = NULL;
- g_assert_not_reached();
- }
+ switch(log_level & G_LOG_LEVEL_MASK) {
+ case G_LOG_LEVEL_ERROR:
+ level = "Err ";
+ break;
+ case G_LOG_LEVEL_CRITICAL:
+ level = "Crit";
+ break;
+ case G_LOG_LEVEL_WARNING:
+ level = "Warn";
+ break;
+ case G_LOG_LEVEL_MESSAGE:
+ level = "Msg ";
+ break;
+ case G_LOG_LEVEL_INFO:
+ level = "Info";
+ break;
+ case G_LOG_LEVEL_DEBUG:
+ level = "Dbg ";
+ break;
+ default:
+ fprintf(stderr, "unknown log_level %u\n", log_level);
+ level = NULL;
+ g_assert_not_reached();
+ }
- /* don't use printf (stdout), in child mode we're using stdout for the sync_pipe */
- if(log_level & G_LOG_LEVEL_MESSAGE) {
- /* normal user messages without additional infos */
- fprintf(stderr, "%s\n", message);
- fflush(stderr);
- } else {
- /* info/debug messages with additional infos */
- fprintf(stderr, "%02u:%02u:%02u %8s %s %s\n",
- today->tm_hour, today->tm_min, today->tm_sec,
- log_domain != NULL ? log_domain : "",
- level, message);
- fflush(stderr);
- }
+ /* don't use printf (stdout), in child mode we're using stdout for the sync_pipe */
+ if(log_level & G_LOG_LEVEL_MESSAGE) {
+ /* normal user messages without additional infos */
+ fprintf(stderr, "%s\n", message);
+ fflush(stderr);
+ } else {
+ /* info/debug messages with additional infos */
+ fprintf(stderr, "%02u:%02u:%02u %8s %s %s\n",
+ today->tm_hour, today->tm_min, today->tm_sec,
+ log_domain != NULL ? log_domain : "",
+ level, message);
+ fflush(stderr);
+ }
}
/****************************************************************************************************************/
-/* sync_pipe handling */
-
-
-/*
- * Maximum length of sync pipe message data. Must be < 2^24, as the
- * message length is 3 bytes.
- * XXX - this should be large enough to handle a Really Big Filter
- * Expression, as the error message for an incorrect filter expression
- * is a bit larger than the filter expression.
- */
-#define SP_MAX_MSG_LEN 4096
-
-/* write a single message header to the recipient pipe */
-static int
-pipe_write_header(int pipe, char indicator, int length)
-{
- guchar header[1+3]; /* indicator + 3-byte len */
-
-
- g_assert(length <= SP_MAX_MSG_LEN);
-
- /* write header (indicator + 3-byte len) */
- header[0] = indicator;
- header[1] = (length >> 16) & 0xFF;
- header[2] = (length >> 8) & 0xFF;
- header[3] = (length >> 0) & 0xFF;
-
- /* write header */
- return write(pipe, header, sizeof header);
-}
-
-/* write a message to the recipient pipe in the standard format
- (3 digit message length (excluding length and indicator field),
- 1 byte message indicator and the rest is the message).
- If msg is NULL, the message has only a length and indicator. */
-static void
-pipe_write_block(int pipe, char indicator, const char *msg)
-{
- int ret;
- size_t len;
-
- /*g_warning("write %d enter", pipe);*/
-
- if(msg != NULL) {
- len = strlen(msg) + 1; /* including the terminating '\0'! */
- } else {
- len = 0;
- }
-
- /* write header (indicator + 3-byte len) */
- ret = pipe_write_header(pipe, indicator, len);
- if(ret == -1) {
- return;
- }
-
- /* write value (if we have one) */
- if(len) {
- /*g_warning("write %d indicator: %c value len: %u msg: %s", pipe, indicator, len, msg);*/
- ret = write(pipe, msg, len);
- if(ret == -1) {
- return;
- }
- } else {
- /*g_warning("write %d indicator: %c no value", pipe, indicator);*/
- }
-
- /*g_warning("write %d leave", pipe);*/
-}
+/* indication report routines */
void
-sync_pipe_packet_count_to_parent(int packet_count)
+report_packet_count(int packet_count)
{
char tmp[SP_DECISIZE+1+1];
static int count = 0;
/* stderr could be line buffered */
fflush(stderr);
}
-
}
void
-sync_pipe_filename_to_parent(const char *filename)
+report_new_capture_file(const char *filename)
{
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_MESSAGE, "File: %s", filename);
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "File: %s", filename);
if(capture_child) {
pipe_write_block(1, SP_FILE, filename);
}
}
-
void
-sync_pipe_cfilter_error_to_parent(const char *cfilter _U_, const char *errmsg)
+report_cfilter_error(const char *cfilter _U_, const char *errmsg)
{
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Capture filter error: %s", errmsg);
}
void
-sync_pipe_errmsg_to_parent(const char *error_msg, const char *secondary_error_msg)
+report_capture_error(const char *error_msg, const char *secondary_error_msg)
{
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_MESSAGE,
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
"Primary Error: %s", error_msg);
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_MESSAGE,
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
"Secondary Error: %s", secondary_error_msg);
if(capture_child) {
- /* first write a "master header" with the length of the two messages plus their "slave headers" */
- pipe_write_header(1, SP_ERROR_MSG, strlen(error_msg) + 1 + 4 + strlen(secondary_error_msg) + 1 + 4);
- pipe_write_block(1, SP_ERROR_MSG, error_msg);
- pipe_write_block(1, SP_ERROR_MSG, secondary_error_msg);
+ sync_pipe_errmsg_to_parent(error_msg, secondary_error_msg);
}
}
void
-sync_pipe_drops_to_parent(int drops)
+report_packet_drops(int drops)
{
char tmp[SP_DECISIZE+1+1];
g_snprintf(tmp, sizeof(tmp), "%d", drops);
- g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_MESSAGE, "Packets dropped: %s", tmp);
+ g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG, "Packets dropped: %s", tmp);
if(capture_child) {
pipe_write_block(1, SP_DROPS, tmp);
const char *netsnmp_get_version(void) { return ""; }
+
git.samba.org / obnox / wireshark / wip.git / blobdiff