diff options
Diffstat (limited to 'epan/dissectors/packet-soupbintcp.c')
| -rw-r--r-- | epan/dissectors/packet-soupbintcp.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index c3dca9b3dc..d1b0a65af2 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -97,7 +97,7 @@ static const value_string reject_code_val[] = { /* Initialize the protocol and registered fields */ -static int proto_soupbintcp = -1; +static int proto_soupbintcp; static dissector_handle_t soupbintcp_handle; static heur_dissector_list_t heur_subdissector_list; @@ -105,23 +105,23 @@ static heur_dissector_list_t heur_subdissector_list; static gboolean soupbintcp_desegment = TRUE; /* Initialize the subtree pointers */ -static gint ett_soupbintcp = -1; +static gint ett_soupbintcp; /* Header field formatting */ -static int hf_soupbintcp_packet_length = -1; -static int hf_soupbintcp_packet_type = -1; -static int hf_soupbintcp_message = -1; -static int hf_soupbintcp_text = -1; -static int hf_soupbintcp_username = -1; -static int hf_soupbintcp_password = -1; -static int hf_soupbintcp_session = -1; -static int hf_soupbintcp_seq_num = -1; -static int hf_soupbintcp_next_seq_num = -1; -static int hf_soupbintcp_req_seq_num = -1; -static int hf_soupbintcp_reject_code = -1; - -static expert_field ei_soupbintcp_next_seq_num_invalid = EI_INIT; -static expert_field ei_soupbintcp_req_seq_num_invalid = EI_INIT; +static int hf_soupbintcp_packet_length; +static int hf_soupbintcp_packet_type; +static int hf_soupbintcp_message; +static int hf_soupbintcp_text; +static int hf_soupbintcp_username; +static int hf_soupbintcp_password; +static int hf_soupbintcp_session; +static int hf_soupbintcp_seq_num; +static int hf_soupbintcp_next_seq_num; +static int hf_soupbintcp_req_seq_num; +static int hf_soupbintcp_reject_code; + +static expert_field ei_soupbintcp_next_seq_num_invalid; +static expert_field ei_soupbintcp_req_seq_num_invalid; /** Dissector for SoupBinTCP messages */ static void @@ -199,7 +199,7 @@ dissect_soupbintcp_common( conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - conversation_pt_to_endpoint_type(pinfo->ptype), + conversation_pt_to_conversation_type(pinfo->ptype), pinfo->srcport, pinfo->destport, 0); @@ -269,13 +269,13 @@ dissect_soupbintcp_common( case '+': /* Debug Message */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_text, - tvb, offset, expected_len - 1, ENC_ASCII|ENC_NA); + tvb, offset, expected_len - 1, ENC_ASCII); break; case 'A': /* Login Accept */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_session, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; seq_num_valid = ws_strtoi32(tvb_get_string_enc(pinfo->pool, @@ -314,17 +314,17 @@ dissect_soupbintcp_common( case 'L': /* Login Request */ proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_username, - tvb, offset, 6, ENC_ASCII|ENC_NA); + tvb, offset, 6, ENC_ASCII); offset += 6; proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_password, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; proto_tree_add_item(soupbintcp_tree, hf_soupbintcp_session, - tvb, offset, 10, ENC_ASCII|ENC_NA); + tvb, offset, 10, ENC_ASCII); offset += 10; seq_num_valid = ws_strtoi32(tvb_get_string_enc(pinfo->pool, @@ -523,6 +523,7 @@ proto_register_soupbintcp(void) module_t *soupbintcp_module; proto_soupbintcp = proto_register_protocol("SoupBinTCP", "SoupBinTCP", "soupbintcp"); + soupbintcp_handle = register_dissector("soupbintcp", dissect_soupbintcp_tcp, proto_soupbintcp); proto_register_field_array(proto_soupbintcp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -537,7 +538,7 @@ proto_register_soupbintcp(void) "spanning multiple TCP segments.", &soupbintcp_desegment); - heur_subdissector_list = register_heur_dissector_list("soupbintcp", proto_soupbintcp); + heur_subdissector_list = register_heur_dissector_list_with_description("soupbintcp", "SoupBinTCP encapsulated data", proto_soupbintcp); expert_soupbinttcp = expert_register_protocol(proto_soupbintcp); expert_register_field_array(expert_soupbinttcp, ei, array_length(ei)); @@ -547,7 +548,6 @@ proto_register_soupbintcp(void) void proto_reg_handoff_soupbintcp(void) { - soupbintcp_handle = create_dissector_handle(dissect_soupbintcp_tcp, proto_soupbintcp); dissector_add_uint_range_with_preference("tcp.port", "", soupbintcp_handle); } |