aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2020-01-08 18:06:29 +0100
committerJörg Mayer <jmayer@loplof.de>2020-01-09 15:26:51 +0000
commit5c0042a2f630d9f5d4577523fbbe898cdec28e69 (patch)
tree5f555ec9b205f389537384eccb0ae87812ff76db
parentdda104cddecb3e85a37e1e30cc49b542404fbbb3 (diff)
packet-ip.c: The return value is already calculated and returned by the previous call.
Change-Id: I9471e4f823d82d31d41ccd21728358ab363854cd Reviewed-on: https://code.wireshark.org/review/35719 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-rw-r--r--epan/dissectors/packet-ip.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index cac6f01b40..2e3ffdfd18 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -2316,12 +2316,10 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
version = tvb_get_guint8(tvb, 0) >> 4;
if(version == 4){
- dissect_ip_v4(tvb, pinfo, tree, data);
- return tvb_captured_length(tvb);
+ return dissect_ip_v4(tvb, pinfo, tree, data);
}
if(version == 6){
- call_dissector(ipv6_handle, tvb, pinfo, tree);
- return tvb_captured_length(tvb);
+ return call_dissector(ipv6_handle, tvb, pinfo, tree);
}
/* Bogus IP version */