# editcap specifics
editcap_SOURCES = \
editcap.c \
- epan/crypt/crypt-md5.c
+ epan/crypt/crypt-md5.c \
+ epan/plugins.c \
+ epan/report_err.c \
+ epan/privileges.c \
+ epan/filesystem.c
+
+capinfos_SOURCES = \
+ capinfos.c \
+ epan/plugins.c \
+ epan/report_err.c \
+ epan/privileges.c \
+ epan/filesystem.c
# dftest specifics
dftest_SOURCES = \
!ENDIF
capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib \
+ wsock32.lib user32.lib shell32.lib \
$(GLIB_LIBS)
editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib \
+ wsock32.lib user32.lib shell32.lib \
$(GLIB_LIBS)
mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
mt.exe -nologo -manifest "tshark.exe.manifest" -outputresource:tshark.exe;1
!ENDIF
-capinfos.exe : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
+capinfos.exe : config.h capinfos.obj getopt.obj epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
@echo Linking $@
$(LINK) @<<
- /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj $(capinfos_LIBS) image\capinfos.res
+ /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console capinfos.obj getopt.obj epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj $(capinfos_LIBS) image\capinfos.res
<<
!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
mt.exe -nologo -manifest "capinfos.exe.manifest" -outputresource:capinfos.exe;1
!ENDIF
-editcap.exe : config.h editcap.obj getopt.obj strptime.obj epan\crypt\crypt-md5.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
+editcap.exe : config.h editcap.obj getopt.obj strptime.obj epan\crypt\crypt-md5.obj epan/unicode-utils.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
@echo Linking $@
$(LINK) @<<
- /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj epan\crypt\crypt-md5.obj $(editcap_LIBS) image\editcap.res
+ /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj strptime.obj epan/unicode-utils.obj epan\crypt\crypt-md5.obj epan/plugins.obj epan/report_err.obj epan/privileges.obj epan/filesystem.obj $(editcap_LIBS) image\editcap.res
<<
!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20"
mt.exe -nologo -manifest "editcap.exe.manifest" -outputresource:editcap.exe;1
xcopy ".\cfilters" $(INSTALL_DIR) /d
xcopy ".\colorfilters" $(INSTALL_DIR) /d
xcopy ".\dfilters" $(INSTALL_DIR) /d
+ xcopy ".\epan\wslua\init.lua" $(INSTALL_DIR) /d
+ xcopy ".\epan\wslua\console.lua" $(INSTALL_DIR) /d
xcopy doc\*.html $(INSTALL_DIR) /d
!IFDEF ETHEREAL_EUG_DIR
xcopy $(ETHEREAL_EUG_DIR) $(INSTALL_DIR) /d
clean-deps: clean-deps1 clean-deps2
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <glib.h>
#include <epan/packet.h>
+#include <epan/filesystem.h>
+#include <epan/plugins.h>
+#include <epan/report_err.h>
#include "wtap.h"
#ifdef NEED_GETOPT_H
fprintf(output, "If no options are given, default is to display all infos\n");
}
+/*
+ * Errors are reported with a console message.
+ */
+static void
+failure_message(const char *msg_format, va_list ap)
+{
+ fprintf(stderr, "capinos: ");
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
+}
+
+
int main(int argc, char *argv[])
{
wtap *wth;
extern int optind;
int opt;
int status = 0;
-
- /* Process the options first */
+ char* init_progfile_dir_error;
+
+ /* Register wiretap plugins */
+
+ if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) {
+ g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+ g_free(init_progfile_dir_error);
+ } else {
+ init_report_err(failure_message,NULL,NULL);
+ init_plugins();
+ register_all_wiretap_modules();
+ }
+
+ /* Process the options */
while ((opt = getopt(argc, argv, "tcsduaeyizvh")) !=-1) {
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
/*
* Just make sure we include the prototype for strptime as well
#endif
#include "epan/crypt/crypt-md5.h"
+#include "epan/plugins.h"
+#include "epan/report_err.h"
+#include "epan/filesystem.h"
#include "svnversion.h"
}
}
+static void
+failure_message(const char *msg_format, va_list ap)
+{
+ fprintf(stderr, "editcap: ");
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
+}
+
int main(int argc, char *argv[])
{
int split_packet_count = 0;
int written_count = 0;
char *filename;
-
- /* Process the options first */
-
+ char* init_progfile_dir_error;
+
+ /* Register wiretap plugins */
+ if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) {
+ g_warning("capinfos: init_progfile_dir(): %s", init_progfile_dir_error);
+ g_free(init_progfile_dir_error);
+ } else {
+ init_report_err(failure_message,NULL,NULL);
+ init_plugins();
+ register_all_wiretap_modules();
+ }
+
+ /* Process the options */
while ((opt = getopt(argc, argv, "A:B:c:C:dE:F:hrs:t:T:v")) !=-1) {
switch (opt) {
range.c \
reassemble.c \
reedsolomon.c \
+ report_err.c \
req_resp_hdrs.c \
sigcomp_state_hdlr.c \
sigcomp-udvm.c \
int wslua_init(void*);
#endif
-static void (*report_failure_func)(const char *, va_list);
-static void (*report_open_failure_func)(const char *, int, gboolean);
-static void (*report_read_failure_func)(const char *, int);
-
gchar*
epan_get_version(void) {
return VERSION;
void (*report_open_failure)(const char *, int, gboolean),
void (*report_read_failure)(const char *, int))
{
- report_failure_func = report_failure;
- report_open_failure_func = report_open_failure;
- report_read_failure_func = report_read_failure;
+ init_report_err(report_failure, report_open_failure, report_read_failure);
/* initialize memory allocation subsystem */
ep_init_chunk();
circuit_init();
}
-/*
- * Report a general error.
- */
-void
-report_failure(const char *msg_format, ...)
-{
- va_list ap;
-
- va_start(ap, msg_format);
- (*report_failure_func)(msg_format, ap);
- va_end(ap);
-}
-
-/*
- * Report an error when trying to open or create a file.
- * "err" is assumed to be an error code from Wiretap; positive values are
- * UNIX-style errnos, so this can be used for open failures not from
- * Wiretap as long as the failue code is just an errno.
- */
-void
-report_open_failure(const char *filename, int err,
- gboolean for_writing)
-{
- (*report_open_failure_func)(filename, err, for_writing);
-}
-
-/*
- * Report an error when trying to read a file.
- * "err" is assumed to be a UNIX-style errno.
- */
-void
-report_read_failure(const char *filename, int err)
-{
- (*report_read_failure_func)(filename, err);
-}
-
epan_dissect_t*
epan_dissect_new(gboolean create_proto_tree, gboolean proto_tree_visible)
{
* of the plugin directory, so it can just fetch the plugins built
* as part of the build process.
*/
-static const char *plugin_dir;
+static const char *plugin_dir = NULL;
void
init_plugin_dir(void)
const char *
get_plugin_dir(void)
{
+ if (!plugin_dir) init_plugin_dir();
return plugin_dir;
}
if ((dir = eth_dir_open(dirname, 0, NULL)) != NULL)
{
+
while ((file = eth_dir_read_name(dir)) != NULL)
{
name = eth_dir_get_name(file);
continue;
}
- /*
- * Call its register routine if it has one.
- * XXX - just save this and call it with the built-in
- * dissector register routines?
- */
- if (register_protoinfo != NULL)
- register_protoinfo();
-
}
eth_dir_close(dir);
}
}
}
+void
+register_all_plugin_registrations(void)
+{
+ plugin *pt_plug;
+
+ /*
+ * For all plugins with register-handoff routines, call the routines.
+ * This is called from "proto_init()"; it must be called after
+ * "register_all_protocols()" and "init_plugins()" are called,
+ * in case one plugin registers itself either with a built-in
+ * dissector or with another plugin; we must first register all
+ * dissectors, whether built-in or plugin, so their dissector tables
+ * are initialized, and only then register all handoffs.
+ */
+ for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+ {
+ if (pt_plug->register_protoinfo)
+ (pt_plug->register_protoinfo)();
+ }
+}
+
void
register_all_plugin_handoffs(void)
{
WS_VAR_IMPORT plugin *plugin_list;
extern void init_plugins(void);
+extern void register_all_plugin_registrations(void);
extern void register_all_plugin_handoffs(void);
extern void register_all_plugin_tap_listeners(void);
extern void register_all_wiretap_modules(void);
if(cb)
(*cb)(RA_PLUGIN_REGISTER, NULL, client_data);
init_plugins();
+ register_all_plugin_registrations();
#endif
/* Now call the "handoff registration" routines of all built-in
--- /dev/null
+/* report_err.h
+* Declarations of routines for dissectors to use to report errors to
+* the user (e.g., problems with preference settings)
+*
+* $Id$
+*
+* 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
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib.h>
+#include <stdarg.h>
+#include "report_err.h"
+
+static void (*report_failure_func)(const char *, va_list);
+static void (*report_open_failure_func)(const char *, int, gboolean);
+static void (*report_read_failure_func)(const char *, int);
+
+void init_report_err(void (*report_failure)(const char *, va_list),
+ void (*report_open_failure)(const char *, int, gboolean),
+ void (*report_read_failure)(const char *, int)) {
+ report_failure_func = report_failure;
+ report_open_failure_func = report_open_failure;
+ report_read_failure_func = report_read_failure;
+}
+
+/*
+ * Report a general error.
+ */
+void
+report_failure(const char *msg_format, ...)
+{
+ va_list ap;
+
+ va_start(ap, msg_format);
+ (*report_failure_func)(msg_format, ap);
+ va_end(ap);
+}
+
+/*
+ * Report an error when trying to open or create a file.
+ * "err" is assumed to be an error code from Wiretap; positive values are
+ * UNIX-style errnos, so this can be used for open failures not from
+ * Wiretap as long as the failue code is just an errno.
+ */
+void
+report_open_failure(const char *filename, int err,
+ gboolean for_writing)
+{
+ (*report_open_failure_func)(filename, err, for_writing);
+}
+
+/*
+ * Report an error when trying to read a file.
+ * "err" is assumed to be a UNIX-style errno.
+ */
+void
+report_read_failure(const char *filename, int err)
+{
+ (*report_read_failure_func)(filename, err);
+}
+
extern "C" {
#endif /* __cplusplus */
+/*
+ * Initialize the report err routines
+ */
+extern void init_report_err(
+ void (*report_failure)(const char *, va_list),
+ void (*report_open_failure)(const char *, int, gboolean),
+ void (*report_read_failure)(const char *, int));
+
/*
* Report an error when trying to open a file.
*/
*/
init_progfile_dir_error = init_progfile_dir(argv[0]);
- /*
- * Now attempt to get the pathname of the plugins.
- */
- init_plugin_dir();
-
/* initialize the funnel mini-api */
initialize_funnel_ops();
init_progfile_dir_error);
}
- /*
- * Now attempt to get the pathname of the plugins.
- */
- init_plugin_dir();
-
/*
* In order to have the -X opts assigned before the wslua machine starts
* we need to call getopts before epan_init() gets called.
git.samba.org / obnox / wireshark / wip.git / commitdiff