osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Guy Harris 2008-07-11 03:16:54 +00:00
parent 08b4f712c8
commit b92594e56c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asn1/s1ap/s1ap.cnf
View File

@ -165,19 +165,19 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
if (!parameter_tvb)
return offset;
if (!parameter_tvb)
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 ))){
is_ascii = FALSE;
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));
#.END
@ -515,4 +515,4 @@ LocationReportingControl N s1ap.proc.imsg id-LocationReportingControl
LocationReportingFailureIndication N s1ap.proc.imsg id-LocationReportingFailureIndication
LocationReport N s1ap.proc.imsg id-LocationReport
#.END
#.END

14
epan/dissectors/packet-s1ap.c
View File

@ -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,
NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
if (!parameter_tvb)
return offset;
if (!parameter_tvb)
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 ))){
is_ascii = FALSE;
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));