aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-04-09 14:34:00 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-09 23:53:42 +0000
commitcbed2a2148c73adad5819b8077a9775368bca131 (patch)
treea106bd6dd0519124c3a643d837268466f5914843 /epan/dissectors
parent1a29a70443768b11583e90cc79d139007e6d8fb7 (diff)
user_encap: Copy all user_encap_t values
Copy all values for user_encap_t in user_copy_cb() when duplicating an entry in the DLT User table. Change-Id: Ic695a6213e12d42b62c2a0614c7f598e57833cdf Reviewed-on: https://code.wireshark.org/review/26827 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-user_encap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 7f31f44d27..21f65ac085 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -187,9 +187,15 @@ static void* user_copy_cb(void* dest, const void* orig, size_t len _U_)
const user_encap_t *o = (const user_encap_t *)orig;
user_encap_t *d = (user_encap_t *)dest;
+ d->encap = o->encap;
d->payload_proto_name = g_strdup(o->payload_proto_name);
- d->header_proto_name = g_strdup(o->header_proto_name);
+ d->payload_proto = o->payload_proto;
+ d->header_proto_name = g_strdup(o->header_proto_name);
+ d->header_proto = o->header_proto;
d->trailer_proto_name = g_strdup(o->trailer_proto_name);
+ d->trailer_proto = o->trailer_proto;
+ d->header_size = o->header_size;
+ d->trailer_size = o->trailer_size;
return d;
}