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

- support of CONTAINING constraint in OCTET STRING and BIT STRING 

- fix handling of tag for EXTERNAL type
- change automatic postfix for duplicate names from '...%d' to '..._%02d'

svn path=/trunk/; revision=21906
This commit is contained in:
Tomas Kukosa 2007-05-23 13:42:05 +00:00
parent e8ecaf723b
commit fe5ee23c89
3 changed files with 1057 additions and 923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
asn1/nbap/packet-nbap-template.c
View File

@ -972,79 +972,79 @@ static int dissect_nbap_SuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset, a
switch(ProcedureCode){
case NBAP_ID_AUDIT: /* 0 */
offset = dissect_id_audit1(tvb, offset, actx, value_tree);
offset = dissect_id_audit_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_BLOCKRESOURCE: /* 2 */
offset = dissect_id_blockResource1(tvb, offset, actx, value_tree);
offset = dissect_id_blockResource_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLDELETION: /* 3 */
offset = dissect_id_cellDeletion1(tvb, offset, actx, value_tree);
offset = dissect_id_cellDeletion_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLRECONFIGURATION: /* 4 */
offset = dissect_id_cellReconfiguration1(tvb, offset, actx, value_tree);
offset = dissect_id_cellReconfiguration_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSETUP: /* 5 */
offset = dissect_id_cellSetup1(tvb, offset, actx, value_tree);
offset = dissect_id_cellSetup_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONMEASUREMENTINITIATION: /* 7 */
offset = dissect_id_commonMeasurementInitiation1(tvb, offset, actx, value_tree);
offset = dissect_id_commonMeasurementInitiation_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONTRANSPORTCHANNELDELETE: /* 10 */
offset = dissect_id_commonTransportChannelDelete1(tvb, offset, actx, value_tree);
offset = dissect_id_commonTransportChannelDelete_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONTRANSPORTCHANNELRECONFIGURE: /* 11 */
offset = dissect_id_commonTransportChannelReconfigure1(tvb, offset, actx, value_tree);
offset = dissect_id_commonTransportChannelReconfigure_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONTRANSPORTCHANNELSETUP: /* 12 */
offset = dissect_id_commonTransportChannelSetup1(tvb, offset, actx, value_tree);
offset = dissect_id_commonTransportChannelSetup_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_RESET: /* 13 */
offset = dissect_id_reset1(tvb, offset, actx, value_tree);
offset = dissect_id_reset_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_DEDICATEDMEASUREMENTINITIATION: /* 17 */
offset = dissect_id_dedicatedMeasurementInitiation(tvb, offset, actx, value_tree);
break;
case NBAP_ID_RADIOLINKADDITION: /* 23 */
if (ddMode==NBAP_FDD){
offset = dissect_id_radioLinkAddition1(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkAddition_01(tvb, offset, actx, value_tree);
}else{
offset = dissect_id_radioLinkAddition_tdd(tvb, offset, actx, value_tree);
}
break;
break;
case NBAP_ID_RADIOLINKDELETION: /* 24 */
offset = dissect_id_radioLinkDeletion1(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkDeletion_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_RADIOLINKSETUP: /* 27 */
if (ddMode==NBAP_FDD){
offset = dissect_id_radioLinkSetup1(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkSetup_01(tvb, offset, actx, value_tree);
}else{
offset = dissect_id_radioLinkSetup_tdd1(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkSetup_tdd_01(tvb, offset, actx, value_tree);
}
break;
case NBAP_ID_SYNCHRONISEDRADIOLINKRECONFIGURATIONPREPARATION: /* 31 */
offset = dissect_id_synchronisedRadioLinkReconfigurationPreparation1(tvb, offset, actx, value_tree);
offset = dissect_id_synchronisedRadioLinkReconfigurationPreparation_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_SYSTEMINFORMATIONUPDATE: /* 32 */
offset = dissect_id_systemInformationUpdate1(tvb, offset, actx, value_tree);
offset = dissect_id_systemInformationUpdate_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_UNSYNCHRONISEDRADIOLINKRECONFIGURATION: /* 34 */
offset = dissect_id_unSynchronisedRadioLinkReconfiguration1(tvb, offset, actx, value_tree);
offset = dissect_id_unSynchronisedRadioLinkReconfiguration_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_PHYSICALSHAREDCHANNELRECONFIGURATION: /* 37 */
offset = dissect_id_physicalSharedChannelReconfiguration1(tvb, offset, actx, value_tree);
offset = dissect_id_physicalSharedChannelReconfiguration_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_INFORMATIONEXCHANGEINITIATION: /* 41 */
offset = dissect_id_informationExchangeInitiation1(tvb, offset, actx, value_tree);
offset = dissect_id_informationExchangeInitiation_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONADJUSTMENT: /* 44 */
offset = dissect_id_cellSynchronisationAdjustment1(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationAdjustment_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONINITIATION: /* 45 */
offset = dissect_id_cellSynchronisationInitiation1(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationInitiation_01(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONRECONFIGURATION: /* 46 */
offset = dissect_id_cellSynchronisationReconfiguration1(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationReconfiguration_01(tvb, offset, actx, value_tree);
break;
default:
offset = offset + length;
@ -1068,66 +1068,66 @@ static int dissect_nbap_UnsuccessfulOutcomeValueValue(tvbuff_t *tvb, int offset,
switch(ProcedureCode){
case NBAP_ID_AUDIT: /* 0 */
offset = dissect_id_audit2(tvb, offset, actx, value_tree);
offset = dissect_id_audit_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_BLOCKRESOURCE: /* 2 */
offset = dissect_id_blockResource2(tvb, offset, actx, value_tree);
offset = dissect_id_blockResource_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLDELETION: /* 3 */
offset = dissect_id_cellReconfiguration2(tvb, offset, actx, value_tree);
offset = dissect_id_cellReconfiguration_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSETUP: /* 5 */
offset = dissect_id_cellSetup2(tvb, offset, actx, value_tree);
offset = dissect_id_cellSetup_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONMEASUREMENTINITIATION: /* 7 */
offset = dissect_id_commonMeasurementInitiation2(tvb, offset, actx, value_tree);
offset = dissect_id_commonMeasurementInitiation_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONTRANSPORTCHANNELRECONFIGURE: /* 11 */
offset = dissect_id_commonTransportChannelReconfigure2(tvb, offset, actx, value_tree);
offset = dissect_id_commonTransportChannelReconfigure_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_COMMONTRANSPORTCHANNELSETUP: /* 12 */
offset = dissect_id_commonTransportChannelSetup2(tvb, offset, actx, value_tree);
offset = dissect_id_commonTransportChannelSetup_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_DEDICATEDMEASUREMENTINITIATION: /* 17 */
offset = dissect_id_dedicatedMeasurementInitiation2(tvb, offset, actx, value_tree);
offset = dissect_id_dedicatedMeasurementInitiation_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_RADIOLINKADDITION: /* 23 */
if (ddMode==NBAP_FDD){
offset = dissect_id_radioLinkAddition2(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkAddition_02(tvb, offset, actx, value_tree);
}else{
offset = dissect_id_radioLinkAddition_tdd1(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkAddition_tdd_01(tvb, offset, actx, value_tree);
}
break;
case NBAP_ID_RADIOLINKSETUP: /* 27 */
if (ddMode==NBAP_FDD){
offset = dissect_id_radioLinkSetup2(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkSetup_02(tvb, offset, actx, value_tree);
}else{
offset = dissect_id_radioLinkSetup_tdd2(tvb, offset, actx, value_tree);
offset = dissect_id_radioLinkSetup_tdd_02(tvb, offset, actx, value_tree);
}
break;
case NBAP_ID_SYNCHRONISEDRADIOLINKRECONFIGURATIONPREPARATION: /* 31 */
offset = dissect_id_synchronisedRadioLinkReconfigurationPreparation2(tvb, offset, actx, value_tree);
offset = dissect_id_synchronisedRadioLinkReconfigurationPreparation_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_SYSTEMINFORMATIONUPDATE: /* 32 */
offset = dissect_id_systemInformationUpdate2(tvb, offset, actx, value_tree);
offset = dissect_id_systemInformationUpdate_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_UNSYNCHRONISEDRADIOLINKRECONFIGURATION: /* 34 */
offset = dissect_id_unSynchronisedRadioLinkReconfiguration2(tvb, offset, actx, value_tree);
offset = dissect_id_unSynchronisedRadioLinkReconfiguration_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_PHYSICALSHAREDCHANNELRECONFIGURATION: /* 37 */
offset = dissect_id_physicalSharedChannelReconfiguration2(tvb, offset, actx, value_tree);
offset = dissect_id_physicalSharedChannelReconfiguration_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_INFORMATIONEXCHANGEINITIATION: /* 41 */
offset = dissect_id_informationExchangeInitiation2(tvb, offset, actx, value_tree);
offset = dissect_id_informationExchangeInitiation_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONADJUSTMENT: /* 44 */
offset = dissect_id_cellSynchronisationAdjustment2(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationAdjustment_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONINITIATION: /* 45 */
offset = dissect_id_cellSynchronisationInitiation2(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationInitiation_02(tvb, offset, actx, value_tree);
break;
case NBAP_ID_CELLSYNCHRONISATIONRECONFIGURATION: /* 46 */
offset = dissect_id_cellSynchronisationReconfiguration2(tvb, offset, actx, value_tree);
offset = dissect_id_cellSynchronisationReconfiguration_02(tvb, offset, actx, value_tree);
break;
default:
offset = offset + length;

1721
epan/dissectors/packet-nbap.c
View File

File diff suppressed because it is too large Load Diff

175
tools/asn2wrs.py
View File

@ -228,7 +228,7 @@ reserved_words = {
'COMPONENT' : 'COMPONENT',
'COMPONENTS' : 'COMPONENTS',
'CONSTRAINED' : 'CONSTRAINED',
# 'CONTAINING' : 'CONTAINING',
'CONTAINING' : 'CONTAINING',
'DEFAULT' : 'DEFAULT',
'DEFINITIONS' : 'DEFINITIONS',
# 'EMBEDDED' : 'EMBEDDED',
@ -489,7 +489,12 @@ class EthCtx:
self.output = output
self.conform.ectx = self
self.output.ectx = self
self.encoding = 'per'
self.aligned = False
self.new_ber = False
self.default_oid_variant = ''
self.default_opentype_variant = ''
self.default_containing_variant = '_pdu_new'
def encp(self): # encoding protocol
encp = self.encoding
@ -775,6 +780,17 @@ class EthCtx:
self.eth_reg_type('_dummy/'+nm, NullType())
self.eth_reg_field(nm, '_dummy/'+nm, pdu=self.conform.use_item('PDU', nm))
#--- required PDUs ----------------------------
for t in self.type_ord:
pdu = self.type[t]['val'].eth_need_pdu(self)
if not pdu: continue
f = pdu['type']
pdu['reg'] = None
pdu['hidden'] = False
pdu['need_decl'] = True
if not self.field.has_key(f):
self.eth_reg_field(f, f, pdu=pdu)
#--- values -> named values -------------------
v_for_remove = []
t_for_update = {}
@ -822,7 +838,7 @@ class EthCtx:
self.eth_type_dupl[nm].append(t)
else:
self.eth_type_dupl[nm] = [self.eth_type[nm]['ref'][0], t]
nm += str(len(self.eth_type_dupl[nm])-1)
nm += '_%02d' % (len(self.eth_type_dupl[nm])-1)
if self.eth_type.has_key(nm):
self.eth_type[nm]['ref'].append(t)
else:
@ -935,7 +951,7 @@ class EthCtx:
self.eth_type[ethtype]['create_field'] = self.eth_type[ethtype]['create_field'] or self.eth_hf[nm]['create_field']
continue
else:
nmx = nm + str(len(self.eth_hf_dupl[nm]))
nmx = nm + ('_%02d' % (len(self.eth_hf_dupl[nm])))
self.eth_hf_dupl[nm][ethtype] = nmx
nm = nmx
else:
@ -946,9 +962,10 @@ class EthCtx:
self.eth_type[ethtype]['create_field'] = self.eth_type[ethtype]['create_field'] or self.eth_hf[nm]['create_field']
continue
else:
nmx = nm + '_01'
self.eth_hf_dupl[nm] = {self.eth_hf[nm]['ethtype']+self.eth_hf[nm]['modified'] : nm, \
ethtypemod : nm+'1'}
nm += '1'
ethtypemod : nmx}
nm = nmx
if (self.field[f]['pdu']):
self.eth_hfpdu_ord.append(nm)
else:
@ -1331,6 +1348,17 @@ class EthCtx:
out += '}\n'
return out
#end out_field()
def out_pdu_decl(f):
t = self.eth_hf[f]['ethtype']
is_new = self.eth_hf[f]['pdu']['new']
out = 'static '
if (is_new):
out += 'int'
else:
out += 'void'
out += ' dissect_'+f+'(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_);\n'
return out
#end out_pdu_decl()
def out_pdu(f):
t = self.eth_hf[f]['ethtype']
is_new = self.eth_hf[f]['pdu']['new']
@ -1373,6 +1401,11 @@ class EthCtx:
#end out_pdu()
fx = self.output.file_open('fn')
pos = fx.tell()
if (len(self.eth_hfpdu_ord)):
for f in self.eth_hfpdu_ord:
if (self.eth_hf[f]['pdu'] and self.eth_hf[f]['pdu']['need_decl']):
fx.write(out_pdu_decl(f))
fx.write('\n')
if self.eth_dep_cycle:
fx.write('/*--- Cyclic dependencies ---*/\n\n')
i = 0
@ -1725,7 +1758,7 @@ class EthCnf:
(reg, hidden) = (None, False)
if (len(par) > 1): reg = par[1]
if (reg and reg[0]=='@'): (reg, hidden) = (reg[1:], True)
attr = {'new' : is_new, 'reg' : reg, 'hidden' : hidden}
attr = {'new' : is_new, 'reg' : reg, 'hidden' : hidden, 'need_decl' : False}
self.add_item('PDU', par[0], attr=attr, fn=fn, lineno=lineno)
return
@ -2423,6 +2456,9 @@ class Type (Node):
def HasPermAlph(self):
return self.HasConstraint() and self.constr.IsPermAlph()
def HasContentsConstraint(self):
return self.HasConstraint() and self.constr.IsContents()
def HasOwnTag(self):
return len(self.tags) > 0
@ -2474,6 +2510,9 @@ class Type (Node):
def eth_has_enum(self, tname, ectx):
return self.eth_has_vals() and (ectx.eth_type[tname]['enum'] & EF_ENUM)
def eth_need_pdu(self, ectx):
return None
def eth_named_bits(self):
return None
@ -2694,7 +2733,7 @@ class Constraint (Node):
return "Constraint: type=%s, subtype=%s" % (self.type, self.subtype)
def IsSize(self):
return self.type == 'Size' and self.subtype.IsValue() \
return (self.type == 'Size' and self.subtype.IsValue()) \
or (self.type == 'Intersection' and (self.subtype[0].IsSize() or self.subtype[1].IsSize())) \
def GetSize(self, ectx):
@ -2787,6 +2826,23 @@ class Constraint (Node):
alph = self.subtype[1].GetPermAlph(ectx)
return alph
def IsContents(self):
return self.type == 'Contents' \
or (self.type == 'Intersection' and (self.subtype[0].IsContents() or self.subtype[1].IsContents())) \
def GetContents(self, ectx):
contents = None
if self.IsContents():
if self.type == 'Contents':
if self.subtype.type == 'Type_Ref':
contents = self.subtype.val
elif self.type == 'Intersection':
if self.subtype[0].IsContents() and not self.subtype[1].IsContents():
contents = self.subtype[0].GetContents(ectx)
elif not self.subtype[0].IsContents() and self.subtype[1].IsContents():
contents = self.subtype[1].GetContents(ectx)
return contents
def IsNegativ(self):
def is_neg(sval):
return sval[0] == '-'
@ -2805,7 +2861,7 @@ class Constraint (Node):
else:
return str(val)
except (ValueError, TypeError):
return str(val)
return asn2c(str(val))
ext = ''
if hasattr(self, 'ext') and self.ext:
@ -3704,6 +3760,9 @@ class ExternalType (Type):
def eth_ftype(self, ectx):
return ('FT_NONE', 'BASE_NONE')
def GetTTag(self, ectx):
return ('BER_CLASS_UNI', 'BER_UNI_TAG_EXTERNAL')
def eth_type_default_pars(self, ectx, tname):
pars = Type.eth_type_default_pars(self, ectx, tname)
pars['TYPE_REF_FN'] = 'NULL'
@ -3752,6 +3811,7 @@ class OpenType (Type):
def eth_type_default_pars(self, ectx, tname):
pars = Type.eth_type_default_pars(self, ectx, tname)
pars['FN_VARIANT'] = ectx.default_opentype_variant
t = self.single_type()
if t:
t = ectx.type[t]['ethname']
@ -3881,9 +3941,34 @@ class OctetStringType (Type):
def GetTTag(self, ectx):
return ('BER_CLASS_UNI', 'BER_UNI_TAG_OCTETSTRING')
def eth_need_pdu(self, ectx):
pdu = None
if self.HasContentsConstraint():
t = self.constr.GetContents(ectx)
if t and (ectx.default_containing_variant in ('_pdu', '_pdu_new')):
pdu = { 'type' : t,
'new' : ectx.default_containing_variant == '_pdu_new' }
return pdu
def eth_type_default_pars(self, ectx, tname):
pars = Type.eth_type_default_pars(self, ectx, tname)
(pars['MIN_VAL'], pars['MAX_VAL'], pars['EXT']) = self.eth_get_size_constr(ectx)
if self.HasContentsConstraint():
pars['FN_VARIANT'] = ectx.default_containing_variant
t = self.constr.GetContents(ectx)
if t:
if pars['FN_VARIANT'] in ('_pdu', '_pdu_new'):
t = ectx.field[t]['ethname']
pars['TYPE_REF_PROTO'] = ''
pars['TYPE_REF_TNAME'] = t
pars['TYPE_REF_FN'] = 'dissect_%(TYPE_REF_TNAME)s'
else:
t = ectx.type[t]['ethname']
pars['TYPE_REF_PROTO'] = ectx.eth_type[t]['proto']
pars['TYPE_REF_TNAME'] = t
pars['TYPE_REF_FN'] = 'dissect_%(TYPE_REF_PROTO)s_%(TYPE_REF_TNAME)s'
else:
pars['TYPE_REF_FN'] = 'NULL'
return pars
def eth_type_default_body(self, ectx, tname):
@ -3892,9 +3977,14 @@ class OctetStringType (Type):
par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s', '%(HF_INDEX)s'),
('%(VAL_PTR)s',),))
elif (ectx.Per()):
body = ectx.eth_fn_call('dissect_%(ER)s_octet_string', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s', '%(VAL_PTR)s',),))
if self.HasContentsConstraint():
body = ectx.eth_fn_call('dissect_%(ER)s_octet_string_containing%(FN_VARIANT)s', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s', '%(TYPE_REF_FN)s',),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_octet_string', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s', '%(VAL_PTR)s',),))
else:
body = '#error Can not decode %s' % (tname)
return body
@ -4064,6 +4154,11 @@ class ObjectIdentifierType (Type):
def GetTTag(self, ectx):
return ('BER_CLASS_UNI', 'BER_UNI_TAG_OID')
def eth_type_default_pars(self, ectx, tname):
pars = Type.eth_type_default_pars(self, ectx, tname)
pars['FN_VARIANT'] = ectx.default_oid_variant
return pars
def eth_type_default_body(self, ectx, tname):
if (ectx.Ber()):
body = ectx.eth_fn_call('dissect_%(ER)s_object_identifier%(FN_VARIANT)s', ret='offset',
@ -4243,6 +4338,15 @@ class BitStringType (Type):
def eth_need_tree(self):
return self.named_list
def eth_need_pdu(self, ectx):
pdu = None
if self.HasContentsConstraint():
t = self.constr.GetContents(ectx)
if t and (ectx.default_containing_variant in ('_pdu', '_pdu_new')):
pdu = { 'type' : t,
'new' : ectx.default_containing_variant == '_pdu_new' }
return pdu
def eth_named_bits(self):
bits = []
if (self.named_list):
@ -4258,6 +4362,22 @@ class BitStringType (Type):
pars['TABLE'] = 'NULL'
if self.eth_named_bits():
pars['TABLE'] = '%(TNAME)s_bits'
if self.HasContentsConstraint():
pars['FN_VARIANT'] = ectx.default_containing_variant
t = self.constr.GetContents(ectx)
if t:
if pars['FN_VARIANT'] in ('_pdu', '_pdu_new'):
t = ectx.field[t]['ethname']
pars['TYPE_REF_PROTO'] = ''
pars['TYPE_REF_TNAME'] = t
pars['TYPE_REF_FN'] = 'dissect_%(TYPE_REF_TNAME)s'
else:
t = ectx.type[t]['ethname']
pars['TYPE_REF_PROTO'] = ectx.eth_type[t]['proto']
pars['TYPE_REF_TNAME'] = t
pars['TYPE_REF_FN'] = 'dissect_%(TYPE_REF_PROTO)s_%(TYPE_REF_TNAME)s'
else:
pars['TYPE_REF_FN'] = 'NULL'
return pars
def eth_type_default_table(self, ectx, tname):
@ -4275,9 +4395,14 @@ class BitStringType (Type):
('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),
('%(VAL_PTR)s',),))
elif (ectx.Per()):
body = ectx.eth_fn_call('dissect_%(ER)s_bit_string', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s','%(EXT)s','%(VAL_PTR)s'),))
if self.HasContentsConstraint():
body = ectx.eth_fn_call('dissect_%(ER)s_bit_string_containing%(FN_VARIANT)s', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s', '%(TYPE_REF_FN)s'),))
else:
body = ectx.eth_fn_call('dissect_%(ER)s_bit_string', ret='offset',
par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'),
('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s', '%(VAL_PTR)s'),))
else:
body = '#error Can not decode %s' % (tname)
return body
@ -5261,12 +5386,12 @@ def p_SingleValue (t):
# 47.3 Contained subtype
# 47.3.1
def p_ContainedSubtype (t):
'ContainedSubtype : Includes Type'
t[0] = Constraint(type = 'ContainedSubtype', subtype = t[2])
'ContainedSubtype : Includes Type'
t[0] = Constraint(type = 'ContainedSubtype', subtype = t[2])
def p_Includes (t):
'''Includes : INCLUDES
| '''
'''Includes : INCLUDES
| '''
# 47.4 Value range
# 47.4.1
@ -5606,8 +5731,8 @@ def set_type_to_class(cls, fld, typename, typeref = None):
# 8.1
def p_GeneralConstraint (t):
'''GeneralConstraint : UserDefinedConstraint
| TableConstraint'''
# | ContentsConstraint''
| TableConstraint
| ContentsConstraint'''
t[0] = t[1]
# 9 User-defined constraints --------------------------------------------------
@ -5634,7 +5759,7 @@ def p_UserDefinedConstraintParameter (t):
'UserDefinedConstraintParameter : type_ref'
t[0] = t[1]
# 10 Table constraints, including component relation constraints
# 10 Table constraints, including component relation constraints --------------
# 10.3
def p_TableConstraint (t):
@ -5651,6 +5776,14 @@ def p_ComponentRelationConstraint (t):
'ComponentRelationConstraint : LBRACE UCASE_IDENT RBRACE LBRACE AT LCASE_IDENT RBRACE'
t[0] = t[2] + '@' + t[6]
# 11 Contents constraints -----------------------------------------------------
# 11.1
def p_ContentsConstraint (t):
'ContentsConstraint : CONTAINING type_ref'
t[0] = Constraint(type = 'Contents', subtype = t[2])
#--- ITU-T Recommendation X.683 -----------------------------------------------
# 8 Parameterized assignments -------------------------------------------------