diff options
Diffstat (limited to 'epan/dissectors/packet-lbmsrs.c')
| -rw-r--r-- | epan/dissectors/packet-lbmsrs.c | 337 |
1 files changed, 168 insertions, 169 deletions
diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c index 369d55b256..9a61b5926c 100644 --- a/epan/dissectors/packet-lbmsrs.c +++ b/epan/dissectors/packet-lbmsrs.c @@ -17,19 +17,17 @@ #include "config.h" #include <epan/packet.h> #include <epan/expert.h> -#include <epan/column-info.h> #include <epan/to_str.h> -#include <packet-lbm.h> +#include "packet-lbm.h" #include <epan/proto.h> -#include <epan/column-utils.h> #include <epan/prefs.h> #include <epan/uat.h> #include <wsutil/pint.h> -#include <dissectors/packet-tcp.h> +#include "packet-tcp.h" -static gint proto_lbmsrs = -1; +static gint proto_lbmsrs; void proto_register_lbmsrs(void); void proto_reg_handoff_lbmsrs(void); @@ -370,186 +368,186 @@ static const value_string lbmsrsApplicationType[] = }; /* Dissector field handles */ -static gint hf_lbmsrs_message_id = -1; +static gint hf_lbmsrs_message_id; /*handles for registration request*/ -static gint hf_lbmsrs_app_type = -1; -static gint hf_lbmsrs_client_addr = -1; -static gint hf_lbmsrs_client_port = -1; -static gint hf_lbmsrs_session_id = -1; -static gint hf_lbmsrs_host_id = -1; -static gint hf_lbmsrs_protocol_version = -1; -static gint hf_lbmsrs_interest_mode = -1; -static gint hf_lbmsrs_req_local_domain_id = -1; +static gint hf_lbmsrs_app_type; +static gint hf_lbmsrs_client_addr; +static gint hf_lbmsrs_client_port; +static gint hf_lbmsrs_session_id; +static gint hf_lbmsrs_host_id; +static gint hf_lbmsrs_protocol_version; +static gint hf_lbmsrs_interest_mode; +static gint hf_lbmsrs_req_local_domain_id; /*handles for registration respose*/ -static gint hf_lbmsrs_client_id = -1; -static gint hf_lbmsrs_resp_local_domain_id = -1; -static gint hf_lbmsrs_reg_resp_protocol_version = -1; +static gint hf_lbmsrs_client_id; +static gint hf_lbmsrs_resp_local_domain_id; +static gint hf_lbmsrs_reg_resp_protocol_version; /*handles for stream request*/ -static gint hf_lbmsrs_stream_req_unused = -1; +static gint hf_lbmsrs_stream_req_unused; /*handles for source info*/ -static gint hf_lbmsrs_sir = -1; -static gint hf_lbmsrs_sir_otid = -1; -static gint hf_lbmsrs_sir_topic_len = -1; -static gint hf_lbmsrs_sir_topic = -1; -static gint hf_lbmsrs_sir_source_len = -1; -static gint hf_lbmsrs_sir_source = -1; -static gint hf_lbmsrs_sir_host_id = -1; -static gint hf_lbmsrs_sir_topic_idx = -1; -static gint hf_lbmsrs_sir_functionality_flags = -1; -static gint hf_lbmsrs_sir_request_ip = -1; -static gint hf_lbmsrs_sir_request_port = -1; -static gint hf_lbmsrs_sir_domain_id = -1; -static gint hf_lbmsrs_sir_encryption = -1; -static gint hf_lbmsrs_sir_compression = -1; -static gint hf_lbmsrs_sir_ulb_src_id = -1; -static gint hf_lbmsrs_sir_ulb_queue_id = -1; -static gint hf_lbmsrs_sir_ulb_reg_id = -1; -static gint hf_lbmsrs_sir_context_instance = -1; -static gint hf_lbmsrs_sir_context_type = -1; -static gint hf_lbmsrs_sir_version = -1; -static gint hf_lbmsrs_sir_version_flags = -1; -static gint hf_lbmsrs_sir_ttl = -1; -static gint hf_lbmsrs_sir_cost = -1; +static gint hf_lbmsrs_sir; +static gint hf_lbmsrs_sir_otid; +static gint hf_lbmsrs_sir_topic_len; +static gint hf_lbmsrs_sir_topic; +static gint hf_lbmsrs_sir_source_len; +static gint hf_lbmsrs_sir_source; +static gint hf_lbmsrs_sir_host_id; +static gint hf_lbmsrs_sir_topic_idx; +static gint hf_lbmsrs_sir_functionality_flags; +static gint hf_lbmsrs_sir_request_ip; +static gint hf_lbmsrs_sir_request_port; +static gint hf_lbmsrs_sir_domain_id; +static gint hf_lbmsrs_sir_encryption; +static gint hf_lbmsrs_sir_compression; +static gint hf_lbmsrs_sir_ulb_src_id; +static gint hf_lbmsrs_sir_ulb_queue_id; +static gint hf_lbmsrs_sir_ulb_reg_id; +static gint hf_lbmsrs_sir_context_instance; +static gint hf_lbmsrs_sir_context_type; +static gint hf_lbmsrs_sir_version; +static gint hf_lbmsrs_sir_version_flags; +static gint hf_lbmsrs_sir_ttl; +static gint hf_lbmsrs_sir_cost; /*handles for source delete*/ -static gint hf_lbmsrs_sdr = -1; -static gint hf_lbmsrs_sdr_otid = -1; -static gint hf_lbmsrs_sdr_topic_len = -1; -static gint hf_lbmsrs_sdr_topic = -1; +static gint hf_lbmsrs_sdr; +static gint hf_lbmsrs_sdr_otid; +static gint hf_lbmsrs_sdr_topic_len; +static gint hf_lbmsrs_sdr_topic; /*handles for receiver info*/ -static gint hf_lbmsrs_rir = -1; -static gint hf_lbmsrs_rir_topic_len = -1; -static gint hf_lbmsrs_rir_topic = -1; -static gint hf_lbmsrs_rir_domain_id = -1; -static gint hf_lbmsrs_rir_context_instance = -1; -static gint hf_lbmsrs_rir_context_type = -1; -static gint hf_lbmsrs_rir_version = -1; -static gint hf_lbmsrs_rir_version_flags = -1; -static gint hf_lbmsrs_rir_reserved = -1; +static gint hf_lbmsrs_rir; +static gint hf_lbmsrs_rir_topic_len; +static gint hf_lbmsrs_rir_topic; +static gint hf_lbmsrs_rir_domain_id; +static gint hf_lbmsrs_rir_context_instance; +static gint hf_lbmsrs_rir_context_type; +static gint hf_lbmsrs_rir_version; +static gint hf_lbmsrs_rir_version_flags; +static gint hf_lbmsrs_rir_reserved; /*handles for receiver delete*/ -static gint hf_lbmsrs_rdr = -1; -static gint hf_lbmsrs_rdr_topic_len = -1; -static gint hf_lbmsrs_rdr_topic = -1; -static gint hf_lbmsrs_rdr_domain_id = -1; -static gint hf_lbmsrs_rdr_context_instance = -1; -static gint hf_lbmsrs_rdr_context_type = -1; -static gint hf_lbmsrs_rdr_version = -1; -static gint hf_lbmsrs_rdr_version_flags = -1; -static gint hf_lbmsrs_rdr_reserved = -1; +static gint hf_lbmsrs_rdr; +static gint hf_lbmsrs_rdr_topic_len; +static gint hf_lbmsrs_rdr_topic; +static gint hf_lbmsrs_rdr_domain_id; +static gint hf_lbmsrs_rdr_context_instance; +static gint hf_lbmsrs_rdr_context_type; +static gint hf_lbmsrs_rdr_version; +static gint hf_lbmsrs_rdr_version_flags; +static gint hf_lbmsrs_rdr_reserved; /*handles for receiver end*/ -static gint hf_lbmsrs_rer = -1; -static gint hf_lbmsrs_rer_topic_len = -1; -static gint hf_lbmsrs_rer_topic = -1; -static gint hf_lbmsrs_rer_domain_id = -1; -static gint hf_lbmsrs_rer_context_instance = -1; -static gint hf_lbmsrs_rer_context_type = -1; -static gint hf_lbmsrs_rer_version = -1; -static gint hf_lbmsrs_rer_version_flags = -1; -static gint hf_lbmsrs_rer_reserved = -1; +static gint hf_lbmsrs_rer; +static gint hf_lbmsrs_rer_topic_len; +static gint hf_lbmsrs_rer_topic; +static gint hf_lbmsrs_rer_domain_id; +static gint hf_lbmsrs_rer_context_instance; +static gint hf_lbmsrs_rer_context_type; +static gint hf_lbmsrs_rer_version; +static gint hf_lbmsrs_rer_version_flags; +static gint hf_lbmsrs_rer_reserved; /*handles for wildcard receiver info*/ -static gint hf_lbmsrs_wir = -1; -static gint hf_lbmsrs_wir_pattern_len = -1; -static gint hf_lbmsrs_wir_pattern = -1; -static gint hf_lbmsrs_wir_domain_id = -1; -static gint hf_lbmsrs_wir_context_instance = -1; -static gint hf_lbmsrs_wir_context_type = -1; -static gint hf_lbmsrs_wir_version = -1; -static gint hf_lbmsrs_wir_version_flags = -1; -static gint hf_lbmsrs_wir_reserved = -1; +static gint hf_lbmsrs_wir; +static gint hf_lbmsrs_wir_pattern_len; +static gint hf_lbmsrs_wir_pattern; +static gint hf_lbmsrs_wir_domain_id; +static gint hf_lbmsrs_wir_context_instance; +static gint hf_lbmsrs_wir_context_type; +static gint hf_lbmsrs_wir_version; +static gint hf_lbmsrs_wir_version_flags; +static gint hf_lbmsrs_wir_reserved; /*handles for wildcard receiver delete*/ -static gint hf_lbmsrs_wdr = -1; -static gint hf_lbmsrs_wdr_pattern_len = -1; -static gint hf_lbmsrs_wdr_pattern = -1; -static gint hf_lbmsrs_wdr_domain_id = -1; -static gint hf_lbmsrs_wdr_context_instance = -1; -static gint hf_lbmsrs_wdr_context_type = -1; -static gint hf_lbmsrs_wdr_version = -1; -static gint hf_lbmsrs_wdr_version_flags = -1; -static gint hf_lbmsrs_wdr_reserved = -1; +static gint hf_lbmsrs_wdr; +static gint hf_lbmsrs_wdr_pattern_len; +static gint hf_lbmsrs_wdr_pattern; +static gint hf_lbmsrs_wdr_domain_id; +static gint hf_lbmsrs_wdr_context_instance; +static gint hf_lbmsrs_wdr_context_type; +static gint hf_lbmsrs_wdr_version; +static gint hf_lbmsrs_wdr_version_flags; +static gint hf_lbmsrs_wdr_reserved; /*handles for wildcard receiver end*/ -static gint hf_lbmsrs_wer = -1; -static gint hf_lbmsrs_wer_pattern_len = -1; -static gint hf_lbmsrs_wer_pattern = -1; -static gint hf_lbmsrs_wer_domain_id = -1; -static gint hf_lbmsrs_wer_context_instance = -1; -static gint hf_lbmsrs_wer_context_type = -1; -static gint hf_lbmsrs_wer_version = -1; -static gint hf_lbmsrs_wer_version_flags = -1; -static gint hf_lbmsrs_wer_reserved = -1; +static gint hf_lbmsrs_wer; +static gint hf_lbmsrs_wer_pattern_len; +static gint hf_lbmsrs_wer_pattern; +static gint hf_lbmsrs_wer_domain_id; +static gint hf_lbmsrs_wer_context_instance; +static gint hf_lbmsrs_wer_context_type; +static gint hf_lbmsrs_wer_version; +static gint hf_lbmsrs_wer_version_flags; +static gint hf_lbmsrs_wer_reserved; /*handles for src leave info*/ -static gint hf_lbmsrs_sli = -1; -static gint hf_lbmsrs_sli_otid = -1; -static gint hf_lbmsrs_sli_topic_len = -1; -static gint hf_lbmsrs_sli_topic = -1; -static gint hf_lbmsrs_sli_source_len = -1; -static gint hf_lbmsrs_sli_source = -1; -static gint hf_lbmsrs_sli_context_instance = -1; -static gint hf_lbmsrs_sli_context_type = -1; -static gint hf_lbmsrs_sli_version = -1; -static gint hf_lbmsrs_sli_version_flags = -1; -static gint hf_lbmsrs_sli_reserved = -1; +static gint hf_lbmsrs_sli; +static gint hf_lbmsrs_sli_otid; +static gint hf_lbmsrs_sli_topic_len; +static gint hf_lbmsrs_sli_topic; +static gint hf_lbmsrs_sli_source_len; +static gint hf_lbmsrs_sli_source; +static gint hf_lbmsrs_sli_context_instance; +static gint hf_lbmsrs_sli_context_type; +static gint hf_lbmsrs_sli_version; +static gint hf_lbmsrs_sli_version_flags; +static gint hf_lbmsrs_sli_reserved; /*rsocket dissector field handles*/ -static gint hf_lbmsrs_rsocket_frame_len = -1; -static gint hf_lbmsrs_rsocket_stream_id = -1; -static gint hf_lbmsrs_rsocket_frame_type = -1; -static gint hf_lbmsrs_rsocket_mdata_len = -1; -static gint hf_lbmsrs_rsocket_mdata = -1; -static gint hf_lbmsrs_rsocket_major_version = -1; -static gint hf_lbmsrs_rsocket_minor_version = -1; -static gint hf_lbmsrs_rsocket_keepalive_interval = -1; -static gint hf_lbmsrs_rsocket_max_lifetime = -1; -static gint hf_lbmsrs_rsocket_mdata_mime_length = -1; -static gint hf_lbmsrs_rsocket_mdata_mime_type = -1; -static gint hf_lbmsrs_rsocket_data_mime_length = -1; -static gint hf_lbmsrs_rsocket_data_mime_type = -1; -static gint hf_lbmsrs_rsocket_req_n = -1; -static gint hf_lbmsrs_rsocket_error_code = -1; -static gint hf_lbmsrs_rsocket_keepalive_last_rcvd_pos = -1; -static gint hf_lbmsrs_rsocket_resume_token_len = -1; -static gint hf_lbmsrs_rsocket_resume_token = -1; +static gint hf_lbmsrs_rsocket_frame_len; +static gint hf_lbmsrs_rsocket_stream_id; +static gint hf_lbmsrs_rsocket_frame_type; +static gint hf_lbmsrs_rsocket_mdata_len; +static gint hf_lbmsrs_rsocket_mdata; +static gint hf_lbmsrs_rsocket_major_version; +static gint hf_lbmsrs_rsocket_minor_version; +static gint hf_lbmsrs_rsocket_keepalive_interval; +static gint hf_lbmsrs_rsocket_max_lifetime; +static gint hf_lbmsrs_rsocket_mdata_mime_length; +static gint hf_lbmsrs_rsocket_mdata_mime_type; +static gint hf_lbmsrs_rsocket_data_mime_length; +static gint hf_lbmsrs_rsocket_data_mime_type; +static gint hf_lbmsrs_rsocket_req_n; +static gint hf_lbmsrs_rsocket_error_code; +static gint hf_lbmsrs_rsocket_keepalive_last_rcvd_pos; +static gint hf_lbmsrs_rsocket_resume_token_len; +static gint hf_lbmsrs_rsocket_resume_token; // other flags -static gint hf_lbmsrs_rsocket_ignore_flag = -1; -static gint hf_lbmsrs_rsocket_metadata_flag = -1; -static gint hf_lbmsrs_rsocket_resume_flag = -1; -static gint hf_lbmsrs_rsocket_lease_flag = -1; -static gint hf_lbmsrs_rsocket_follows_flag = -1; -static gint hf_lbmsrs_rsocket_complete_flag = -1; -static gint hf_lbmsrs_rsocket_next_flag = -1; -static gint hf_lbmsrs_rsocket_respond_flag = -1; +static gint hf_lbmsrs_rsocket_ignore_flag; +static gint hf_lbmsrs_rsocket_metadata_flag; +static gint hf_lbmsrs_rsocket_resume_flag; +static gint hf_lbmsrs_rsocket_lease_flag; +static gint hf_lbmsrs_rsocket_follows_flag; +static gint hf_lbmsrs_rsocket_complete_flag; +static gint hf_lbmsrs_rsocket_next_flag; +static gint hf_lbmsrs_rsocket_respond_flag; /*dissector tree handles*/ -static gint ett_lbmsrs = -1; -static gint ett_lbmsrs_data = -1; -static gint ett_lbmsrs_details = -1; -static gint ett_lbmsrs_sir = -1; -static gint ett_lbmsrs_sdr = -1; -static gint ett_lbmsrs_ser = -1; -static gint ett_lbmsrs_rir = -1; -static gint ett_lbmsrs_rdr = -1; -static gint ett_lbmsrs_rer = -1; -static gint ett_lbmsrs_wir = -1; -static gint ett_lbmsrs_wdr = -1; -static gint ett_lbmsrs_wer = -1; -static gint ett_lbmsrs_sli = -1; - -static gint ett_lbmsrs_rsocket_frame = -1; +static gint ett_lbmsrs; +static gint ett_lbmsrs_data; +static gint ett_lbmsrs_details; +static gint ett_lbmsrs_sir; +static gint ett_lbmsrs_sdr; +static gint ett_lbmsrs_ser; +static gint ett_lbmsrs_rir; +static gint ett_lbmsrs_rdr; +static gint ett_lbmsrs_rer; +static gint ett_lbmsrs_wir; +static gint ett_lbmsrs_wdr; +static gint ett_lbmsrs_wer; +static gint ett_lbmsrs_sli; + +static gint ett_lbmsrs_rsocket_frame; /*Expert analysis fields*/ -static expert_field ei_lbmsrs_analysis_invalid_msg_id = EI_INIT; +static expert_field ei_lbmsrs_analysis_invalid_msg_id; /* Dissector handle */ static dissector_handle_t lbmsrs_dissector_handle; @@ -636,7 +634,7 @@ static const value_string rSocketErrorCodeNames[] = /*----------------------------------------------------------------------------*/ /* UAT callback functions. */ /*----------------------------------------------------------------------------*/ -static gboolean lbmsrs_tag_update_cb(void * record, char * * error_string) +static bool lbmsrs_tag_update_cb(void * record, char * * error_string) { lbmsrs_tag_entry_t * tag = (lbmsrs_tag_entry_t *)record; @@ -769,7 +767,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset) offset += rsocket_frame_len_field_size; /*check the length*/ - /*rsocket data maybe split accross multiple packets*/ + /*rsocket data maybe split across multiple packets*/ guint32 tvb_length = tvb_captured_length(tvb); if (tvb_length < (offset - start_offset + rsocket_stream_id_field_size)) @@ -848,7 +846,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset) } /*add the rsocket metadata length field*/ - guint32 rsocket_metadata_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN);; + guint32 rsocket_metadata_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN); offset += 3; /*move the offset by the metadata length*/ offset += rsocket_metadata_len; @@ -898,7 +896,7 @@ static gboolean check_lbmsrs_packet(tvbuff_t *tvb, guint offset) static guint get_rsocket_frame_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_) { /*get the rsocket frame length (3-byte long field)*/ - /*offset argument points to the begining of the Rsocket PDU*/ + /*offset argument points to the beginning of the Rsocket PDU*/ guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN); /*return total RSocket PDU size*/ @@ -1139,7 +1137,7 @@ static guint dissect_lbmsrs_sir_ser(tvbuff_t * tvb, proto_tree * tree, guint off guint total_payload_len = tvb_captured_length(tvb); guint start_offset = offset; - /*first filed is OTID, check if that many bytes are left to process*/ + /*first field is OTID, check if that many bytes are left to process*/ if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID) { /*stop processing in case not available*/ @@ -1374,7 +1372,7 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, proto_tree * tree, guint offset, guint total_payload_len = tvb_captured_length(tvb); guint start_offset = offset; - /*first filed is OTID, check if that many bytes are left to process*/ + /*first field is OTID, check if that many bytes are left to process*/ if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID) { /*stop processing in case not available*/ @@ -1389,7 +1387,7 @@ static guint dissect_lbmsrs_sdr(tvbuff_t * tvb, proto_tree * tree, guint offset, proto_tree_add_item(sdr_tree, hf_lbmsrs_message_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - /*first filed is OTID, check if that many bytes are left to process*/ + /*first field is OTID, check if that many bytes are left to process*/ if ((total_payload_len - offset) < L_LBM_SRS_SRC_INFO_INFO_T_OTID) { /*stop processing in case not available*/ @@ -2075,7 +2073,7 @@ static guint dissect_lbmsrs_sli(tvbuff_t * tvb, proto_tree * tree, guint offset guint total_payload_len = tvb_captured_length(tvb); guint start_offset = offset; - /*first filed is OTID, check if that many bytes are left to process*/ + /*first field is OTID, check if that many bytes are left to process*/ if ((total_payload_len - offset) < L_LBM_SRS_SRC_LEAVE_INFO_T_OTID) { /*stop processing in case not available*/ @@ -2442,7 +2440,7 @@ static guint dissect_lbmsrs_data(tvbuff_t * tvb, packet_info * pinfo, proto_tree default: { expert_add_info_format(pinfo, tree, &ei_lbmsrs_analysis_invalid_msg_id, - "Invalid LBMSRS Message Id :%" G_GUINT16_FORMAT, message_id); + "Invalid LBMSRS Message Id :%" PRIu16, message_id); } @@ -2467,8 +2465,8 @@ static int dissect_lbmsrs_pdus(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /*get the rsocket frame length*/ guint32 rsocket_frame_len = tvb_get_guint24(tvb, offset, ENC_BIG_ENDIAN); - /*adjust the rscoket tree size correctly so as to accomodate - only the available data, its always possible that the rsocket length reported + /*adjust the rsocket tree size correctly so as to accommodate + only the available data. It's always possible that the rsocket length reported in the rsocket PDU is more than the data captured in this packet or vice-versa*/ guint32 rsocket_tree_length = rsocket_frame_len; if (tvb_length < (rsocket_frame_len + rsocket_frame_len_field_size)) @@ -2672,7 +2670,7 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_mdata_len, { "Metadata Length", "lbmsrs.rsocket.metadata_len", FT_UINT24, BASE_DEC, NULL,0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_mdata, - { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, STR_ASCII, NULL, 0x0, NULL,HFILL } }, + { "Metadata", "lbmsrs.rsocket.metadata", FT_STRING, BASE_NONE, NULL, 0x0, NULL,HFILL } }, { &hf_lbmsrs_rsocket_ignore_flag, { "Ignore", "lbmsrs.rsocket.flags.ignore", FT_BOOLEAN, 16, NULL, 0x0200, NULL,HFILL } }, { &hf_lbmsrs_rsocket_metadata_flag, @@ -2700,11 +2698,11 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_mdata_mime_length, { "Metadata MIME Length", "lbmsrs.rsocket.mdata_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_mdata_mime_type, - { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, STR_ASCII,NULL, 0x0, NULL, HFILL } }, + { "Metadata MIME Type", "lbmsrs.rsocket.mdata_mime_type", FT_STRING, BASE_NONE,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_data_mime_length, { "Data MIME Length", "lbmsrs.rsocket.data_mime_length", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_data_mime_type, - { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, STR_ASCII, NULL,0x0, NULL, HFILL } }, + { "Data MIME Type", "lbmsrs.rsocket.data_mime_type", FT_STRING, BASE_NONE, NULL,0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_req_n, { "Request N", "lbmsrs.rsocket.request_n", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,HFILL } }, { &hf_lbmsrs_rsocket_error_code, @@ -2714,7 +2712,7 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_rsocket_resume_token_len, { "Resume Token Length", "lbmsrs.rsocket.resume.token.len", FT_UINT16, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_rsocket_resume_token, - { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, STR_ASCII, NULL, 0x0,NULL, HFILL } }, + { "Resume Token", "lbmsrs.rsocket.resume.token", FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL } }, /*rsocket related items end*/ /*SRS Registration Request items start*/ @@ -2742,7 +2740,7 @@ void proto_register_lbmsrs(void) { &hf_lbmsrs_resp_local_domain_id, { "Local Domain ID", "lbmsrs.registration_response.local_domain_id", FT_UINT32, BASE_DEC,NULL, 0x0, NULL, HFILL } }, { &hf_lbmsrs_reg_resp_protocol_version, - { "Protocol Version", "lbmsrs.registration_response.protocol_version", FT_UINT8, BASE_DEC,NULL, 0x0, NULL, HFILL } }, + { "Protocol Version", "lbmsrs.registration_response.protocol_version", FT_UINT32, BASE_DEC,NULL, 0x0, NULL, HFILL } }, /*SRS Registration Response items end*/ /*SRS Stream Request items start*/ @@ -2992,6 +2990,8 @@ void proto_register_lbmsrs(void) expert_module_t *expert_lbmsrs = expert_register_protocol(proto_lbmsrs); expert_register_field_array(expert_lbmsrs, ei, array_length(ei)); + lbmsrs_dissector_handle = register_dissector("lbmsrs", dissect_lbmsrs, proto_lbmsrs); + /*Set the preference menu items*/ module_t* lbmsrs_module = prefs_register_protocol_subtree("29West", proto_lbmsrs, proto_reg_handoff_lbmsrs); @@ -3047,7 +3047,6 @@ void proto_reg_handoff_lbmsrs(void) if (!already_registered) { - lbmsrs_dissector_handle = create_dissector_handle(dissect_lbmsrs, proto_lbmsrs); dissector_add_for_decode_as_with_preference("tcp.port", lbmsrs_dissector_handle); heur_dissector_add("tcp", test_lbmsrs_packet, "LBM Stateful Resolution Service over RSocket", "lbmsrs_tcp", proto_lbmsrs, HEURISTIC_ENABLE); } |