aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-06-11 15:05:44 -0700
committerGerald Combs <gerald@wireshark.org>2015-06-16 03:45:54 +0000
commitece4b01f218ab4e71233580e199e830b83958c99 (patch)
treef7503d8f097b6e3f6406dd3f6b0c69bb46b97909 /wsutil
parent2a3fa1418544469e7dc6f0e0fddb6eaab507b71a (diff)
Add the wireless toolbar.
Add the wireless toolbar to the Qt UI. Start adding AirPcap support to ui/80211_utils. Add FCS validation routines to ws80211_utils. Move a bunch of AirPcap routines that require epan from caputils to ui/gtk. They were required for driver key management, which we'll leave to the AirPcap Control Panel in the Qt UI. Move frequency-utils to wsutil. Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1 Reviewed-on: https://code.wireshark.org/review/8910 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/CMakeLists.txt1
-rw-r--r--wsutil/Makefile.common2
-rw-r--r--wsutil/frequency-utils.c107
-rw-r--r--wsutil/frequency-utils.h76
4 files changed, 186 insertions, 0 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 6741ce4c8c..d21dac6fb0 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -52,6 +52,7 @@ set(WSUTIL_FILES
des.c
eax.c
filesystem.c
+ frequency-utils.c
g711.c
jsmn.c
md4.c
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 9507e3f146..19626aef34 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -49,6 +49,7 @@ LIBWSUTIL_SRC = \
des.c \
eax.c \
filesystem.c \
+ frequency-utils.c \
g711.c \
jsmn.c \
md4.c \
@@ -98,6 +99,7 @@ libwsutil_nonrepl_INCLUDES = \
des.h \
eax.h \
filesystem.h \
+ frequency-utils.h \
g711.h \
jsmn.h \
md4.h \
diff --git a/wsutil/frequency-utils.c b/wsutil/frequency-utils.c
new file mode 100644
index 0000000000..2ee6bc9d8c
--- /dev/null
+++ b/wsutil/frequency-utils.c
@@ -0,0 +1,107 @@
+/* frequency-utils.c
+ * Frequency conversion utility definitions
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2007 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+
+#include "frequency-utils.h"
+
+typedef struct freq_cvt_s {
+ guint fmin; /* Minimum frequency in MHz */
+ guint fmax; /* Maximum frequency in MHz */
+ gint cmin; /* Minimum/base channel */
+ gboolean is_bg; /* B/G channel? */
+} freq_cvt_t;
+
+#define FREQ_STEP 5 /* MHz. This seems to be consistent, thankfully */
+
+/* From "802.11 Wireless Networks: The Definitive Guide", 2nd Ed. by Matthew Gast */
+static freq_cvt_t freq_cvt[] = {
+ { 2412, 2472, 1, TRUE }, /* Table 12-1, p 257 */
+ { 2484, 2484, 14, TRUE }, /* Table 12-1, p 257 */
+ { 5000, 5995, 0, FALSE }, /* Table 13-1, p 289 */
+ { 4920, 4995, 240, FALSE } /* Table 13-1, p 289 */
+};
+
+#define NUM_FREQ_CVT (sizeof(freq_cvt) / sizeof(freq_cvt_t))
+#define MAX_CHANNEL(fc) ( (gint) ((fc.fmax - fc.fmin) / FREQ_STEP) + fc.cmin )
+
+/*
+ * Get channel number given a Frequency
+ */
+gint
+ieee80211_mhz_to_chan(guint freq) {
+ guint i;
+
+ for (i = 0; i < NUM_FREQ_CVT; i++) {
+ if (freq >= freq_cvt[i].fmin && freq <= freq_cvt[i].fmax) {
+ return ((freq - freq_cvt[i].fmin) / FREQ_STEP) + freq_cvt[i].cmin;
+ }
+ }
+ return -1;
+}
+
+/*
+ * Get Frequency given a Channel number
+ */
+guint
+ieee80211_chan_to_mhz(gint chan, gboolean is_bg) {
+ guint i;
+
+ for (i = 0; i < NUM_FREQ_CVT; i++) {
+ if (is_bg == freq_cvt[i].is_bg &&
+ chan >= freq_cvt[i].cmin && chan <= MAX_CHANNEL(freq_cvt[i])) {
+ return ((chan - freq_cvt[i].cmin) * FREQ_STEP) + freq_cvt[i].fmin;
+ }
+ }
+ return 0;
+}
+
+/*
+ * Get channel representation string given a Frequency
+ */
+gchar*
+ieee80211_mhz_to_str(guint freq){
+ gint chan = ieee80211_mhz_to_chan(freq);
+ gboolean is_bg = FREQ_IS_BG(freq);
+
+ if (chan < 0) {
+ return g_strdup_printf("%u", freq);
+ } else {
+ return g_strdup_printf("%u [%s %u]", freq, is_bg ? "BG" : "A",
+ chan);
+ }
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/wsutil/frequency-utils.h b/wsutil/frequency-utils.h
new file mode 100644
index 0000000000..10603e06d7
--- /dev/null
+++ b/wsutil/frequency-utils.h
@@ -0,0 +1,76 @@
+/* frequency-utils.h
+ * Frequency conversion utility definitions
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 2007 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __FREQUENCY_UTILS_H__
+#define __FREQUENCY_UTILS_H__
+
+#include "ws_symbol_export.h"
+
+/** @file
+ * Frequency and channel conversion utilities.
+ */
+
+/**
+ * Given a center frequency in MHz, return a channel number.
+ * @param freq Frequency in MHz.
+ * @return The equivalent channel or -1 if no match is found.
+ */
+WS_DLL_PUBLIC
+gint
+ieee80211_mhz_to_chan(guint freq);
+
+/**
+ * Given a channel number and a band type, return a center frequency.
+ * @param chan Channel number
+ * @param is_bg TRUE if the channel is a b/g channel, FALSE otherwise.
+ * @return The equivalent frequency or 0 if no match is found.
+ */
+WS_DLL_PUBLIC
+guint
+ieee80211_chan_to_mhz(gint chan, gboolean is_bg);
+
+/**
+ * Given a frequency in MHz, return a string representation.
+ * @param freq Frequench in MHz.
+ * @return A string showing the frequency, channel number, and type. The string must be freed with g_free() after use.
+ */
+WS_DLL_PUBLIC
+gchar*
+ieee80211_mhz_to_str(guint freq);
+
+/* Should this be "(freq < 4920)", or something else? */
+#define FREQ_IS_BG(freq) (freq <= 2484)
+
+#endif /* __FREQUENCY_UTILS_H__ */
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */