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

Define in one and only one C file, declare in a header file. 

Presumably the intent is to have the two dissectors share the tables in
question; if so, it's best done by defining the tables in one and only
one C file and declaring it in a header file included by both C files -
that 1) ensures the declaration and definition stay in sync and 2) keeps
the OS X build from failing.

Change-Id: Id2e7e5b7270c7109ffb091b2e16a631b83dde212
Reviewed-on: https://code.wireshark.org/review/14309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-03-02 17:37:02 -08:00
parent ed6554c202
commit dc92e98db4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-gtp.h
View File

@ -158,6 +158,12 @@ typedef struct session_args {
guint8 last_cause;
} session_args_t;
/* Relation between frame -> session */
extern GHashTable* session_table;
/* Relation between <teid,ip> -> frame */
extern wmem_tree_t* frame_tree;
guint32 get_frame(address ip, guint32 teid, guint32 *frame);
void remove_frame_info(guint32 *f);

5
epan/dissectors/packet-gtpv2.c
View File

@ -1031,11 +1031,6 @@ static const value_string gtpv2_element_type_vals[] = {
};
static value_string_ext gtpv2_element_type_vals_ext = VALUE_STRING_EXT_INIT(gtpv2_element_type_vals);
/* Relation between frame -> session */
GHashTable* session_table;
/* Relation between <teid,ip> -> frame */
wmem_tree_t* frame_tree;
typedef struct _gtpv2_hdr {
guint8 flags; /* GTP header flags */
guint8 message; /* Message type */