osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

support UINT64 constants for upper value bounds 

svn path=/trunk/; revision=28042
This commit is contained in:
Tomas Kukosa 2009-04-14 07:34:56 +00:00
parent e99e0bc9bb
commit 3d8d91d80c
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-pcap.c
View File

@ -3219,7 +3219,7 @@ dissect_pcap_DGPSCorrections(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
dissect_pcap_T_ue_GPSTimingOfCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 37158911999999U, NULL, TRUE);
0U, G_GUINT64_CONSTANT(37158911999999), NULL, TRUE);
return offset;
}
@ -4753,7 +4753,7 @@ dissect_pcap_GANSS_GenericMeasurementInfo(tvbuff_t *tvb _U_, int offset _U_, asn
static int
dissect_pcap_T_ue_GANSSTimingOfCellFrames(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 345599999999U, NULL, FALSE);
0U, G_GUINT64_CONSTANT(345599999999), NULL, FALSE);
return offset;
}
@ -9725,7 +9725,7 @@ dissect_pcap_VelocityEstimate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
static int
dissect_pcap_T_utran_GPSTimingOfCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 2322431999999U, NULL, TRUE);
0U, G_GUINT64_CONSTANT(2322431999999), NULL, TRUE);
return offset;
}

2
epan/dissectors/packet-rrc.c
View File

@ -64823,7 +64823,7 @@ dissect_rrc_UE_InternalMeasuredResults_v770ext(tvbuff_t *tvb _U_, int offset _U_
static int
dissect_rrc_T_ue_GANSSTimingOfCellFrames(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 345599999999U, NULL, FALSE);
0U, G_GUINT64_CONSTANT(345599999999), NULL, FALSE);
return offset;
}

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

@ -1483,7 +1483,7 @@ dissect_s1ap_Bearers_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset
static int
dissect_s1ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 10000000000U, NULL, FALSE);
0U, G_GUINT64_CONSTANT(10000000000), NULL, FALSE);
return offset;
}

2
epan/dissectors/packet-x2ap.c
View File

@ -666,7 +666,7 @@ dissect_x2ap_Bearer_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
static int
dissect_x2ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, 10000000000U, NULL, FALSE);
0U, G_GUINT64_CONSTANT(10000000000), NULL, FALSE);
return offset;
}

6
tools/asn2wrs.py
View File

@ -3104,7 +3104,11 @@ class Type (Node):
if minv == 'MIN': minv = 'NO_BOUND'
if maxv == 'MAX': maxv = 'NO_BOUND'
if str(minv).isdigit(): minv += 'U'
if str(maxv).isdigit(): maxv += 'U'
if str(maxv).isdigit():
if (long(maxv) >= 2**32):
maxv = "G_GUINT64_CONSTANT(%s)" % (str(maxv))
else:
maxv += 'U'
if (ext): ext = 'TRUE'
else: ext = 'FALSE'
return (minv, maxv, ext)