forked from osmocom/wireshark
![Michael Mann](/assets/img/avatar_default.png)
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
126 lines
4.2 KiB
C
126 lines
4.2 KiB
C
/*
|
|
* Copyright (c) 2003 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
|
|
void proto_register_udpencap(void);
|
|
void proto_reg_handoff_udpencap(void);
|
|
|
|
static int proto_udpencap = -1;
|
|
|
|
static int hf_nat_keepalive = -1;
|
|
static int hf_non_esp_marker = -1;
|
|
|
|
static gint ett_udpencap = -1;
|
|
|
|
static dissector_handle_t esp_handle;
|
|
static dissector_handle_t isakmp_handle;
|
|
|
|
/*
|
|
* UDP Encapsulation of IPsec Packets
|
|
* draft-ietf-ipsec-udp-encaps-06.txt
|
|
*/
|
|
static int
|
|
dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
|
{
|
|
tvbuff_t *next_tvb;
|
|
proto_tree *udpencap_tree;
|
|
proto_item *ti;
|
|
guint32 spi;
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDPENCAP");
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
|
|
|
ti = proto_tree_add_item(tree, proto_udpencap, tvb, 0, -1, ENC_NA);
|
|
udpencap_tree = proto_item_add_subtree(ti, ett_udpencap);
|
|
|
|
/* 1 byte of 0xFF indicates NAT-keepalive */
|
|
if ((tvb_captured_length(tvb) == 1) && (tvb_get_guint8(tvb, 0) == 0xff)) {
|
|
col_set_str(pinfo->cinfo, COL_INFO, "NAT-keepalive");
|
|
proto_tree_add_item(udpencap_tree, hf_nat_keepalive, tvb, 0, 1, ENC_NA);
|
|
} else {
|
|
/* SPI of zero indicates IKE traffic, otherwise it's ESP */
|
|
spi = tvb_get_ntohl(tvb, 0);
|
|
if (spi == 0) {
|
|
col_set_str(pinfo->cinfo, COL_INFO, "ISAKMP");
|
|
proto_tree_add_item(udpencap_tree, hf_non_esp_marker, tvb, 0, 4, ENC_NA);
|
|
proto_item_set_len(ti, 4);
|
|
next_tvb = tvb_new_subset_remaining(tvb, 4);
|
|
call_dissector(isakmp_handle, next_tvb, pinfo, tree);
|
|
} else {
|
|
col_set_str(pinfo->cinfo, COL_INFO, "ESP");
|
|
proto_item_set_len(ti, 0);
|
|
call_dissector(esp_handle, tvb, pinfo, tree);
|
|
}
|
|
}
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
void
|
|
proto_register_udpencap(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_nat_keepalive, { "NAT-keepalive packet", "udpencap.nat_keepalive",
|
|
FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
|
|
{ &hf_non_esp_marker, { "Non-ESP Marker", "udpencap.non_esp_marker",
|
|
FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
&ett_udpencap,
|
|
};
|
|
|
|
proto_udpencap = proto_register_protocol(
|
|
"UDP Encapsulation of IPsec Packets", "UDPENCAP", "udpencap");
|
|
proto_register_field_array(proto_udpencap, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_udpencap(void)
|
|
{
|
|
dissector_handle_t udpencap_handle;
|
|
|
|
esp_handle = find_dissector_add_dependency("esp", proto_udpencap);
|
|
isakmp_handle = find_dissector_add_dependency("isakmp", proto_udpencap);
|
|
|
|
udpencap_handle = create_dissector_handle(dissect_udpencap, proto_udpencap);
|
|
dissector_add_uint("udp.port", 4500, udpencap_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local Variables:
|
|
* c-basic-offset: 2
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* ex: set shiftwidth=2 tabstop=8 expandtab:
|
|
* :indentSize=2:tabSize=8:noTabs=true:
|
|
*/
|