forked from osmocom/wireshark
From Olivier Jacques,
- beautify TCAP decoding without upper dissector associated. With a couple of if (parameter_tvb) trown in to hopfully fix a Buildbot crash output svn path=/trunk/; revision=14591
This commit is contained in:
parent
d82116f2aa
commit
e92c34b0f9
|
@ -341,7 +341,7 @@ tlen = tvb_length_remaining(tvb, offset);
|
|||
if (pc)
|
||||
{
|
||||
pi =
|
||||
proto_tree_add_text(tree, tvb, saved_offset, -1, "CONSTRUCTOR");
|
||||
proto_tree_add_text(tree, tvb, saved_offset, len + (len_offset - saved_offset), "CONSTRUCTOR");
|
||||
subtree = proto_item_add_subtree(pi, ett_param);
|
||||
proto_tree_add_uint_format(subtree, hf_tcap_tag, tvb,
|
||||
saved_offset, tag_offset-saved_offset, tag, "CONSTRUCTOR Tag");
|
||||
|
@ -361,7 +361,7 @@ tlen = tvb_length_remaining(tvb, offset);
|
|||
|
||||
pi =
|
||||
proto_tree_add_text(tree, tvb,
|
||||
saved_offset, len + (len_offset - saved_offset), "Parameter");
|
||||
saved_offset, len + (len_offset - saved_offset), "Parameter (0x%.2x)", tag);
|
||||
|
||||
subtree = proto_item_add_subtree(pi, ett_param);
|
||||
|
||||
|
|
|
@ -197,30 +197,31 @@ tvbuff_t *parameter_tvb;
|
|||
guint8 len, i;
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
len = tvb_length_remaining(parameter_tvb, 0);
|
||||
if ((len)&&(check_col(pinfo->cinfo, COL_INFO)))
|
||||
{
|
||||
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "otid(");
|
||||
for(i=0;i<len;i++)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, ") ");
|
||||
}
|
||||
|
||||
if (parameter_tvb){
|
||||
len = tvb_length_remaining(parameter_tvb, 0);
|
||||
if ((len)&&(check_col(pinfo->cinfo, COL_INFO))){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "otid(");
|
||||
for(i=0;i<len;i++)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, ") ");
|
||||
}
|
||||
|
||||
}
|
||||
#.FN_BODY DestTransactionID
|
||||
tvbuff_t *parameter_tvb;
|
||||
guint8 len , i;
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
¶meter_tvb);
|
||||
len = tvb_length_remaining(parameter_tvb, 0);
|
||||
if ((len)&&(check_col(pinfo->cinfo, COL_INFO)))
|
||||
{
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "dtid(");
|
||||
for(i=0;i<len;i++)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, ") ");
|
||||
}
|
||||
|
||||
if (parameter_tvb){
|
||||
len = tvb_length_remaining(parameter_tvb, 0);
|
||||
if ((len)&&(check_col(pinfo->cinfo, COL_INFO))){
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "dtid(");
|
||||
for(i=0;i<len;i++)
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i));
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, ") ");
|
||||
}
|
||||
}
|
||||
#.FN_BODY Begin
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_append_fstr(pinfo->cinfo, COL_INFO, " Begin ");
|
||||
|
|
Loading…
Reference in New Issue