diff options
| author | Evan Huus <eapache@gmail.com> | 2013-11-05 17:48:48 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-11-05 17:48:48 +0000 |
| commit | 389423aaaac460f5b0fcbaf37b4f3d5cd7941c5b (patch) | |
| tree | 7ad4c2fcd1bb606b9c88d33e6489650aafe4f661 /epan/dissectors/packet-ip.c | |
| parent | d04079eedc5e7ea91b3ca940ce43d7fa4dd47856 (diff) | |
Replace pinfo->layer_names as a string with pinfo->layers as a wmem_list of
protocol IDs. This is substantially more efficient, which means we can build it
all the time rather than only if tree (in my benchmarks the extra time taken is
not large enough to be statistically significant even over tens of thousands of
packets).
This fixes what was probably a bug in btobex that relied on layer_names for
non-tree dissection. It also enables a much simpler fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303
svn path=/trunk/; revision=53089
Diffstat (limited to 'epan/dissectors/packet-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 589ba2ba6b..abe4156611 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -88,7 +88,7 @@ static gboolean ip_use_geoip = TRUE; /* Interpret the reserved flag as security flag (RFC 3514) */ static gboolean ip_security_flag = FALSE; -static int proto_ip = -1; +int proto_ip = -1; static int hf_ip_version = -1; static int hf_ip_hdr_len = -1; static int hf_ip_dsfield = -1; |