diff options
Diffstat (limited to 'epan/dissectors/packet-t30.c')
-rw-r--r-- | epan/dissectors/packet-t30.c | 251 |
1 files changed, 126 insertions, 125 deletions
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index 391c67f795..2b3fda09e1 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.c @@ -433,41 +433,42 @@ static const value_string t30_SharedDataMemory_capacity_vals[] = { }; static const true_false_string t30_octets_preferred_value = { - "64 octets preferred", - "256 octets preferred", + "64 octets preferred", + "256 octets preferred", }; static const true_false_string t30_extension_ind_value = { - "information continues through the next octet", - "last octet", + "information continues through the next octet", + "last octet", }; static const true_false_string t30_compress_value = { - "Uncompressed mode", - "Compressed mode", + "Uncompressed mode", + "Compressed mode", }; static const true_false_string t30_minimum_scan_value = { - "T15.4 = 1/2 T7.7", - "T15.4 = T7.7", + "T15.4 = 1/2 T7.7", + "T15.4 = T7.7", }; static const true_false_string t30_duplex_operation_value = { - "Duplex and half duplex operation", - "Half duplex operation only", + "Duplex and half duplex operation", + "Half duplex operation only", }; static const true_false_string t30_frame_size_dcs_value = { - "64 octets", - "256 octets", + "64 octets", + "256 octets", }; static const true_false_string t30_res_type_sel_value = { - "inch based resolution", - "metric based resolution", + "inch based resolution", + "metric based resolution", }; -guint8 reverse_byte(guint8 val) +static guint8 +reverse_byte(guint8 val) { return ( ((val & 0x80)>>7) | ((val & 0x40)>>5) | ((val & 0x20)>>3) | ((val & 0x10)>>1) | @@ -476,7 +477,7 @@ guint8 reverse_byte(guint8 val) } #define LENGTH_T30_NUM 20 -gchar * +static gchar * t30_get_string_numbers(tvbuff_t *tvb, int offset, int len) { gchar *buf; @@ -510,7 +511,7 @@ dissect_t30_numbers(tvbuff_t *tvb, int offset, packet_info *pinfo, int len, prot col_append_fstr(pinfo->cinfo, COL_INFO, " - Number:%s", str_num ); if (pinfo->private_data) - g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "Num: %s", str_num); + g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "Num: %s", str_num); } else { proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED OR SHORT PACKET: number of digits must be 20]"); @@ -542,7 +543,7 @@ dissect_t30_facsimile_coded_data(tvbuff_t *tvb, int offset, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " - Frame num:%d", reverse_byte(octet)); if (pinfo->private_data) - g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "Frm num: %d", reverse_byte(octet)); + g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "Frm num: %d", reverse_byte(octet)); t4_data = ep_alloc(len-1); tvb_memcpy(tvb, t4_data, offset, len-1); @@ -609,7 +610,7 @@ dissect_t30_partial_page_signal(tvbuff_t *tvb, int offset, packet_info *pinfo, i col_append_fstr(pinfo->cinfo, COL_INFO, " - PC:%d BC:%d FC:%d", page_count, block_count, frame_count); if (pinfo->private_data) - g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "PC:%d BC:%d FC:%d", page_count, block_count, frame_count); + g_snprintf(((t38_packet_info*)pinfo->private_data)->desc, MAX_T38_DESC, "PC:%d BC:%d FC:%d", page_count, block_count, frame_count); } @@ -964,330 +965,330 @@ proto_register_t30(void) NULL, 0, "Address Field", HFILL }}, { &hf_t30_Control, { "Control", "t30.Control", FT_UINT8, BASE_HEX, - VALS(t30_control_vals), 0, "Address Field", HFILL }}, + VALS(t30_control_vals), 0, "Control Field", HFILL }}, { &hf_t30_Facsimile_Control, { "Facsimile Control", "t30.FacsimileControl", FT_UINT8, BASE_DEC, - VALS(t30_facsimile_control_field_vals), 0, "Facsimile Control", HFILL }}, + VALS(t30_facsimile_control_field_vals), 0, NULL, HFILL }}, { &hf_t30_fif_sm, { "Store and forward Internet fax- Simple mode (ITU-T T.37)", "t30.fif.sm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_rtif, { "Real-time Internet fax (ITU T T.38)", "t30.fif.rtif", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_3gmn, { "3rd Generation Mobile Network", "t30.fif.3gmn", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_v8c, { "V.8 capabilities", "t30.fif.v8c", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_op, { "Octets preferred", "t30.fif.op", FT_BOOLEAN, 8, - TFS(&t30_octets_preferred_value), 0x02, "", HFILL }}, + TFS(&t30_octets_preferred_value), 0x02, NULL, HFILL }}, { &hf_t30_fif_rtfc, { "Ready to transmit a facsimile document (polling)", "t30.fif.rtfc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_rfo, { "Receiver fax operation", "t30.fif.rfo", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_dsr, { "Data signalling rate", "t30.fif.dsr", FT_UINT8, BASE_HEX, - VALS(t30_data_signalling_rate_vals), 0x3C, "", HFILL }}, + VALS(t30_data_signalling_rate_vals), 0x3C, NULL, HFILL }}, { &hf_t30_fif_dsr_dcs, { "Data signalling rate", "t30.fif.dsr_dcs", FT_UINT8, BASE_HEX, - VALS(t30_data_signalling_rate_dcs_vals), 0x3C, "", HFILL }}, + VALS(t30_data_signalling_rate_dcs_vals), 0x3C, NULL, HFILL }}, { &hf_t30_fif_res, { "R8x7.7 lines/mm and/or 200x200 pels/25.4 mm", "t30.fif.res", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_tdcc, { "Two dimensional coding capability", "t30.fif.tdcc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x01, "", HFILL }}, + TFS(&flags_set_truth), 0x01, NULL, HFILL }}, { &hf_t30_fif_rwc, { "Recording width capabilities", "t30.fif.rwc", FT_UINT8, BASE_HEX, - VALS(t30_recording_width_capabilities_vals), 0xC0, "", HFILL }}, + VALS(t30_recording_width_capabilities_vals), 0xC0, NULL, HFILL }}, { &hf_t30_fif_rw_dcs, { "Recording width", "t30.fif.rw_dcs", FT_UINT8, BASE_HEX, - VALS(t30_recording_width_dcs_vals), 0xC0, "", HFILL }}, + VALS(t30_recording_width_dcs_vals), 0xC0, NULL, HFILL }}, { &hf_t30_fif_rlc, { "Recording length capability", "t30.fif.rlc", FT_UINT8, BASE_HEX, - VALS(t30_recording_length_capability_vals), 0x30, "", HFILL }}, + VALS(t30_recording_length_capability_vals), 0x30, NULL, HFILL }}, { &hf_t30_fif_rl_dcs, { "Recording length capability", "t30.fif.rl_dcs", FT_UINT8, BASE_HEX, - VALS(t30_recording_length_dcs_vals), 0x30, "", HFILL }}, + VALS(t30_recording_length_dcs_vals), 0x30, NULL, HFILL }}, { &hf_t30_fif_msltcr, { "Minimum scan line time capability at the receiver", "t30.fif.msltcr", FT_UINT8, BASE_HEX, - VALS(t30_minimum_scan_line_time_rec_vals), 0x0E, "", HFILL }}, + VALS(t30_minimum_scan_line_time_rec_vals), 0x0E, NULL, HFILL }}, { &hf_t30_fif_mslt_dcs, { "Minimum scan line time", "t30.fif.mslt_dcs", FT_UINT8, BASE_HEX, - VALS(t30_minimum_scan_line_time_dcs_vals), 0x0E, "", HFILL }}, + VALS(t30_minimum_scan_line_time_dcs_vals), 0x0E, NULL, HFILL }}, { &hf_t30_fif_ext, { "Extension indicator", "t30.fif.ext", FT_BOOLEAN, 8, - TFS(&t30_extension_ind_value), 0x01, "", HFILL }}, + TFS(&t30_extension_ind_value), 0x01, NULL, HFILL }}, { &hf_t30_fif_cm, { "Compress/Uncompress mode", "t30.fif.cm", FT_BOOLEAN, 8, - TFS(&t30_compress_value), 0x40, "", HFILL }}, + TFS(&t30_compress_value), 0x40, NULL, HFILL }}, { &hf_t30_fif_ecm, { "Error correction mode", "t30.fif.ecm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_fs_dcs, { "Frame size", "t30.fif.fs_dcm", FT_BOOLEAN, 8, - TFS(&t30_frame_size_dcs_value), 0x10, "", HFILL }}, + TFS(&t30_frame_size_dcs_value), 0x10, NULL, HFILL }}, { &hf_t30_fif_t6, { "T.6 coding capability", "t30.fif.t6", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_fvc, { "Field valid capability", "t30.fif.fvc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_mspc, { "Multiple selective polling capability", "t30.fif.mspc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_ps, { "Polled Subaddress", "t30.fif.ps", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_t43, { "T.43 coding", "t30.fif.t43", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_pi, { "Plane interleave", "t30.fif.pi", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_vc32k, { "Voice coding with 32k ADPCM (ITU T G.726)", "t30.fif.vc32k", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_r8x15, { "R8x15.4 lines/mm", "t30.fif.r8x15", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_300x300, { "300x300 pels/25.4 mm", "t30.fif.300x300", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_r16x15, { "R16x15.4 lines/mm and/or 400x400 pels/25.4 mm", "t30.fif.r16x15", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_ibrp, { "Inch based resolution preferred", "t30.fif.ibrp", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_mbrp, { "Metric based resolution preferred", "t30.fif.mbrp", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_msltchr, { "Minimum scan line time capability for higher resolutions", "t30.fif.msltchr", FT_BOOLEAN, 8, - TFS(&t30_minimum_scan_value), 0x04, "", HFILL }}, + TFS(&t30_minimum_scan_value), 0x04, NULL, HFILL }}, { &hf_t30_fif_rts, { "Resolution type selection", "t30.fif.rts", FT_BOOLEAN, 8, - TFS(&t30_res_type_sel_value), 0x10, "", HFILL }}, + TFS(&t30_res_type_sel_value), 0x10, NULL, HFILL }}, { &hf_t30_fif_sp, { "Selective polling", "t30.fif.sp", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_sc, { "Subaddressing capability", "t30.fif.sc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_passw, { "Password", "t30.fif.passw", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_sit, { "Sender Identification transmission", "t30.fif.sit", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_rttd, { "Ready to transmit a data file (polling)", "t30.fif.rttd", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_bft, { "Binary File Transfer (BFT)", "t30.fif.bft", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_dtm, { "Document Transfer Mode (DTM)", "t30.fif.dtm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_edi, { "Electronic Data Interchange (EDI)", "t30.fif.edi", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_btm, { "Basic Transfer Mode (BTM)", "t30.fif.btm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_rttcmmd, { "Ready to transmit a character or mixed mode document (polling)", "t30.fif.rttcmmd", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_chrm, { "Character mode", "t30.fif.cm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_mm, { "Mixed mode (Annex E/T.4)", "t30.fif.mm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_pm26, { "Processable mode 26 (ITU T T.505)", "t30.fif.pm26", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_dnc, { "Digital network capability", "t30.fif.dnc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_do, { "Duplex operation", "t30.fif.do", FT_BOOLEAN, 8, - TFS(&t30_duplex_operation_value), 0x20, "", HFILL }}, + TFS(&t30_duplex_operation_value), 0x20, NULL, HFILL }}, { &hf_t30_fif_jpeg, { "JPEG coding", "t30.fif.jpeg", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_fcm, { "Full colour mode", "t30.fif.fcm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_pht, { "Preferred Huffman tables", "t30.fif.pht", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_12c, { "12 bits/pel component", "t30.fif.12c", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_ns, { "No subsampling (1:1:1)", "t30.fif.ns", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_ci, { "Custom illuminant", "t30.fif.ci", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_cgr, { "Custom gamut range", "t30.fif.cgr", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_nalet, { "North American Letter (215.9 x 279.4 mm) capability", "t30.fif.nalet", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_naleg, { "North American Legal (215.9 x 355.6 mm) capability", "t30.fif.naleg", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_spscb, { "Single-progression sequential coding (ITU-T T.85) basic capability", "t30.fif.spscb", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_spsco, { "Single-progression sequential coding (ITU-T T.85) optional L0 capability", "t30.fif.spsco", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_hkm, { "HKM key management capability", "t30.fif.hkm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_rsa, { "RSA key management capability", "t30.fif.rsa", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_oc, { "Override capability", "t30.fif.oc", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_hfx40, { "HFX40 cipher capability", "t30.fif.hfx40", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_acn2c, { "Alternative cipher number 2 capability", "t30.fif.acn2c", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_acn3c, { "Alternative cipher number 3 capability", "t30.fif.acn3c", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_hfx40i, { "HFX40-I hashing capability", "t30.fif.hfx40i", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_ahsn2, { "Alternative hashing system number 2 capability", "t30.fif.ahsn2", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_ahsn3, { "Alternative hashing system number 3 capability", "t30.fif.ahsn3", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_t441, { "T.44 (Mixed Raster Content)", "t30.fif.t441", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_t442, { "T.44 (Mixed Raster Content)", "t30.fif.t442", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_t443, { "T.44 (Mixed Raster Content)", "t30.fif.t443", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_plmss, { "Page length maximum strip size for T.44 (Mixed Raster Content)", "t30.fif.plmss", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_cg300, { "Colour/gray-scale 300 pels/25.4 mm x 300 lines/25.4 mm or 400 pels/25.4 mm x 400 lines/25.4 mm resolution", "t30.fif.cg300", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_100x100cg, { "100 pels/25.4 mm x 100 lines/25.4 mm for colour/gray scale", "t30.fif.100x100cg", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_spcbft, { "Simple Phase C BFT Negotiations capability", "t30.fif.spcbft", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_ebft, { "Extended BFT Negotiations capability", "t30.fif.ebft", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_isp, { "Internet Selective Polling Address (ISP)", "t30.fif.isp", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_ira, { "Internet Routing Address (IRA)", "t30.fif.ira", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_600x600, { "600 pels/25.4 mm x 600 lines/25.4 mm", "t30.fif.600x600", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_1200x1200, { "1200 pels/25.4 mm x 1200 lines/25.4 mm", "t30.fif.1200x1200", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_300x600, { "300 pels/25.4 mm x 600 lines/25.4 mm", "t30.fif.300x600", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_400x800, { "400 pels/25.4 mm x 800 lines/25.4 mm", "t30.fif.400x800", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_600x1200, { "600 pels/25.4 mm x 1200 lines/25.4 mm", "t30.fif.600x1200", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x08, "", HFILL }}, + TFS(&flags_set_truth), 0x08, NULL, HFILL }}, { &hf_t30_fif_cg600x600, { "Colour/gray scale 600 pels/25.4 mm x 600 lines/25.4 mm resolution", "t30.fif.cg600x600", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x04, "", HFILL }}, + TFS(&flags_set_truth), 0x04, NULL, HFILL }}, { &hf_t30_fif_cg1200x1200, { "Colour/gray scale 1200 pels/25.4 mm x 1200 lines/25.4 mm resolution", "t30.fif.cg1200x1200", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x02, "", HFILL }}, + TFS(&flags_set_truth), 0x02, NULL, HFILL }}, { &hf_t30_fif_dspcam, { "Double sided printing capability (alternate mode)", "t30.fif.dspcam", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x80, "", HFILL }}, + TFS(&flags_set_truth), 0x80, NULL, HFILL }}, { &hf_t30_fif_dspccm, { "Double sided printing capability (continuous mode)", "t30.fif.dspccm", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x40, "", HFILL }}, + TFS(&flags_set_truth), 0x40, NULL, HFILL }}, { &hf_t30_fif_bwmrcp, { "Black and white mixed raster content profile (MRCbw)", "t30.fif.bwmrcp", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x20, "", HFILL }}, + TFS(&flags_set_truth), 0x20, NULL, HFILL }}, { &hf_t30_fif_t45, { "T.45 (run length colour encoding)", "t30.fif.t45", FT_BOOLEAN, 8, - TFS(&flags_set_truth), 0x10, "", HFILL }}, + TFS(&flags_set_truth), 0x10, NULL, HFILL }}, { &hf_t30_fif_sdmc, { "SharedDataMemory capacity", "t30.fif.sdmc", FT_UINT8, BASE_HEX, - VALS(t30_SharedDataMemory_capacity_vals), 0x0C, "", HFILL }}, - - { &hf_t30_fif_number, - { "Number", "t30.fif.number", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + VALS(t30_SharedDataMemory_capacity_vals), 0x0C, NULL, HFILL }}, + { &hf_t30_fif_number, + { "Number", "t30.fif.number", FT_STRING, BASE_NONE, + NULL, 0x0, NULL, HFILL }}, + { &hf_t30_fif_country_code, { "ITU-T Country code", "t30.fif.country_code", FT_UINT8, BASE_DEC, - NULL, 0, "ITU-T Country code", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_fif_non_stand_bytes, { "Non-standard capabilities", "t30.fif.non_standard_cap", FT_BYTES, BASE_HEX, - NULL, 0, "Non-standard capabilities", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_t4_frame_num, { "T.4 Frame number", "t30.t4.frame_num", FT_UINT8, BASE_DEC, - NULL, 0, "T.4 Frame number", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_t4_data, { "T.4 Facsimile data field", "t30.t4.data", FT_BYTES, BASE_HEX, - NULL, 0, "T.4 Facsimile data field", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_partial_page_fcf2, { "Post-message command", "t30.pps.fcf2", FT_UINT8, BASE_DEC, - VALS(t30_partial_page_fcf2_vals), 0, "Post-message command", HFILL }}, + VALS(t30_partial_page_fcf2_vals), 0, NULL, HFILL }}, { &hf_t30_partial_page_i1, { "Page counter", "t30.t4.page_count", FT_UINT8, BASE_DEC, - NULL, 0, "Page counter", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_partial_page_i2, { "Block counter", "t30.t4.block_count", FT_UINT8, BASE_DEC, - NULL, 0, "Block counter", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_t30_partial_page_i3, { "Frame counter", "t30.t4.frame_count", FT_UINT8, BASE_DEC, - NULL, 0, "Frame counter", HFILL }}, + NULL, 0, NULL, HFILL }}, }; static gint *t30_ett[] = |