osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Always provide wslua_plugin_list, even if we don't have Lua configured. 

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35163 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
rbalint 2010-12-09 15:20:14 +00:00
parent 5c0b789e16
commit ab74c4cf73
4 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/plugins.h
View File

@ -55,6 +55,14 @@ extern void register_all_plugin_tap_listeners(void);
extern void register_all_wiretap_modules(void);
extern void register_all_codecs(void);
typedef struct _wslua_plugin {
gchar *name; /**< plugin name */
gchar *version; /**< plugin version */
struct _wslua_plugin *next;
} wslua_plugin;
WS_VAR_IMPORT wslua_plugin *wslua_plugin_list;
#ifdef __cplusplus
}
#endif /* __cplusplus */

2
epan/wslua/init_wslua.c
View File

@ -32,9 +32,9 @@
#include <math.h>
#include <epan/expert.h>
#include <epan/ex-opt.h>
#include <epan/plugins.h>
#include <wsutil/privileges.h>
#include <wsutil/file_util.h>
#include "init_wslua.h"
static lua_State* L = NULL;

43
epan/wslua/init_wslua.h
View File

@ -1,43 +0,0 @@
/* init_wslua.h
* definitions for wslua plugins structures
*
* $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.
*/
#ifndef __INIT_WSLUA_H__
#define __INIT_WSLUA_H__
#include <glib.h>
/** @defgroup wslua_group Wireshark LUA
*
*/
/** @file
* @ingroup wslua_group
*/
typedef struct _wslua_plugin {
gchar *name; /**< plugin name */
gchar *version; /**< plugin version */
struct _wslua_plugin *next;
} wslua_plugin;
WS_VAR_IMPORT wslua_plugin *wslua_plugin_list;
#endif /* __INIT_WSLUA_H__ */

3
gtk/plugins_dlg.c
View File

@ -29,9 +29,6 @@
#include <gtk/gtk.h>
#include "epan/plugins.h"
#ifdef HAVE_LUA_5_1
#include "epan/wslua/init_wslua.h"
#endif
#include "gtk/dlg_utils.h"
#include "gtk/gui_utils.h"