From Kovarththanan Rajaratnam:

Clean up header field info in asn1/*-template.c files.

From me:
Fixed a few typos in the patch.

svn path=/trunk/; revision=28817
This commit is contained in:
Stig Bjørlykke 2009-06-23 06:02:12 +00:00
parent 1e4fec00cf
commit e3ef20f3ea
16 changed files with 60 additions and 60 deletions

View File

@ -1354,16 +1354,16 @@ void proto_register_h248(void) {
static hf_register_info hf[] = {
{ &hf_h248_mtpaddress_ni, {
"NI", "h248.mtpaddress.ni", FT_UINT32, BASE_DEC,
NULL, 0, "NI", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_h248_mtpaddress_pc, {
"PC", "h248.mtpaddress.pc", FT_UINT32, BASE_DEC,
NULL, 0, "PC", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_name, {
"Package", "h248.package_name", FT_UINT16, BASE_HEX,
VALS(package_name_vals), 0, "Package", HFILL }},
VALS(package_name_vals), 0, NULL, HFILL }},
{ &hf_248_pkg_param, {
"Parameter ID", "h248.package_paramid", FT_UINT16, BASE_HEX,
NULL, 0, "Parameter ID", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_h248_signal_code, {
"Signal ID", "h248.package_signalid", FT_UINT16, BASE_HEX,
NULL, 0, "Parameter ID", HFILL }},
@ -1379,7 +1379,7 @@ void proto_register_h248(void) {
{ &hf_h248_pkg_bcp_BNCChar_PDU,
{ "BNCChar", "h248.package_bcp.BNCChar",
FT_UINT32, BASE_DEC, VALS(gcp_term_types), 0,
"BNCChar", HFILL }},
NULL, HFILL }},
{ &hf_h248_error_code,
{ "errorCode", "h248.errorCode",
@ -1392,32 +1392,32 @@ void proto_register_h248(void) {
{ &hf_h248_term_wild_type,
{ "Wildcard Mode", "h248.term.wildcard.mode",
FT_UINT8, BASE_DEC, VALS(wildcard_modes), 0x80,
"", HFILL }},
NULL, HFILL }},
{ &hf_h248_term_wild_level,
{ "Wildcarding Level", "h248.term.wildcard.level",
FT_UINT8, BASE_DEC, VALS(wildcard_levels), 0x40,
"", HFILL }},
NULL, HFILL }},
{ &hf_h248_term_wild_position,
{ "Wildcarding Position", "h248.term.wildcard.pos",
FT_UINT8, BASE_DEC, NULL, 0x3F,
"", HFILL }},
NULL, HFILL }},
{ &hf_h248_no_pkg,
{ "Unknown Package", "h248.pkg.unknown",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }},
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_no_sig,
{ "Unknown Signal", "h248.pkg.unknown.sig",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }},
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_no_evt,
{ "Unknown Event", "h248.pkg.unknown.evt",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }},
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_param,
{ "Parameter", "h248.pkg.unknown.param",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }},
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_h248_serviceChangeReasonStr,
{ "ServiceChangeReasonStr", "h248.serviceChangeReasonstr",
FT_STRING, BASE_NONE, NULL, 0,

View File

@ -116,7 +116,7 @@ void proto_register_pkix1explicit(void) {
{ &hf_pkix1explicit_addressFamily_afn,
{ "Address family(AFN)", "pkix1explicit.addressfamily", FT_UINT16, BASE_DEC, VALS(afn_vals), 0,
"Address family(AFN)", HFILL }},
NULL, HFILL }},
{ &hf_pkix1explicit_addressFamily_safi,
{ "Subsequent Address Family Identifiers (SAFI)", "pkix1explicit.addressfamily.safi", FT_UINT16, BASE_DEC, NULL, 0,

View File

@ -335,7 +335,7 @@ void proto_register_cmp(void) {
{ &hf_cmp_tcptrans_next_poll_ref,
{ "Next Polling Reference", "cmp.tcptrans.next_poll_ref",
FT_UINT32, BASE_HEX, NULL, 0,
"TCP transport Next Polling Reference ", HFILL }},
"TCP transport Next Polling Reference", HFILL }},
{ &hf_cmp_tcptrans_ttcb,
{ "Time to check Back", "cmp.tcptrans.ttcb",
FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0,

View File

@ -281,14 +281,14 @@ void proto_register_q932(void) {
FT_UINT8, BASE_DEC, NULL, 0x0,
"Information Element Length", HFILL }},
{ &hf_q932_ie_data, { "Data", "q932.ie.data",
FT_BYTES, BASE_HEX, NULL, 0x0,
"Data", HFILL }},
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_q932_pp, { "Protocol profile", "q932.pp",
FT_UINT8, BASE_HEX, VALS(str_pp), 0x1F,
"Protocol profile", HFILL }},
NULL, HFILL }},
{ &hf_q932_nd, { "Notification description", "q932.nd",
FT_UINT8, BASE_HEX, VALS(str_nd), 0x0,
"Notification description", HFILL }},
NULL, HFILL }},
#include "packet-q932-hfarr.c"
};

View File

@ -583,13 +583,13 @@ void proto_register_qsig(void) {
static hf_register_info hf[] = {
{ &hf_qsig_operation, { "Operation", "qsig.operation",
FT_UINT8, BASE_DEC, VALS(qsig_str_operation), 0x0,
"Operation", HFILL }},
NULL, HFILL }},
{ &hf_qsig_service, { "Service", "qsig.service",
FT_UINT8, BASE_DEC, VALS(qsig_str_service), 0x0,
"Supplementary Service", HFILL }},
{ &hf_qsig_error, { "Error", "qsig.error",
FT_UINT8, BASE_DEC, VALS(qsig_str_error), 0x0,
"Error", HFILL }},
NULL, HFILL }},
{ &hf_qsig_ie_type, { "Type", "qsig.ie.type",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Information Element Type", HFILL }},
@ -604,13 +604,13 @@ void proto_register_qsig(void) {
"Information Element Length", HFILL }},
{ &hf_qsig_ie_data, { "Data", "qsig.ie.data",
FT_BYTES, BASE_HEX, NULL, 0x0,
"Data", HFILL }},
NULL, HFILL }},
{ &hf_qsig_tc, { "Transit count", "qsig.tc",
FT_UINT8, BASE_DEC, NULL, 0x1F,
"Transit count", HFILL }},
NULL, HFILL }},
{ &hf_qsig_pc, { "Party category", "qsig.pc",
FT_UINT8, BASE_HEX, VALS(qsig_str_pc), 0x07,
"Party category", HFILL }},
NULL, HFILL }},
#include "packet-qsig-hfarr.c"
};

View File

@ -279,7 +279,7 @@ void proto_register_ranap(void) {
{ &hf_ranap_imsi_digits,
{ "IMSI digits", "ranap.imsi_digits",
FT_STRING, BASE_NONE, NULL, 0,
"IMSI digits", HFILL }},
NULL, HFILL }},
{ &hf_ranap_transportLayerAddress_ipv4,
{ "transportLayerAddress IPv4", "ranap.transportLayerAddress_ipv4",
FT_IPv4, BASE_NONE, NULL, 0,

View File

@ -324,18 +324,18 @@ void proto_register_rtse(void) {
NULL, 0x00, "Message fragment", HFILL } },
{ &hf_rtse_fragment_overlap,
{ "RTSE fragment overlap", "rtse.fragment.overlap", FT_BOOLEAN,
BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
BASE_NONE, NULL, 0x0, "Message fragment overlap", HFILL } },
{ &hf_rtse_fragment_overlap_conflicts,
{ "RTSE fragment overlapping with conflicting data",
"rtse.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
0x00, "Message fragment overlapping with conflicting data", HFILL } },
0x0, "Message fragment overlapping with conflicting data", HFILL } },
{ &hf_rtse_fragment_multiple_tails,
{ "RTSE has multiple tail fragments",
"rtse.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
NULL, 0x00, "Message has multiple tail fragments", HFILL } },
NULL, 0x0, "Message has multiple tail fragments", HFILL } },
{ &hf_rtse_fragment_too_long_fragment,
{ "RTSE fragment too long", "rtse.fragment.too_long_fragment",
FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Message fragment too long",
HFILL } },
{ &hf_rtse_fragment_error,
{ "RTSE defragmentation error", "rtse.fragment.error", FT_FRAMENUM,

View File

@ -192,11 +192,11 @@ void proto_register_s1ap(void) {
static hf_register_info hf[] = {
{ &hf_s1ap_transportLayerAddressIPv4,
{ "transportLayerAddress(IPv4)", "s1ap.transportLayerAddressIPv4",
FT_IPv4, BASE_DEC, NULL, 0,
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_s1ap_transportLayerAddressIPv6,
{ "transportLayerAddress(IPv6)", "s1ap.transportLayerAddressIPv6",
FT_IPv4, BASE_HEX, NULL, 0,
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL }},
#include "packet-s1ap-hfarr.c"

View File

@ -171,7 +171,7 @@ void proto_register_sabp(void) {
{ &hf_sabp_no_of_pages,
{ "Number-of-Pages", "sabp.no_of_pages",
FT_UINT8, BASE_DEC, NULL, 0,
"Number-of-Pages", HFILL }},
NULL, HFILL }},
#include "packet-sabp-hfarr.c"
};

View File

@ -154,13 +154,13 @@ void proto_register_smrse(void) {
NULL, 0, "Reserved byte, must be 126", HFILL }},
{ &hf_smrse_tag, {
"Tag", "smrse.tag", FT_UINT8, BASE_DEC,
VALS(tag_vals), 0, "Tag", HFILL }},
VALS(tag_vals), 0, NULL, HFILL }},
{ &hf_smrse_length, {
"Length", "smrse.length", FT_UINT16, BASE_DEC,
NULL, 0, "Length of SMRSE PDU", HFILL }},
{ &hf_smrse_Octet_Format,
{ "octet-Format", "smrse.octet_Format",
FT_STRING, BASE_HEX, NULL, 0,
FT_STRING, BASE_NONE, NULL, 0,
"SMS-Address/address-value/octet-format", HFILL }},
#include "packet-smrse-hfarr.c"

View File

@ -1318,17 +1318,17 @@ void proto_register_spnego(void) {
static hf_register_info hf[] = {
{ &hf_spnego,
{ "SPNEGO", "spnego", FT_NONE, BASE_NONE, NULL, 0x0,
"SPNEGO", HFILL }},
NULL, HFILL }},
{ &hf_spnego_wraptoken,
{ "wrapToken", "spnego.wraptoken",
FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO wrapToken",
HFILL}},
{ &hf_spnego_krb5,
{ "krb5_blob", "spnego.krb5.blob", FT_BYTES,
BASE_NONE, NULL, 0, "krb5_blob", HFILL }},
BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_spnego_krb5_oid,
{ "KRB5 OID", "spnego.krb5_oid", FT_STRING,
BASE_NONE, NULL, 0, "KRB5 OID", HFILL }},
BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_spnego_krb5_tok_id,
{ "krb5_tok_id", "spnego.krb5.tok_id", FT_UINT16, BASE_HEX,
VALS(spnego_krb5_tok_id_vals), 0, "KRB5 Token Id", HFILL}},
@ -1348,20 +1348,20 @@ void proto_register_spnego(void) {
{ "krb5_confounder", "spnego.krb5.confounder", FT_BYTES, BASE_NONE,
NULL, 0, "KRB5 Confounder", HFILL}},
{ &hf_spnego_krb5_filler,
{ "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_HEX,
{ "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_NONE,
NULL, 0, "KRB5 Filler", HFILL}},
{ &hf_spnego_krb5_cfx_flags,
{ "krb5_cfx_flags", "spnego.krb5.cfx_flags", FT_UINT8, BASE_HEX,
NULL, 0, "KRB5 CFX Flags", HFILL}},
{ &hf_spnego_krb5_cfx_flags_01,
{ "SendByAcceptor", "spnego.krb5.send_by_acceptor", FT_BOOLEAN, 8,
TFS (&flags_set_truth), 0x01, "", HFILL}},
TFS (&flags_set_truth), 0x01, NULL, HFILL}},
{ &hf_spnego_krb5_cfx_flags_02,
{ "Sealed", "spnego.krb5.sealed", FT_BOOLEAN, 8,
TFS (&flags_set_truth), 0x02, "", HFILL}},
TFS (&flags_set_truth), 0x02, NULL, HFILL}},
{ &hf_spnego_krb5_cfx_flags_04,
{ "AcceptorSubkey", "spnego.krb5.acceptor_subkey", FT_BOOLEAN, 8,
TFS (&flags_set_truth), 0x04, "", HFILL}},
TFS (&flags_set_truth), 0x04, NULL, HFILL}},
{ &hf_spnego_krb5_cfx_ec,
{ "krb5_cfx_ec", "spnego.krb5.cfx_ec", FT_UINT16, BASE_DEC,
NULL, 0, "KRB5 CFX Extra Count", HFILL}},

View File

@ -701,18 +701,18 @@ proto_register_t38(void)
FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
{&hf_t38_fragment_overlap,
{"Message fragment overlap", "t38.fragment.overlap",
FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{&hf_t38_fragment_overlap_conflicts,
{"Message fragment overlapping with conflicting data",
"t38.fragment.overlap.conflicts",
FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{&hf_t38_fragment_multiple_tails,
{"Message has multiple tail fragments",
"t38.fragment.multiple_tails",
FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{&hf_t38_fragment_too_long_fragment,
{"Message fragment too long", "t38.fragment.too_long_fragment",
FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
{&hf_t38_fragment_error,
{"Message defragmentation error", "t38.fragment.error",
FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },

View File

@ -267,29 +267,29 @@ proto_register_tcap(void)
{ &hf_tcap_tag,
{ "Tag", "tcap.msgtype",
FT_UINT8, BASE_HEX, NULL, 0,
"", HFILL }
NULL, HFILL }
},
{ &hf_tcap_length,
{ "Length", "tcap.len",
FT_UINT8, BASE_DEC, NULL, 0,
"", HFILL }
NULL, HFILL }
},
{ &hf_tcap_data,
{ "Data", "tcap.data",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_tcap_tid,
{ "Transaction Id", "tcap.tid",
FT_BYTES, BASE_HEX, NULL, 0,
"", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
/* Tcap Service Response Time */
{ &hf_tcapsrt_SessionId,
{ "Session Id",
"tcap.srt.session_id",
FT_UINT32, BASE_DEC, NULL, 0x0,
"", HFILL }
NULL, HFILL }
},
{ &hf_tcapsrt_BeginSession,
{ "Begin Session",

View File

@ -100,11 +100,11 @@ void proto_register_x509af(void) {
{ &hf_x509af_algorithm_id,
{ "Algorithm Id", "x509af.algorithm.id",
FT_OID, BASE_NONE, NULL, 0,
"Algorithm Id", HFILL }},
NULL, HFILL }},
{ &hf_x509af_extension_id,
{ "Extension Id", "x509af.extension.id",
FT_OID, BASE_NONE, NULL, 0,
"Extension Id", HFILL }},
NULL, HFILL }},
#include "packet-x509af-hfarr.c"
};

View File

@ -86,11 +86,11 @@ void proto_register_x509ce(void) {
{ &hf_x509ce_id_ce_baseUpdateTime,
{ "baseUpdateTime", "x509ce.id_ce_baseUpdateTime",
FT_STRING, BASE_NONE, NULL, 0,
"baseUpdateTime", HFILL }},
NULL, HFILL }},
{ &hf_x509ce_id_ce_invalidityDate,
{ "invalidityDate", "x509ce.id_ce_invalidityDate",
FT_STRING, BASE_NONE, NULL, 0,
"invalidityDate", HFILL }},
NULL, HFILL }},
{ &hf_x509ce_object_identifier_id,
{ "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0,
"Object identifier Id", HFILL }},

View File

@ -117,7 +117,7 @@ void proto_register_x509if(void) {
{ "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0,
"Object identifier Id", HFILL }},
{ &hf_x509if_any_string,
{ "AnyString", "x509if.any.String", FT_BYTES, BASE_HEX,
{ "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE,
NULL, 0, "This is any String", HFILL }},
#include "packet-x509if-hfarr.c"