diff options
Diffstat (limited to 'plugins/epan/unistim')
| -rw-r--r-- | plugins/epan/unistim/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugins/epan/unistim/audio.h | 226 | ||||
| -rw-r--r-- | plugins/epan/unistim/basic.h | 40 | ||||
| -rw-r--r-- | plugins/epan/unistim/broadcast.h | 16 | ||||
| -rw-r--r-- | plugins/epan/unistim/display.h | 188 | ||||
| -rw-r--r-- | plugins/epan/unistim/expansion.h | 2 | ||||
| -rw-r--r-- | plugins/epan/unistim/key.h | 52 | ||||
| -rw-r--r-- | plugins/epan/unistim/network.h | 86 | ||||
| -rw-r--r-- | plugins/epan/unistim/packet-unistim.c | 263 | ||||
| -rw-r--r-- | plugins/epan/unistim/uftp.h | 10 |
10 files changed, 443 insertions, 443 deletions
diff --git a/plugins/epan/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt index 8c349b8515..ade7e6d910 100644 --- a/plugins/epan/unistim/CMakeLists.txt +++ b/plugins/epan/unistim/CMakeLists.txt @@ -29,10 +29,11 @@ set_source_files_properties( register_plugin_files(plugin.c plugin + "Unified Networks IP Stimulus (UNIStim) dissection" ${DISSECTOR_SRC} ) -add_plugin_library(unistim epan) +add_wireshark_epan_plugin_library(unistim) target_link_libraries(unistim epan) diff --git a/plugins/epan/unistim/audio.h b/plugins/epan/unistim/audio.h index bc062cd406..743b4ac765 100644 --- a/plugins/epan/unistim/audio.h +++ b/plugins/epan/unistim/audio.h @@ -13,119 +13,119 @@ #ifndef UNISTIM_AUDIO_H #define UNISTIM_AUDIO_H -static int hf_audio_mgr_attr=-1; -static int hf_audio_mgr_opts=-1; -static int hf_audio_mgr_alert=-1; -static int hf_audio_mgr_adj_rx_vol=-1; -static int hf_audio_mgr_def_rx_vol=-1; -static int hf_audio_mgr_handset=-1; -static int hf_audio_mgr_headset=-1; -static int hf_audio_default_rx_vol_id=-1; - -static int hf_audio_mgr_opt_max_vol=-1; -static int hf_audio_mgr_opt_adj_vol=-1; -static int hf_audio_mgr_opt_aa_rx_vol_rpt=-1; -static int hf_audio_mgr_opt_hs_on_air=-1; -static int hf_audio_mgr_opt_hd_on_air=-1; -static int hf_audio_mgr_opt_noise_squelch=-1; - -static int hf_audio_mgr_mute=-1; -static int hf_audio_mgr_tx_rx=-1; -static int hf_audio_mgr_stream_id=-1; - -static int hf_audio_mgr_transducer_based_tone_id=-1; -static int hf_audio_mgr_attenuated=-1; -static int hf_audio_mgr_warbler_select=-1; -static int hf_audio_mgr_transducer_routing=-1; -static int hf_audio_mgr_tone_vol_range=-1; -static int hf_audio_mgr_cadence_select=-1; -static int hf_audio_special_tone=-1; -static int hf_audio_tone_level=-1; -static int hf_audio_visual_tones=-1; - -static int hf_audio_stream_based_tone_id=-1; -static int hf_audio_stream_based_tone_rx_tx=-1; -static int hf_audio_stream_based_tone_mute=-1; -static int hf_audio_stream_id=-1; -static int hf_audio_stream_based_volume=-1; - -static int hf_audio_apb_number=-1; -static int hf_audio_apb_op_code=-1; -static int hf_audio_apb_param_len=-1; -static int hf_audio_apb_data=-1; -static int hf_audio_vocoder_id=-1; -static int hf_audio_vocoder_param=-1; -static int hf_audio_vocoder_entity=-1; -static int hf_audio_vocoder_annexa=-1; -static int hf_audio_vocoder_annexb=-1; -static int hf_audio_sample_rate=-1; -static int hf_audio_rtp_type=-1; -static int hf_audio_bytes_per_frame=-1; - -static int hf_audio_rx_stream_id=-1; -static int hf_audio_tx_stream_id=-1; -static int hf_rx_vocoder_type=-1; -static int hf_tx_vocoder_type=-1; -static int hf_frames_per_packet=-1; -static int hf_audio_tos=-1; -static int hf_audio_precedence=-1; -static int hf_audio_frf_11=-1; -static int hf_rtcp_bucket_id=-1; -static int hf_audio_lcl_rtp_port=-1; -static int hf_audio_lcl_rtcp_port=-1; -static int hf_audio_far_rtp_port=-1; -static int hf_audio_far_rtcp_port=-1; -static int hf_audio_far_ip_add=-1; -static int hf_audio_rtcp_bucket_id=-1; -static int hf_audio_clear_bucket=-1; - -static int hf_audio_transducer_pair=-1; -static int hf_audio_rx_enable=-1; -static int hf_audio_tx_enable=-1; -static int hf_audio_sidetone_disable=-1; -static int hf_audio_destruct_additive=-1; -static int hf_audio_dont_force_active=-1; -static int hf_audio_source_descr=-1; -static int hf_audio_sdes_rtcp_bucket=-1; -static int hf_audio_desired_jitter=-1; -static int hf_audio_high_water_mark=-1; -static int hf_audio_early_packet_resync_thresh=-1; -static int hf_audio_late_packet_resync_thresh=-1; -static int hf_audio_resolve_phone_port=-1; -static int hf_audio_far_end_echo_port=-1; -static int hf_audio_far_end_ip_address=-1; -static int hf_audio_nat_port=-1; -static int hf_audio_nat_ip_address=-1; -static int hf_audio_direction_code=-1; -static int hf_audio_hf_support=-1; -static int hf_audio_opt_rpt_max=-1; -static int hf_audio_opt_rpt_adj_vol=-1; -static int hf_audio_opt_rpt_auto_adj_vol=-1; -static int hf_audio_opt_rpt_hs_on_air=-1; -static int hf_audio_opt_rpt_hd_on_air=-1; -static int hf_audio_opt_rpt_noise_squelch=-1; -static int hf_audio_rx_vol_apb_rpt=-1; -static int hf_audio_rx_vol_vol_up=-1; -static int hf_audio_rx_vol_vol_floor=-1; -static int hf_audio_rx_vol_vol_ceiling=-1; -static int hf_audio_current_adj_vol_id=-1; -static int hf_audio_current_rx_level=-1; -static int hf_audio_current_rx_range=-1; -static int hf_audio_cadence_select=-1; -static int hf_audio_warbler_select=-1; -static int hf_audio_open_stream_rpt=-1; -static int hf_audio_sdes_rpt_source_desc=-1; -static int hf_audio_sdes_rpt_buk_id=-1; -static int hf_audio_phone_port=-1; -static int hf_audio_phone_ip=-1; - -static int hf_audio_phone_add_len=-1; -static int hf_audio_nat_listen_port=-1; -static int hf_audio_nat_ip=-1; -static int hf_audio_nat_add_len=-1; -static int hf_audio_stream_direction_code=-1; -static int hf_audio_stream_state=-1; -static int hf_audio_transducer_list_length=-1; +static int hf_audio_mgr_attr; +static int hf_audio_mgr_opts; +static int hf_audio_mgr_alert; +static int hf_audio_mgr_adj_rx_vol; +static int hf_audio_mgr_def_rx_vol; +static int hf_audio_mgr_handset; +static int hf_audio_mgr_headset; +static int hf_audio_default_rx_vol_id; + +static int hf_audio_mgr_opt_max_vol; +static int hf_audio_mgr_opt_adj_vol; +static int hf_audio_mgr_opt_aa_rx_vol_rpt; +static int hf_audio_mgr_opt_hs_on_air; +static int hf_audio_mgr_opt_hd_on_air; +static int hf_audio_mgr_opt_noise_squelch; + +static int hf_audio_mgr_mute; +static int hf_audio_mgr_tx_rx; +static int hf_audio_mgr_stream_id; + +static int hf_audio_mgr_transducer_based_tone_id; +static int hf_audio_mgr_attenuated; +static int hf_audio_mgr_warbler_select; +static int hf_audio_mgr_transducer_routing; +static int hf_audio_mgr_tone_vol_range; +static int hf_audio_mgr_cadence_select; +static int hf_audio_special_tone; +static int hf_audio_tone_level; +static int hf_audio_visual_tones; + +static int hf_audio_stream_based_tone_id; +static int hf_audio_stream_based_tone_rx_tx; +static int hf_audio_stream_based_tone_mute; +static int hf_audio_stream_id; +static int hf_audio_stream_based_volume; + +static int hf_audio_apb_number; +static int hf_audio_apb_op_code; +static int hf_audio_apb_param_len; +static int hf_audio_apb_data; +static int hf_audio_vocoder_id; +static int hf_audio_vocoder_param; +static int hf_audio_vocoder_entity; +static int hf_audio_vocoder_annexa; +static int hf_audio_vocoder_annexb; +static int hf_audio_sample_rate; +static int hf_audio_rtp_type; +static int hf_audio_bytes_per_frame; + +static int hf_audio_rx_stream_id; +static int hf_audio_tx_stream_id; +static int hf_rx_vocoder_type; +static int hf_tx_vocoder_type; +static int hf_frames_per_packet; +static int hf_audio_tos; +static int hf_audio_precedence; +static int hf_audio_frf_11; +static int hf_rtcp_bucket_id; +static int hf_audio_lcl_rtp_port; +static int hf_audio_lcl_rtcp_port; +static int hf_audio_far_rtp_port; +static int hf_audio_far_rtcp_port; +static int hf_audio_far_ip_add; +static int hf_audio_rtcp_bucket_id; +static int hf_audio_clear_bucket; + +static int hf_audio_transducer_pair; +static int hf_audio_rx_enable; +static int hf_audio_tx_enable; +static int hf_audio_sidetone_disable; +static int hf_audio_destruct_additive; +static int hf_audio_dont_force_active; +static int hf_audio_source_descr; +static int hf_audio_sdes_rtcp_bucket; +static int hf_audio_desired_jitter; +static int hf_audio_high_water_mark; +static int hf_audio_early_packet_resync_thresh; +static int hf_audio_late_packet_resync_thresh; +static int hf_audio_resolve_phone_port; +static int hf_audio_far_end_echo_port; +static int hf_audio_far_end_ip_address; +static int hf_audio_nat_port; +static int hf_audio_nat_ip_address; +static int hf_audio_direction_code; +static int hf_audio_hf_support; +static int hf_audio_opt_rpt_max; +static int hf_audio_opt_rpt_adj_vol; +static int hf_audio_opt_rpt_auto_adj_vol; +static int hf_audio_opt_rpt_hs_on_air; +static int hf_audio_opt_rpt_hd_on_air; +static int hf_audio_opt_rpt_noise_squelch; +static int hf_audio_rx_vol_apb_rpt; +static int hf_audio_rx_vol_vol_up; +static int hf_audio_rx_vol_vol_floor; +static int hf_audio_rx_vol_vol_ceiling; +static int hf_audio_current_adj_vol_id; +static int hf_audio_current_rx_level; +static int hf_audio_current_rx_range; +static int hf_audio_cadence_select; +static int hf_audio_warbler_select; +static int hf_audio_open_stream_rpt; +static int hf_audio_sdes_rpt_source_desc; +static int hf_audio_sdes_rpt_buk_id; +static int hf_audio_phone_port; +static int hf_audio_phone_ip; + +static int hf_audio_phone_add_len; +static int hf_audio_nat_listen_port; +static int hf_audio_nat_ip; +static int hf_audio_nat_add_len; +static int hf_audio_stream_direction_code; +static int hf_audio_stream_state; +static int hf_audio_transducer_list_length; static const value_string audio_switch_msgs[]={ diff --git a/plugins/epan/unistim/basic.h b/plugins/epan/unistim/basic.h index 9429ce98e2..793c7e82dc 100644 --- a/plugins/epan/unistim/basic.h +++ b/plugins/epan/unistim/basic.h @@ -13,27 +13,27 @@ #ifndef UNISTIM_BASIC_H #define UNISTIM_BASIC_H -static int hf_basic_switch_query_flags=-1; -static int hf_basic_switch_query_attr=-1; -static int hf_basic_switch_query_opts=-1; -static int hf_basic_switch_query_fw=-1; -static int hf_basic_switch_query_hw_id=-1; -static int hf_basic_switch_query_it_type=-1; -static int hf_basic_switch_query_prod_eng_code=-1; -static int hf_basic_switch_query_gray_mkt_info=-1; -static int hf_basic_switch_options_secure=-1; -static int hf_basic_switch_element_id=-1; -static int hf_basic_switch_eeprom_data=-1; -static int hf_basic_switch_terminal_id=-1; +static int hf_basic_switch_query_flags; +static int hf_basic_switch_query_attr; +static int hf_basic_switch_query_opts; +static int hf_basic_switch_query_fw; +static int hf_basic_switch_query_hw_id; +static int hf_basic_switch_query_it_type; +static int hf_basic_switch_query_prod_eng_code; +static int hf_basic_switch_query_gray_mkt_info; +static int hf_basic_switch_options_secure; +static int hf_basic_switch_element_id; +static int hf_basic_switch_eeprom_data; +static int hf_basic_switch_terminal_id; -static int hf_basic_phone_eeprom_stat_cksum=-1; -static int hf_basic_phone_eeprom_dynam=-1; -static int hf_basic_phone_eeprom_net_config_cksum=-1; -static int hf_basic_phone_hw_id=-1; -static int hf_basic_phone_fw_ver=-1; -static int hf_basic_it_type=-1; -static int hf_basic_prod_eng_code=-1; -static int hf_basic_ether_address=-1; +static int hf_basic_phone_eeprom_stat_cksum; +static int hf_basic_phone_eeprom_dynam; +static int hf_basic_phone_eeprom_net_config_cksum; +static int hf_basic_phone_hw_id; +static int hf_basic_phone_fw_ver; +static int hf_basic_it_type; +static int hf_basic_prod_eng_code; +static int hf_basic_ether_address; static const value_string it_types[]={ {0x02,"i2004"}, diff --git a/plugins/epan/unistim/broadcast.h b/plugins/epan/unistim/broadcast.h index 4c85afc476..e8edd524bc 100644 --- a/plugins/epan/unistim/broadcast.h +++ b/plugins/epan/unistim/broadcast.h @@ -13,14 +13,14 @@ #ifndef UNISTIM_BROADCAST_H #define UNISTIM_BROADCAST_H -static int hf_broadcast_year=-1; -static int hf_broadcast_month=-1; -static int hf_broadcast_day=-1; -static int hf_broadcast_hour=-1; -static int hf_broadcast_minute=-1; -static int hf_broadcast_second=-1; -static int hf_broadcast_icon_state=-1; -static int hf_broadcast_icon_cadence=-1; +static int hf_broadcast_year; +static int hf_broadcast_month; +static int hf_broadcast_day; +static int hf_broadcast_hour; +static int hf_broadcast_minute; +static int hf_broadcast_second; +static int hf_broadcast_icon_state; +static int hf_broadcast_icon_cadence; static const value_string broadcast_switch_msgs[]={ diff --git a/plugins/epan/unistim/display.h b/plugins/epan/unistim/display.h index 829441d61f..7b478cdd72 100644 --- a/plugins/epan/unistim/display.h +++ b/plugins/epan/unistim/display.h @@ -13,102 +13,102 @@ #ifndef UNISTIM_DISPLAY_H #define UNISTIM_DISPLAY_H -static int hf_display_write_cursor_move=-1; -static int hf_display_write_clear_left=-1; -static int hf_display_write_clear_right=-1; -static int hf_display_write_shift_left=-1; -static int hf_display_write_shift_right=-1; -static int hf_display_write_highlight=-1; -static int hf_display_write_tag=-1; -static int hf_display_write_address_numeric=-1; -static int hf_display_write_address_context=-1; -static int hf_display_write_address_line=-1; -static int hf_display_write_address_soft_key=-1; -static int hf_display_write_address_soft_label=-1; -static int hf_display_write_address_softkey_id=-1; -static int hf_display_write_address_char_pos=-1; -static int hf_display_write_address_line_number=-1; -static int hf_display_cursor_move_cmd=-1; -static int hf_display_cursor_blink=-1; -static int hf_icon_id=-1; -static int hf_display_arrow=-1; -static int hf_display_clear_numeric =-1; -static int hf_display_clear_context =-1; -static int hf_display_clear_date =-1; -static int hf_display_clear_time =-1; -static int hf_display_clear_line =-1; -static int hf_display_clear_status_bar_icon =-1; -static int hf_display_clear_softkey =-1; -static int hf_display_clear_softkey_label =-1; -static int hf_display_clear_line_1 =-1; -static int hf_display_clear_line_2 =-1; -static int hf_display_clear_line_3 =-1; -static int hf_display_clear_line_4 =-1; -static int hf_display_clear_line_5 =-1; -static int hf_display_clear_line_6 =-1; -static int hf_display_clear_line_7 =-1; -static int hf_display_clear_line_8 =-1; -static int hf_display_clear_status_bar_icon_1 =-1; -static int hf_display_clear_status_bar_icon_2 =-1; -static int hf_display_clear_status_bar_icon_3 =-1; -static int hf_display_clear_status_bar_icon_4 =-1; -static int hf_display_clear_status_bar_icon_5 =-1; -static int hf_display_clear_status_bar_icon_6 =-1; -static int hf_display_clear_status_bar_icon_7 =-1; -static int hf_display_clear_status_bar_icon_8 =-1; -static int hf_display_clear_soft_key_1 =-1; -static int hf_display_clear_soft_key_2 =-1; -static int hf_display_clear_soft_key_3 =-1; -static int hf_display_clear_soft_key_4 =-1; -static int hf_display_clear_soft_key_5 =-1; -static int hf_display_clear_soft_key_6 =-1; -static int hf_display_clear_soft_key_7 =-1; -static int hf_display_clear_soft_key_8 =-1; -static int hf_display_clear_sk_label_key_id=-1; -static int hf_display_clear_all_slks=-1; +static int hf_display_write_cursor_move; +static int hf_display_write_clear_left; +static int hf_display_write_clear_right; +static int hf_display_write_shift_left; +static int hf_display_write_shift_right; +static int hf_display_write_highlight; +static int hf_display_write_tag; +static int hf_display_write_address_numeric; +static int hf_display_write_address_context; +static int hf_display_write_address_line; +static int hf_display_write_address_soft_key; +static int hf_display_write_address_soft_label; +static int hf_display_write_address_softkey_id; +static int hf_display_write_address_char_pos; +static int hf_display_write_address_line_number; +static int hf_display_cursor_move_cmd; +static int hf_display_cursor_blink; +static int hf_icon_id; +static int hf_display_arrow; +static int hf_display_clear_numeric; +static int hf_display_clear_context; +static int hf_display_clear_date; +static int hf_display_clear_time; +static int hf_display_clear_line; +static int hf_display_clear_status_bar_icon; +static int hf_display_clear_softkey; +static int hf_display_clear_softkey_label; +static int hf_display_clear_line_1; +static int hf_display_clear_line_2; +static int hf_display_clear_line_3; +static int hf_display_clear_line_4; +static int hf_display_clear_line_5; +static int hf_display_clear_line_6; +static int hf_display_clear_line_7; +static int hf_display_clear_line_8; +static int hf_display_clear_status_bar_icon_1; +static int hf_display_clear_status_bar_icon_2; +static int hf_display_clear_status_bar_icon_3; +static int hf_display_clear_status_bar_icon_4; +static int hf_display_clear_status_bar_icon_5; +static int hf_display_clear_status_bar_icon_6; +static int hf_display_clear_status_bar_icon_7; +static int hf_display_clear_status_bar_icon_8; +static int hf_display_clear_soft_key_1; +static int hf_display_clear_soft_key_2; +static int hf_display_clear_soft_key_3; +static int hf_display_clear_soft_key_4; +static int hf_display_clear_soft_key_5; +static int hf_display_clear_soft_key_6; +static int hf_display_clear_soft_key_7; +static int hf_display_clear_soft_key_8; +static int hf_display_clear_sk_label_key_id; +static int hf_display_clear_all_slks; -static int hf_display_line_width=-1; -static int hf_display_lines=-1; -static int hf_display_softkey_width=-1; -static int hf_display_softkeys=-1; -static int hf_display_icon=-1; -static int hf_display_softlabel_key_width=-1; -static int hf_display_context_width=-1; -static int hf_display_numeric_width=-1; -static int hf_display_time_width=-1; -static int hf_display_date_width=-1; -static int hf_display_char_dload=-1; -static int hf_display_freeform_icon_dload=-1; -static int hf_display_icon_type=-1; -static int hf_display_charsets=-1; -static int hf_display_contrast=-1; -static int hf_display_cursor_numeric=-1; -static int hf_display_cursor_context =-1; -static int hf_display_cursor_line =-1; -static int hf_display_cursor_softkey =-1; -static int hf_display_cursor_softkey_id =-1; -static int hf_display_cursor_char_pos =-1; -static int hf_display_cursor_line_number =-1; -static int hf_display_hlight_start=-1; -static int hf_display_hlight_end=-1; -static int hf_display_date_format=-1; -static int hf_display_time_format=-1; -static int hf_display_use_time_format=-1; -static int hf_display_use_date_format=-1; -static int hf_display_context_format=-1; -static int hf_display_context_field=-1; -static int hf_display_char_address=-1; -static int hf_display_layer_number=-1; -static int hf_display_layer_skey_id=-1; -static int hf_display_layer_all_skeys=-1; -static int hf_display_once_or_cyclic=-1; -static int hf_display_layer_duration=-1; -static int hf_display_call_timer_mode=-1; -static int hf_display_call_timer_reset=-1; -static int hf_display_call_timer_display=-1; -static int hf_display_call_timer_delay=-1; -static int hf_display_call_timer_id=-1; +static int hf_display_line_width; +static int hf_display_lines; +static int hf_display_softkey_width; +static int hf_display_softkeys; +static int hf_display_icon; +static int hf_display_softlabel_key_width; +static int hf_display_context_width; +static int hf_display_numeric_width; +static int hf_display_time_width; +static int hf_display_date_width; +static int hf_display_char_dload; +static int hf_display_freeform_icon_dload; +static int hf_display_icon_type; +static int hf_display_charsets; +static int hf_display_contrast; +static int hf_display_cursor_numeric; +static int hf_display_cursor_context; +static int hf_display_cursor_line; +static int hf_display_cursor_softkey; +static int hf_display_cursor_softkey_id; +static int hf_display_cursor_char_pos; +static int hf_display_cursor_line_number; +static int hf_display_hlight_start; +static int hf_display_hlight_end; +static int hf_display_date_format; +static int hf_display_time_format; +static int hf_display_use_time_format; +static int hf_display_use_date_format; +static int hf_display_context_format; +static int hf_display_context_field; +static int hf_display_char_address; +static int hf_display_layer_number; +static int hf_display_layer_skey_id; +static int hf_display_layer_all_skeys; +static int hf_display_once_or_cyclic; +static int hf_display_layer_duration; +static int hf_display_call_timer_mode; +static int hf_display_call_timer_reset; +static int hf_display_call_timer_display; +static int hf_display_call_timer_delay; +static int hf_display_call_timer_id; static const value_string arrow_dirs[]={ diff --git a/plugins/epan/unistim/expansion.h b/plugins/epan/unistim/expansion.h index 4081ca84fa..50ffc2a6ec 100644 --- a/plugins/epan/unistim/expansion.h +++ b/plugins/epan/unistim/expansion.h @@ -12,7 +12,7 @@ #ifndef UNISTIM_EXPANSION_H #define UNISTIM_EXPANSION_H -static int hf_expansion_softlabel_number=-1; +static int hf_expansion_softlabel_number; static const value_string expansion_switch_msgs[]={ {0x17,"Next Display/Write command regards expansion module"}, diff --git a/plugins/epan/unistim/key.h b/plugins/epan/unistim/key.h index 43acba8d63..bf7d68b35e 100644 --- a/plugins/epan/unistim/key.h +++ b/plugins/epan/unistim/key.h @@ -14,32 +14,32 @@ #define UNISTIM_KEY_H -static int hf_key_icon_id=-1; -static int hf_key_led_cadence=-1; -static int hf_key_led_id=-1; -static int hf_key_programmable_keys=-1; -static int hf_keys_soft_keys=-1; -static int hf_keys_hd_key=-1; -static int hf_keys_mute_key=-1; -static int hf_keys_quit_key=-1; -static int hf_keys_copy_key=-1; -static int hf_keys_mwi_key=-1; -static int hf_keys_num_nav_keys=-1; -static int hf_keys_num_conspic_keys=-1; -static int hf_keys_send_key_rel=-1; -static int hf_keys_enable_vol=-1; -static int hf_keys_conspic_prog_key=-1; -static int hf_keys_acd_super_control=-1; -static int hf_keys_local_dial_feedback=-1; -static int hf_keys_admin_command=-1; -static int hf_keys_logical_icon_id=-1; -static int hf_keys_repeat_timer_one=-1; -static int hf_keys_repeat_timer_two=-1; -static int hf_keys_led_id=-1; -static int hf_keys_phone_icon_id=-1; -static int hf_keys_cadence_on_time=-1; -static int hf_keys_cadence_off_time=-1; -static int hf_keys_user_activity_timeout=-1; +static int hf_key_icon_id; +static int hf_key_led_cadence; +static int hf_key_led_id; +static int hf_key_programmable_keys; +static int hf_keys_soft_keys; +static int hf_keys_hd_key; +static int hf_keys_mute_key; +static int hf_keys_quit_key; +static int hf_keys_copy_key; +static int hf_keys_mwi_key; +static int hf_keys_num_nav_keys; +static int hf_keys_num_conspic_keys; +static int hf_keys_send_key_rel; +static int hf_keys_enable_vol; +static int hf_keys_conspic_prog_key; +static int hf_keys_acd_super_control; +static int hf_keys_local_dial_feedback; +static int hf_keys_admin_command; +static int hf_keys_logical_icon_id; +static int hf_keys_repeat_timer_one; +static int hf_keys_repeat_timer_two; +static int hf_keys_led_id; +static int hf_keys_phone_icon_id; +static int hf_keys_cadence_on_time; +static int hf_keys_cadence_off_time; +static int hf_keys_user_activity_timeout; static const value_string keys_led_ids[]={ {0x00,"Message Waiting LED"}, diff --git a/plugins/epan/unistim/network.h b/plugins/epan/unistim/network.h index 561ef8dcb1..06ee76bf8f 100644 --- a/plugins/epan/unistim/network.h +++ b/plugins/epan/unistim/network.h @@ -14,48 +14,48 @@ #define UNISTIM_NETWORK_H -static int hf_net_diag_flag=-1; -static int hf_net_managers_flag=-1; -static int hf_net_attributes_flag=-1; -static int hf_net_serv_info_flag=-1; -static int hf_net_options_flag=-1; -static int hf_net_sanity_flag=-1; -static int hf_net_enable_diag=-1; -static int hf_net_enable_rudp=-1; -static int hf_net_server_id=-1; -static int hf_net_server_port=-1; -static int hf_net_server_action=-1; -static int hf_net_server_retry_count=-1; -static int hf_net_server_failover_id=-1; -static int hf_net_server_ip_address=-1; -static int hf_net_server_time_out=-1; -static int hf_net_server_config_element=-1; -static int hf_net_server_recovery_time_low=-1; -static int hf_net_server_recovery_time_high=-1; -static int hf_net_phone_rx_ovr_flag=-1; -static int hf_net_phone_tx_ovr_flag=-1; -static int hf_net_phone_rx_empty_flag=-1; -static int hf_net_phone_invalid_msg_flag=-1; -static int hf_net_phone_eeprom_insane_flag=-1; -static int hf_net_phone_eeprom_unsafe_flag=-1; -static int hf_net_phone_diag=-1; -static int hf_net_phone_rudp=-1; +static int hf_net_diag_flag; +static int hf_net_managers_flag; +static int hf_net_attributes_flag; +static int hf_net_serv_info_flag; +static int hf_net_options_flag; +static int hf_net_sanity_flag; +static int hf_net_enable_diag; +static int hf_net_enable_rudp; +static int hf_net_server_id; +static int hf_net_server_port; +static int hf_net_server_action; +static int hf_net_server_retry_count; +static int hf_net_server_failover_id; +static int hf_net_server_ip_address; +static int hf_net_server_time_out; +static int hf_net_server_config_element; +static int hf_net_server_recovery_time_low; +static int hf_net_server_recovery_time_high; +static int hf_net_phone_rx_ovr_flag; +static int hf_net_phone_tx_ovr_flag; +static int hf_net_phone_rx_empty_flag; +static int hf_net_phone_invalid_msg_flag; +static int hf_net_phone_eeprom_insane_flag; +static int hf_net_phone_eeprom_unsafe_flag; +static int hf_net_phone_diag; +static int hf_net_phone_rudp; -static int hf_net_phone_primary_server_id=-1; -static int hf_net_phone_server_port=-1; -static int hf_net_phone_server_action=-1; -static int hf_net_phone_server_retry_count=-1; -static int hf_net_phone_server_failover_id=-1; -static int hf_net_phone_server_ip=-1; -static int hf_net_file_xfer_mode =-1; -static int hf_net_force_download =-1; -static int hf_net_use_file_server_port =-1; -static int hf_net_use_local_port=-1; -static int hf_net_file_server_port=-1; -static int hf_net_local_port=-1; -static int hf_net_file_server_address=-1; -static int hf_net_full_pathname=-1; -static int hf_net_file_identifier=-1; +static int hf_net_phone_primary_server_id; +static int hf_net_phone_server_port; +static int hf_net_phone_server_action; +static int hf_net_phone_server_retry_count; +static int hf_net_phone_server_failover_id; +static int hf_net_phone_server_ip; +static int hf_net_file_xfer_mode; +static int hf_net_force_download; +static int hf_net_use_file_server_port; +static int hf_net_use_local_port; +static int hf_net_file_server_port; +static int hf_net_local_port; +static int hf_net_file_server_address; +static int hf_net_full_pathname; +static int hf_net_file_identifier; static const value_string file_xfer_modes[]={ {0x00,"TFTP"}, @@ -73,8 +73,8 @@ static const value_string action_bytes[]={ {0,NULL} }; -static int hf_key_code=-1; -static int hf_key_command=-1; +static int hf_key_code; +static int hf_key_command; static const value_string key_cmds[]={ {0x00,"Key Released"}, diff --git a/plugins/epan/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c index 493f2a481a..58b01eccd0 100644 --- a/plugins/epan/unistim/packet-unistim.c +++ b/plugins/epan/unistim/packet-unistim.c @@ -32,8 +32,10 @@ void proto_register_unistim(void); +static dissector_handle_t unistim_handle; + static unistim_info_t *uinfo; -static int unistim_tap = -1; +static int unistim_tap; void proto_reg_handoff_unistim(void); static void dissect_payload(proto_tree *unistim_tree,tvbuff_t *tvb,gint offset, packet_info *pinfo); @@ -72,37 +74,37 @@ static gint dissect_uftp_message(proto_tree *unistim_tree, packet_info *pinfo, tvbuff_t *tvb,gint offset); -static int proto_unistim = -1; -static int hf_unistim_seq_nu = -1; -static int hf_unistim_packet_type = -1; -static int hf_unistim_payload = -1; -static int hf_unistim_cmd_add = -1; -static int hf_unistim_len =-1; -static int hf_terminal_id=-1; -static int hf_basic_bit_field=-1; - -static int hf_basic_switch_cmd=-1; -static int hf_basic_phone_cmd=-1; -static int hf_broadcast_switch_cmd=-1; -/* static int hf_broadcast_phone_cmd=-1; */ -static int hf_audio_switch_cmd=-1; -static int hf_audio_phone_cmd=-1; -static int hf_display_switch_cmd=-1; -static int hf_display_phone_cmd=-1; -static int hf_key_switch_cmd=-1; -static int hf_key_phone_cmd=-1; -static int hf_network_switch_cmd=-1; -static int hf_network_phone_cmd=-1; -static int hf_expansion_switch_cmd=-1; -static int hf_expansion_phone_cmd=-1; -static int hf_module_key_number=-1; - -static int hf_generic_data=-1; -static int hf_generic_string=-1; - -static gint ett_unistim = -1; - -static expert_field ei_unistim_len = EI_INIT; +static int proto_unistim; +static int hf_unistim_seq_nu; +static int hf_unistim_packet_type; +static int hf_unistim_payload; +static int hf_unistim_cmd_add; +static int hf_unistim_len; +static int hf_terminal_id; +static int hf_basic_bit_field; + +static int hf_basic_switch_cmd; +static int hf_basic_phone_cmd; +static int hf_broadcast_switch_cmd; +/* static int hf_broadcast_phone_cmd; */ +static int hf_audio_switch_cmd; +static int hf_audio_phone_cmd; +static int hf_display_switch_cmd; +static int hf_display_phone_cmd; +static int hf_key_switch_cmd; +static int hf_key_phone_cmd; +static int hf_network_switch_cmd; +static int hf_network_phone_cmd; +static int hf_expansion_switch_cmd; +static int hf_expansion_phone_cmd; +static int hf_module_key_number; + +static int hf_generic_data; +static int hf_generic_string; + +static gint ett_unistim; + +static expert_field ei_unistim_len; static const value_string packet_names[]={ {0,"NAK"}, @@ -290,7 +292,7 @@ dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, gint offset, pac break; } - /* Handle UFTP seperately because it is significantly different + /* Handle UFTP separately because it is significantly different than standard UNISTIM */ while (tvb_reported_length_remaining(tvb, offset) > 0) offset = dissect_unistim_message(unistim_tree,pinfo,tvb,offset); @@ -2660,43 +2662,43 @@ proto_register_unistim(void){ }, { &hf_net_server_id, {"Download Server ID","unistim.download.id",FT_UINT8, - BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} + BASE_HEX, VALS(network_server_id),0x0,NULL,HFILL} }, { &hf_net_server_port, {"Download Server Port","unistim.download.port",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} + BASE_DEC, NULL,0x0,NULL,HFILL} }, { &hf_net_server_action, {"Download Server Action","unistim.download.action",FT_UINT8, - BASE_HEX, VALS(server_action),0x00,NULL,HFILL} + BASE_HEX, VALS(server_action),0x0,NULL,HFILL} }, { &hf_net_server_retry_count, {"Download Retry Count","unistim.download.retry",FT_UINT8, - BASE_DEC, NULL,0x00,NULL,HFILL} + BASE_DEC, NULL,0x0,NULL,HFILL} }, { &hf_net_server_failover_id, {"Download Failover Server ID","unistim.download.failover",FT_UINT8, - BASE_HEX, VALS(network_server_id),0x00,NULL,HFILL} + BASE_HEX, VALS(network_server_id),0x0,NULL,HFILL} }, { &hf_net_server_ip_address, {"Download Server Address","unistim.download.address",FT_IPv4, - BASE_NONE, NULL,0x00,NULL,HFILL} + BASE_NONE, NULL,0x0,NULL,HFILL} }, { &hf_net_server_time_out, {"Watchdog Timeout","unistim.watchdog.timeout",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} + BASE_DEC, NULL,0x0,NULL,HFILL} }, { &hf_net_server_config_element, {"Configure Network Element","unistim.config.element",FT_UINT8, - BASE_HEX, VALS(network_elements),0x00,NULL,HFILL} + BASE_HEX, VALS(network_elements),0x0,NULL,HFILL} }, { &hf_net_server_recovery_time_low, {"Recovery Procedure Idle Low Boundary","unistim.recovery.low",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} + BASE_DEC, NULL,0x0,NULL,HFILL} }, { &hf_net_server_recovery_time_high, {"Recovery Procedure Idle High Boundary","unistim.recovery.high",FT_UINT16, - BASE_DEC, NULL,0x00,NULL,HFILL} + BASE_DEC, NULL,0x0,NULL,HFILL} }, { &hf_net_phone_rx_ovr_flag, {"Receive Buffer Overflow","unistim.receive.overflow", @@ -2774,11 +2776,11 @@ proto_register_unistim(void){ }, { &hf_basic_switch_element_id, {"Basic Element ID","unistim.basic.element.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_basic_switch_eeprom_data, {"EEProm Data","unistim.basic.eeprom.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_basic_phone_eeprom_stat_cksum, {"Basic Phone EEProm Static Checksum","unistim.static.cksum",FT_UINT8, @@ -2786,19 +2788,19 @@ proto_register_unistim(void){ }, { &hf_basic_phone_eeprom_dynam, {"Basic Phone EEProm Dynamic Checksum","unistim.dynam.cksum",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_basic_phone_eeprom_net_config_cksum, {"Basic Phone EEProm Net Config Checksum","unistim.netconfig.cksum",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_basic_phone_hw_id, {"Basic Phone Hardware ID","unistim.basic.hw.id",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_basic_phone_fw_ver, {"Basic Phone Firmware Version","unistim.basic.fw.ver",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_key_code, {"Key Name","unistim.key.name",FT_UINT8, @@ -2850,7 +2852,7 @@ proto_register_unistim(void){ }, { &hf_audio_default_rx_vol_id, {"Audio Manager Default Receive Volume ID","unistim.audio.volume.id",FT_UINT8, - BASE_HEX,VALS(default_rx_vol_id),0x00,NULL,HFILL} + BASE_HEX,VALS(default_rx_vol_id),0x0,NULL,HFILL} }, { &hf_audio_mgr_opt_max_vol, {"Audio Manager Enable Max Tone Volume","unistim.audio.max.tone",FT_BOOLEAN, @@ -2886,7 +2888,7 @@ proto_register_unistim(void){ }, { &hf_audio_mgr_stream_id, {"Audio Manager Stream ID","unistim.audio.stream.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_mgr_transducer_based_tone_id, {"Audio Manager Transducer Based Tone On","unistim.audio.transducer.on",FT_UINT8, @@ -2914,7 +2916,7 @@ proto_register_unistim(void){ }, { &hf_audio_special_tone, {"Special Tone Select","unistim.special.tone.select",FT_UINT8, - BASE_HEX,VALS(special_tones_vals),0x00,NULL,HFILL} + BASE_HEX,VALS(special_tones_vals),0x0,NULL,HFILL} }, { &hf_audio_tone_level, {"Tone Level","unistim.audio.tone.level",FT_UINT8, @@ -2938,63 +2940,63 @@ proto_register_unistim(void){ }, { &hf_audio_stream_id, {"Stream ID","unistim.audio.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_audio_stream_based_volume, {"Stream Based Volume ID","unistim.stream.volume.id",FT_UINT8, - BASE_HEX,VALS(stream_base_vol_level),0x00,NULL,HFILL} + BASE_HEX,VALS(stream_base_vol_level),0x0,NULL,HFILL} }, { &hf_basic_switch_terminal_id, {"Terminal ID assigned by Switch","unistim.switch.terminal.id",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_basic_it_type, {"IT (Phone) Type","unistim.it.type",FT_UINT8, - BASE_HEX,VALS(it_types),0x00,NULL,HFILL} + BASE_HEX,VALS(it_types),0x0,NULL,HFILL} }, { &hf_basic_prod_eng_code, {"Product Engineering Code for phone","unistim.basic.eng.code",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_net_phone_primary_server_id, {"Phone Primary Server ID","unistim.net.phone.primary.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_phone_server_port, {"Port Number","unistim.server.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_phone_server_action, {"Action","unistim.server.action.byte",FT_UINT8, - BASE_HEX,VALS(action_bytes),0x00,NULL,HFILL} + BASE_HEX,VALS(action_bytes),0x0,NULL,HFILL} }, { &hf_net_phone_server_retry_count, {"Number of times to Retry","unistim.server.retry.count",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_phone_server_failover_id, {"Failover Server ID","unistim.server.failover.id",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_phone_server_ip, {"IP address","unistim.server.ip.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_apb_number, {"APB Number","unistim.audio.apb.number",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { & hf_audio_apb_op_code, {"APB Operation Code","unistim.audio.apb.op.code",FT_UINT8, - BASE_HEX,VALS(apb_op_codes),0x00,NULL,HFILL} + BASE_HEX,VALS(apb_op_codes),0x0,NULL,HFILL} }, { &hf_audio_apb_param_len, {"APB Operation Parameter Length","unistim.apb.param.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_apb_data, {"APB Operation Data","unistim.apb.operation.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_display_write_address_numeric, {"Is Address Numeric","unistim.write.address.numeric",FT_BOOLEAN, @@ -3054,7 +3056,7 @@ proto_register_unistim(void){ }, { &hf_display_write_tag, {"Tag for text","unistim.display.text.tag",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_display_cursor_move_cmd, {"Cursor Movement Command","unistim.cursor.move.cmd",FT_UINT8, @@ -3066,7 +3068,7 @@ proto_register_unistim(void){ }, { &hf_audio_vocoder_id, {"Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + BASE_HEX,VALS(vocoder_ids),0x0,NULL,HFILL} }, { &hf_audio_vocoder_param, {"Vocoder Config Param","unistim.vocoder.config.param",FT_UINT8, @@ -3086,35 +3088,35 @@ proto_register_unistim(void){ }, { &hf_audio_sample_rate, {"Sample Rate","unistim.audio.sample.rate",FT_UINT8, - BASE_HEX,VALS(sample_rates),0x00,NULL,HFILL} + BASE_HEX,VALS(sample_rates),0x0,NULL,HFILL} }, { &hf_audio_rtp_type, {"RTP Type","unistim.audio.rtp.type",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_audio_bytes_per_frame, {"Bytes Per Frame","unistim.audio.bytes.per.frame",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_rx_stream_id, {"Receive Stream Id","unistim.rx.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_audio_tx_stream_id, {"Transmit Stream Id","unistim.tx.stream.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_rx_vocoder_type, {"Receive Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + BASE_HEX,VALS(vocoder_ids),0x0,NULL,HFILL} }, { &hf_tx_vocoder_type, {"Transmit Vocoder Protocol","unistim.vocoder.id",FT_UINT8, - BASE_HEX,VALS(vocoder_ids),0x00,NULL,HFILL} + BASE_HEX,VALS(vocoder_ids),0x0,NULL,HFILL} }, { &hf_frames_per_packet, {"Frames Per Packet","unistim.vocoder.frames.per.packet",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_tos, {"Type of Service","unistim.audio.type.service",FT_UINT8, @@ -3130,31 +3132,31 @@ proto_register_unistim(void){ }, { &hf_audio_lcl_rtp_port, {"Phone RTP Port","unistim.local.rtp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_lcl_rtcp_port, {"Phone RTCP Port","unistim.local.rtcp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_far_rtp_port, {"Distant RTP Port","unistim.far.rtp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_far_rtcp_port, {"Distant RTCP Port","unistim.far.rtcp.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_far_ip_add, {"Distant IP Address for RT[C]P","unistim.far.ip.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_rtcp_bucket_id, {"RTCP Bucket ID","unistim.rtcp.bucket.id",FT_UINT16, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_key_icon_id, {"Icon ID","unistim.key.icon.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_display_clear_numeric, {"Numeric Index Field in InfoBar","unistim.display.clear.numeric",FT_BOOLEAN, @@ -3302,7 +3304,7 @@ proto_register_unistim(void){ }, { &hf_basic_ether_address, {"Phone Ethernet Address","unistim.phone.ether",FT_ETHER, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_rtcp_bucket_id, {"RTCP Bucket ID","unistim.audio.rtcp.bucket.id",FT_UINT8, @@ -3314,7 +3316,7 @@ proto_register_unistim(void){ }, { &hf_display_arrow, {"Arrow Display Direction","unistim.arrow.direction",FT_UINT8, - BASE_HEX,VALS(arrow_dirs),0x00,NULL,HFILL} + BASE_HEX,VALS(arrow_dirs),0x0,NULL,HFILL} }, { &hf_audio_transducer_pair, {"Audio Transducer Pair","unistim.transducer.pairs",FT_UINT8, @@ -3333,7 +3335,7 @@ proto_register_unistim(void){ 8,NULL,AUDIO_SIDETONE_DISABLE,NULL,HFILL} }, { &hf_audio_destruct_additive, - {"Destructive/Additive","unistim.destructive.active",FT_BOOLEAN, + {"Destructive/Additive","unistim.destructive.additive",FT_BOOLEAN, 8,TFS(&destruct_additive),AUDIO_DESTRUCT_ADD,NULL,HFILL} }, { &hf_audio_dont_force_active, @@ -3398,7 +3400,7 @@ proto_register_unistim(void){ }, { &hf_display_contrast, {"Phone Contrast Level","unistim.phone.contrast.level",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_display_cursor_numeric, {"Numeric Index Field","unistim.field.numeric",FT_BOOLEAN, @@ -3430,11 +3432,11 @@ proto_register_unistim(void){ }, { &hf_display_hlight_start, {"Display Highlight Start Position","unistim.hilite.start.pos",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_display_hlight_end, {"Display Highlight End Position","unistim.hilite.end.pos",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_display_date_format, {"Date Format","unistim.display.date.format",FT_UINT8, @@ -3462,11 +3464,11 @@ proto_register_unistim(void){ }, { &hf_display_char_address, {"Display Character Address","unistim.display.char.address",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_display_layer_number, {"Softkey Layer Number","unistim.softkey.layer.num",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_display_layer_skey_id, {"Softkey ID","unistim.layer.softkey.id",FT_UINT8, @@ -3482,7 +3484,7 @@ proto_register_unistim(void){ }, { &hf_display_layer_duration, {"Display Duration (20ms steps)","unistim.layer.display.duration",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_key_programmable_keys, {"Number of Programmable Keys","unistim.num.prog.keys",FT_UINT8, @@ -3550,39 +3552,39 @@ proto_register_unistim(void){ }, { &hf_audio_desired_jitter, {"Desired Jitter","unistim.audio.desired.jitter",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_high_water_mark, {"Threshold of audio frames where jitter buffer removes frames","unistim.high.water.mark",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_early_packet_resync_thresh, {"Threshold in x/8000 sec where packets are too early","unistim.early.packet.thresh",FT_UINT32, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_late_packet_resync_thresh, {"Threshold in x/8000 sec where packets are too late","unistim.late.packet.thresh",FT_UINT32, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_resolve_phone_port, {"Resolve Phone Port","unistim.resolve.phone.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_far_end_echo_port, {"Resolve Far End Port","unistim.resolve.far.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_far_end_ip_address, {"Resolve Far End IP","unistim.resolve.far.ip",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_nat_port, {"NAT Port","unistim.audio.nat.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_nat_ip_address, {"NAT IP Address","unistim.audio.nat.ip",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_direction_code, {"Stream Direction Code","unistim.audio.direction.codes",FT_UINT8, @@ -3639,11 +3641,11 @@ proto_register_unistim(void){ }, { &hf_audio_current_rx_level, {"Current RX Volume Level","unistim.current.rx.vol.level",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_current_rx_range, {"Current RX Volume Range","unistim.current.rx.vol.range",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_cadence_select, {"Alerting Cadence Select","unistim.alert.cad.sel",FT_UINT8, @@ -3655,7 +3657,7 @@ proto_register_unistim(void){ }, { &hf_audio_open_stream_rpt, {"Open Stream Report","unistim.open.audio.stream.rpt",FT_UINT8, - BASE_HEX,VALS(stream_result),0x00,NULL,HFILL} + BASE_HEX,VALS(stream_result),0x0,NULL,HFILL} }, { &hf_audio_sdes_rpt_source_desc, {"Report Source Description","unistim.rpt.src.desc",FT_UINT8, @@ -3667,27 +3669,27 @@ proto_register_unistim(void){ }, { &hf_audio_phone_port, {"Phone Listen Port","unistim.phone.listen.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_phone_ip, {"Phone Listen Address","unistim.phone.listen.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_phone_add_len, {"Phone Address Length","unistim.phone.address.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_nat_listen_port, {"NAT Listen Port","unistim.nat.listen.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_nat_ip, {"NAT Listen Address","unistim.nat.listen.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_audio_nat_add_len, {"NAT Address Length","unistim.nat.address.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_audio_stream_direction_code, {"Audio Stream Direction","unistim.audio.stream.direction",FT_UINT8, @@ -3699,7 +3701,7 @@ proto_register_unistim(void){ }, { &hf_audio_transducer_list_length, {"Transducer List Length","unistim.trans.list.len",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_file_xfer_mode, {"File Transfer Mode","unistim.net.file.xfer.mode",FT_UINT8, @@ -3719,23 +3721,23 @@ proto_register_unistim(void){ }, { &hf_net_file_server_port, {"File Server Port","unistim.net.file.server.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_full_pathname, {"Full Pathname","unistim.net.full_pathname",FT_STRINGZ, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_net_file_identifier, {"File Identifier","unistim.net.file_identifier",FT_STRINGZ, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_net_local_port, {"Local XFer Port","unistim.net.local.xfer.port",FT_UINT16, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_net_file_server_address, {"File Server IP Address","unistim.net.file.server.address",FT_IPv4, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_keys_admin_command, {"Admin Command","unistim.key.icon.admin.cmd",FT_UINT8, @@ -3743,35 +3745,35 @@ proto_register_unistim(void){ }, { &hf_keys_logical_icon_id, {"Logical Icon ID","unistim.keys.logical.icon.id",FT_UINT16, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_keys_repeat_timer_one, {"Key Repeat Timer 1 Value","unistim.keys.repeat.time.one",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_keys_repeat_timer_two, {"Key Repeat Timer 2 Value","unistim.keys.repeat.time.two",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_keys_led_id, {"Led ID","unistim.keys.led.id",FT_UINT8, - BASE_HEX,VALS(keys_led_ids),0x00,NULL,HFILL} + BASE_HEX,VALS(keys_led_ids),0x0,NULL,HFILL} }, { &hf_keys_phone_icon_id, {"Phone Icon ID","unistim.keys.phone.icon.id",FT_UINT8, - BASE_HEX,NULL,0x00,NULL,HFILL} + BASE_HEX,NULL,0x0,NULL,HFILL} }, { &hf_keys_cadence_on_time, {"Indicator Cadence On Time","unistim.keys.cadence.on.time",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_keys_cadence_off_time, {"Indicator Cadence Off Time","unistim.keys.cadence.off.time",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_keys_user_activity_timeout, {"User Activity Timeout Value","unistim.keys.user.timeout.value",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, { &hf_display_call_timer_mode, {"Call Timer Mode","unistim.display.call.timer.mode",FT_BOOLEAN, @@ -3807,18 +3809,18 @@ proto_register_unistim(void){ }, { &hf_expansion_softlabel_number, {"Module Soft Label Number","unistim.expansion.label.number",FT_UINT8, - BASE_DEC,NULL,0x00,NULL,HFILL} + BASE_DEC,NULL,0x0,NULL,HFILL} }, /****LAST****/ { &hf_generic_string, {"DATA","unistim.generic.string_data",FT_STRING, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} }, { &hf_generic_data, {"DATA","unistim.generic.data",FT_BYTES, - BASE_NONE,NULL,0x00,NULL,HFILL} + BASE_NONE,NULL,0x0,NULL,HFILL} } }; @@ -3835,6 +3837,7 @@ proto_register_unistim(void){ expert_module_t* expert_unistim; proto_unistim=proto_register_protocol("UNISTIM Protocol", "UNISTIM", "unistim"); + unistim_handle=register_dissector("unistim", dissect_unistim,proto_unistim); proto_register_subtree_array(ett,array_length(ett)); proto_register_field_array(proto_unistim,hf,array_length(hf)); @@ -3846,10 +3849,6 @@ proto_register_unistim(void){ void proto_reg_handoff_unistim(void) { - - dissector_handle_t unistim_handle; - - unistim_handle=create_dissector_handle(dissect_unistim,proto_unistim); dissector_add_for_decode_as_with_preference("udp.port", unistim_handle); } diff --git a/plugins/epan/unistim/uftp.h b/plugins/epan/unistim/uftp.h index 865f23b5e9..c6d9fa7acb 100644 --- a/plugins/epan/unistim/uftp.h +++ b/plugins/epan/unistim/uftp.h @@ -13,11 +13,11 @@ #ifndef UNISTIM_UFTP_H #define UNISTIM_UFTP_H -static int hf_uftp_datablock_size=-1; -static int hf_uftp_datablock_limit=-1; -static int hf_uftp_filename=-1; -static int hf_uftp_datablock=-1; -static int hf_uftp_command=-1; +static int hf_uftp_datablock_size; +static int hf_uftp_datablock_limit; +static int hf_uftp_filename; +static int hf_uftp_datablock; +static int hf_uftp_command; static const value_string uftp_commands[]={ {0x00,"Connection Granted"}, |