diff options
Diffstat (limited to 'epan/dissectors/packet-lbmpdmtcp.c')
| -rw-r--r-- | epan/dissectors/packet-lbmpdmtcp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index 73c6a73607..3ecf31bd80 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -77,10 +77,10 @@ static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, guint lbmtcp_transport_t * entry; conversation_t * conv = NULL; - conv = find_conversation(frame, address1, address2, ENDPOINT_TCP, port1, port2, 0); + conv = find_conversation(frame, address1, address2, CONVERSATION_TCP, port1, port2, 0); if (conv == NULL) { - conv = conversation_new(frame, address1, address2, ENDPOINT_TCP, port1, port2, 0); + conv = conversation_new(frame, address1, address2, CONVERSATION_TCP, port1, port2, 0); } entry = (lbmtcp_transport_t *) conversation_get_proto_data(conv, lbmpdm_tcp_protocol_handle); if (entry != NULL) @@ -141,7 +141,7 @@ static uat_field_t lbmpdm_tcp_tag_array[] = /*----------------------------------------------------------------------------*/ /* UAT callback functions. */ /*----------------------------------------------------------------------------*/ -static gboolean lbmpdm_tcp_tag_update_cb(void * record, char * * error_string) +static bool lbmpdm_tcp_tag_update_cb(void * record, char * * error_string) { lbmpdm_tcp_tag_entry_t * tag = (lbmpdm_tcp_tag_entry_t *)record; @@ -228,11 +228,11 @@ static char * lbmpdm_tcp_tag_find(packet_info * pinfo) /*----------------------------------------------------------------------------*/ /* Dissector tree handles */ -static int ett_lbmpdm_tcp = -1; +static int ett_lbmpdm_tcp; /* Dissector field handles */ -static int hf_lbmpdm_tcp_tag = -1; -static int hf_lbmpdm_tcp_channel = -1; +static int hf_lbmpdm_tcp_tag; +static int hf_lbmpdm_tcp_channel; static guint get_lbmpdm_tcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb, int offset, void *data _U_) @@ -419,6 +419,8 @@ void proto_register_lbmpdm_tcp(void) "LBMPDM-TCP Tags", "A table to define LBMPDM-TCP tags", tag_uat); + + lbmpdm_tcp_dissector_handle = register_dissector("lbmpdm_tcp", dissect_lbmpdm_tcp, lbmpdm_tcp_protocol_handle); } /* The registration hand-off routine */ @@ -428,7 +430,6 @@ void proto_reg_handoff_lbmpdm_tcp(void) if (!already_registered) { - lbmpdm_tcp_dissector_handle = create_dissector_handle(dissect_lbmpdm_tcp, lbmpdm_tcp_protocol_handle); dissector_add_for_decode_as_with_preference("tcp.port", lbmpdm_tcp_dissector_handle); heur_dissector_add("tcp", test_lbmpdm_tcp_packet, "LBMPDM over TCP", "lbmpdm_tcp", lbmpdm_tcp_protocol_handle, HEURISTIC_ENABLE); } |