forked from osmocom/wireshark
- e_addr_resolve is structure so pass it by pointer.
- name_resolve_concurrency must be only defined when used. svn path=/trunk/; revision=43584
This commit is contained in:
parent
500018d4f6
commit
f31b3943c0
|
@ -287,7 +287,9 @@ static void add_serv_port_cb(const guint32 port);
|
|||
* Flag controlling what names to resolve.
|
||||
*/
|
||||
e_addr_resolve gbl_resolv_flags = {TRUE, FALSE, TRUE, TRUE};
|
||||
#if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS)
|
||||
static guint name_resolve_concurrency = 500;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Global variables (can be changed in GUI sections)
|
||||
|
|
|
@ -916,10 +916,10 @@ void expand_tree_cb(GtkWidget *widget _U_, gpointer data _U_) {
|
|||
}
|
||||
|
||||
void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) {
|
||||
e_addr_resolve resolv_flags = {TRUE, TRUE, TRUE, TRUE};
|
||||
static const e_addr_resolve resolv_flags = {TRUE, TRUE, TRUE, TRUE};
|
||||
|
||||
if (cfile.edt->tree) {
|
||||
proto_tree_draw_resolve(cfile.edt->tree, tree_view_gbl, resolv_flags);
|
||||
proto_tree_draw_resolve(cfile.edt->tree, tree_view_gbl, &resolv_flags);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2132,7 +2132,7 @@ expand_finfos(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointe
|
|||
}
|
||||
|
||||
void
|
||||
proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, e_addr_resolve resolv)
|
||||
proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e_addr_resolve *resolv)
|
||||
{
|
||||
ProtoTreeModel *model;
|
||||
|
||||
|
|
|
@ -192,7 +192,7 @@ extern GtkWidget * proto_tree_view_new(e_prefs *prefs, GtkWidget **tree_view_p);
|
|||
*/
|
||||
extern void proto_tree_draw(proto_tree *protocol_tree, GtkWidget *tree_view);
|
||||
|
||||
extern void proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, e_addr_resolve resolv);
|
||||
extern void proto_tree_draw_resolve(proto_tree *protocol_tree, GtkWidget *tree_view, const e_addr_resolve *resolv);
|
||||
|
||||
/** Expand the whole tree view.
|
||||
*
|
||||
|
|
|
@ -455,10 +455,10 @@ proto_tree_model_get_type(void)
|
|||
}
|
||||
|
||||
void
|
||||
proto_tree_model_force_resolv(ProtoTreeModel *model, e_addr_resolve flags)
|
||||
proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *flags)
|
||||
{
|
||||
model->resolv_forced = TRUE;
|
||||
model->resolv_flags = flags;
|
||||
model->resolv_flags = *flags;
|
||||
}
|
||||
|
||||
ProtoTreeModel *
|
||||
|
|
|
@ -37,6 +37,6 @@ typedef struct proto_tree_model ProtoTreeModel;
|
|||
|
||||
GType proto_tree_model_get_type(void);
|
||||
ProtoTreeModel *proto_tree_model_new(proto_tree *protocol_tree, int display_hidden_proto_items);
|
||||
void proto_tree_model_force_resolv(ProtoTreeModel *model, e_addr_resolve resolv_flags);
|
||||
void proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *resolv_flags);
|
||||
|
||||
#endif /* __PROTO_TREE_MODEL_H__ */
|
||||
|
|
Loading…
Reference in New Issue