From f74bd40eaca6d97f3b72b8fce9f09e2666e2691b Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Wed, 8 Apr 2020 13:01:19 +0200 Subject: packet-dhcp.c: Small whitespace fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c6bad7986f77f0d7456e29c794d95d4fc055add Reviewed-on: https://code.wireshark.org/review/36747 Reviewed-by: Jörg Mayer --- epan/dissectors/packet-dhcp.c | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'epan/dissectors/packet-dhcp.c') diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index c3f20804f0..b3d03f2c65 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -184,7 +184,7 @@ static int hf_dhcp_option_value_ip_address = -1; static int hf_dhcp_option_value_boolean = -1; static int hf_dhcp_suboption_length = -1; -static int hf_dhcp_option_padding = -1; /* 0 */ +static int hf_dhcp_option_padding = -1; /* 0 */ static int hf_dhcp_option_subnet_mask = -1; /* 1 */ static int hf_dhcp_option_time_offset = -1; /* 2 */ static int hf_dhcp_option_router = -1; /* 3 */ @@ -198,7 +198,7 @@ static int hf_dhcp_option_impress_server = -1; /* 10 */ static int hf_dhcp_option_resource_location_server = -1; /* 11 */ static int hf_dhcp_option_hostname = -1; /* 12 */ static int hf_dhcp_option_boot_file_size = -1; /* 13 */ -static int hf_dhcp_option_merit_dump_file = -1; /* 14 */ +static int hf_dhcp_option_merit_dump_file = -1; /* 14 */ static int hf_dhcp_option_domain_name = -1; /* 15 */ static int hf_dhcp_option_swap_server = -1; /* 16 */ static int hf_dhcp_option_root_path = -1; /* 17 */ @@ -216,24 +216,24 @@ static int hf_dhcp_option_all_subnets_are_local = -1; /* 27 */ static int hf_dhcp_option_broadcast_address = -1; /* 28 */ static int hf_dhcp_option_perform_mask_discovery = -1; /* 29 */ static int hf_dhcp_option_mask_supplier = -1; /* 30 */ -static int hf_dhcp_option_perform_router_discover = -1; /* 31 */ +static int hf_dhcp_option_perform_router_discover = -1; /* 31 */ static int hf_dhcp_option_router_solicitation_address = -1; /* 32 */ -static int hf_dhcp_option_static_route_ip = -1; /* 33 - Destination IP */ +static int hf_dhcp_option_static_route_ip = -1; /* 33 - Destination IP */ static int hf_dhcp_option_static_route_router = -1; /* 33 - Router */ static int hf_dhcp_option_trailer_encapsulation = -1; /* 34 */ static int hf_dhcp_option_arp_cache_timeout = -1; /* 35 */ static int hf_dhcp_option_ethernet_encapsulation = -1; /* 36 */ -static int hf_dhcp_option_tcp_default_ttl = -1; /* 37 */ +static int hf_dhcp_option_tcp_default_ttl = -1; /* 37 */ static int hf_dhcp_option_tcp_keepalive_interval = -1; /* 38 */ static int hf_dhcp_option_tcp_keepalive_garbage = -1; /* 39 */ static int hf_dhcp_option_nis_domain = -1; /* 40 */ static int hf_dhcp_option_nis_server = -1; /* 41 */ static int hf_dhcp_option_ntp_server = -1; /* 42 */ -static int hf_dhcp_option43_value = -1; /* 43 suboption value */ +static int hf_dhcp_option43_value = -1; /* 43 suboption value */ static int hf_dhcp_option43_value_8 = -1; /* 43 suboption value */ static int hf_dhcp_option43_value_32 = -1; /* 43 suboption value */ -static int hf_dhcp_option43_value_stringz = -1; /* 43 suboption value */ +static int hf_dhcp_option43_value_stringz = -1; /* 43 suboption value */ static int hf_dhcp_option43_value_ip_address = -1; /* 43 suboption value */ static int hf_dhcp_option43_pxeclient_suboption = -1; /* 43 suboption */ @@ -242,7 +242,7 @@ static int hf_dhcp_option43_pxeclient_mtftp_ip = -1; /* 43:1 PXE */ static int hf_dhcp_option43_pxeclient_mtftp_client_port = -1; /* 43:2 PXE */ static int hf_dhcp_option43_pxeclient_mtftp_server_port = -1; /* 43:3 PXE */ static int hf_dhcp_option43_pxeclient_mtftp_timeout = -1; /* 43:4 PXE */ -static int hf_dhcp_option43_pxeclient_mtftp_delay = -1; /* 43:5 PXE */ +static int hf_dhcp_option43_pxeclient_mtftp_delay = -1; /* 43:5 PXE */ static int hf_dhcp_option43_pxeclient_discovery_control = -1; /* 43:6 PXE */ static int hf_dhcp_option43_pxeclient_discovery_control_bc = -1; /* 43:6 PXE */ static int hf_dhcp_option43_pxeclient_discovery_control_mc = -1; /* 43:6 PXE */ @@ -257,8 +257,8 @@ static int hf_dhcp_option43_pxeclient_boot_menu = -1; /* 43:9 PXE */ static int hf_dhcp_option43_pxeclient_boot_menu_type = -1; /* 43:9 PXE */ static int hf_dhcp_option43_pxeclient_boot_menu_length = -1; /* 43:9 PXE */ static int hf_dhcp_option43_pxeclient_boot_menu_desc = -1; /* 43:9 PXE */ -static int hf_dhcp_option43_pxeclient_menu_prompt = -1; /* 43:10 PXE */ -static int hf_dhcp_option43_pxeclient_menu_prompt_timeout = -1; /* 43:10 PXE */ +static int hf_dhcp_option43_pxeclient_menu_prompt = -1; /* 43:10 PXE */ +static int hf_dhcp_option43_pxeclient_menu_prompt_timeout = -1; /* 43:10 PXE */ static int hf_dhcp_option43_pxeclient_menu_prompt_prompt = -1; /* 43:10 PXE */ static int hf_dhcp_option43_pxeclient_multicast_address_alloc = -1; /* 43:11 PXE */ static int hf_dhcp_option43_pxeclient_credential_types = -1; /* 43:12 PXE */ @@ -271,21 +271,21 @@ static int hf_dhcp_option43_pxeclient_lcm_nic_option = -1; /* 43:181 PXE */ static int hf_dhcp_option43_pxeclient_lcm_workgroup = -1; /* 43:190 PXE */ static int hf_dhcp_option43_pxeclient_discovery = -1; /* 43:191 PXE */ static int hf_dhcp_option43_pxeclient_configured = -1; /* 43:192 PXE */ -static int hf_dhcp_option43_pxeclient_lcm_version = -1; /* 43:193 PXE */ +static int hf_dhcp_option43_pxeclient_lcm_version = -1; /* 43:193 PXE */ static int hf_dhcp_option43_pxeclient_lcm_serial = -1; /* 43:194 PXE */ -static int hf_dhcp_option43_pxeclient_end = -1; /* 43:255 PXE */ +static int hf_dhcp_option43_pxeclient_end = -1; /* 43:255 PXE */ static int hf_dhcp_option43_cl_suboption = -1; /* 43 suboption */ static int hf_dhcp_option43_cl_padding = -1; /* 43:0 CL */ static int hf_dhcp_option43_cl_suboption_request_list = -1; /* 43:1 CL */ static int hf_dhcp_option43_cl_device_type = -1; /* 43:2 CL */ -static int hf_dhcp_option43_cl_esafe_type = -1; /* 43:3 CL */ +static int hf_dhcp_option43_cl_esafe_type = -1; /* 43:3 CL */ static int hf_dhcp_option43_cl_serial_number = -1; /* 43:4 CL */ static int hf_dhcp_option43_cl_hardware_version = -1; /* 43:5 CL */ static int hf_dhcp_option43_cl_software_version = -1; /* 43:6 CL */ static int hf_dhcp_option43_cl_boot_rom_version = -1; /* 43:7 CL */ static int hf_dhcp_option43_cl_oui_bytes = -1; /* 43:8 CL */ -static int hf_dhcp_option43_cl_oui_string = -1; /* 43:8 CL */ +static int hf_dhcp_option43_cl_oui_string = -1; /* 43:8 CL */ static int hf_dhcp_option43_cl_model_number = -1; /* 43:9 CL */ static int hf_dhcp_option43_cl_vendor_name10 = -1; /* 43:10 CL */ static int hf_dhcp_option43_cl_address_realm = -1; /* 43:11 CL */ @@ -312,10 +312,10 @@ static int hf_dhcp_option43_bsdp_boot_image_list_path = -1; /* 43:6 BSDP */ static int hf_dhcp_option43_bsdp_default_boot_image_id = -1; /* 43:7 BSDP */ static int hf_dhcp_option43_bsdp_selected_boot_image_id = -1; /* 43:8 BSDP */ static int hf_dhcp_option43_bsdp_boot_image_list = -1; /* 43:9 BSDP */ -static int hf_dhcp_option43_bsdp_netboot_firmware = -1; /* 43:10 BSDP */ +static int hf_dhcp_option43_bsdp_netboot_firmware = -1; /* 43:10 BSDP */ static int hf_dhcp_option43_bsdp_attributes_filter_list = -1; /* 43:11 BSDP */ static int hf_dhcp_option43_bsdp_message_size = -1; /* 43:12 BSDP */ -static int hf_dhcp_option43_bsdp_boot_image_index = -1; /* 43 BSDP */ +static int hf_dhcp_option43_bsdp_boot_image_index = -1; /* 43 BSDP */ static int hf_dhcp_option43_bsdp_boot_image_attribute = -1; /* 43 BSDP */ static int hf_dhcp_option43_bsdp_boot_image_attribute_install = -1; /* 43 BSDP */ static int hf_dhcp_option43_bsdp_boot_image_attribute_kind = -1; /* 43 BSDP */ @@ -342,8 +342,8 @@ static int hf_dhcp_option43_cisco_clientint = -1; /* 43:12 Cisco */ static int hf_dhcp_option43_alcatel_suboption = -1; /* 43 suboption */ static int hf_dhcp_option43_alcatel_padding = -1; /* 43:0 Alcatel */ static int hf_dhcp_option43_alcatel_vlan_id = -1; /* 43:58 Alcatel */ -static int hf_dhcp_option43_alcatel_tftp1 = -1; /* 43:64 Alcatel */ -static int hf_dhcp_option43_alcatel_tftp2 = -1; /* 43:65 Alcatel */ +static int hf_dhcp_option43_alcatel_tftp1 = -1; /* 43:64 Alcatel */ +static int hf_dhcp_option43_alcatel_tftp2 = -1; /* 43:65 Alcatel */ static int hf_dhcp_option43_alcatel_app_type = -1; /* 43:66 Alcatel */ static int hf_dhcp_option43_alcatel_sip_url = -1; /* 43:67 Alcatel */ static int hf_dhcp_option43_alcatel_end = -1; /* 43:255 Alcatel */ @@ -359,27 +359,27 @@ static int hf_dhcp_option_netbios_over_tcpip_dd_name_server = -1; /* 45 */ static int hf_dhcp_option_netbios_over_tcpip_node_type = -1; /* 46 */ static int hf_dhcp_option_netbios_over_tcpip_scope = -1; /* 47 */ static int hf_dhcp_option_xwindows_system_font_server = -1; /* 48 */ -static int hf_dhcp_option_xwindows_system_display_manager = -1; /* 49 */ +static int hf_dhcp_option_xwindows_system_display_manager = -1; /* 49 */ static int hf_dhcp_option_requested_ip_address = -1; /* 50 */ static int hf_dhcp_option_ip_address_lease_time = -1; /* 51 */ -static int hf_dhcp_option_option_overload = -1; /* 52 */ +static int hf_dhcp_option_option_overload = -1; /* 52 */ static int hf_dhcp_option_dhcp = -1; /* 53 */ static int hf_dhcp_option_dhcp_server_id = -1; /* 54 */ static int hf_dhcp_option_parameter_request_list_item = -1; /* 55 */ -static int hf_dhcp_option_message = -1; /* 56 */ +static int hf_dhcp_option_message = -1; /* 56 */ static int hf_dhcp_option_dhcp_max_message_size = -1; /* 57 */ static int hf_dhcp_option_renewal_time_value = -1; /* 58 */ static int hf_dhcp_option_rebinding_time_value = -1; /* 59 */ -static int hf_dhcp_option_vendor_class_id = -1; /* 60 */ +static int hf_dhcp_option_vendor_class_id = -1; /* 60 */ static int hf_dhcp_option_vendor_class_data = -1; /* 60 */ static int hf_dhcp_option_novell_netware_ip_domain = -1; /* 62 */ static int hf_dhcp_option63_suboption = -1; /* 63 suboption */ -static int hf_dhcp_option63_value = -1; /* 63 suboption value */ +static int hf_dhcp_option63_value = -1; /* 63 suboption value */ static int hf_dhcp_option63_value_8 = -1; /* 63 suboption value */ static int hf_dhcp_option63_value_ip_address = -1; /* 63 suboption value */ -static int hf_dhcp_option63_value_boolean = -1; /* 63 suboption value */ +static int hf_dhcp_option63_value_boolean = -1; /* 63 suboption value */ static int hf_dhcp_option63_broadcast = -1; /* 63:5 */ static int hf_dhcp_option63_preferred_dss_server = -1; /* 63:6 */ static int hf_dhcp_option63_nearest_nwip_server = -1; /* 63:7 */ @@ -388,8 +388,8 @@ static int hf_dhcp_option63_autoretry_delay = -1; /* 63:9 */ static int hf_dhcp_option63_support_netware_v1_1 = -1; /* 63:10 */ static int hf_dhcp_option63_primary_dss = -1; /* 63:11 */ -static int hf_dhcp_option_nis_plus_domain = -1; /* 64 */ -static int hf_dhcp_option_nis_plus_server = -1; /* 65 */ +static int hf_dhcp_option_nis_plus_domain = -1; /* 64 */ +static int hf_dhcp_option_nis_plus_server = -1; /* 65 */ static int hf_dhcp_option_tftp_server_name = -1; /* 66 */ static int hf_dhcp_option_bootfile_name = -1; /* 67 */ static int hf_dhcp_option_mobile_ip_home_agent = -1; /* 68 */ @@ -407,22 +407,22 @@ static int hf_dhcp_option77_user_class_data = -1; /* 77 data of User Class ins static int hf_dhcp_option77_user_class_text = -1; /* 77 User class text */ static int hf_dhcp_option_slp_directory_agent_value = -1; /* 78 */ static int hf_dhcp_option_slp_directory_agent_slpda_address = -1; /* 78 */ -static int hf_dhcp_option_slp_service_scope_value = -1; /* 79 */ +static int hf_dhcp_option_slp_service_scope_value = -1; /* 79 */ static int hf_dhcp_option_slp_service_scope_string = -1; /* 79 */ static int hf_dhcp_option82_suboption = -1; /* 82 suboption */ -static int hf_dhcp_option82_value = -1; /* 82 suboption value */ +static int hf_dhcp_option82_value = -1; /* 82 suboption value */ static int hf_dhcp_option82_value_8 = -1; /* 82 suboption value */ static int hf_dhcp_option82_value_32 = -1; /* 82 suboption value */ static int hf_dhcp_option82_value_ip_address = -1; /* 82 suboption value */ -static int hf_dhcp_option82_value_stringz = -1; /* 82 suboption value */ +static int hf_dhcp_option82_value_stringz = -1; /* 82 suboption value */ static int hf_dhcp_option82_padding = -1; /* 82:0 */ static int hf_dhcp_option82_agent_circuit_id = -1; /* 82:1 */ static int hf_dhcp_option82_agent_remote_id = -1; /* 82:2 */ static int hf_dhcp_option82_reserved = -1; /* 82:3 */ static int hf_dhcp_option82_docsis_device_class = -1; /* 82:4 */ static int hf_dhcp_option82_link_selection = -1; /* 82:5 */ -static int hf_dhcp_option82_subscriber_id = -1; /* 82:6 */ +static int hf_dhcp_option82_subscriber_id = -1; /* 82:6 */ static int hf_dhcp_option82_radius_attributes = -1; /* 82:7 */ static int hf_dhcp_option82_authentication = -1; /* 82:8 */ static int hf_dhcp_option82_vi = -1; /* 82:9 */ @@ -435,7 +435,7 @@ static int hf_dhcp_option82_vi_cl_tag = -1; static int hf_dhcp_option82_vi_cl_tag_length = -1; static int hf_dhcp_option82_vi_cl_docsis_version = -1; /* 82:9 suboptions end */ -static int hf_dhcp_option82_flags = -1; /* 82:10 */ +static int hf_dhcp_option82_flags = -1; /* 82:10 */ static int hf_dhcp_option82_server_id_override = -1; /* 82:11 */ static int hf_dhcp_option82_relay_agent_id = -1; /* 82:12 */ static int hf_dhcp_option82_link_selection_cisco = -1; /* 82:150 */ @@ -491,12 +491,12 @@ static int hf_dhcp_option_novell_ds_context = -1; /* 87 */ static int hf_dhcp_option_dhcp_authentication_protocol = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_alg_delay = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_algorithm = -1; /* 90 */ -static int hf_dhcp_option_dhcp_authentication_rdm = -1; /* 90 */ +static int hf_dhcp_option_dhcp_authentication_rdm = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_rdm_replay_detection = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_rdm_rdv = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_secret_id = -1; /* 90 */ static int hf_dhcp_option_dhcp_authentication_hmac_md5_hash = -1; /* 90 */ -static int hf_dhcp_option_dhcp_authentication_information = -1; /* 90 */ +static int hf_dhcp_option_dhcp_authentication_information = -1; /* 90 */ static int hf_dhcp_option_client_last_transaction_time = -1; /* 91 */ static int hf_dhcp_option_associated_ip_option = -1; /* 92 */ static int hf_dhcp_option_client_system_architecture = -1; /* 93 */ @@ -506,12 +506,12 @@ static int hf_dhcp_option_civic_location_what = -1; /* 99 */ static int hf_dhcp_option_civic_location_country = -1; /* 99 */ static int hf_dhcp_option_civic_location_ca_type = -1; /* 99 */ static int hf_dhcp_option_civic_location_ca_length = -1; /* 99 */ -static int hf_dhcp_option_civic_location_ca_value = -1; /* 99 */ +static int hf_dhcp_option_civic_location_ca_value = -1; /* 99 */ static int hf_dhcp_option_tz_pcode = -1; /* 100 */ static int hf_dhcp_option_tz_tcode = -1; /* 101 */ static int hf_dhcp_option_netinfo_parent_server_address = -1; /* 112 */ static int hf_dhcp_option_netinfo_parent_server_tag = -1; /* 113 */ -static int hf_dhcp_option_dhcp_auto_configuration = -1; /* 116 */ +static int hf_dhcp_option_dhcp_auto_configuration = -1; /* 116 */ static int hf_dhcp_option_dhcp_name_service_search_option = -1; /* 117 */ static int hf_dhcp_option_dhcp_dns_domain_search_list_rfc_3396_detected = -1; /* 119 */ static int hf_dhcp_option_dhcp_dns_domain_search_list_refer_last_option = -1; /* 119 */ @@ -520,17 +520,17 @@ static int hf_dhcp_option_sip_server_rfc_3396_detected = -1; /* 120 */ static int hf_dhcp_option_sip_server_refer_last_option = -1; /* 120 */ static int hf_dhcp_option_sip_server_enc = -1; /* 120 */ static int hf_dhcp_option_sip_server_name = -1; /* 120 */ -static int hf_dhcp_option_sip_server_address = -1; /* 120 */ +static int hf_dhcp_option_sip_server_address = -1; /* 120 */ static int hf_dhcp_option_classless_static_route = -1; /* 120 */ -static int hf_dhcp_option_rfc3825_error = -1; /* 123 */ -static int hf_dhcp_option_rfc3825_latitude = -1; /* 123 */ -static int hf_dhcp_option_rfc3825_longitude = -1; /* 123 */ +static int hf_dhcp_option_rfc3825_error = -1; /* 123 */ +static int hf_dhcp_option_rfc3825_latitude = -1; /* 123 */ +static int hf_dhcp_option_rfc3825_longitude = -1; /* 123 */ static int hf_dhcp_option_rfc3825_latitude_res = -1; /* 123 */ static int hf_dhcp_option_rfc3825_longitude_res = -1; /* 123 */ -static int hf_dhcp_option_rfc3825_altitude = -1; /* 123 */ +static int hf_dhcp_option_rfc3825_altitude = -1; /* 123 */ static int hf_dhcp_option_rfc3825_altitide_res = -1; /* 123 */ static int hf_dhcp_option_rfc3825_altitude_type = -1; /* 123 */ -static int hf_dhcp_option_rfc3825_map_datum = -1; /* 123 */ +static int hf_dhcp_option_rfc3825_map_datum = -1; /* 123 */ static int hf_dhcp_option_cl_dss_id_option = -1; /* 123 CL */ static int hf_dhcp_option_cl_dss_id_len = -1; /* 123 CL */ static int hf_dhcp_option_cl_dss_id = -1; /* 123 CL */ @@ -553,15 +553,15 @@ static int hf_dhcp_option125_tr111_device_product_class = -1; /* 125:TR-111 3 * static int hf_dhcp_option125_tr111_gateway_manufacturer_oui = -1; /* 125:TR-111 4 */ static int hf_dhcp_option125_tr111_gateway_serial_number = -1; /* 125:TR-111 5 */ static int hf_dhcp_option125_tr111_gateway_product_class = -1; /* 125:TR-111 6 */ -static int hf_dhcp_option125_cl_suboption = -1; /* 125 suboption */ +static int hf_dhcp_option125_cl_suboption = -1; /* 125 suboption */ static int hf_dhcp_option125_cl_option_request = -1; /* 125:CL 1 */ static int hf_dhcp_option125_cl_tftp_server_addresses = -1; /* 125:CL 2 */ static int hf_dhcp_option125_cl_erouter_container_option = -1; /* 125:CL 3 */ static int hf_dhcp_option125_cl_mib_environment_indicator_option = -1; /* 125:CL 4 */ static int hf_dhcp_option125_cl_modem_capabilities = -1; /* 125:CL 5 */ -static int hf_dhcp_option_subnet_selection_option = -1; /* 118 */ -static int hf_dhcp_option_lost_server_domain_name = -1; /* 137 */ +static int hf_dhcp_option_subnet_selection_option = -1; /* 118 */ +static int hf_dhcp_option_lost_server_domain_name = -1; /* 137 */ static int hf_dhcp_option_capwap_access_controller = -1; /* 138 */ static int hf_dhcp_option_andsf_server = -1; /* 142 */ static int hf_dhcp_option_forcerenew_nonce_algo = -1; /* 145 */ @@ -579,15 +579,15 @@ static int hf_dhcp_option_bulk_lease_query_start = -1; /* 154 */ static int hf_dhcp_option_bulk_lease_query_end = -1; /* 155 */ static int hf_dhcp_option_bulk_lease_dhcp_state = -1; /* 156 */ static int hf_dhcp_option_bulk_lease_data_source = -1; /* 157 */ -static int hf_dhcp_option_pcp_list_length = -1; /* 158 */ +static int hf_dhcp_option_pcp_list_length = -1; /* 158 */ static int hf_dhcp_option_pcp_server = -1; /* 158 */ static int hf_dhcp_option_portparams_offset = -1; /* 159 */ static int hf_dhcp_option_portparams_psid_length = -1; /* 159 */ -static int hf_dhcp_option_portparams_psid = -1; /* 159 */ +static int hf_dhcp_option_portparams_psid = -1; /* 159 */ static int hf_dhcp_option_captive_portal = -1; /* 160 */ static int hf_dhcp_option_mudurl = -1; /* 161 */ -static int hf_dhcp_option_pxe_config_file = -1; /* 209 */ -static int hf_dhcp_option_pxe_path_prefix = -1; /* 210 */ +static int hf_dhcp_option_pxe_config_file = -1; /* 209 */ +static int hf_dhcp_option_pxe_path_prefix = -1; /* 210 */ static int hf_dhcp_option_6RD_ipv4_mask_len = -1; /* 212 */ static int hf_dhcp_option_6RD_prefix_len = -1; /* 212 */ static int hf_dhcp_option_6RD_prefix = -1; /* 212 */ @@ -596,10 +596,10 @@ static int hf_dhcp_option242_avaya = -1; /* 242 */ static int hf_dhcp_option242_avaya_tlssrvr = -1; /* 242 */ static int hf_dhcp_option242_avaya_httpsrvr = -1; /* 242 */ static int hf_dhcp_option242_avaya_httpdir = -1; /* 242 */ -static int hf_dhcp_option242_avaya_static = -1; /* 242 */ +static int hf_dhcp_option242_avaya_static = -1; /* 242 */ static int hf_dhcp_option242_avaya_mcipadd = -1; /* 242 */ static int hf_dhcp_option242_avaya_dot1x = -1; /* 242 */ -static int hf_dhcp_option242_avaya_icmpdu = -1; /* 242 */ +static int hf_dhcp_option242_avaya_icmpdu = -1; /* 242 */ static int hf_dhcp_option242_avaya_icmpred = -1; /* 242 */ static int hf_dhcp_option242_avaya_l2q = -1; /* 242 */ static int hf_dhcp_option242_avaya_l2qvlan = -1; /* 242 */ @@ -1479,7 +1479,7 @@ static struct opt_info default_dhcp_opt[DHCP_OPT_NUM] = { /* 117 */ { "Name Service Search", special, NULL }, /* 118 */ { "Subnet Selection Option", ipv4_list, &hf_dhcp_option_subnet_selection_option }, /* 119 */ { "Domain Search", special, NULL }, -/* 120 */ { "SIP Servers", special, NULL }, +/* 120 */ { "SIP Servers", special, NULL }, /* 121 */ { "Classless Static Route", special, NULL}, /* 122 */ { "CableLabs Client Configuration [TODO:RFC3495]", opaque, NULL }, /* 123 */ { "Coordinate-based Location Configuration", special, NULL}, @@ -1611,7 +1611,7 @@ static struct opt_info default_dhcp_opt[DHCP_OPT_NUM] = { /* 249 */ { "Private/Classless Static Route (Microsoft)", special, NULL}, /* 250 */ { "Private", opaque, NULL }, /* 251 */ { "Private", opaque, NULL }, -/* 252 */ { "Private/Proxy autodiscovery", string, &hf_dhcp_option_private_proxy_autodiscovery }, +/* 252 */ { "Private/Proxy autodiscovery", string, &hf_dhcp_option_private_proxy_autodiscovery }, /* 253 */ { "Private", opaque, NULL }, /* 254 */ { "Private", opaque, NULL }, /* 255 */ { "End", opaque, NULL } -- cgit v1.2.3