diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-20 18:33:33 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-20 18:33:33 +0000 |
commit | 6f2d887850c5300b0035a6dd1219f2fada37dd3a (patch) | |
tree | e38b5570b863ce33a9b3a4eb4be355227042ee5d /asn1 | |
parent | 631380a950a88a8da34cd74e7e405a67886fd1f3 (diff) |
From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup in the asn1 cnf files.
Dissectors will be regenerated later.
svn path=/trunk/; revision=28782
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ansi-tcap/ansi_tcap.cnf | 6 | ||||
-rw-r--r-- | asn1/ansi_map/ansi_map.cnf | 36 | ||||
-rw-r--r-- | asn1/camel/camel.cnf | 4 | ||||
-rw-r--r-- | asn1/h225/h225.cnf | 4 | ||||
-rw-r--r-- | asn1/h245/h245.cnf | 4 | ||||
-rw-r--r-- | asn1/h450-ros/h450-ros.cnf | 6 | ||||
-rw-r--r-- | asn1/pkix1explicit/pkix1explicit_exp.cnf | 2 | ||||
-rw-r--r-- | asn1/pkix1implicit/pkix1implicit_exp.cnf | 4 | ||||
-rw-r--r-- | asn1/q932-ros/q932-ros.cnf | 6 | ||||
-rw-r--r-- | asn1/snmp/snmp.cnf | 4 |
10 files changed, 38 insertions, 38 deletions
diff --git a/asn1/ansi-tcap/ansi_tcap.cnf b/asn1/ansi-tcap/ansi_tcap.cnf index 62835dcb72..d584921641 100644 --- a/asn1/ansi-tcap/ansi_tcap.cnf +++ b/asn1/ansi-tcap/ansi_tcap.cnf @@ -19,7 +19,7 @@ OperationCode/private VAL_PTR = &ansi_tcap_private.d.OperationCode_private #--- INVOKE --- #.FIELD_ATTR -Invoke/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX +Invoke/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY Invoke/parameter tvbuff_t *parameter_tvb; @@ -37,7 +37,7 @@ tvbuff_t *parameter_tvb; #--- RETURN RESULT --- #.FIELD_ATTR -ReturnResult/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnResult/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnResult/parameter tvbuff_t *parameter_tvb; @@ -57,7 +57,7 @@ tvbuff_t *parameter_tvb; #--- RETURN ERROR --- #.FIELD_ATTR -ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnError/parameter tvbuff_t *parameter_tvb; diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf index 3a1477b4ee..af004bf275 100644 --- a/asn1/ansi_map/ansi_map.cnf +++ b/asn1/ansi_map/ansi_map.cnf @@ -449,28 +449,28 @@ #.TYPE_ATTR # Dont't put the bytes after the name in the display -CDMA2000HandoffInvokeIOSData TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -CDMA2000HandoffResponseIOSData TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -InterMSCCircuitID TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -MobileIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -MobileStationMIN TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -CallingPartyNumberString1 TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -CallingPartyNumberString2 TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SMS-Address TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SMS-DestinationAddress TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SMS-OriginatingAddress TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SMS-OriginalOriginatingAddress TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SMS-OriginalDestinationAddress TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -SenderIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -MobileDirectoryNumber TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -Digits TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -MSCIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -NewlyAssignedMIN TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL +CDMA2000HandoffInvokeIOSData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +CDMA2000HandoffResponseIOSData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +InterMSCCircuitID TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +MobileIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +MobileStationMIN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +CallingPartyNumberString1 TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +CallingPartyNumberString2 TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SMS-Address TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SMS-DestinationAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SMS-OriginatingAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SMS-OriginalOriginatingAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SMS-OriginalDestinationAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +SenderIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +MobileDirectoryNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +Digits TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +MSCIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +NewlyAssignedMIN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL RedirectingNumberDigits = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL RedirectingNumberString = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL CallingPartyNumberDigits1 = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL CallingPartyNumberDigits2 = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -TemporaryReferenceNumber TYPE = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL +TemporaryReferenceNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL ActionCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(ansi_map_ActionCode_vals) AuthenticationCapability TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(ansi_map_AuthenticationCapability_vals) diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index dcea9fd7fb..40779a16ca 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -635,8 +635,8 @@ proto_tree *subtree; #.TYPE_ATTR PDPTypeOrganization TYPE = FT_UINT8 DISPLAY = BASE_DEC BITMASK = 0x0f STRINGS = VALS(gsm_map_PDP_Type_Organisation_vals) -DateAndTime TYPE = FT_STRING DISPLAY = NONE -AccessPointName TYPE = FT_STRING DISPLAY = NONE +DateAndTime TYPE = FT_STRING DISPLAY = BASE_NONE +AccessPointName TYPE = FT_STRING DISPLAY = BASE_NONE Code/local TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_opr_code_strings) ServiceInteractionIndicatorsTwo/holdTreatmentIndicator TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_holdTreatmentIndicator_values) ServiceInteractionIndicatorsTwo/cwTreatmentIndicator TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(camel_cwTreatmentIndicator_values) diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index b1d8bd99e1..33c326e40a 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -725,8 +725,8 @@ TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NU TransportAddress/ip6Address/ip TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL H245TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL H245TransportAddress/ip6Address/ip TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL -VendorIdentifier/productId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL -VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL +VendorIdentifier/productId TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL +VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL H323-UserInformation/user-data/protocol-discriminator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(q931_protocol_discriminator_vals) H323-UU-PDU/tunnelledSignallingMessage/messageContent/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC NonStandardParameter/data TYPE = FT_UINT32 DISPLAY = BASE_DEC diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index d92725bee0..ad324cc78d 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -1388,8 +1388,8 @@ MulticastAddress/iPAddress/network TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS MulticastAddress/iP6Address/network TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL RTPPayloadType/payloadDescriptor/rfc-number TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h245_RFC_number_vals) NonStandardIdentifier/h221NonStandard/t35CountryCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(T35CountryCode_vals) -VendorIdentification/productNumber TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL -VendorIdentification/versionNumber TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL +VendorIdentification/productNumber TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL +VendorIdentification/versionNumber TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL ParameterValue/octetString TYPE = FT_UINT32 DISPLAY = BASE_DEC #---------------------------------------------------------------------------------------- diff --git a/asn1/h450-ros/h450-ros.cnf b/asn1/h450-ros/h450-ros.cnf index f2fdf88737..1900694a1a 100644 --- a/asn1/h450-ros/h450-ros.cnf +++ b/asn1/h450-ros/h450-ros.cnf @@ -70,7 +70,7 @@ ReturnErrorProblem VAL_PTR = &problem_val #.END #.FIELD_ATTR -Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_HEX +Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_PARS Invoke/argument FN_VARIANT = _pdu @@ -82,7 +82,7 @@ TYPE_REF_FN = argument_cb #--- RETURN RESULT --- #.FIELD_ATTR -ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_PARS ReturnResult/result/result FN_VARIANT = _pdu @@ -95,7 +95,7 @@ TYPE_REF_FN = result_cb #--- RETURN ERROR --- #.FIELD_ATTR -ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_PARS ReturnError/parameter FN_VARIANT = _pdu diff --git a/asn1/pkix1explicit/pkix1explicit_exp.cnf b/asn1/pkix1explicit/pkix1explicit_exp.cnf index c7cca6fc50..53824f5294 100644 --- a/asn1/pkix1explicit/pkix1explicit_exp.cnf +++ b/asn1/pkix1explicit/pkix1explicit_exp.cnf @@ -38,7 +38,7 @@ SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL TeletexDomainDefinedAttribute TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 TerminalType TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(pkix1explicit_Time_vals) BITMASK = 0 -UniqueIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 +UniqueIdentifier TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Version TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = VALS(pkix1explicit_Version_vals) BITMASK = 0 #.END diff --git a/asn1/pkix1implicit/pkix1implicit_exp.cnf b/asn1/pkix1implicit/pkix1implicit_exp.cnf index d583aaa454..fc2faf22db 100644 --- a/asn1/pkix1implicit/pkix1implicit_exp.cnf +++ b/asn1/pkix1implicit/pkix1implicit_exp.cnf @@ -10,8 +10,8 @@ UserNotice BER_CLASS_UNI BER_UNI_TAG_SEQUENCE #.TYPE_ATTR AuthorityInfoAccessSyntax TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 GeneralName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 -KeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 -ReasonFlags TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 +KeyIdentifier TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ReasonFlags TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 UserNotice TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/q932-ros/q932-ros.cnf b/asn1/q932-ros/q932-ros.cnf index 7e30c38570..97e9dd5567 100644 --- a/asn1/q932-ros/q932-ros.cnf +++ b/asn1/q932-ros/q932-ros.cnf @@ -63,7 +63,7 @@ ReturnErrorProblem VAL_PTR = &problem_val #--- INVOKE --- #.FIELD_ATTR -Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_HEX +Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY Invoke/argument gint len; @@ -81,7 +81,7 @@ Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_HEX #--- RETURN RESULT --- #.FIELD_ATTR -ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnResult/result/result gint len; @@ -100,7 +100,7 @@ ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_HEX #--- RETURN ERROR --- #.FIELD_ATTR -ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_HEX +ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnError/parameter diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf index 6a3753b7f9..30eb817dc5 100644 --- a/asn1/snmp/snmp.cnf +++ b/asn1/snmp/snmp.cnf @@ -227,7 +227,7 @@ gint pdu_type=-1; #.TYPE_ATTR NetworkAddress TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL -Message/community TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL +Message/community TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL HeaderData/msgSecurityModel TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(sec_models) -UsmSecurityParameters/msgUserName TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL +UsmSecurityParameters/msgUserName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL #.END |