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>

6 files changed, 2 insertions, 188 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index dbd6448012..9de53140fe 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1605,7 +1605,6 @@ set(LIBWIRESHARK_FILES
 	follow.c
 	frame_data.c
 	frame_data_sequence.c
-	frequency-utils.c
 	funnel.c
 	g_int64_hash_routines.c
 	gcp.c
diff --git a/epan/Makefile.common b/epan/Makefile.common
index de70f8f8f5..52b772ebd1 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -56,7 +56,6 @@ LIBWIRESHARK_SRC =		\
 	follow.c		\
 	frame_data.c		\
 	frame_data_sequence.c	\
-	frequency-utils.c	\
 	funnel.c		\
 	g_int64_hash_routines.c	\
 	gcp.c			\
@@ -196,7 +195,6 @@ LIBWIRESHARK_INCLUDES =		\
 	follow.h		\
 	frame_data.h		\
 	frame_data_sequence.h	\
-	frequency-utils.h	\
 	funnel.h		\
 	g_int64_hash_routines.h	\
 	garrayfix.h		\
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 93a5b7c832..d875f9e9ea 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <wsutil/pint.h>
 #include <epan/crc32-tvb.h>
-#include <epan/frequency-utils.h>
+#include <wsutil/frequency-utils.h>
 #include <epan/tap.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 44e3faba27..c6ef8173a4 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -51,7 +51,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <epan/reassemble.h>
-#include <epan/frequency-utils.h>
+#include <wsutil/frequency-utils.h>
 #include <wsutil/pint.h>
 
 /* Needed for wtap_pcap_encap_to_wtap_encap(). */
diff --git a/epan/frequency-utils.c b/epan/frequency-utils.c
deleted file mode 100644
index 2ee6bc9d8c..0000000000
--- a/epan/frequency-utils.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* 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/epan/frequency-utils.h b/epan/frequency-utils.h
deleted file mode 100644
index 10603e06d7..0000000000
--- a/epan/frequency-utils.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 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:
- */