forked from osmocom/wireshark
ASCII (well, alphabetic, really) until proven otherwise; that fixes a
warning, which is a valid warning if the length is 0. Clean up indentation a bit. svn path=/trunk/; revision=25701
This commit is contained in:
parent
08b4f712c8
commit
b92594e56c
|
@ -165,19 +165,19 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
|
||||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||||
NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb);
|
NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb);
|
||||||
|
|
||||||
if (!parameter_tvb)
|
if (!parameter_tvb)
|
||||||
return offset;
|
return offset;
|
||||||
|
|
||||||
length = tvb_length(parameter_tvb);
|
length = tvb_length(parameter_tvb);
|
||||||
|
|
||||||
for (p_offset=0; p_offset < length; p_offset++){
|
is_ascii = TRUE;
|
||||||
|
for (p_offset=0; p_offset < length; p_offset++){
|
||||||
if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){
|
if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){
|
||||||
is_ascii = FALSE;
|
is_ascii = FALSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
is_ascii = TRUE;
|
}
|
||||||
}
|
if (is_ascii)
|
||||||
if (is_ascii)
|
|
||||||
proto_item_append_text(actx->created_item,"(%%s)",tvb_format_text(parameter_tvb, 0, length));
|
proto_item_append_text(actx->created_item,"(%%s)",tvb_format_text(parameter_tvb, 0, length));
|
||||||
|
|
||||||
#.END
|
#.END
|
||||||
|
@ -515,4 +515,4 @@ LocationReportingControl N s1ap.proc.imsg id-LocationReportingControl
|
||||||
LocationReportingFailureIndication N s1ap.proc.imsg id-LocationReportingFailureIndication
|
LocationReportingFailureIndication N s1ap.proc.imsg id-LocationReportingFailureIndication
|
||||||
|
|
||||||
LocationReport N s1ap.proc.imsg id-LocationReport
|
LocationReport N s1ap.proc.imsg id-LocationReport
|
||||||
#.END
|
#.END
|
||||||
|
|
|
@ -1757,19 +1757,19 @@ dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
|
||||||
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
|
||||||
NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb);
|
NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb);
|
||||||
|
|
||||||
if (!parameter_tvb)
|
if (!parameter_tvb)
|
||||||
return offset;
|
return offset;
|
||||||
|
|
||||||
length = tvb_length(parameter_tvb);
|
length = tvb_length(parameter_tvb);
|
||||||
|
|
||||||
for (p_offset=0; p_offset < length; p_offset++){
|
is_ascii = TRUE;
|
||||||
|
for (p_offset=0; p_offset < length; p_offset++){
|
||||||
if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){
|
if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){
|
||||||
is_ascii = FALSE;
|
is_ascii = FALSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
is_ascii = TRUE;
|
}
|
||||||
}
|
if (is_ascii)
|
||||||
if (is_ascii)
|
|
||||||
proto_item_append_text(actx->created_item,"(%s)",tvb_format_text(parameter_tvb, 0, length));
|
proto_item_append_text(actx->created_item,"(%s)",tvb_format_text(parameter_tvb, 0, length));
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue