aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ipsec.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-09-12 10:04:11 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-09-12 10:04:11 +0000
commita92d1dc783525700edf29eb5715d81de775f5252 (patch)
treee526339e3582bbeb6757be0d452d07cddf673a6a /epan/dissectors/packet-ipsec.c
parent68e8b2f914ccfd781c45e0475a91be21b0dc93f1 (diff)
put the ah and esp payload as its own top level expansion in the tree instead of as an expansion inside the ah/esp layer.
since source/dest/protocol/info is updated by the content of the payload it doesnt make sense to hide the actual payload inside esp/ah it just would look confusing svn path=/trunk/; revision=19206
Diffstat (limited to 'epan/dissectors/packet-ipsec.c')
-rw-r--r--epan/dissectors/packet-ipsec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 278609ee21..d1f24f3ae2 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -1322,7 +1322,7 @@ dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/* do lookup with the subdissector table */
- if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, next_tree)) {
+ if (!dissector_try_port(ip_dissector_table, nxt, next_tvb, pinfo, tree)) {
call_dissector(data_handle,next_tvb, pinfo, next_tree);
}
}
@@ -2291,7 +2291,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
decrypted_len - esp_auth_len - esp_pad_len - esp_iv_len - 2,
decrypted_len - esp_auth_len - esp_pad_len - esp_iv_len - 2),
pinfo,
- esp_tree)) /*tree))*/
+ tree))
{
decrypt_dissect_ok = TRUE;
}
@@ -2387,7 +2387,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-1,
len - sizeof(struct newesp) - 14 - esp_pad_len),
pinfo,
- esp_tree))
+ tree))
{
decrypt_dissect_ok = TRUE;
}