diff options
| -rw-r--r-- | asn1/dap/dap.asn | 4 | ||||
| -rw-r--r-- | asn1/disp/disp.asn | 4 | ||||
| -rw-r--r-- | asn1/dop/dop.asn | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-dop.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/asn1/dap/dap.asn b/asn1/dap/dap.asn index 15986401f9..068fe378fd 100644 --- a/asn1/dap/dap.asn +++ b/asn1/dap/dap.asn @@ -134,7 +134,7 @@ EntryInformationSelection ::= SET { CHOICE {allUserAttributes [0] NULL, select [1] SET OF AttributeType -- empty set implies no attributes are requested - } OPTIONAL --DEFAULT allUserAttributes:NULL--, + } DEFAULT allUserAttributes:NULL, infoTypes [2] INTEGER {attributeTypesOnly(0), attributeTypesAndValues(1)} DEFAULT attributeTypesAndValues, @@ -683,7 +683,7 @@ SearchArgumentData ::= subset [1] INTEGER {baseObject(0), oneLevel(1), wholeSubtree(2)} DEFAULT baseObject, - filter [2] Filter OPTIONAL --DEFAULT and:{}--, + filter [2] Filter DEFAULT and:{}, searchAliases [3] BOOLEAN DEFAULT TRUE, selection [4] EntryInformationSelection DEFAULT {}, pagedResults [5] PagedResultsRequest OPTIONAL, diff --git a/asn1/disp/disp.asn b/asn1/disp/disp.asn index f8df9f8624..9e1a6760b7 100644 --- a/asn1/disp/disp.asn +++ b/asn1/disp/disp.asn @@ -102,7 +102,7 @@ AgreementID ::= OperationalBindingID ShadowingAgreementInfo ::= SEQUENCE { shadowSubject UnitOfReplication, - updateMode UpdateMode -- DEFAULT supplierInitiated:onChange:TRUE--, + updateMode UpdateMode supplierInitiated:onChange:TRUE, master AccessPoint OPTIONAL, secondaryShadows [2] BOOLEAN DEFAULT FALSE } @@ -132,7 +132,7 @@ AttributeSelection ::= SET OF ClassAttributeSelection ClassAttributeSelection ::= SEQUENCE { class OBJECT IDENTIFIER OPTIONAL, - classAttributes ClassAttributes -- DEFAULT allAttributes:NULL -- OPTIONAL + classAttributes ClassAttributes DEFAULT allAttributes:NULL } ClassAttributes ::= CHOICE { diff --git a/asn1/dop/dop.asn b/asn1/dop/dop.asn index a8fb62d381..218920eef8 100644 --- a/asn1/dop/dop.asn +++ b/asn1/dop/dop.asn @@ -315,11 +315,11 @@ OperationalBindingID ::= SEQUENCE {identifier INTEGER, Validity ::= SEQUENCE { validFrom [0] CHOICE {now [0] NULL, - time [1] Time} -- DEFAULT now:NULL --, + time [1] Time } DEFAULT now:NULL, validUntil [1] CHOICE {explicitTermination [0] NULL, time [1] Time - } -- DEFAULT explicitTermination:NULL + } DEFAULT explicitTermination:NULL } Time ::= CHOICE {utcTime UTCTime, diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 2291dfc9ce..db122615a3 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -759,8 +759,8 @@ dissect_dop_T_validUntil(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static const ber_sequence_t Validity_sequence[] = { - { &hf_dop_validFrom , BER_CLASS_CON, 0, 0, dissect_dop_T_validFrom }, - { &hf_dop_validUntil , BER_CLASS_CON, 1, 0, dissect_dop_T_validUntil }, + { &hf_dop_validFrom , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_dop_T_validFrom }, + { &hf_dop_validUntil , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_dop_T_validUntil }, { NULL, 0, 0, 0, NULL } }; |