diff options
Diffstat (limited to 'plugins/epan/unistim')
| -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 | 387 | ||||
| -rw-r--r-- | plugins/epan/unistim/packet-unistim.h | 28 | ||||
| -rw-r--r-- | plugins/epan/unistim/uftp.h | 10 |
10 files changed, 517 insertions, 518 deletions
diff --git a/plugins/epan/unistim/audio.h b/plugins/epan/unistim/audio.h index bc062cd4..743b4ac7 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 9429ce98..793c7e82 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 4c85afc4..e8edd524 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 829441d6..7b478cdd 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 4081ca84..50ffc2a6 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 43acba8d..bf7d68b3 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 561ef8dc..06ee76bf 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 861ac763..e6094c2e 100644 --- a/plugins/epan/unistim/packet-unistim.c +++ b/plugins/epan/unistim/packet-unistim.c @@ -35,76 +35,76 @@ 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); - -static gint dissect_broadcast_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_expansion_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_key_indicator_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_basic_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_network_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_broadcast_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_audio_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_expansion_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_display_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_key_indicator_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_basic_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_network_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len); -static gint dissect_unistim_message(proto_tree *unistim_tree, packet_info *pinfo, - tvbuff_t *tvb,gint offset); -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 void dissect_payload(proto_tree *unistim_tree,tvbuff_t *tvb,int offset, packet_info *pinfo); + +static int dissect_broadcast_switch(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_expansion_switch(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_key_indicator_switch(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_basic_switch(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_network_switch(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_broadcast_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_audio_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_expansion_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_display_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_key_indicator_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_basic_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_network_phone(proto_tree *msg_tree, + tvbuff_t *tvb,int offset,unsigned msg_len); +static int dissect_unistim_message(proto_tree *unistim_tree, packet_info *pinfo, + tvbuff_t *tvb,int offset); +static int dissect_uftp_message(proto_tree *unistim_tree, packet_info *pinfo, + tvbuff_t *tvb,int offset); + + +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 int ett_unistim; + +static expert_field ei_unistim_len; static const value_string packet_names[]={ {0,"NAK"}, @@ -159,18 +159,18 @@ static const value_string command_address[]={ static int dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_){ - gint offset=0; + int offset=0; proto_item *ti= NULL; proto_tree *overall_unistim_tree = NULL; proto_tree *rudpm_tree=NULL; /* heuristic*/ - switch(tvb_get_guint8(tvb,offset+4)) {/*rudp packet type 0,1,2 only */ + switch(tvb_get_uint8(tvb,offset+4)) {/*rudp packet type 0,1,2 only */ case 0x0:/*NAK*/ case 0x1:/*ACK*/ break; case 0x2:/*PAYLOAD*/ - switch(tvb_get_guint8(tvb,offset+5)){/*payload type 0,1,2,3,ff only */ + switch(tvb_get_uint8(tvb,offset+5)){/*payload type 0,1,2,3,ff only */ case 0x0: /*NULL*/ case 0x1: /*UNISTIM*/ case 0x2: /*UNISTIM WITH TERM ID*/ @@ -217,9 +217,9 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_ offset+=4; proto_tree_add_item(rudpm_tree,hf_unistim_packet_type,tvb,offset,1,ENC_BIG_ENDIAN); - uinfo->rudp_type = tvb_get_guint8(tvb,offset); + uinfo->rudp_type = tvb_get_uint8(tvb,offset); - switch(tvb_get_guint8(tvb,offset)) { + switch(tvb_get_uint8(tvb,offset)) { case 0x00: /*NAK*/ col_add_fstr(pinfo->cinfo, COL_INFO, "NAK for seq - 0x%X", @@ -238,7 +238,6 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_ break; default: return 0; - break; } /* Queue packet for tap */ @@ -247,10 +246,10 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_ } static void -dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, gint offset, packet_info *pinfo){ +dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, int offset, packet_info *pinfo){ proto_item *ti; proto_tree *unistim_tree; - guint payload_proto=tvb_get_guint8(tvb,offset); + unsigned payload_proto=tvb_get_uint8(tvb,offset); /* Payload type for tap */ uinfo->payload_type = payload_proto; @@ -292,24 +291,24 @@ 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); } -static gint -dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *tvb,gint offset){ +static int +dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *tvb,int offset){ - guint command; - guint str_len; - guint dat_len; + unsigned command; + unsigned str_len; + unsigned dat_len; proto_tree *msg_tree; msg_tree = proto_tree_add_subtree(unistim_tree,tvb,offset,-1,ett_unistim,NULL,"UFTP CMD"); - command=tvb_get_guint8(tvb,offset); + command=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_uftp_command,tvb,offset,1,ENC_BIG_ENDIAN); @@ -365,21 +364,21 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t } -static gint -dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tvb,gint offset){ - guint addr; - guint msg_len; +static int +dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tvb,int offset){ + unsigned addr; + unsigned msg_len; proto_item *ti; proto_tree *msg_tree; msg_tree = proto_tree_add_subtree(unistim_tree,tvb,offset,-1,ett_unistim,&ti,"Unistim CMD"); - addr=tvb_get_guint8(tvb,offset); + addr=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_unistim_cmd_add,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - msg_len=tvb_get_guint8(tvb,offset); + msg_len=tvb_get_uint8(tvb,offset); if (msg_len<=2) { @@ -480,12 +479,12 @@ dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tv /*DONE*/ -static gint +static int dissect_basic_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint basic_cmd; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned basic_cmd; - basic_cmd=tvb_get_guint8(tvb,offset); + basic_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_basic_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); @@ -570,11 +569,11 @@ dissect_basic_phone(proto_tree *msg_tree, return offset; } /*DONE*/ -static gint +static int dissect_basic_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len){ - guint basic_cmd; - basic_cmd=tvb_get_guint8(tvb,offset); + tvbuff_t *tvb,int offset,unsigned msg_len){ + unsigned basic_cmd; + basic_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_basic_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(basic_cmd){ @@ -649,14 +648,14 @@ dissect_basic_switch(proto_tree *msg_tree, /*DONE*/ -static gint +static int dissect_broadcast_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint bcast_cmd; - guint year,month,day,hour,minute,second; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned bcast_cmd; + unsigned year,month,day,hour,minute,second; proto_tree *date_tree; proto_tree *time_tree; - bcast_cmd=tvb_get_guint8(tvb,offset); + bcast_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_broadcast_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(bcast_cmd){ @@ -675,12 +674,12 @@ dissect_broadcast_switch(proto_tree *msg_tree, break; case 0x02: /*Time and Date Download*/ - year=tvb_get_guint8(tvb,offset); - month=tvb_get_guint8(tvb,offset+1); - day=tvb_get_guint8(tvb,offset+2); - hour=tvb_get_guint8(tvb,offset+3); - minute=tvb_get_guint8(tvb,offset+4); - second=tvb_get_guint8(tvb,offset+5); + year=tvb_get_uint8(tvb,offset); + month=tvb_get_uint8(tvb,offset+1); + day=tvb_get_uint8(tvb,offset+2); + hour=tvb_get_uint8(tvb,offset+3); + minute=tvb_get_uint8(tvb,offset+4); + second=tvb_get_uint8(tvb,offset+5); date_tree=proto_tree_add_subtree_format(msg_tree,tvb,offset,3,ett_unistim,NULL, "Date %i/%i/%i",month,day,year%100); proto_tree_add_item(date_tree,hf_broadcast_year,tvb,offset,1,ENC_BIG_ENDIAN); @@ -721,9 +720,9 @@ dissect_broadcast_switch(proto_tree *msg_tree, return offset; } /*DONE Haven't seen any phone broadcasts, wouldn't expect to*/ -static gint +static int dissect_broadcast_phone(proto_tree *msg_tree, - tvbuff_t *tvb, gint offset,guint msg_len){ + tvbuff_t *tvb, int offset,unsigned msg_len){ proto_tree_add_item(msg_tree,hf_generic_data, tvb,offset,msg_len,ENC_NA); offset+=msg_len; @@ -732,17 +731,17 @@ dissect_broadcast_phone(proto_tree *msg_tree, } /*DONE*/ -static gint +static int dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, - tvbuff_t *tvb, gint offset,guint msg_len){ - guint clear_mask; - guint highlight_cmd; - guint time_date_mask; - guint display_cmd; - guint address_byte; - guint movement_byte; + tvbuff_t *tvb, int offset,unsigned msg_len){ + unsigned clear_mask; + unsigned highlight_cmd; + unsigned time_date_mask; + unsigned display_cmd; + unsigned address_byte; + unsigned movement_byte; proto_tree *address_tree; - display_cmd=tvb_get_guint8(tvb,offset); + display_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_display_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; @@ -805,7 +804,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, break; case 0x0f: /*Clear Field*/ - clear_mask=tvb_get_guint8(tvb,offset); + clear_mask=tvb_get_uint8(tvb,offset); /*need to know which paths to take*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_clear_numeric, @@ -896,7 +895,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, break; case 0x10: /*Cursor Control*/ - movement_byte=tvb_get_guint8(tvb,offset); + movement_byte=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_move_cmd,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_blink,tvb,offset,1,ENC_BIG_ENDIAN); @@ -906,7 +905,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, break; } if((movement_byte&0x01)==0x01){ - address_byte=tvb_get_guint8(tvb,offset); + address_byte=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_write_address_numeric, tvb,offset,1,ENC_BIG_ENDIAN); @@ -968,7 +967,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, break; case 0x17: /*Time and Date Format*/ - time_date_mask=tvb_get_guint8(tvb,offset); + time_date_mask=tvb_get_uint8(tvb,offset); if((time_date_mask&DISPLAY_USE_TIME_FORMAT)==DISPLAY_USE_TIME_FORMAT){ proto_tree_add_item(msg_tree,hf_display_time_format,tvb,offset,1,ENC_BIG_ENDIAN); } @@ -993,7 +992,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, #define F_TAG 4 if((display_cmd&F_ADDR)==F_ADDR){ address_tree=proto_tree_add_subtree(msg_tree,tvb,offset,0,ett_unistim,NULL,"Address Data"); - address_byte=tvb_get_guint8(tvb,offset); + address_byte=tvb_get_uint8(tvb,offset); proto_tree_add_item(address_tree,hf_basic_bit_field, tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(address_tree,hf_display_write_address_numeric, @@ -1088,7 +1087,7 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, break; case 0x23: /*Highlighted Field Definition*/ - highlight_cmd=tvb_get_guint8(tvb,offset); + highlight_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_display_cursor_numeric,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_context ,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_line,tvb,offset,1,ENC_BIG_ENDIAN); @@ -1186,12 +1185,12 @@ dissect_display_switch(proto_tree *msg_tree, packet_info *pinfo, return offset; } /*DONE*/ -static gint +static int dissect_display_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len){ - guint display_cmd; - guint highlight_cmd; - display_cmd=tvb_get_guint8(tvb,offset); + tvbuff_t *tvb,int offset,unsigned msg_len){ + unsigned display_cmd; + unsigned highlight_cmd; + display_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_display_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(display_cmd){ @@ -1238,7 +1237,7 @@ dissect_display_phone(proto_tree *msg_tree, break; case 0x03: /*Highlight Status On*/ - highlight_cmd=tvb_get_guint8(tvb,offset); + highlight_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_display_cursor_numeric,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_context ,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_line,tvb,offset,1,ENC_BIG_ENDIAN); @@ -1298,11 +1297,11 @@ dissect_display_phone(proto_tree *msg_tree, } -static gint +static int dissect_key_indicator_switch(proto_tree *msg_tree, - tvbuff_t *tvb, gint offset,guint msg_len){ - guint key_cmd; - key_cmd=tvb_get_guint8(tvb,offset); + tvbuff_t *tvb, int offset,unsigned msg_len){ + unsigned key_cmd; + key_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_key_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(key_cmd){ @@ -1416,21 +1415,21 @@ dissect_key_indicator_switch(proto_tree *msg_tree, } /*DONE*/ -static gint +static int dissect_key_indicator_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint key_cmd; - key_cmd=tvb_get_guint8(tvb,offset); + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned key_cmd; + key_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_key_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(key_cmd){ case 0x00: /*Key Event*/ /* Set the tap info */ - uinfo->key_state = tvb_get_guint8(tvb,offset); + uinfo->key_state = tvb_get_uint8(tvb,offset); uinfo->key_state >>= 6; /* Extract the key code */ - uinfo->key_val = (tvb_get_guint8(tvb,offset) & 0x3F); + uinfo->key_val = (tvb_get_uint8(tvb,offset) & 0x3F); proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_key_code,tvb,offset,1,ENC_BIG_ENDIAN); @@ -1511,13 +1510,13 @@ dissect_key_indicator_phone(proto_tree *msg_tree, /*Done*/ -static gint +static int dissect_network_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint network_cmd; - guint string_len; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned network_cmd; + unsigned string_len; - network_cmd=tvb_get_guint8(tvb,offset); + network_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_network_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(network_cmd){ @@ -1654,13 +1653,13 @@ dissect_network_switch(proto_tree *msg_tree, } /*DONE*/ -static gint +static int dissect_expansion_switch(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint expansion_cmd; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned expansion_cmd; - expansion_cmd=tvb_get_guint8(tvb,offset); + expansion_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_expansion_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; switch(expansion_cmd){ @@ -1701,16 +1700,16 @@ dissect_expansion_switch(proto_tree *msg_tree, return offset; } -static gint +static int dissect_expansion_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint expansion_cmd; - guint key_number; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned expansion_cmd; + unsigned key_number; - expansion_cmd=tvb_get_guint8(tvb,offset); + expansion_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_expansion_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; - key_number=(tvb_get_guint8(tvb,offset))-64; + key_number=(tvb_get_uint8(tvb,offset))-64; switch(expansion_cmd){ case 0x59: @@ -1723,13 +1722,13 @@ dissect_expansion_phone(proto_tree *msg_tree, return offset; } -static gint +static int dissect_network_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset, guint msg_len){ - guint network_cmd; + tvbuff_t *tvb,int offset, unsigned msg_len){ + unsigned network_cmd; proto_tree *server_tree; - guint i; - network_cmd=tvb_get_guint8(tvb,offset); + unsigned i; + network_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_network_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(network_cmd){ @@ -1768,7 +1767,7 @@ dissect_network_phone(proto_tree *msg_tree, break; case 0x05: /*Network Manager Options Report*/ - proto_tree_add_boolean(msg_tree,hf_net_phone_diag,tvb,offset,1,FALSE); + proto_tree_add_boolean(msg_tree,hf_net_phone_diag,tvb,offset,1,false); proto_tree_add_item(msg_tree,hf_net_phone_rudp,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; @@ -1790,7 +1789,7 @@ dissect_network_phone(proto_tree *msg_tree, offset+=1;msg_len-=1; for (i=1; msg_len>8; i++){ /*if less than 9 not full report so punt*/ -/* guint16 port_num; +/* uint16_t port_num; port_num=tvb_get_ntohs(tvb,offset); if(port_num<1064) break; @@ -1834,15 +1833,15 @@ dissect_network_phone(proto_tree *msg_tree, return offset; } /*DONE*/ -static gint +static int dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, - tvbuff_t *tvb,gint offset,guint msg_len){ + tvbuff_t *tvb,int offset,unsigned msg_len){ proto_tree *param_tree; - guint audio_cmd; - guint apb_op_code; - guint apb_data_len; - guint vocoder_param; - audio_cmd=tvb_get_guint8(tvb,offset); + unsigned audio_cmd; + unsigned apb_op_code; + unsigned apb_data_len; + unsigned vocoder_param; + audio_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(audio_cmd){ @@ -2050,13 +2049,13 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; while(msg_len>0){ - apb_op_code=tvb_get_guint8(tvb,offset); + apb_op_code=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_op_code,tvb, offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(apb_op_code>0x39){ /*should have a len + data*/ - apb_data_len=tvb_get_guint8(tvb,offset); + apb_data_len=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_param_len,tvb, offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; @@ -2112,15 +2111,15 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, proto_tree_add_item(msg_tree,hf_audio_far_ip_add,tvb,offset,4,ENC_BIG_ENDIAN); offset+=4;msg_len-=4; { - guint32 far_ip_addr; + uint32_t far_ip_addr; address far_addr; - guint16 far_port; + uint16_t far_port; far_ip_addr = tvb_get_ipv4(tvb, offset-4); set_address(&far_addr, AT_IPv4, 4, &far_ip_addr); far_port = tvb_get_ntohs(tvb, offset-8); - rtp_add_address(pinfo, PT_UDP, &far_addr, far_port, 0, "UNISTIM", pinfo->num, FALSE, NULL); + rtp_add_address(pinfo, PT_UDP, &far_addr, far_port, 0, "UNISTIM", pinfo->num, false, NULL); far_port = tvb_get_ntohs(tvb, offset-6); rtcp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->num); @@ -2178,7 +2177,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, offset+=1;msg_len-=1; while(msg_len>0){ param_tree=proto_tree_add_subtree(msg_tree,tvb,offset,0,ett_unistim,NULL,"Param"); - vocoder_param=tvb_get_guint8(tvb,offset); + vocoder_param=tvb_get_uint8(tvb,offset); proto_tree_add_item(param_tree,hf_basic_bit_field, tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(param_tree,hf_audio_vocoder_param, @@ -2270,15 +2269,15 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, } /*DONE*/ -static gint +static int dissect_audio_phone(proto_tree *msg_tree, - tvbuff_t *tvb,gint offset,guint msg_len){ - guint audio_cmd; - guint apb_op_code; - guint apb_data_len; - guint stream_dir; - guint stream_state; - audio_cmd=tvb_get_guint8(tvb,offset); + tvbuff_t *tvb,int offset,unsigned msg_len){ + unsigned audio_cmd; + unsigned apb_op_code; + unsigned apb_data_len; + unsigned stream_dir; + unsigned stream_state; + audio_cmd=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(audio_cmd){ @@ -2415,12 +2414,12 @@ dissect_audio_phone(proto_tree *msg_tree, break; case 0x13: /*Audio Stream Status Report*/ - stream_dir=tvb_get_guint8(tvb,offset); + stream_dir=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_stream_direction_code,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - stream_state=tvb_get_guint8(tvb,offset); + stream_state=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_stream_state,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if((AUDIO_STREAM_STATE&stream_state)!=AUDIO_STREAM_STATE) @@ -2462,13 +2461,13 @@ dissect_audio_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; while(msg_len>0){ - apb_op_code=tvb_get_guint8(tvb,offset); + apb_op_code=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_op_code,tvb, offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(apb_op_code>0x39){ /*should have a len + data*/ - apb_data_len=tvb_get_guint8(tvb,offset); + apb_data_len=tvb_get_uint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_param_len,tvb, offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; @@ -2744,23 +2743,23 @@ proto_register_unistim(void){ }, { &hf_basic_switch_query_attr, {"Query Basic Manager Attributes","unistim.basic.attrs",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_ATTRIBUTES,"Basic Query Attributes",HFILL} + 8,NULL,BASIC_QUERY_ATTRIBUTES,NULL,HFILL} }, { &hf_basic_switch_query_opts, {"Query Basic Manager Options","unistim.basic.opts",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_OPTIONS,"Basic Query Options",HFILL} + 8,NULL,BASIC_QUERY_OPTIONS,NULL,HFILL} }, { &hf_basic_switch_query_fw, {"Query Basic Switch Firmware","unistim.basic.fw",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_FW,"Basic Query Firmware",HFILL} + 8,NULL,BASIC_QUERY_FW,NULL,HFILL} }, { &hf_basic_switch_query_hw_id, {"Query Basic Manager Hardware ID","unistim.basic.hwid",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_HW_ID,"Basic Query Hardware ID",HFILL} + 8,NULL,BASIC_QUERY_HW_ID,NULL,HFILL} }, { &hf_basic_switch_query_it_type, {"Query Basic Manager Phone Type","unistim.basic.type",FT_BOOLEAN, - 8,NULL,BASIC_QUERY_IT_TYPE,"Basic Query Phone Type",HFILL} + 8,NULL,BASIC_QUERY_IT_TYPE,NULL,HFILL} }, { &hf_basic_switch_query_prod_eng_code, {"Query Basic Manager Prod Eng Code","unistim.basic.code",FT_BOOLEAN, @@ -3826,7 +3825,7 @@ proto_register_unistim(void){ /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_unistim }; diff --git a/plugins/epan/unistim/packet-unistim.h b/plugins/epan/unistim/packet-unistim.h index b1462a6a..0eb8db94 100644 --- a/plugins/epan/unistim/packet-unistim.h +++ b/plugins/epan/unistim/packet-unistim.h @@ -15,22 +15,22 @@ typedef struct _unistim_info_t { - guint8 rudp_type; /* NAK, ACK, Payload */ - guint8 payload_type; /* unistim payload type (aggregate, non-aggregate, encapsulated) */ - guint32 sequence; /* rudp sequence number */ - guint32 termid; /* termid if available */ + uint8_t rudp_type; /* NAK, ACK, Payload */ + uint8_t payload_type; /* unistim payload type (aggregate, non-aggregate, encapsulated) */ + uint32_t sequence; /* rudp sequence number */ + uint32_t termid; /* termid if available */ address it_ip; /* IP addr of it, determined by who is sending termids */ - guint32 it_port; /* port of it (phone) */ + uint32_t it_port; /* port of it (phone) */ address ni_ip; /* IP addr of ni (server) as determined by who's sending termids */ - gint key_val; /* actual key pressed (-1 if not used) */ - gint key_state; /* Key state 1=down 0=up */ - gint hook_state; /* Hook state 1=offhook 0=onhook */ - gint stream_connect; /* Audio stream connect 1=connect 0=disconnect */ - gint trans_connect; /* Transducer connect? 1=connect 0=disconnect */ - gint set_termid; /* Set the termid 1=set termid */ - const guint8 *string_data; /* Any time a string is written to the display, this has the string */ - gint call_state; /* Not used? */ - guchar *key_buffer; /* Used in voip-calls.c tap, holds call keys pressed */ + int key_val; /* actual key pressed (-1 if not used) */ + int key_state; /* Key state 1=down 0=up */ + int hook_state; /* Hook state 1=offhook 0=onhook */ + int stream_connect; /* Audio stream connect 1=connect 0=disconnect */ + int trans_connect; /* Transducer connect? 1=connect 0=disconnect */ + int set_termid; /* Set the termid 1=set termid */ + const uint8_t *string_data; /* Any time a string is written to the display, this has the string */ + int call_state; /* Not used? */ + unsigned char *key_buffer; /* Used in voip-calls.c tap, holds call keys pressed */ } unistim_info_t; #endif diff --git a/plugins/epan/unistim/uftp.h b/plugins/epan/unistim/uftp.h index 865f23b5..c6d9fa7a 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"}, |