diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 8ca0322223..9612ae72ca 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -334,14 +334,14 @@ static int hf_cip_seg_safety_time_correction_prio = -1; static int hf_cip_seg_safety_time_correction_fixed_var = -1; static int hf_cip_seg_safety_time_correction_con_size = -1; static int hf_cip_seg_safety_tunid = -1; -static int hf_cip_seg_safety_tunid_ssn_timestamp = -1; -static int hf_cip_seg_safety_tunid_ssn_date = -1; -static int hf_cip_seg_safety_tunid_ssn_time = -1; +static int hf_cip_seg_safety_tunid_snn_timestamp = -1; +static int hf_cip_seg_safety_tunid_snn_date = -1; +static int hf_cip_seg_safety_tunid_snn_time = -1; static int hf_cip_seg_safety_tunid_macid = -1; static int hf_cip_seg_safety_ounid = -1; -static int hf_cip_seg_safety_ounid_ssn_timestamp = -1; -static int hf_cip_seg_safety_ounid_ssn_date = -1; -static int hf_cip_seg_safety_ounid_ssn_time = -1; +static int hf_cip_seg_safety_ounid_snn_timestamp = -1; +static int hf_cip_seg_safety_ounid_snn_date = -1; +static int hf_cip_seg_safety_ounid_snn_time = -1; static int hf_cip_seg_safety_ounid_macid = -1; static int hf_cip_seg_safety_ping_eri_multiplier = -1; static int hf_cip_seg_safety_time_coord_msg_min_multiplier = -1; @@ -541,9 +541,9 @@ static gint ett_network_seg = -1; static gint ett_network_seg_safety = -1; static gint ett_network_seg_safety_time_correction_net_params = -1; static gint ett_cip_seg_safety_tunid = -1; -static gint ett_cip_seg_safety_tunid_ssn = -1; +static gint ett_cip_seg_safety_tunid_snn = -1; static gint ett_cip_seg_safety_ounid = -1; -static gint ett_cip_seg_safety_ounid_ssn = -1; +static gint ett_cip_seg_safety_ounid_snn = -1; static gint ett_rrsc = -1; static gint ett_status_item = -1; @@ -4577,7 +4577,7 @@ static int dissect_segment_safety(packet_info* pinfo, tvbuff_t* tvb, int offset, proto_tree_add_item(safety_tree, hf_cip_seg_safety_reserved, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_configuration_crc, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); - dissect_cipsafety_ssn(safety_tree, tvb, pinfo, offset + 8, + dissect_cipsafety_snn(safety_tree, tvb, pinfo, offset + 8, hf_cip_seg_safety_configuration_timestamp, hf_cip_seg_safety_configuration_date, hf_cip_seg_safety_configuration_time); proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_epi, tvb, offset + 14, 4, ENC_LITTLE_ENDIAN); dissect_net_param16(tvb, offset + 18, safety_tree, @@ -4586,13 +4586,13 @@ static int dissect_segment_safety(packet_info* pinfo, tvbuff_t* tvb, int offset, hf_cip_seg_safety_time_correction_fixed_var, hf_cip_seg_safety_time_correction_con_size, ett_network_seg_safety_time_correction_net_params); proto_item* it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_tunid, tvb, offset + 20, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset + 20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_ssn_timestamp, - hf_cip_seg_safety_tunid_ssn_date, hf_cip_seg_safety_tunid_ssn_time, hf_cip_seg_safety_tunid_macid, - ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_ssn); + dissect_unid(tvb, pinfo, offset + 20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_snn_timestamp, + hf_cip_seg_safety_tunid_snn_date, hf_cip_seg_safety_tunid_snn_time, hf_cip_seg_safety_tunid_macid, + ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_snn); it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_ounid, tvb, offset + 30, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset + 30, it, "Originator UNID SSN", hf_cip_seg_safety_ounid_ssn_timestamp, - hf_cip_seg_safety_ounid_ssn_date, hf_cip_seg_safety_ounid_ssn_time, hf_cip_seg_safety_ounid_macid, - ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_ssn); + dissect_unid(tvb, pinfo, offset + 30, it, "Originator UNID SNN", hf_cip_seg_safety_ounid_snn_timestamp, + hf_cip_seg_safety_ounid_snn_date, hf_cip_seg_safety_ounid_snn_time, hf_cip_seg_safety_ounid_macid, + ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_snn); proto_tree_add_item(safety_tree, hf_cip_seg_safety_ping_eri_multiplier, tvb, offset + 40, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_coord_msg_min_multiplier, tvb, offset + 42, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_network_time_expected_multiplier, tvb, offset + 44, 2, ENC_LITTLE_ENDIAN); @@ -4624,7 +4624,7 @@ static int dissect_segment_safety(packet_info* pinfo, tvbuff_t* tvb, int offset, proto_tree_add_item(safety_tree, hf_cip_seg_safety_reserved, tvb, offset + 3, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_configuration_crc, tvb, offset + 4, 4, ENC_LITTLE_ENDIAN); - dissect_cipsafety_ssn(safety_tree, tvb, pinfo, offset + 8, + dissect_cipsafety_snn(safety_tree, tvb, pinfo, offset + 8, hf_cip_seg_safety_configuration_timestamp, hf_cip_seg_safety_configuration_date, hf_cip_seg_safety_configuration_time); proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_epi, tvb, offset + 14, 4, ENC_LITTLE_ENDIAN); dissect_net_param16(tvb, offset + 18, safety_tree, @@ -4633,13 +4633,13 @@ static int dissect_segment_safety(packet_info* pinfo, tvbuff_t* tvb, int offset, hf_cip_seg_safety_time_correction_fixed_var, hf_cip_seg_safety_time_correction_con_size, ett_network_seg_safety_time_correction_net_params); proto_item* it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_tunid, tvb, offset + 20, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset + 20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_ssn_timestamp, - hf_cip_seg_safety_tunid_ssn_date, hf_cip_seg_safety_tunid_ssn_time, hf_cip_seg_safety_tunid_macid, - ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_ssn); + dissect_unid(tvb, pinfo, offset + 20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_snn_timestamp, + hf_cip_seg_safety_tunid_snn_date, hf_cip_seg_safety_tunid_snn_time, hf_cip_seg_safety_tunid_macid, + ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_snn); it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_ounid, tvb, offset + 30, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset + 30, it, "Originator UNID SSN", hf_cip_seg_safety_ounid_ssn_timestamp, - hf_cip_seg_safety_ounid_ssn_date, hf_cip_seg_safety_ounid_ssn_time, hf_cip_seg_safety_ounid_macid, - ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_ssn); + dissect_unid(tvb, pinfo, offset + 30, it, "Originator UNID SNN", hf_cip_seg_safety_ounid_snn_timestamp, + hf_cip_seg_safety_ounid_snn_date, hf_cip_seg_safety_ounid_snn_time, hf_cip_seg_safety_ounid_macid, + ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_snn); proto_tree_add_item(safety_tree, hf_cip_seg_safety_ping_eri_multiplier, tvb, offset + 40, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_coord_msg_min_multiplier, tvb, offset + 42, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(safety_tree, hf_cip_seg_safety_network_time_expected_multiplier, tvb, offset + 44, 2, ENC_LITTLE_ENDIAN); @@ -8160,7 +8160,7 @@ proto_register_cip(void) { &hf_cip_seg_safety_reserved, { "Reserved", "cip.safety_segment.reserved", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_configuration_crc, { "Configuration CRC", "cip.safety_segment.configuration_crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_configuration_timestamp, { "Configuration Timestamp", "cip.safety_segment.configuration_timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }}, - { &hf_cip_seg_safety_configuration_date, { "Configuration (Manual) Date", "cip.safety_segment.configuration_date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }}, + { &hf_cip_seg_safety_configuration_date, { "Configuration (Manual) Date", "cip.safety_segment.configuration_date", FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL }}, { &hf_cip_seg_safety_configuration_time, { "Configuration (Manual) Time", "cip.safety_segment.configuration_time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_time_correction_epi, { "Time Correction EPI", "cip.safety_segment.time_correction_eri", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_time_correction_net_params, { "Time Correction Network Connection Parameters", "cip.safety_segment.time_correction.net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -8170,14 +8170,14 @@ proto_register_cip(void) { &hf_cip_seg_safety_time_correction_fixed_var, { "Connection Size Type", "cip.safety_segment.time_correction.f_v", FT_UINT16, BASE_DEC, VALS(cip_con_fw_vals), 0x0200, "Time Correction: Fixed or variable connection size", HFILL }}, { &hf_cip_seg_safety_time_correction_con_size, { "Connection Size", "cip.safety_segment.time_correction.consize", FT_UINT16, BASE_DEC, NULL, 0x01FF, "Time Correction: Connection size", HFILL }}, { &hf_cip_seg_safety_tunid, { "Target UNID", "cip.safety_segment.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_cip_seg_safety_tunid_ssn_timestamp, { "SSN Timestamp", "cip.safety_segment.tunid.ssn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }}, - { &hf_cip_seg_safety_tunid_ssn_date, { "SSN (Manual) Date", "cip.safety_segment.tunid.ssn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }}, - { &hf_cip_seg_safety_tunid_ssn_time, { "SSN (Manual) Time", "cip.safety_segment.tunid.ssn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_cip_seg_safety_tunid_snn_timestamp, { "SNN Timestamp", "cip.safety_segment.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }}, + { &hf_cip_seg_safety_tunid_snn_date, { "SNN (Manual) Date", "cip.safety_segment.tunid.snn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL }}, + { &hf_cip_seg_safety_tunid_snn_time, { "SNN (Manual) Time", "cip.safety_segment.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_tunid_macid, { "MAC ID", "cip.safety_segment.tunid.macid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_ounid, { "Originator UNID", "cip.safety_segment.ounid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_cip_seg_safety_ounid_ssn_timestamp, { "SSN Timestamp", "cip.safety_segment.tunid.ssn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }}, - { &hf_cip_seg_safety_ounid_ssn_date, { "SSN (Manual) Date", "cip.safety_segment.tunid.ssn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }}, - { &hf_cip_seg_safety_ounid_ssn_time, { "SSN (Manual) Time", "cip.safety_segment.tunid.ssn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, + { &hf_cip_seg_safety_ounid_snn_timestamp, { "SNN Timestamp", "cip.safety_segment.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }}, + { &hf_cip_seg_safety_ounid_snn_date, { "SNN (Manual) Date", "cip.safety_segment.tunid.snn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL }}, + { &hf_cip_seg_safety_ounid_snn_time, { "SNN (Manual) Time", "cip.safety_segment.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_ounid_macid, { "MAC ID", "cip.safety_segment.ounid.macid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_ping_eri_multiplier, { "Ping Interval EPI Multiplier", "cip.safety_segment.ping_eri_multiplier", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_cip_seg_safety_time_coord_msg_min_multiplier, { "Time Coord Msg Min Multiplier", "cip.safety_segment.time_coord_msg_min_multiplier", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -8558,9 +8558,9 @@ proto_register_cip(void) &ett_network_seg_safety, &ett_network_seg_safety_time_correction_net_params, &ett_cip_seg_safety_tunid, - &ett_cip_seg_safety_tunid_ssn, + &ett_cip_seg_safety_tunid_snn, &ett_cip_seg_safety_ounid, - &ett_cip_seg_safety_ounid_ssn, + &ett_cip_seg_safety_ounid_snn, &ett_status_item, &ett_add_status_item, &ett_cip_get_attributes_all_item, diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index a766f49bd9..2b05b01d39 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -98,14 +98,14 @@ static int hf_cip_ssupervisor_recover_data = -1; static int hf_cip_ssupervisor_perform_diag_data = -1; static int hf_cip_ssupervisor_configure_request_password = -1; static int hf_cip_ssupervisor_configure_request_tunid = -1; -static int hf_cip_ssupervisor_configure_request_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_configure_request_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_configure_request_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_configure_request_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_configure_request_tunid_snn_date = -1; +static int hf_cip_ssupervisor_configure_request_tunid_snn_time = -1; static int hf_cip_ssupervisor_configure_request_tunid_macid = -1; static int hf_cip_ssupervisor_configure_request_ounid = -1; -static int hf_cip_ssupervisor_configure_request_ounid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_configure_request_ounid_ssn_date = -1; -static int hf_cip_ssupervisor_configure_request_ounid_ssn_time = -1; +static int hf_cip_ssupervisor_configure_request_ounid_snn_timestamp = -1; +static int hf_cip_ssupervisor_configure_request_ounid_snn_date = -1; +static int hf_cip_ssupervisor_configure_request_ounid_snn_time = -1; static int hf_cip_ssupervisor_configure_request_ounid_macid = -1; static int hf_cip_ssupervisor_validate_configuration_sccrc = -1; static int hf_cip_ssupervisor_validate_configuration_scts_timestamp = -1; @@ -117,18 +117,18 @@ static int hf_cip_ssupervisor_set_password_new_password = -1; static int hf_cip_ssupervisor_configure_lock_value = -1; static int hf_cip_ssupervisor_configure_lock_password = -1; static int hf_cip_ssupervisor_configure_lock_tunid = -1; -static int hf_cip_ssupervisor_configure_lock_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_configure_lock_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_configure_lock_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_configure_lock_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_configure_lock_tunid_snn_date = -1; +static int hf_cip_ssupervisor_configure_lock_tunid_snn_time = -1; static int hf_cip_ssupervisor_configure_lock_tunid_macid = -1; static int hf_cip_ssupervisor_mode_change_value = -1; static int hf_cip_ssupervisor_mode_change_password = -1; static int hf_cip_ssupervisor_reset_type = -1; static int hf_cip_ssupervisor_reset_password = -1; static int hf_cip_ssupervisor_reset_tunid = -1; -static int hf_cip_ssupervisor_reset_tunid_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_reset_tunid_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_reset_tunid_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_reset_tunid_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_reset_tunid_tunid_snn_date = -1; +static int hf_cip_ssupervisor_reset_tunid_tunid_snn_time = -1; static int hf_cip_ssupervisor_reset_tunid_macid = -1; static int hf_cip_ssupervisor_reset_attr_bitmap = -1; static int hf_cip_ssupervisor_reset_attr_bitmap_macid = -1; @@ -142,14 +142,14 @@ static int hf_cip_ssupervisor_reset_attr_bitmap_extended = -1; static int hf_cip_ssupervisor_reset_password_data_size = -1; static int hf_cip_ssupervisor_reset_password_data = -1; static int hf_cip_ssupervisor_propose_tunid_tunid = -1; -static int hf_cip_ssupervisor_propose_tunid_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_propose_tunid_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_propose_tunid_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_propose_tunid_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_propose_tunid_tunid_snn_date = -1; +static int hf_cip_ssupervisor_propose_tunid_tunid_snn_time = -1; static int hf_cip_ssupervisor_propose_tunid_tunid_macid = -1; static int hf_cip_ssupervisor_apply_tunid_tunid = -1; -static int hf_cip_ssupervisor_apply_tunid_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_apply_tunid_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_apply_tunid_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_apply_tunid_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_apply_tunid_tunid_snn_date = -1; +static int hf_cip_ssupervisor_apply_tunid_tunid_snn_time = -1; static int hf_cip_ssupervisor_apply_tunid_tunid_macid = -1; static int hf_cip_ssupervisor_class_subclass = -1; @@ -179,27 +179,27 @@ static int hf_cip_ssupervisor_scheduled_maintenance_expiration_timer = -1; static int hf_cip_ssupervisor_scheduled_maintenance_expiration_warning_enable = -1; static int hf_cip_ssupervisor_run_hours = -1; static int hf_cip_ssupervisor_configuration_lock = -1; -static int hf_cip_ssupervisor_configuration_unid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_configuration_unid_ssn_date = -1; -static int hf_cip_ssupervisor_configuration_unid_ssn_time = -1; +static int hf_cip_ssupervisor_configuration_unid_snn_timestamp = -1; +static int hf_cip_ssupervisor_configuration_unid_snn_date = -1; +static int hf_cip_ssupervisor_configuration_unid_snn_time = -1; static int hf_cip_ssupervisor_configuration_unid_macid = -1; -static int hf_cip_ssupervisor_safety_configuration_id_ssn_timestamp = -1; -static int hf_cip_ssupervisor_safety_configuration_id_ssn_date = -1; -static int hf_cip_ssupervisor_safety_configuration_id_ssn_time = -1; +static int hf_cip_ssupervisor_safety_configuration_id_snn_timestamp = -1; +static int hf_cip_ssupervisor_safety_configuration_id_snn_date = -1; +static int hf_cip_ssupervisor_safety_configuration_id_snn_time = -1; static int hf_cip_ssupervisor_safety_configuration_id_sccrc = -1; -static int hf_cip_ssupervisor_target_unid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_target_unid_ssn_date = -1; -static int hf_cip_ssupervisor_target_unid_ssn_time = -1; +static int hf_cip_ssupervisor_target_unid_snn_timestamp = -1; +static int hf_cip_ssupervisor_target_unid_snn_date = -1; +static int hf_cip_ssupervisor_target_unid_snn_time = -1; static int hf_cip_ssupervisor_target_unid_macid = -1; static int hf_cip_ssupervisor_cp_owners_num_entries = -1; -static int hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_date = -1; -static int hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_time = -1; +static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_date = -1; +static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_time = -1; static int hf_cip_ssupervisor_output_cp_owners_ocpunid_macid = -1; static int hf_cip_ssupervisor_cp_owners_app_path_size = -1; -static int hf_cip_ssupervisor_proposed_tunid_ssn_timestamp = -1; -static int hf_cip_ssupervisor_proposed_tunid_ssn_date = -1; -static int hf_cip_ssupervisor_proposed_tunid_ssn_time = -1; +static int hf_cip_ssupervisor_proposed_tunid_snn_timestamp = -1; +static int hf_cip_ssupervisor_proposed_tunid_snn_date = -1; +static int hf_cip_ssupervisor_proposed_tunid_snn_time = -1; static int hf_cip_ssupervisor_proposed_tunid_macid = -1; static int hf_cip_ssupervisor_instance_subclass = -1; @@ -249,29 +249,29 @@ static gint ett_cip_class_s_supervisor = -1; static gint ett_ssupervisor_rrsc = -1; static gint ett_ssupervisor_cmd_data = -1; static gint ett_ssupervisor_propose_tunid = -1; -static gint ett_ssupervisor_propose_tunid_ssn = -1; +static gint ett_ssupervisor_propose_tunid_snn = -1; static gint ett_ssupervisor_configure_request_tunid = -1; -static gint ett_ssupervisor_configure_request_tunid_ssn = -1; +static gint ett_ssupervisor_configure_request_tunid_snn = -1; static gint ett_ssupervisor_configure_request_ounid = -1; -static gint ett_ssupervisor_configure_request_ounid_ssn = -1; +static gint ett_ssupervisor_configure_request_ounid_snn = -1; static gint ett_ssupervisor_configure_lock_tunid = -1; -static gint ett_ssupervisor_configure_lock_tunid_ssn = -1; +static gint ett_ssupervisor_configure_lock_tunid_snn = -1; static gint ett_ssupervisor_reset_tunid = -1; -static gint ett_ssupervisor_reset_tunid_ssn = -1; +static gint ett_ssupervisor_reset_tunid_snn = -1; static gint ett_ssupervisor_apply_tunid = -1; -static gint ett_ssupervisor_apply_tunid_ssn = -1; +static gint ett_ssupervisor_apply_tunid_snn = -1; static gint ett_exception_detail_common = -1; static gint ett_exception_detail_device = -1; static gint ett_exception_detail_manufacturer = -1; static gint ett_ssupervisor_configuration_unid = -1; -static gint ett_ssupervisor_configuration_unid_ssn = -1; +static gint ett_ssupervisor_configuration_unid_snn = -1; static gint ett_ssupervisor_target_unid = -1; -static gint ett_ssupervisor_target_unid_ssn = -1; +static gint ett_ssupervisor_target_unid_snn = -1; static gint ett_ssupervisor_output_cp_owners = -1; static gint ett_ssupervisor_output_cp_owners_ocpunid = -1; -static gint ett_ssupervisor_output_cp_owners_ocpunid_ssn = -1; +static gint ett_ssupervisor_output_cp_owners_ocpunid_snn = -1; static gint ett_ssupervisor_proposed_tunid = -1; -static gint ett_ssupervisor_proposed_tunid_ssn = -1; +static gint ett_ssupervisor_proposed_tunid_snn = -1; static gint ett_cip_ssupervisor_reset_attr_bitmap = -1; static gint ett_cip_class_s_validator = -1; @@ -328,15 +328,15 @@ typedef struct cip_safety_packet_data { #define MODE_BYTE_CRC_S5_BASE_MASK 0xE0 #define MODE_BYTE_CRC_S5_EXTENDED_MASK 0x1F -const value_string cipsafety_ssn_date_vals[8] = { +const value_string cipsafety_snn_date_vals[8] = { - { 0, "NULL SSN" }, + { 0, "NULL SNN" }, { 1, "Manual Setting - Backplane" }, { 2, "Manual Setting - ControlNet" }, { 4, "Manual Setting - EtherNet/IP" }, { 5, "Manual Setting - DeviceNet" }, { 6, "Manual Setting - SERCOS III" }, - { 65535, "No SSN Set" }, + { 65535, "No SNN Set" }, { 0, NULL } }; @@ -452,20 +452,20 @@ static const value_string cip_svalidator_type_conn_type_vals[] = { void dissect_unid(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *pi, - const char* ssn_name, int hf_ssn_timestamp, - int hf_ssn_date, int hf_ssn_time, int hf_macid, gint ett, gint ett_ssn) + const char* snn_name, int hf_snn_timestamp, + int hf_snn_date, int hf_snn_time, int hf_macid, gint ett, gint ett_snn) { - proto_tree *tree, *ssn_tree; + proto_tree *tree, *snn_tree; tree = proto_item_add_subtree(pi, ett); - ssn_tree = proto_tree_add_subtree(tree, tvb, offset, 6, ett_ssn, NULL, ssn_name); - dissect_cipsafety_ssn(ssn_tree, tvb, pinfo, offset, hf_ssn_timestamp, hf_ssn_date, hf_ssn_time); + snn_tree = proto_tree_add_subtree(tree, tvb, offset, 6, ett_snn, NULL, snn_name); + dissect_cipsafety_snn(snn_tree, tvb, pinfo, offset, hf_snn_timestamp, hf_snn_date, hf_snn_time); proto_tree_add_item(tree, hf_macid, tvb, offset+6, 4, ENC_LITTLE_ENDIAN); } -void dissect_cipsafety_ssn(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, +void dissect_cipsafety_snn(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int hf_real_datetime, int hf_date, int hf_time) { guint16 date; @@ -492,13 +492,13 @@ static void dissect_safety_supervisor_safety_reset(proto_tree* cmd_data_tree, tv proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_reset_password, tvb, offset + 1, 16, ENC_NA); proto_item* pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_reset_tunid, tvb, offset + 17, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset + 17, pi, "TUNID SSN", - hf_cip_ssupervisor_reset_tunid_tunid_ssn_timestamp, - hf_cip_ssupervisor_reset_tunid_tunid_ssn_date, - hf_cip_ssupervisor_reset_tunid_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset + 17, pi, "TUNID SNN", + hf_cip_ssupervisor_reset_tunid_tunid_snn_timestamp, + hf_cip_ssupervisor_reset_tunid_tunid_snn_date, + hf_cip_ssupervisor_reset_tunid_tunid_snn_time, hf_cip_ssupervisor_reset_tunid_macid, ett_ssupervisor_reset_tunid, - ett_ssupervisor_reset_tunid_ssn); + ett_ssupervisor_reset_tunid_snn); /* Attribute bitmap only included on Reset Type 2 */ if (reset_type == 2) @@ -572,7 +572,7 @@ dissect_cip_s_supervisor_data( proto_tree *item_tree, case SC_SSUPER_VALIDATE_CONFIGURATION: proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_validate_configuration_sccrc, tvb, offset+4+add_stat_size, 4, ENC_LITTLE_ENDIAN); - dissect_cipsafety_ssn(cmd_data_tree, + dissect_cipsafety_snn(cmd_data_tree, tvb, pinfo, offset+4+add_stat_size+4, hf_cip_ssupervisor_validate_configuration_scts_timestamp, hf_cip_ssupervisor_validate_configuration_scts_date, @@ -627,27 +627,27 @@ dissect_cip_s_supervisor_data( proto_tree *item_tree, tvb, offset+2+req_path_size, 16, ENC_NA); pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_configure_request_tunid, tvb, offset+2+req_path_size+16, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset+2+req_path_size+16, pi, "TUNID SSN", - hf_cip_ssupervisor_configure_request_tunid_ssn_timestamp, - hf_cip_ssupervisor_configure_request_tunid_ssn_date, - hf_cip_ssupervisor_configure_request_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset+2+req_path_size+16, pi, "TUNID SNN", + hf_cip_ssupervisor_configure_request_tunid_snn_timestamp, + hf_cip_ssupervisor_configure_request_tunid_snn_date, + hf_cip_ssupervisor_configure_request_tunid_snn_time, hf_cip_ssupervisor_configure_request_tunid_macid, ett_ssupervisor_configure_request_tunid, - ett_ssupervisor_configure_request_tunid_ssn); + ett_ssupervisor_configure_request_tunid_snn); pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_configure_request_ounid, tvb, offset+2+req_path_size+26, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset+2+req_path_size+16, pi, "OUNID SSN", - hf_cip_ssupervisor_configure_request_ounid_ssn_timestamp, - hf_cip_ssupervisor_configure_request_ounid_ssn_date, - hf_cip_ssupervisor_configure_request_ounid_ssn_time, + dissect_unid(tvb, pinfo, offset+2+req_path_size+16, pi, "OUNID SNN", + hf_cip_ssupervisor_configure_request_ounid_snn_timestamp, + hf_cip_ssupervisor_configure_request_ounid_snn_date, + hf_cip_ssupervisor_configure_request_ounid_snn_time, hf_cip_ssupervisor_configure_request_ounid_macid, ett_ssupervisor_configure_request_ounid, - ett_ssupervisor_configure_request_ounid_ssn); + ett_ssupervisor_configure_request_ounid_snn); break; case SC_SSUPER_VALIDATE_CONFIGURATION: proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_validate_configuration_sccrc, tvb, offset+2+req_path_size, 4, ENC_LITTLE_ENDIAN); - dissect_cipsafety_ssn(cmd_data_tree, tvb, pinfo, offset+2+req_path_size+4, + dissect_cipsafety_snn(cmd_data_tree, tvb, pinfo, offset+2+req_path_size+4, hf_cip_ssupervisor_validate_configuration_scts_timestamp, hf_cip_ssupervisor_validate_configuration_scts_date, hf_cip_ssupervisor_validate_configuration_scts_time); @@ -665,13 +665,13 @@ dissect_cip_s_supervisor_data( proto_tree *item_tree, tvb, offset+2+req_path_size+1, 16, ENC_NA); pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_configure_lock_tunid, tvb, offset+2+req_path_size+17, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset+2+req_path_size+17, pi, "TUNID SSN", - hf_cip_ssupervisor_configure_lock_tunid_ssn_timestamp, - hf_cip_ssupervisor_configure_lock_tunid_ssn_date, - hf_cip_ssupervisor_configure_lock_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset+2+req_path_size+17, pi, "TUNID SNN", + hf_cip_ssupervisor_configure_lock_tunid_snn_timestamp, + hf_cip_ssupervisor_configure_lock_tunid_snn_date, + hf_cip_ssupervisor_configure_lock_tunid_snn_time, hf_cip_ssupervisor_configure_lock_tunid_macid, ett_ssupervisor_configure_lock_tunid, - ett_ssupervisor_configure_lock_tunid_ssn); + ett_ssupervisor_configure_lock_tunid_snn); break; case SC_SSUPER_MODE_CHANGE: proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_mode_change_value, @@ -692,24 +692,24 @@ dissect_cip_s_supervisor_data( proto_tree *item_tree, case SC_SSUPER_PROPOSE_TUNID: pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_propose_tunid_tunid, tvb, offset+2+req_path_size, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset+2+req_path_size, pi, "TUNID SSN", - hf_cip_ssupervisor_propose_tunid_tunid_ssn_timestamp, - hf_cip_ssupervisor_propose_tunid_tunid_ssn_date, - hf_cip_ssupervisor_propose_tunid_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset+2+req_path_size, pi, "TUNID SNN", + hf_cip_ssupervisor_propose_tunid_tunid_snn_timestamp, + hf_cip_ssupervisor_propose_tunid_tunid_snn_date, + hf_cip_ssupervisor_propose_tunid_tunid_snn_time, hf_cip_ssupervisor_propose_tunid_tunid_macid, ett_ssupervisor_propose_tunid, - ett_ssupervisor_propose_tunid_ssn); + ett_ssupervisor_propose_tunid_snn); break; case SC_SSUPER_APPLY_TUNID: pi = proto_tree_add_item(cmd_data_tree, hf_cip_ssupervisor_apply_tunid_tunid, tvb, offset+2+req_path_size, 10, ENC_NA); - dissect_unid(tvb, pinfo, offset+2+req_path_size, pi, "TUNID SSN", - hf_cip_ssupervisor_apply_tunid_tunid_ssn_timestamp, - hf_cip_ssupervisor_apply_tunid_tunid_ssn_date, - hf_cip_ssupervisor_apply_tunid_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset+2+req_path_size, pi, "TUNID SNN", + hf_cip_ssupervisor_apply_tunid_tunid_snn_timestamp, + hf_cip_ssupervisor_apply_tunid_tunid_snn_date, + hf_cip_ssupervisor_apply_tunid_tunid_snn_time, hf_cip_ssupervisor_apply_tunid_tunid_macid, ett_ssupervisor_apply_tunid, - ett_ssupervisor_apply_tunid_ssn); + ett_ssupervisor_apply_tunid_snn); break; default: proto_tree_add_item(cmd_data_tree, hf_cip_data, @@ -801,13 +801,13 @@ static int dissect_s_supervisor_configuration_unid(packet_info *pinfo, proto_tre return total_len; } - dissect_unid(tvb, pinfo, offset, item, "CFUNID SSN", - hf_cip_ssupervisor_configuration_unid_ssn_timestamp, - hf_cip_ssupervisor_configuration_unid_ssn_date, - hf_cip_ssupervisor_configuration_unid_ssn_time, + dissect_unid(tvb, pinfo, offset, item, "CFUNID SNN", + hf_cip_ssupervisor_configuration_unid_snn_timestamp, + hf_cip_ssupervisor_configuration_unid_snn_date, + hf_cip_ssupervisor_configuration_unid_snn_time, hf_cip_ssupervisor_configuration_unid_macid, ett_ssupervisor_configuration_unid, - ett_ssupervisor_configuration_unid_ssn); + ett_ssupervisor_configuration_unid_snn); return 10; } @@ -822,10 +822,10 @@ static int dissect_s_supervisor_safety_configuration_id(packet_info *pinfo, prot proto_tree_add_item(tree, hf_cip_ssupervisor_safety_configuration_id_sccrc, tvb, offset, 4, ENC_LITTLE_ENDIAN); - dissect_cipsafety_ssn(tree, tvb, pinfo, offset + 4, - hf_cip_ssupervisor_safety_configuration_id_ssn_timestamp, - hf_cip_ssupervisor_safety_configuration_id_ssn_date, - hf_cip_ssupervisor_safety_configuration_id_ssn_time); + dissect_cipsafety_snn(tree, tvb, pinfo, offset + 4, + hf_cip_ssupervisor_safety_configuration_id_snn_timestamp, + hf_cip_ssupervisor_safety_configuration_id_snn_date, + hf_cip_ssupervisor_safety_configuration_id_snn_time); return 10; } @@ -839,13 +839,13 @@ static int dissect_s_supervisor_target_unid(packet_info *pinfo, proto_tree *tree return total_len; } - dissect_unid(tvb, pinfo, offset, item, "TUNID SSN", - hf_cip_ssupervisor_target_unid_ssn_timestamp, - hf_cip_ssupervisor_target_unid_ssn_date, - hf_cip_ssupervisor_target_unid_ssn_time, + dissect_unid(tvb, pinfo, offset, item, "TUNID SNN", + hf_cip_ssupervisor_target_unid_snn_timestamp, + hf_cip_ssupervisor_target_unid_snn_date, + hf_cip_ssupervisor_target_unid_snn_time, hf_cip_ssupervisor_target_unid_macid, ett_ssupervisor_target_unid, - ett_ssupervisor_target_unid_ssn); + ett_ssupervisor_target_unid_snn); return 10; } @@ -880,13 +880,13 @@ static int dissect_s_supervisor_output_connection_point_owners(packet_info *pinf return total_len; } - dissect_unid(tvb, pinfo, offset+attr_len, entry_item, "OCPUNID SSN", - hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_timestamp, - hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_date, - hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_time, + dissect_unid(tvb, pinfo, offset+attr_len, entry_item, "OCPUNID SNN", + hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_timestamp, + hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_date, + hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_time, hf_cip_ssupervisor_output_cp_owners_ocpunid_macid, ett_ssupervisor_output_cp_owners_ocpunid, - ett_ssupervisor_output_cp_owners_ocpunid_ssn); + ett_ssupervisor_output_cp_owners_ocpunid_snn); attr_len += 10; proto_tree_add_item(entry_tree, hf_cip_ssupervisor_cp_owners_app_path_size, @@ -919,13 +919,13 @@ static int dissect_s_supervisor_proposed_tunid(packet_info *pinfo, proto_tree *t return total_len; } - dissect_unid(tvb, pinfo, offset, item, "Proposed TUNID SSN", - hf_cip_ssupervisor_proposed_tunid_ssn_timestamp, - hf_cip_ssupervisor_proposed_tunid_ssn_date, - hf_cip_ssupervisor_proposed_tunid_ssn_time, + dissect_unid(tvb, pinfo, offset, item, "Proposed TUNID SNN", + hf_cip_ssupervisor_proposed_tunid_snn_timestamp, + hf_cip_ssupervisor_proposed_tunid_snn_date, + hf_cip_ssupervisor_proposed_tunid_snn_time, hf_cip_ssupervisor_proposed_tunid_macid, ett_ssupervisor_proposed_tunid, - ett_ssupervisor_proposed_tunid_ssn); + ett_ssupervisor_proposed_tunid_snn); return 10; } @@ -2338,16 +2338,16 @@ proto_register_cipsafety(void) { "Target UNID", "cipsafety.ssupervisor.configure_request.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_tunid_ssn_timestamp, - { "TUNID SSN Timestamp", "cipsafety.ssupervisor.configure_request.tunid.ssn.timestamp", + { &hf_cip_ssupervisor_configure_request_tunid_snn_timestamp, + { "TUNID SNN Timestamp", "cipsafety.ssupervisor.configure_request.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_tunid_ssn_date, - { "TUNID SSN (Manual) Date", "cipsafety.ssupervisor.configure_request.tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_configure_request_tunid_snn_date, + { "TUNID SNN (Manual) Date", "cipsafety.ssupervisor.configure_request.tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_tunid_ssn_time, - { "TUNID SSN (Manual) Time", "cipsafety.ssupervisor.configure_request.tunid.ssn.time", + { &hf_cip_ssupervisor_configure_request_tunid_snn_time, + { "TUNID SNN (Manual) Time", "cipsafety.ssupervisor.configure_request.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_configure_request_tunid_macid, @@ -2358,16 +2358,16 @@ proto_register_cipsafety(void) { "Originator UNID", "cipsafety.ssupervisor.configure_request.ounid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_ounid_ssn_timestamp, - { "OUNID SSN Timestamp", "cipsafety.ssupervisor.configure_request.ounid.ssn.timestamp", + { &hf_cip_ssupervisor_configure_request_ounid_snn_timestamp, + { "OUNID SNN Timestamp", "cipsafety.ssupervisor.configure_request.ounid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_ounid_ssn_date, - { "OUNID SSN (Manual) Date", "cipsafety.ssupervisor.configure_request.ounid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_configure_request_ounid_snn_date, + { "OUNID SNN (Manual) Date", "cipsafety.ssupervisor.configure_request.ounid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_request_ounid_ssn_time, - { "OUNID SSN (Manual) Time", "cipsafety.ssupervisor.configure_request.ounid.ssn.time", + { &hf_cip_ssupervisor_configure_request_ounid_snn_time, + { "OUNID SNN (Manual) Time", "cipsafety.ssupervisor.configure_request.ounid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_configure_request_ounid_macid, @@ -2384,7 +2384,7 @@ proto_register_cipsafety(void) }, { &hf_cip_ssupervisor_validate_configuration_scts_date, { "SCTS (Manual) Date", "cipsafety.ssupervisor.validate_configuration.scts.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, { &hf_cip_ssupervisor_validate_configuration_scts_time, { "SCTS (Manual) Time", "cipsafety.ssupervisor.validate_configuration.scts.time", @@ -2414,16 +2414,16 @@ proto_register_cipsafety(void) { "Target UNID", "cipsafety.ssupervisor.configure_lock.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_lock_tunid_ssn_timestamp, - { "TUNID SSN Timestamp", "cipsafety.ssupervisor.configure_lock.tunid.ssn.timestamp", + { &hf_cip_ssupervisor_configure_lock_tunid_snn_timestamp, + { "TUNID SNN Timestamp", "cipsafety.ssupervisor.configure_lock.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_lock_tunid_ssn_date, - { "TUNID SSN (Manual) Date", "cipsafety.ssupervisor.configure_lock.tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_configure_lock_tunid_snn_date, + { "TUNID SNN (Manual) Date", "cipsafety.ssupervisor.configure_lock.tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configure_lock_tunid_ssn_time, - { "TUNID SSN (Manual) Time", "cipsafety.ssupervisor.configure_lock.tunid.ssn.time", + { &hf_cip_ssupervisor_configure_lock_tunid_snn_time, + { "TUNID SNN (Manual) Time", "cipsafety.ssupervisor.configure_lock.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_configure_lock_tunid_macid, @@ -2450,16 +2450,16 @@ proto_register_cipsafety(void) { "Target UNID", "cipsafety.ssupervisor.reset.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_reset_tunid_tunid_ssn_timestamp, - { "TUNID SSN Timestamp", "cipsafety.ssupervisor.reset.tunid.ssn.timestamp", + { &hf_cip_ssupervisor_reset_tunid_tunid_snn_timestamp, + { "TUNID SNN Timestamp", "cipsafety.ssupervisor.reset.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_reset_tunid_tunid_ssn_date, - { "TUNID SSN (Manual) Date", "cipsafety.ssupervisor.reset.tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_reset_tunid_tunid_snn_date, + { "TUNID SNN (Manual) Date", "cipsafety.ssupervisor.reset.tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_reset_tunid_tunid_ssn_time, - { "TUNID SSN (Manual) Time", "cipsafety.ssupervisor.reset.tunid.ssn.time", + { &hf_cip_ssupervisor_reset_tunid_tunid_snn_time, + { "TUNID SNN (Manual) Time", "cipsafety.ssupervisor.reset.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_reset_tunid_macid, @@ -2514,16 +2514,16 @@ proto_register_cipsafety(void) { "Target UNID", "cipsafety.ssupervisor.propose_tunid.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_propose_tunid_tunid_ssn_timestamp, - { "TUNID SSN Timestamp", "cipsafety.ssupervisor.propose_tunid.tunid.ssn.timestamp", + { &hf_cip_ssupervisor_propose_tunid_tunid_snn_timestamp, + { "TUNID SNN Timestamp", "cipsafety.ssupervisor.propose_tunid.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_propose_tunid_tunid_ssn_date, - { "TUNID SSN (Manual) Date", "cipsafety.ssupervisor.propose_tunid.tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_propose_tunid_tunid_snn_date, + { "TUNID SNN (Manual) Date", "cipsafety.ssupervisor.propose_tunid.tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_propose_tunid_tunid_ssn_time, - { "TUNID SSN (Manual) Time", "cipsafety.ssupervisor.propose_tunid.tunid.ssn.time", + { &hf_cip_ssupervisor_propose_tunid_tunid_snn_time, + { "TUNID SNN (Manual) Time", "cipsafety.ssupervisor.propose_tunid.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_propose_tunid_tunid_macid, @@ -2534,16 +2534,16 @@ proto_register_cipsafety(void) { "Target UNID", "cipsafety.ssupervisor.apply_tunid.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_apply_tunid_tunid_ssn_timestamp, - { "TUNID SSN Timestamp", "cipsafety.ssupervisor.apply_tunid.tunid.ssn.timestamp", + { &hf_cip_ssupervisor_apply_tunid_tunid_snn_timestamp, + { "TUNID SNN Timestamp", "cipsafety.ssupervisor.apply_tunid.tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_apply_tunid_tunid_ssn_date, - { "TUNID SSN (Manual) Date", "cipsafety.ssupervisor.apply_tunid.tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_apply_tunid_tunid_snn_date, + { "TUNID SNN (Manual) Date", "cipsafety.ssupervisor.apply_tunid.tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_apply_tunid_tunid_ssn_time, - { "TUNID SSN (Manual) Time", "cipsafety.ssupervisor.apply_tunid.tunid.ssn.time", + { &hf_cip_ssupervisor_apply_tunid_tunid_snn_time, + { "TUNID SNN (Manual) Time", "cipsafety.ssupervisor.apply_tunid.tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_apply_tunid_tunid_macid, @@ -2658,48 +2658,48 @@ proto_register_cipsafety(void) { "Configuration Lock", "cipsafety.ssupervisor.configuration_lock", FT_UINT8, BASE_DEC, VALS(cip_ssupervisor_lock_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configuration_unid_ssn_timestamp, - { "Configuration UNID SSN Timestamp", "cipsafety.ssupervisor.configuration_unid.ssn.timestamp", + { &hf_cip_ssupervisor_configuration_unid_snn_timestamp, + { "Configuration UNID SNN Timestamp", "cipsafety.ssupervisor.configuration_unid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configuration_unid_ssn_date, - { "Configuration UNID SSN (Manual) Date", "cipsafety.ssupervisor.configuration_unid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_configuration_unid_snn_date, + { "Configuration UNID SNN (Manual) Date", "cipsafety.ssupervisor.configuration_unid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_configuration_unid_ssn_time, - { "Configuration UNID SSN (Manual) Time", "cipsafety.ssupervisor.configuration_unid.ssn.time", + { &hf_cip_ssupervisor_configuration_unid_snn_time, + { "Configuration UNID SNN (Manual) Time", "cipsafety.ssupervisor.configuration_unid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_configuration_unid_macid, { "Configuration UNID MAC ID", "cipsafety.ssupervisor.configuration_unid.macid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_safety_configuration_id_ssn_timestamp, - { "Safety Configuration ID SSN Timestamp", "cipsafety.ssupervisor.safety_configuration_id.ssn.timestamp", + { &hf_cip_ssupervisor_safety_configuration_id_snn_timestamp, + { "Safety Configuration ID SNN Timestamp", "cipsafety.ssupervisor.safety_configuration_id.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_safety_configuration_id_ssn_date, - { "Safety Configuration ID SSN (Manual) Date", "cipsafety.ssupervisor.safety_configuration_id.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_safety_configuration_id_snn_date, + { "Safety Configuration ID SNN (Manual) Date", "cipsafety.ssupervisor.safety_configuration_id.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_safety_configuration_id_ssn_time, - { "Safety Configuration ID SSN (Manual) Time", "cipsafety.ssupervisor.safety_configuration_id.ssn.time", + { &hf_cip_ssupervisor_safety_configuration_id_snn_time, + { "Safety Configuration ID SNN (Manual) Time", "cipsafety.ssupervisor.safety_configuration_id.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_safety_configuration_id_sccrc, { "Safety Configuration ID SCCRC", "cipsafety.ssupervisor.safety_configuration_id.sccrc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_target_unid_ssn_timestamp, - { "Target UNID SSN Timestamp", "cipsafety.ssupervisor.target_unid.ssn.timestamp", + { &hf_cip_ssupervisor_target_unid_snn_timestamp, + { "Target UNID SNN Timestamp", "cipsafety.ssupervisor.target_unid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_target_unid_ssn_date, - { "Target UNID SSN (Manual) Date", "cipsafety.ssupervisor.target_unid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_target_unid_snn_date, + { "Target UNID SNN (Manual) Date", "cipsafety.ssupervisor.target_unid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_target_unid_ssn_time, - { "Target UNID SSN (Manual) Time", "cipsafety.ssupervisor.target_unid.ssn.time", + { &hf_cip_ssupervisor_target_unid_snn_time, + { "Target UNID SNN (Manual) Time", "cipsafety.ssupervisor.target_unid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_target_unid_macid, @@ -2710,16 +2710,16 @@ proto_register_cipsafety(void) { "Number of Array Entries", "cipsafety.ssupervisor.cp_owners.num_entries", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_timestamp, - { "OCPUNID SSN Timestamp", "cipsafety.ssupervisor.cp_owners.ssn.timestamp", + { &hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_timestamp, + { "OCPUNID SNN Timestamp", "cipsafety.ssupervisor.cp_owners.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_date, - { "OCPUNID SSN (Manual) Date", "cipsafety.ssupervisor.cp_owners.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_date, + { "OCPUNID SNN (Manual) Date", "cipsafety.ssupervisor.cp_owners.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_output_cp_owners_ocpunid_ssn_time, - { "OCPUNID SSN (Manual) Time", "cipsafety.ssupervisor.cp_owners.ssn.time", + { &hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_time, + { "OCPUNID SNN (Manual) Time", "cipsafety.ssupervisor.cp_owners.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_output_cp_owners_ocpunid_macid, @@ -2730,16 +2730,16 @@ proto_register_cipsafety(void) { "EPATH Size", "cipsafety.ssupervisor.cp_owners.epath_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_proposed_tunid_ssn_timestamp, - { "Proposed TUNID SSN Timestamp", "cipsafety.ssupervisor.proposed_tunid.ssn.timestamp", + { &hf_cip_ssupervisor_proposed_tunid_snn_timestamp, + { "Proposed TUNID SNN Timestamp", "cipsafety.ssupervisor.proposed_tunid.snn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_proposed_tunid_ssn_date, - { "Proposed TUNID SSN (Manual) Date", "cipsafety.ssupervisor.proposed_tunid.ssn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL } + { &hf_cip_ssupervisor_proposed_tunid_snn_date, + { "Proposed TUNID SNN (Manual) Date", "cipsafety.ssupervisor.proposed_tunid.snn.date", + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, - { &hf_cip_ssupervisor_proposed_tunid_ssn_time, - { "Proposed TUNID SSN (Manual) Time", "cipsafety.ssupervisor.proposed_tunid.ssn.time", + { &hf_cip_ssupervisor_proposed_tunid_snn_time, + { "Proposed TUNID SNN (Manual) Time", "cipsafety.ssupervisor.proposed_tunid.snn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_cip_ssupervisor_proposed_tunid_macid, @@ -2861,29 +2861,29 @@ proto_register_cipsafety(void) &ett_ssupervisor_rrsc, &ett_ssupervisor_cmd_data, &ett_ssupervisor_propose_tunid, - &ett_ssupervisor_propose_tunid_ssn, + &ett_ssupervisor_propose_tunid_snn, &ett_ssupervisor_configure_request_tunid, - &ett_ssupervisor_configure_request_tunid_ssn, + &ett_ssupervisor_configure_request_tunid_snn, &ett_ssupervisor_configure_request_ounid, - &ett_ssupervisor_configure_request_ounid_ssn, + &ett_ssupervisor_configure_request_ounid_snn, &ett_ssupervisor_configure_lock_tunid, - &ett_ssupervisor_configure_lock_tunid_ssn, + &ett_ssupervisor_configure_lock_tunid_snn, &ett_ssupervisor_reset_tunid, - &ett_ssupervisor_reset_tunid_ssn, + &ett_ssupervisor_reset_tunid_snn, &ett_ssupervisor_apply_tunid, - &ett_ssupervisor_apply_tunid_ssn, + &ett_ssupervisor_apply_tunid_snn, &ett_exception_detail_common, &ett_exception_detail_device, &ett_exception_detail_manufacturer, &ett_ssupervisor_configuration_unid, - &ett_ssupervisor_configuration_unid_ssn, + &ett_ssupervisor_configuration_unid_snn, &ett_ssupervisor_target_unid, - &ett_ssupervisor_target_unid_ssn, + &ett_ssupervisor_target_unid_snn, &ett_ssupervisor_output_cp_owners, &ett_ssupervisor_output_cp_owners_ocpunid, - &ett_ssupervisor_output_cp_owners_ocpunid_ssn, + &ett_ssupervisor_output_cp_owners_ocpunid_snn, &ett_ssupervisor_proposed_tunid, - &ett_ssupervisor_proposed_tunid_ssn, + &ett_ssupervisor_proposed_tunid_snn, &ett_cip_ssupervisor_reset_attr_bitmap }; diff --git a/epan/dissectors/packet-cipsafety.h b/epan/dissectors/packet-cipsafety.h index 23eae4ed43..f3d532518c 100644 --- a/epan/dissectors/packet-cipsafety.h +++ b/epan/dissectors/packet-cipsafety.h @@ -46,14 +46,14 @@ typedef struct cip_safety_info { /* ** Exported functions */ -extern void dissect_unid(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *pi, const char* ssn_name, int hf_ssn_timestamp, - int hf_ssn_date, int hf_ssn_time, int hf_macid, gint ett, gint ett_ssn); -extern void dissect_cipsafety_ssn(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, int hf_real_datetime, int hf_date, int hf_time); +extern void dissect_unid(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *pi, const char* snn_name, int hf_snn_timestamp, + int hf_snn_date, int hf_snn_time, int hf_macid, gint ett, gint ett_snn); +extern void dissect_cipsafety_snn(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, int hf_real_datetime, int hf_date, int hf_time); /* ** Exported variables */ -extern const value_string cipsafety_ssn_date_vals[8]; +extern const value_string cipsafety_snn_date_vals[8]; extern attribute_info_t cip_safety_attribute_vals[51]; #endif /* PACKET_CIPSAFETY_H */ diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index c4b416cf6b..825c580327 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -359,7 +359,7 @@ static expert_field ei_mal_tcpip_config_control = EI_INIT; static expert_field ei_mal_tcpip_interface_config = EI_INIT; static expert_field ei_mal_tcpip_mcast_config = EI_INIT; static expert_field ei_mal_tcpip_last_conflict = EI_INIT; -static expert_field ei_mal_tcpip_ssn = EI_INIT; +static expert_field ei_mal_tcpip_snn = EI_INIT; static expert_field ei_mal_elink_interface_flags = EI_INIT; static expert_field ei_mal_elink_physical_address = EI_INIT; static expert_field ei_mal_elink_interface_counters = EI_INIT; @@ -1483,16 +1483,16 @@ static int dissect_tcpip_hostname(packet_info *pinfo, proto_tree *tree, proto_it return parsed_len; } -static int dissect_tcpip_ssn(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, +static int dissect_tcpip_snn(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { if (total_len < 6) { - expert_add_info(pinfo, item, &ei_mal_tcpip_ssn); + expert_add_info(pinfo, item, &ei_mal_tcpip_snn); return total_len; } - dissect_cipsafety_ssn(tree, tvb, pinfo, offset, hf_tcpip_snn_timestamp, hf_tcpip_snn_date, hf_tcpip_snn_time); + dissect_cipsafety_snn(tree, tvb, pinfo, offset, hf_tcpip_snn_timestamp, hf_tcpip_snn_date, hf_tcpip_snn_time); return 6; } @@ -2086,7 +2086,7 @@ attribute_info_t enip_attribute_vals[99] = { {0xF5, FALSE, 4, 3, "Physical Link Object", cip_dissector_func, NULL, dissect_tcpip_physical_link}, {0xF5, FALSE, 5, 4, "Interface Configuration", cip_dissector_func, NULL, dissect_tcpip_interface_config}, {0xF5, FALSE, 6, 5, "Host Name", cip_dissector_func, NULL, dissect_tcpip_hostname}, - {0xF5, FALSE, 7, 6, "Safety Network Number", cip_dissector_func, NULL, dissect_tcpip_ssn}, + {0xF5, FALSE, 7, 6, "Safety Network Number", cip_dissector_func, NULL, dissect_tcpip_snn}, {0xF5, FALSE, 8, 7, "TTL Value", cip_usint, &hf_tcpip_ttl_value, NULL}, {0xF5, FALSE, 9, 8, "Multicast Configuration", cip_dissector_func, NULL, dissect_tcpip_mcast_config}, {0xF5, FALSE, 10, 9, "Select ACD", cip_bool, &hf_tcpip_select_acd, NULL}, @@ -3729,7 +3729,7 @@ proto_register_enip(void) { &hf_tcpip_snn_date, { "Safety Network Number (Manual) Date", "cip.tcpip.snn.date", - FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, + FT_UINT16, BASE_HEX, VALS(cipsafety_snn_date_vals), 0, NULL, HFILL } }, @@ -4390,7 +4390,7 @@ proto_register_enip(void) { &ei_mal_tcpip_config_cap, { "cip.malformed.tcpip.config_cap", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Configuration Capability", EXPFILL }}, { &ei_mal_tcpip_config_control, { "cip.malformed.tcpip.config_control", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Configuration Control", EXPFILL }}, { &ei_mal_tcpip_interface_config, { "cip.malformed.tcpip.interface_config", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Interface Configuration", EXPFILL }}, - { &ei_mal_tcpip_ssn, { "cip.malformed.tcpip.ssn", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Object Safety Network Number", EXPFILL }}, + { &ei_mal_tcpip_snn, { "cip.malformed.tcpip.snn", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Object Safety Network Number", EXPFILL }}, { &ei_mal_tcpip_mcast_config, { "cip.malformed.tcpip.mcast_config", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Multicast Config", EXPFILL }}, { &ei_mal_tcpip_last_conflict, { "cip.malformed.tcpip.last_conflict", PI_MALFORMED, PI_ERROR, "Malformed TCP/IP Last Conflict Detected", EXPFILL }}, { &ei_mal_elink_interface_flags, { "cip.malformed.elink.interface_flags", PI_MALFORMED, PI_ERROR, "Malformed Ethernet Link Interface Flags", EXPFILL }},