Make proper use of esg_tree.
svn path=/trunk/; revision=40948
This commit is contained in:
parent
7be6e75c13
commit
eaba461f2a
|
@ -57,6 +57,7 @@ dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||||
{
|
{
|
||||||
tvbuff_t *next_tvb;
|
tvbuff_t *next_tvb;
|
||||||
guint16 len;
|
guint16 len;
|
||||||
|
proto_tree *esg_tree = NULL;
|
||||||
|
|
||||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC");
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC");
|
||||||
col_clear(pinfo->cinfo, COL_INFO);
|
col_clear(pinfo->cinfo, COL_INFO);
|
||||||
|
@ -64,19 +65,16 @@ dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||||
/* call into flute */
|
/* call into flute */
|
||||||
len = tvb_reported_length_remaining(tvb, 0);
|
len = tvb_reported_length_remaining(tvb, 0);
|
||||||
|
|
||||||
/* FIXME: make proper use of esg_tree, everythign else is a logic bug */
|
|
||||||
if (tree) {
|
if (tree) {
|
||||||
/* proto_item *ti; */
|
proto_item *ti;
|
||||||
/* proto_tree *esg_tree; */
|
|
||||||
|
|
||||||
/* ti = */ proto_tree_add_protocol_format(tree, proto_ipdc,
|
ti = proto_tree_add_protocol_format(tree, proto_ipdc, tvb, 0, len,
|
||||||
tvb, 0, len,
|
|
||||||
"ESG Bootstrap");
|
"ESG Bootstrap");
|
||||||
/* esg_tree = proto_item_add_subtree(ti, ett_ipdc); */
|
esg_tree = proto_item_add_subtree(ti, ett_ipdc);
|
||||||
}
|
}
|
||||||
|
|
||||||
next_tvb = tvb_new_subset(tvb, 0, len, len);
|
next_tvb = tvb_new_subset(tvb, 0, len, len);
|
||||||
call_dissector(sub_handles[SUB_FLUTE], next_tvb, pinfo, tree);
|
call_dissector(sub_handles[SUB_FLUTE], next_tvb, pinfo, esg_tree);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -85,17 +83,14 @@ proto_register_dvb_ipdc(void)
|
||||||
static hf_register_info hf[] = {
|
static hf_register_info hf[] = {
|
||||||
{&hf_ipdc_esg_bootstrap_xml,
|
{&hf_ipdc_esg_bootstrap_xml,
|
||||||
{"ESG Provider Discovery", "ipdc.bootstrap",
|
{"ESG Provider Discovery", "ipdc.bootstrap",
|
||||||
FT_STRING, BASE_NONE, NULL, 0x0,
|
FT_STRING, BASE_NONE, NULL, 0x0, "List of ESG Providers", HFILL}}
|
||||||
"List of ESG Providers", HFILL}
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static gint *ett[] = {
|
static gint *ett[] = {
|
||||||
&ett_ipdc,
|
&ett_ipdc,
|
||||||
};
|
};
|
||||||
|
|
||||||
proto_ipdc =
|
proto_ipdc = proto_register_protocol("ETSI IPDC Bootstrap",
|
||||||
proto_register_protocol("ETSI IPDC Bootstrap",
|
|
||||||
"ESG Bootstrap", "dvb_ipdc");
|
"ESG Bootstrap", "dvb_ipdc");
|
||||||
proto_register_field_array(proto_ipdc, hf, array_length(hf));
|
proto_register_field_array(proto_ipdc, hf, array_length(hf));
|
||||||
proto_register_subtree_array(ett, array_length(ett));
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
|
@ -112,7 +107,6 @@ proto_reg_handoff_dvb_ipdc(void)
|
||||||
|
|
||||||
ipdc_handle = create_dissector_handle(dissect_ipdc, proto_ipdc);
|
ipdc_handle = create_dissector_handle(dissect_ipdc, proto_ipdc);
|
||||||
dissector_add_uint("udp.port", UDP_PORT_IPDC_ESG_BOOTSTRAP, ipdc_handle);
|
dissector_add_uint("udp.port", UDP_PORT_IPDC_ESG_BOOTSTRAP, ipdc_handle);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue