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

Fix compilation with gcc 4.3.2 and without GEOIP 

svn path=/trunk/; revision=43587
This commit is contained in:
Pascal Quantin 2012-07-06 12:25:54 +00:00
parent 88cb14dda3
commit 7e38fe433a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/ipproto.c
View File

@ -285,7 +285,8 @@ const char *ipprotostr(const int proto) {
* XXX - have another flag for resolving network-layer
* protocol names?
*/
if (gbl_resolv_flags != 0) {
if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name ||
gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) {
static char buf[128];
struct protoent *pe;

11
epan/prefs.c
View File

@ -42,7 +42,9 @@
#include <epan/address.h>
#include <epan/addr_resolv.h>
#include <epan/oids.h>
#ifdef HAVE_GEOIP
#include <epan/geoip_db.h>
#endif
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/proto.h>
@ -982,7 +984,9 @@ prefs_register_modules(void)
"Name Resolution", NULL);
addr_resolve_pref_init(nameres_module);
oid_pref_init(nameres_module);
#ifdef HAVE_GEOIP
geoip_db_pref_init(nameres_module);
#endif
/* Printing */
printing = prefs_register_module(NULL, "print", "Printing",
@ -998,11 +1002,11 @@ prefs_register_modules(void)
#ifndef _WIN32
prefs_register_string_preference(printing, "command", "Command",
"Output gets piped to this command when the destination is set to \"command\"", &prefs.pr_cmd);
"Output gets piped to this command when the destination is set to \"command\"", (const char**)(&prefs.pr_cmd));
#endif
prefs_register_filename_preference(printing, "file", "File",
"This is the file that gets written to when the destination is set to \"file\"", &prefs.pr_file);
"This is the file that gets written to when the destination is set to \"file\"", (const char**)(&prefs.pr_file));
/* Statistics */
@ -2206,9 +2210,6 @@ prefs_capture_device_monitor_mode(const char *name)
#define GREEN_COMPONENT(x) (guint16) (((((x) >> 8) & 0xff) * 65535 / 255))
#define BLUE_COMPONENT(x) (guint16) ( (((x) & 0xff) * 65535 / 255))
static const gchar *pr_formats[] = { "text", "postscript" };
static const gchar *pr_dests[] = { "command", "file" };
char
string_to_name_resolve(char *string, e_addr_resolve *name_resolve)
{

1
ui/gtk/capture_file_dlg.c
View File

@ -578,7 +578,6 @@ file_open_cmd(GtkWidget *w)
cfile.rfcode = rfcode;
/* Set the global resolving variable */
gbl_resolv_flags = prefs.name_resolve;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
gbl_resolv_flags.mac_name = TRUE;
else