diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-05-18 21:06:20 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-05-18 21:06:20 +0000 |
| commit | 55d2b928c25bbf1279d03560a50a071f9e5d9f5d (patch) | |
| tree | 73fd0bdd4133b7c7f3ad9e8aa1bb51c59f2cc0a6 /gtk/airpcap_gui_utils.h | |
| parent | 86ba8937c73843cf0ae3b5c485f7e0e38b142649 (diff) | |
| download | wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.tar.gz wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.tar.bz2 wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.zip | |
From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
some related upcoming code changes.
- Remove airpcap.h from the repository, since it exists in the AirPcap
devpack (and will be superseded Real Soon Now).
- Show the individual channel flag bits in radiotap.
Fix the 802.11n MCS set display.
This is a partial checkin, so hopefully nothing is broken.
svn path=/trunk/; revision=21831
Diffstat (limited to 'gtk/airpcap_gui_utils.h')
| -rw-r--r-- | gtk/airpcap_gui_utils.h | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/gtk/airpcap_gui_utils.h b/gtk/airpcap_gui_utils.h index d4e4e7c604..5139de8941 100644 --- a/gtk/airpcap_gui_utils.h +++ b/gtk/airpcap_gui_utils.h @@ -35,7 +35,8 @@ #define AIRPCAP_LINK_TYPE_NAME_802_11_ONLY "802.11 Only" #define AIRPCAP_LINK_TYPE_NAME_802_11_PLUS_RADIO "802.11 + Radio" -#define AIRPCAP_LINK_TYPE_NAME_UNKNOWN "Unknown" +#define AIRPCAP_LINK_TYPE_NAME_UNKNOWN "Unknown" +#define AIRPCAP_LINK_TYPE_NAME_802_11_PLUS_PPI "802.11 + PPI" #define AIRPCAP_DECRYPTION_TYPE_STRING_WIRESHARK "Wireshark" #define AIRPCAP_DECRYPTION_TYPE_STRING_AIRPCAP "Driver" @@ -44,6 +45,9 @@ #define NO_ROW_SELECTED -1 #define NO_COLUMN_SELECTED -1 +/* Controls the releay of settings back to the adapter. */ +extern gboolean change_airpcap_settings; + /* * This structure is used because we need to store infos about the currently selected * row in the key list. @@ -147,10 +151,16 @@ AirpcapValidationType airpcap_validation_type_combo_get_type(GtkWidget* c); /* + * Update channel offset combo box to 'offset'. + */ +void +airpcap_update_channel_offset_combo_entry(GtkWidget* w, gchar extChannel); + +/* * Returns the string corresponding to the given UINT (1-14, for channel only) */ -UINT -airpcap_get_channel_number(const gchar* s); +ULONG +airpcap_get_frequency_from_str(const gchar* s); /* * Retrieve the UINT corresponding to the given string (channel only, handle with care!) @@ -171,6 +181,12 @@ int airpcap_if_is_any(airpcap_if_info_t* if_info); /* + * Change channel of Airpcap Adapter + */ +gboolean +airpcap_update_frequency_and_offset(airpcap_if_info_t* if_info); + +/* * Takes the keys from the GtkList widget, and add them to the interface list */ void @@ -183,6 +199,18 @@ void airpcap_update_channel_combo(GtkWidget* w, airpcap_if_info_t* if_info); /* + * Update the channel offset of the given combobox + */ +void +airpcap_update_channel_offset_cb(airpcap_if_info_t* if_info, ULONG ch_freq, GtkWidget *channel_offset_cb); + +/* + * Update channel offset combo box given the selected frequency. Return the flags from the given frequency. + */ +ULONG +airpcap_load_channel_offset_cb(airpcap_if_info_t* if_info, GtkWidget* channel_offset_cb, ULONG chan_freq); + +/* * This function will take the current keys (widget list), specified for the * current adapter, and save them as default for ALL the others. */ |