aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dlsw.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-dlsw.c')
-rw-r--r--epan/dissectors/packet-dlsw.c188
1 files changed, 94 insertions, 94 deletions
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 4d0e031251..f7dbaea0ca 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -22,88 +22,91 @@
void proto_register_dlsw(void);
void proto_reg_handoff_dlsw(void);
-static int proto_dlsw = -1;
-static int hf_dlsw_flow_control_indication = -1;
-static int hf_dlsw_flow_control_ack = -1;
-static int hf_dlsw_flow_control_operator = -1;
-static int hf_dlsw_flags_explorer_msg = -1;
+static dissector_handle_t dlsw_udp_handle;
+static dissector_handle_t dlsw_tcp_handle;
+
+static int proto_dlsw;
+static int hf_dlsw_flow_control_indication;
+static int hf_dlsw_flow_control_ack;
+static int hf_dlsw_flow_control_operator;
+static int hf_dlsw_flags_explorer_msg;
/* Generated from convert_proto_tree_add_text.pl */
-static int hf_dlsw_vector_length = -1;
-static int hf_dlsw_dlc_header_sa = -1;
-static int hf_dlsw_dlc_header_fc_byte = -1;
-static int hf_dlsw_target_transport_id = -1;
-static int hf_dlsw_error_pointer = -1;
-static int hf_dlsw_capabilities_length = -1;
-static int hf_dlsw_multicast_version_number = -1;
-static int hf_dlsw_frame_direction = -1;
-static int hf_dlsw_circuit_priority = -1;
-static int hf_dlsw_origin_dlc_port_id = -1;
-static int hf_dlsw_protocol_id = -1;
-static int hf_dlsw_mac_address_list = -1;
-static int hf_dlsw_origin_link_sap = -1;
-static int hf_dlsw_header_length = -1;
-static int hf_dlsw_dlc_header_ctrl = -1;
-static int hf_dlsw_target_dlc_port_id = -1;
-static int hf_dlsw_vector_type = -1;
-static int hf_dlsw_largest_frame_size = -1;
-static int hf_dlsw_error_cause = -1;
-static int hf_dlsw_dlc_header_length = -1;
-static int hf_dlsw_oui = -1;
-static int hf_dlsw_target_dlc = -1;
-static int hf_dlsw_dlc_header_ac_byte = -1;
-static int hf_dlsw_tcp_connections = -1;
-static int hf_dlsw_initial_pacing_window = -1;
-static int hf_dlsw_old_message_type = -1;
-static int hf_dlsw_capex_type = -1;
-static int hf_dlsw_ssp_flags = -1;
-static int hf_dlsw_target_mac_address = -1;
-static int hf_dlsw_origin_mac_address = -1;
-static int hf_dlsw_dlc_header_rif = -1;
-static int hf_dlsw_message_type = -1;
-static int hf_dlsw_header_number = -1;
-static int hf_dlsw_message_length = -1;
-static int hf_dlsw_remote_dlc_pid = -1;
-static int hf_dlsw_vendor_oui = -1;
-static int hf_dlsw_flow_ctrl_byte = -1;
-static int hf_dlsw_version = -1;
-static int hf_dlsw_version_string = -1;
-static int hf_dlsw_dlsw_version = -1;
-static int hf_dlsw_remote_dlc = -1;
-static int hf_dlsw_origin_dlc = -1;
-static int hf_dlsw_origin_transport_id = -1;
-static int hf_dlsw_dlc_header_ssap = -1;
-static int hf_dlsw_target_link_sap = -1;
-static int hf_dlsw_dlc_header_da = -1;
-static int hf_dlsw_netbios_name = -1;
-static int hf_dlsw_dlc_header_dsap = -1;
-static int hf_dlsw_reserved = -1;
-static int hf_dlsw_data = -1;
-static int hf_dlsw_vector_data = -1;
-static int hf_dlsw_unknown_data = -1;
-static int hf_dlsw_mac_address_exclusivity = -1;
-static int hf_dlsw_netbios_name_exclusivity = -1;
-static int hf_dlsw_gds_id = -1;
-static int hf_dlsw_sap_list_support = -1;
-static int hf_dlsw_sap_list_support_x0 = -1;
-static int hf_dlsw_sap_list_support_x2 = -1;
-static int hf_dlsw_sap_list_support_x4 = -1;
-static int hf_dlsw_sap_list_support_x6 = -1;
-static int hf_dlsw_sap_list_support_x8 = -1;
-static int hf_dlsw_sap_list_support_xA = -1;
-static int hf_dlsw_sap_list_support_xC = -1;
-static int hf_dlsw_sap_list_support_xE = -1;
-
-static gint ett_dlsw = -1;
-static gint ett_dlsw_header = -1;
-static gint ett_dlsw_fc = -1;
-static gint ett_dlsw_sspflags = -1;
-static gint ett_dlsw_data = -1;
-static gint ett_dlsw_vector = -1;
-static gint ett_dlsw_sap_list_support = -1;
-
-static expert_field ei_dlsw_dlc_header_length = EI_INIT;
-static expert_field ei_dlsw_not_used_for_capex = EI_INIT;
-static expert_field ei_dlsw_vec_len_invalid = EI_INIT;
+static int hf_dlsw_vector_length;
+static int hf_dlsw_dlc_header_sa;
+static int hf_dlsw_dlc_header_fc_byte;
+static int hf_dlsw_target_transport_id;
+static int hf_dlsw_error_pointer;
+static int hf_dlsw_capabilities_length;
+static int hf_dlsw_multicast_version_number;
+static int hf_dlsw_frame_direction;
+static int hf_dlsw_circuit_priority;
+static int hf_dlsw_origin_dlc_port_id;
+static int hf_dlsw_protocol_id;
+static int hf_dlsw_mac_address_list;
+static int hf_dlsw_origin_link_sap;
+static int hf_dlsw_header_length;
+static int hf_dlsw_dlc_header_ctrl;
+static int hf_dlsw_target_dlc_port_id;
+static int hf_dlsw_vector_type;
+static int hf_dlsw_largest_frame_size;
+static int hf_dlsw_error_cause;
+static int hf_dlsw_dlc_header_length;
+static int hf_dlsw_oui;
+static int hf_dlsw_target_dlc;
+static int hf_dlsw_dlc_header_ac_byte;
+static int hf_dlsw_tcp_connections;
+static int hf_dlsw_initial_pacing_window;
+static int hf_dlsw_old_message_type;
+static int hf_dlsw_capex_type;
+static int hf_dlsw_ssp_flags;
+static int hf_dlsw_target_mac_address;
+static int hf_dlsw_origin_mac_address;
+static int hf_dlsw_dlc_header_rif;
+static int hf_dlsw_message_type;
+static int hf_dlsw_header_number;
+static int hf_dlsw_message_length;
+static int hf_dlsw_remote_dlc_pid;
+static int hf_dlsw_vendor_oui;
+static int hf_dlsw_flow_ctrl_byte;
+static int hf_dlsw_version;
+static int hf_dlsw_version_string;
+static int hf_dlsw_dlsw_version;
+static int hf_dlsw_remote_dlc;
+static int hf_dlsw_origin_dlc;
+static int hf_dlsw_origin_transport_id;
+static int hf_dlsw_dlc_header_ssap;
+static int hf_dlsw_target_link_sap;
+static int hf_dlsw_dlc_header_da;
+static int hf_dlsw_netbios_name;
+static int hf_dlsw_dlc_header_dsap;
+static int hf_dlsw_reserved;
+static int hf_dlsw_data;
+static int hf_dlsw_vector_data;
+static int hf_dlsw_unknown_data;
+static int hf_dlsw_mac_address_exclusivity;
+static int hf_dlsw_netbios_name_exclusivity;
+static int hf_dlsw_gds_id;
+static int hf_dlsw_sap_list_support;
+static int hf_dlsw_sap_list_support_x0;
+static int hf_dlsw_sap_list_support_x2;
+static int hf_dlsw_sap_list_support_x4;
+static int hf_dlsw_sap_list_support_x6;
+static int hf_dlsw_sap_list_support_x8;
+static int hf_dlsw_sap_list_support_xA;
+static int hf_dlsw_sap_list_support_xC;
+static int hf_dlsw_sap_list_support_xE;
+
+static gint ett_dlsw;
+static gint ett_dlsw_header;
+static gint ett_dlsw_fc;
+static gint ett_dlsw_sspflags;
+static gint ett_dlsw_data;
+static gint ett_dlsw_vector;
+static gint ett_dlsw_sap_list_support;
+
+static expert_field ei_dlsw_dlc_header_length;
+static expert_field ei_dlsw_not_used_for_capex;
+static expert_field ei_dlsw_vec_len_invalid;
#define CANUREACH 0x03
#define ICANREACH 0x04
@@ -411,7 +414,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
static void
dlsw_fmt_version( gchar *result, guint32 revision )
{
- g_snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
+ snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", (guint8)(( revision & 0xFF00 ) >> 8), (guint8)(revision & 0xFF) );
}
static void
@@ -633,13 +636,13 @@ proto_register_dlsw(void)
{ &hf_dlsw_gds_id, { "GDS ID", "dlsw.gds_id", FT_UINT16, BASE_DEC, VALS(dlsw_gds_vals), 0x0, NULL, HFILL }},
{ &hf_dlsw_sap_list_support, { "SAP List Support", "dlsw.sap_list_support", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_dlsw_sap_list_support_x0, { "x0", "dlsw.sap_list_support.x0", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x80, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_x2, { "x0", "dlsw.sap_list_support.x2", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x40, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_x4, { "x0", "dlsw.sap_list_support.x4", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x20, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_x6, { "x0", "dlsw.sap_list_support.x6", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x10, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_x8, { "x0", "dlsw.sap_list_support.x8", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x08, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_xA, { "x0", "dlsw.sap_list_support.xA", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x04, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_xC, { "x0", "dlsw.sap_list_support.xC", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x02, NULL, HFILL }},
- { &hf_dlsw_sap_list_support_xE, { "x0", "dlsw.sap_list_support.xE", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x01, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_x2, { "x2", "dlsw.sap_list_support.x2", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x40, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_x4, { "x4", "dlsw.sap_list_support.x4", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x20, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_x6, { "x6", "dlsw.sap_list_support.x6", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x10, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_x8, { "x8", "dlsw.sap_list_support.x8", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x08, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_xA, { "xA", "dlsw.sap_list_support.xA", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x04, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_xC, { "xC", "dlsw.sap_list_support.xC", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x02, NULL, HFILL }},
+ { &hf_dlsw_sap_list_support_xE, { "xE", "dlsw.sap_list_support.xE", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x01, NULL, HFILL }},
};
static gint *ett[] = {
@@ -666,17 +669,14 @@ proto_register_dlsw(void)
expert_dlsw = expert_register_protocol(proto_dlsw);
expert_register_field_array(expert_dlsw, ei, array_length(ei));
+ dlsw_udp_handle = register_dissector("dlsw.udp", dissect_dlsw_udp, proto_dlsw);
+ dlsw_tcp_handle = register_dissector("dlsw.tcp", dissect_dlsw_tcp, proto_dlsw);
}
void
proto_reg_handoff_dlsw(void)
{
- dissector_handle_t dlsw_udp_handle, dlsw_tcp_handle;
-
- dlsw_udp_handle = create_dissector_handle(dissect_dlsw_udp, proto_dlsw);
dissector_add_uint_with_preference("udp.port", UDP_PORT_DLSW, dlsw_udp_handle);
-
- dlsw_tcp_handle = create_dissector_handle(dissect_dlsw_tcp, proto_dlsw);
dissector_add_uint_with_preference("tcp.port", TCP_PORT_DLSW, dlsw_tcp_handle);
}