diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/dap/dap.cnf | 20 | ||||
-rw-r--r-- | asn1/disp/disp.cnf | 6 | ||||
-rw-r--r-- | asn1/dop/dop.cnf | 22 | ||||
-rw-r--r-- | asn1/h245/h245.cnf | 2 | ||||
-rw-r--r-- | asn1/ldap/ldap.cnf | 10 | ||||
-rw-r--r-- | asn1/pres/pres.cnf | 10 | ||||
-rw-r--r-- | asn1/ranap/ranap.cnf | 4 | ||||
-rw-r--r-- | asn1/ros/ros.cnf | 20 | ||||
-rw-r--r-- | asn1/rtse/rtse.cnf | 12 | ||||
-rw-r--r-- | asn1/tcap/tcap.cnf | 2 | ||||
-rw-r--r-- | asn1/x411/x411.cnf | 71 | ||||
-rw-r--r-- | asn1/x420/x420.cnf | 2 |
12 files changed, 106 insertions, 75 deletions
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 0fdc31663b..f0280d3679 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -110,27 +110,27 @@ TokenData/name distinguished-name TokenData/time utctime -#.FN_BODY T_initial +#.FN_BODY FilterItem/substrings/strings/_item/initial proto_item *it; it = proto_tree_add_item(tree, hf_index, tvb, offset, -1, FALSE); proto_item_append_text(it," XXX: Not yet implemented!"); -#.FN_BODY T_any +#.FN_BODY FilterItem/substrings/strings/_item/any /* XXX: not yet implemented */ -#.FN_BODY T_final +#.FN_BODY FilterItem/substrings/strings/_item/final /* XXX: not yet implemented */ -#.FN_BODY T_matchValue +#.FN_BODY MatchingRuleAssertion/matchValue /* XXX: not yet implemented */ -#.FN_BODY T_req +#.FN_BODY SpkmCredentials/req /* XXX: not yet implemented */ -#.FN_BODY T_rep +#.FN_BODY SpkmCredentials/rep /* XXX: not yet implemented */ -#.FN_BODY T_spkmInfo +#.FN_BODY SecurityErrorData/spkmInfo /* XXX: not yet implemented */ #.FN_BODY DirectoryBindArgument @@ -159,10 +159,10 @@ TokenData/time utctime if(check_col(actx->pinfo->cinfo, COL_INFO)) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x509if_get_last_dn()); -#.FN_PARS OCTET_STRING - VAL_PTR=&out_tvb + + -#.FN_BODY OCTET_STRING +#.FN_BODY PagedResultsRequest/queryReference VAL_PTR=&out_tvb tvbuff_t *out_tvb; int i; int len; diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index 8d2ce538ea..60f1839262 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -56,10 +56,10 @@ ModificationParameter B "dop.modify.roleb.2.5.19.1" "shadow-modify-roleb" col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_RefreshInformation_vals, "unknown(%%d)")); } -#.FN_PARS StandardUpdate - VAL_PTR = &update +#.END + -#.FN_BODY StandardUpdate +#.FN_BODY CoordinateShadowUpdateArgumentData/updateStrategy/standard VAL_PTR = &update guint32 update; %(DEFAULT_BODY)s diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index f80260d218..77a84c3474 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -104,39 +104,39 @@ OpBindingErrorParam/bindingType BindingType append_oid(actx->pinfo, binding_type); #.END -#.FN_BODY EstablishSymmetric +#.FN_BODY EstablishOperationalBindingArgumentData/initiator/symmetric offset = call_dop_oid_callback("dop.establish.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); -#.FN_BODY EstablishRoleAInitiates +#.FN_BODY EstablishOperationalBindingArgumentData/initiator/roleA-initiates offset = call_dop_oid_callback("dop.establish.rolea", tvb, offset, actx->pinfo, tree, "roleA"); -#.FN_BODY EstablishRoleBInitiates +#.FN_BODY EstablishOperationalBindingArgumentData/initiator/roleB-initiates offset = call_dop_oid_callback("dop.establish.roleb", tvb, offset, actx->pinfo, tree, "roleB"); -#.FN_BODY ModifySymmetric +#.FN_BODY ModifyOperationalBindingArgumentData/initiator/symmetric offset = call_dop_oid_callback("dop.modify.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); -#.FN_BODY ModifyRoleAInitiates +#.FN_BODY ModifyOperationalBindingArgumentData/initiator/roleA-initiates offset = call_dop_oid_callback("dop.modify.rolea", tvb, offset, actx->pinfo, tree, "roleA"); -#.FN_BODY ModifyRoleBInitiates +#.FN_BODY ModifyOperationalBindingArgumentData/initiator/roleB-initiates offset = call_dop_oid_callback("dop.modify.roleb", tvb, offset, actx->pinfo, tree, "roleB"); -#.FN_BODY TerminateSymmetric +#.FN_BODY TerminateOperationalBindingArgumentData/initiator/symmetric offset = call_dop_oid_callback("dop.terminate.symmetric", tvb, offset, actx->pinfo, tree, "symmetric"); -#.FN_BODY TerminateRoleAInitiates +#.FN_BODY TerminateOperationalBindingArgumentData/initiator/roleA-initiates offset = call_dop_oid_callback("dop.terminate.rolea", tvb, offset, actx->pinfo, tree, "roleA"); -#.FN_BODY TerminateRoleBInitiates +#.FN_BODY TerminateOperationalBindingArgumentData/initiator/roleB-initiates offset = call_dop_oid_callback("dop.terminate.roleb", tvb, offset, actx->pinfo, tree, "roleB"); @@ -160,11 +160,11 @@ OpBindingErrorParam/bindingType BindingType offset = call_dop_oid_callback("dop.agreement", tvb, offset, actx->pinfo, tree, NULL); -#.FN_BODY ResultNewAgreement +#.FN_BODY ModifyOperationalBindingResultData/newAgreement offset = call_dop_oid_callback("dop.agreement", tvb, offset, actx->pinfo, tree, NULL); -#.FN_BODY ArgumentNewAgreement +#.FN_BODY ModifyOperationalBindingArgumentData/newAgreement offset = call_dop_oid_callback("dop.agreement", tvb, offset, actx->pinfo, tree, NULL); diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 64b30e4af1..7b0c01db79 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -433,7 +433,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format g_snprintf(h245_pi->frame_label, 50, "%%s %%s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn")); #.END #---------------------------------------------------------------------------------------- -#.FN_BODY DataModeApplication VAL_PTR = &value +#.FN_BODY DataMode/application VAL_PTR = &value guint32 value; %(DEFAULT_BODY)s diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index af625f61b7..7888895d68 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -365,7 +365,7 @@ ldap_conv_info_t *ldap_info; } -#.FN_BODY BindResponse_resultCode VAL_PTR = &result +#.FN_BODY BindResponse/resultCode VAL_PTR = &result const gchar *valstr; @@ -532,14 +532,14 @@ ldap_conv_info_t *ldap_info; #.FN_FTR Filter/not Filter_string=ep_strdup_printf("(!%s)",Filter_string); -#.FN_BODY BOOLEAN +#.FN_BODY MatchingRuleAssertion/dnAttributes gboolean val; - offset = dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_index, &val); +offset = dissect_ber_boolean_value(implicit_tag, actx, tree, tvb, offset, hf_index, &val); + - if (hf_index == hf_ldap_dnAttributes) { matching_rule_dnattr = val; - } + #.FN_HDR Filter/extensibleMatch attr_type=NULL; diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index 96180d59ce..2ad84caaeb 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -28,8 +28,8 @@ CPA-PPDU/x410-mode-parameters cPR_PPDU_x400_mode_parameters ARP-PPDU/provider-reason aRU_PPDU_provider-reason CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason -#.FN_BODY OPEN -/* FIX ME*/ + + #.FN_BODY PDV-list/presentation-data-values/single-ASN1-type @@ -59,13 +59,13 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason } -#.FN_PARS Abstract_syntax_name +#.FN_PARS Abstract-syntax-name FN_VARIANT = _str VAL_PTR = &abstract_syntax_name_oid -#.FN_PARS Presentation_context_identifier +#.FN_PARS Presentation-context-identifier VAL_PTR = &presentation_context_identifier -#.FN_BODY Presentation_context_identifier +#.FN_BODY Presentation-context-identifier %(DEFAULT_BODY)s diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index ee72587f1a..e110082e98 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -67,7 +67,7 @@ VAL_PTR = &ProtocolIE_ID offset = dissect_ranap_messages(tvb, offset, %(ACTX)s, tree); -#.FN_BODY RANAP_PROTOCOL_IES_Value +#.FN_BODY RANAP-PROTOCOL-IES-Value offset = dissect_ranap_ies(tvb, offset, %(ACTX)s, tree); @@ -90,7 +90,7 @@ tvbuff_t *nas_pdu_tvb=NULL; offset = dissect_ranap_ies(tvb, offset, %(ACTX)s, tree); -#.FN_BODY RANAP_PRIVATE_IES_Value +#.FN_BODY RANAP-PRIVATE-IES-Value /* FIX ME */ #.FN_BODY PLMNidentity VAL_PTR = ¶meter_tvb diff --git a/asn1/ros/ros.cnf b/asn1/ros/ros.cnf index 462a7c9c3d..5623c55cf1 100644 --- a/asn1/ros/ros.cnf +++ b/asn1/ros/ros.cnf @@ -15,9 +15,9 @@ Reject/problem/returnResult rejectResult #.FN_PARS ErrorCode VAL_PTR = &opcode -#.FN_PARS INTEGER VAL_PTR = &invokeid +#.FN_PARS InvokeId/present VAL_PTR = &invokeid -#.FN_BODY T_argument +#.FN_BODY Invoke/argument char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "invoke argument"); @@ -32,7 +32,7 @@ Reject/problem/returnResult rejectResult offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree); } -#.FN_BODY OperationResult +#.FN_BODY ReturnResult/result/result char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "return result"); @@ -47,7 +47,7 @@ Reject/problem/returnResult rejectResult offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree); } -#.FN_BODY T_parameter +#.FN_BODY ReturnError/parameter char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "return result"); @@ -63,7 +63,7 @@ Reject/problem/returnResult rejectResult } -#.FN_BODY T_bind_invoke +#.FN_BODY ROS/bind-invoke char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "bind-invoke"); @@ -74,7 +74,7 @@ Reject/problem/returnResult rejectResult offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree); } -#.FN_BODY T_bind_result +#.FN_BODY ROS/bind-result char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "bind-result"); @@ -85,7 +85,7 @@ Reject/problem/returnResult rejectResult offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree); } -#.FN_BODY T_bind_error +#.FN_BODY ROS/bind-error char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "bind-error"); @@ -97,7 +97,7 @@ Reject/problem/returnResult rejectResult } -#.FN_BODY T_unbind_invoke +#.FN_BODY ROS/unbind-invoke char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "unbind-invoke"); @@ -109,7 +109,7 @@ Reject/problem/returnResult rejectResult } -#.FN_BODY T_unbind_result +#.FN_BODY ROS/unbind-result char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "unbind-result"); @@ -120,7 +120,7 @@ Reject/problem/returnResult rejectResult offset = call_ros_oid_callback(oid, tvb, offset, actx->pinfo, top_tree); } -#.FN_BODY T_unbind_error +#.FN_BODY ROS/unbind-error char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "unbind-error"); diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index 929adb1e67..6a8543ee37 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -137,9 +137,9 @@ EXTERNALt col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Recover"); %(DEFAULT_BODY)s -#.FN_PARS T61String - VAL_PTR=&string -#.FN_BODY T61String +#.END + +#.FN_BODY CallingSSuserReference/t61String VAL_PTR=&string tvbuff_t *string = NULL; %(DEFAULT_BODY)s if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO)) @@ -153,9 +153,9 @@ EXTERNALt if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO)) col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string))); -#.FN_PARS OCTET_STRING - VAL_PTR=&string -#.FN_BODY OCTET_STRING +#.END + +#.FN_BODY CallingSSuserReference/octetString VAL_PTR=&string tvbuff_t *string = NULL; %(DEFAULT_BODY)s if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO)) diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index 90cbe7ab05..1ba3fff0ee 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -91,7 +91,7 @@ if (!next_tvb) offset += len; return offset; -#.FN_BODY User_information +#.FN_BODY User-information tvbuff_t *next_tvb; gint8 class; gboolean pc; diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index d232d40612..11d2ac36d5 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -485,12 +485,10 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" g_strlcat(oraddress, tvb_format_text(string, 0, tvb_length(string)), MAX_ORA_STR_LEN); } +#.VIRTUAL_ASSGN +AddrNumericString UserAddress/x121/x121-address CountryName/x121-dcc-code PhysicalDeliveryCountryName/x121-dcc-code PostalCode/numeric-code - -#.FN_PARS NumericString - VAL_PTR=&nstring - -#.FN_BODY NumericString +#.FN_BODY AddrNumericString VAL_PTR=&nstring tvbuff_t *nstring = NULL; %(DEFAULT_BODY)s @@ -498,9 +496,10 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" if(doing_address && nstring) g_strlcat(oraddress, tvb_format_text(nstring, 0, tvb_length(nstring)), MAX_ORA_STR_LEN); -#.FN_PARS TeletexString +#.VIRTUAL_ASSGN +AddrTeletexString TeletexPersonalName/surname TeletexPersonalName/given-name TeletexPersonalName/initials TeletexPersonalName/generation-qualifier TeletexDomainDefinedAttribute/type TeletexDomainDefinedAttribute/value -#.FN_BODY TeletexString +#.FN_BODY AddrTeletexString VAL_PTR=&tstring tvbuff_t *tstring = NULL; %(DEFAULT_BODY)s @@ -509,28 +508,60 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" g_strlcat(oraddress, tvb_format_text(tstring, 0, tvb_length(tstring)), MAX_ORA_STR_LEN); -#.FN_PARS PrintableString - VAL_PTR=&pstring +#.FN_BODY PersonalName/surname VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s -#.FN_BODY PrintableString + if(doing_address && pstring) { + g_strlcat(oraddress, "/S=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/given-name VAL_PTR=&pstring tvbuff_t *pstring = NULL; - char *fmt = NULL; %(DEFAULT_BODY)s if(doing_address && pstring) { - if(hf_index == hf_x411_printable_surname) fmt = "/S="; - else if(hf_index == hf_x411_printable_given_name) fmt = "/G="; - else if(hf_index == hf_x411_printable_initials) fmt = "/I="; - else if(hf_index == hf_x411_printable_generation_qualifier) fmt = "/GQ="; - else if(hf_index == hf_x411_printable_type) fmt = "/DD."; - else if(hf_index == hf_x411_printable_value) fmt = "="; - - if(fmt) - g_strlcat(oraddress, fmt, MAX_ORA_STR_LEN); + g_strlcat(oraddress, "/G=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/initials VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/I=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/generation-qualifier VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/GQ=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } + +#.FN_BODY BuiltInDomainDefinedAttribute/type VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/DD.", MAX_ORA_STR_LEN); g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY BuiltInDomainDefinedAttribute/value VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); } #.FN_BODY ORAddress diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 913a8460c5..71a1962708 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -160,7 +160,7 @@ ForwardedContentParameters B "2.6.1.11.17.1.3.26.0.4406.0.4.1" "id-ep-content- if((pi = get_ber_last_created_item())) proto_item_append_text(pi, " (%%s)", val_to_str(crs, charsetreg_vals, "unknown")); -#.FN_BODY Interchange_Data_Element +#.FN_BODY Interchange-Data-Element /* XXX Not implemented yet */ #.FN_BODY NationallyDefinedBodyPart |