optimize imports

OpenHD · Aug 13, 2023 · 20c2087 · 20c2087
1 parent 1eeaa4d
commit 20c2087
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 64 deletions.
diff --git a/WBLib.cmake b/WBLib.cmake
@@ -32,7 +32,8 @@ target_sources(wifibroadcast PUBLIC
         ${CMAKE_CURRENT_LIST_DIR}/src/Ieee80211Header.hpp
         ${CMAKE_CURRENT_LIST_DIR}/src/RadiotapHeader.hpp
         ${CMAKE_CURRENT_LIST_DIR}/src/RSSIAccumulator.hpp
-        ${CMAKE_CURRENT_LIST_DIR}/src/wifibroadcast-spdlog-fake.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/src/wifibroadcast_spdlog.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/src/wifibroadcast_spdlog_fake.cpp
         ${CMAKE_CURRENT_LIST_DIR}/src/Encryption.cpp
         )
 target_include_directories(wifibroadcast PUBLIC

diff --git a/executables/example_hello.cpp b/executables/example_hello.cpp
@@ -5,7 +5,7 @@
 #include "../src/WBStreamRx.h"
 #include "../src/WBStreamTx.h"
 #include "../src/WBTxRx.h"
-#include "../src/wifibroadcast-spdlog.h"
+#include "../src/wifibroadcast_spdlog.h"
 #include "RandomBufferPot.hpp"
 
 /**

diff --git a/executables/example_pollute.cpp b/executables/example_pollute.cpp
@@ -5,7 +5,7 @@
 #include "../src/WBStreamRx.h"
 #include "../src/WBStreamTx.h"
 #include "../src/WBTxRx.h"
-#include "../src/wifibroadcast-spdlog.h"
+#include "../src/wifibroadcast_spdlog.h"
 #include "RandomBufferPot.hpp"
 
 /**

diff --git a/executables/example_udp.cpp b/executables/example_udp.cpp
@@ -2,15 +2,15 @@
 // Created by consti10 on 30.06.23.
 //
 
+#include "../src/HelperSources/SocketHelper.hpp"
+#include "../src/HelperSources/TimeHelper.hpp"
 #include "../src/WBStreamRx.h"
 #include "../src/WBStreamTx.h"
 #include "../src/WBTxRx.h"
-#include "../src/wifibroadcast-spdlog.h"
-#include "../src/HelperSources/SocketHelper.hpp"
-#include "RandomBufferPot.hpp"
-#include "../src/HelperSources/TimeHelper.hpp"
 #include "../src/legacy/WBStreamRxUDP.h"
 #include "../src/legacy/WBStreamTxUDP.h"
+#include "../src/wifibroadcast_spdlog.h"
+#include "RandomBufferPot.hpp"
 
 /**
  * Simple example application that uses UDP as data input / output

diff --git a/executables/injection_rate_test.cpp b/executables/injection_rate_test.cpp
@@ -5,7 +5,7 @@
 #include "../src/WBStreamRx.h"
 #include "../src/WBStreamTx.h"
 #include "../src/WBTxRx.h"
-#include "../src/wifibroadcast-spdlog.h"
+#include "../src/wifibroadcast_spdlog.h"
 #include "DummyStreamGenerator.hpp"
 #include "RandomBufferPot.hpp"
 #include "Rates.hpp"

diff --git a/executables/test_txrx.cpp b/executables/test_txrx.cpp
@@ -5,7 +5,7 @@
 #include "../src/WBStreamRx.h"
 #include "../src/WBStreamTx.h"
 #include "../src/WBTxRx.h"
-#include "../src/wifibroadcast-spdlog.h"
+#include "../src/wifibroadcast_spdlog.h"
 #include "RandomBufferPot.hpp"
 
 int main(int argc, char *const *argv) {

diff --git a/executables/unit_test.cpp b/executables/unit_test.cpp
@@ -30,7 +30,7 @@
 #include "../src/Encryption.h"
 #include "../src/HelperSources/Helper.hpp"
 #include "../src/Ieee80211Header.hpp"
-#include "../src/wifibroadcast-spdlog.h"
+#include "../src/wifibroadcast_spdlog.h"
 
 // Simple unit testing for the FEC lib that doesn't require wifi cards
 

diff --git a/src/Encryption.cpp b/src/Encryption.cpp
@@ -8,7 +8,7 @@
 #include <cstring>
 #include <iostream>
 
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 wb::KeyPairTxRx wb::generate_keypair_random() {
   KeyPairTxRx ret{};

diff --git a/src/FECStream.cpp b/src/FECStream.cpp
@@ -2,11 +2,12 @@
 // Created by consti10 on 30.06.23.
 //
 
+#include "FECStream.h"
+
 #include <cmath>
 
 #include "FEC.hpp"
-#include "FECStream.h"
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 void FECEncoder::encode_block(
     std::vector<std::shared_ptr<std::vector<uint8_t>>> data_packets,

diff --git a/src/HelperSources/NonceSeqNrHelper.h b/src/HelperSources/NonceSeqNrHelper.h
@@ -6,10 +6,10 @@
 #define WIFIBROADCAST_NONCESEQNRHELPER_H
 
 #include <atomic>
-#include <memory>
 #include <cmath>
+#include <memory>
 
-#include "../wifibroadcast-spdlog.h"
+#include "../wifibroadcast_spdlog.h"
 #include "StringHelper.hpp"
 
 // Helper for dealing with sequence number

diff --git a/src/HelperSources/SchedulingHelper.hpp b/src/HelperSources/SchedulingHelper.hpp
@@ -8,9 +8,11 @@
 #include <pthread.h>
 #include <sys/resource.h>
 #include <unistd.h>
-#include <string>
+
 #include <iostream>
-#include "../wifibroadcast-spdlog.h"
+#include <string>
+
+#include "../wifibroadcast_spdlog.h"
 
 namespace SchedulingHelper {
 static void printCurrentThreadPriority(const std::string& name) {

diff --git a/src/HelperSources/SeqNrHelper.hpp b/src/HelperSources/SeqNrHelper.hpp
@@ -9,7 +9,7 @@
 #include <cmath>
 #include <memory>
 
-#include "../wifibroadcast-spdlog.h"
+#include "../wifibroadcast_spdlog.h"
 
 namespace seq_nr{
 

diff --git a/src/HelperSources/SequenceNumberDebugger.hpp b/src/HelperSources/SequenceNumberDebugger.hpp
@@ -5,12 +5,13 @@
 #ifndef WIFIBROADCAST_SRC_HELPERSOURCES_SEQUENCENUMBERDEBUGGER_H_
 #define WIFIBROADCAST_SRC_HELPERSOURCES_SEQUENCENUMBERDEBUGGER_H_
 
-#include <vector>
+#include <chrono>
 #include <cstdint>
 #include <iostream>
-#include <chrono>
+#include <vector>
+
+#include "../wifibroadcast_spdlog.h"
 #include "StringHelper.hpp"
-#include "../wifibroadcast-spdlog.h"
 
 /**
  * Debug the n lost packets and the n of packet gaps by for a continuous stream of packets with increasing sequence number.

diff --git a/src/HelperSources/SocketHelper.hpp b/src/HelperSources/SocketHelper.hpp
@@ -5,23 +5,24 @@
 #ifndef WIFIBROADCAST_SOCKETHELPER_HPP
 #define WIFIBROADCAST_SOCKETHELPER_HPP
 
-#include <list>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <net/if.h>
 #include <netinet/ether.h>
+#include <netinet/in.h>
 #include <netpacket/packet.h>
-#include <termio.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
-#include <optional>
+#include <sys/socket.h>
+#include <termio.h>
 #include <unistd.h>
+
+#include <list>
 #include <mutex>
+#include <optional>
 #include <thread>
 
+#include "../wifibroadcast_spdlog.h"
 #include "Helper.hpp"
 #include "TimeHelper.hpp"
-#include "../wifibroadcast-spdlog.h"
 
 namespace SocketHelper {
 struct UDPConfig{

diff --git a/src/Ieee80211Header.hpp b/src/Ieee80211Header.hpp
@@ -1,27 +1,27 @@
 #ifndef __WIFIBROADCAST_IEEE80211_HEADER_HPP__
 #define __WIFIBROADCAST_IEEE80211_HEADER_HPP__
 
-#include <cstdio>
-#include <cstdlib>
-#include <cerrno>
-#include <resolv.h>
-#include <cstring>
-#include <utime.h>
-#include <unistd.h>
-#include <getopt.h>
 #include <endian.h>
 #include <fcntl.h>
+#include <getopt.h>
+#include <resolv.h>
 #include <sys/mman.h>
-#include <endian.h>
-#include <string>
-#include <sstream>
-#include <vector>
+#include <unistd.h>
+#include <utime.h>
+
 #include <array>
-#include <iostream>
 #include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
 
-#include "wifibroadcast-spdlog.h"
 #include "HelperSources/StringHelper.hpp"
+#include "wifibroadcast_spdlog.h"
 
 // Helper for dealing with the IEEE80211 header in wifibroadcast / openhd
 // Usefully references:

diff --git a/src/RSSIAccumulator.hpp b/src/RSSIAccumulator.hpp
@@ -8,7 +8,7 @@
 #include <optional>
 
 #include "TimeHelper.hpp"
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 /**
  * Helper to accumulate RSSI values

diff --git a/src/RadiotapHeader.hpp b/src/RadiotapHeader.hpp
@@ -7,28 +7,28 @@ extern "C" {
 #include "external/radiotap/radiotap.h"
 };
 
+#include <endian.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <pcap.h>
+#include <resolv.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <utime.h>
+
+#include <cassert>
+#include <cerrno>
+#include <chrono>
 #include <cstdio>
 #include <cstdlib>
-#include <cerrno>
-#include <resolv.h>
 #include <cstring>
-#include <utime.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <pcap.h>
-#include <endian.h>
-#include <fcntl.h>
 #include <ctime>
-#include <sys/mman.h>
-#include <endian.h>
+#include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <chrono>
-#include <sstream>
-#include <iostream>
-#include <cassert>
 
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 // everything must be in little endian byte order http://www.radiotap.org/
 static_assert(__BYTE_ORDER == __LITTLE_ENDIAN, "This code is written for little endian only !");

diff --git a/src/SignalQualityAccumulator.hpp b/src/SignalQualityAccumulator.hpp
@@ -8,7 +8,7 @@
 #include <optional>
 
 #include "TimeHelper.hpp"
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 /**
  * Helper to accumulate (rtl8812au) signal quality values

diff --git a/src/WBStreamRx.h b/src/WBStreamRx.h
@@ -14,7 +14,7 @@
 #include "HelperSources/TimeHelper.hpp"
 #include "SimpleStream.hpp"
 #include "WBTxRx.h"
-#include "wifibroadcast-spdlog.h"
+#include "wifibroadcast_spdlog.h"
 
 /**
  * Receiver for a (multiplexed) wifbroadcast stream

diff --git a/src/wifibroadcast_spdlog.cpp b/src/wifibroadcast_spdlog.cpp
@@ -0,0 +1,5 @@
+//
+// Created by consti10 on 13.08.23.
+//
+
+#include "wifibroadcast_spdlog.h"
diff --git a/src/wifibroadcast-spdlog.h → src/wifibroadcast_spdlog.h b/src/wifibroadcast-spdlog.h → src/wifibroadcast_spdlog.h
@@ -5,9 +5,9 @@
 #ifndef WIFIBROADCAST_SRC_WIFIBROADCAST_SPDLOG_H_
 #define WIFIBROADCAST_SRC_WIFIBROADCAST_SPDLOG_H_
 
-#include "wifibroadcast-spdlog-fake.h"
+//#include "wifibroadcast-spdlog-fake.h"
 
-/*#include <spdlog/sinks/stdout_color_sinks.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>
 #include <mutex>
 
@@ -30,5 +30,5 @@ static std::shared_ptr<spdlog::logger> get_default() {
   return create_or_get("wifibroadcast");
 }
 
-}*/
+}
 #endif  // WIFIBROADCAST_SRC_WIFIBROADCAST_SPDLOG_H_
diff --git a/src/wifibroadcast-spdlog-fake.cpp → src/wifibroadcast_spdlog_fake.cpp b/src/wifibroadcast-spdlog-fake.cpp → src/wifibroadcast_spdlog_fake.cpp
@@ -2,7 +2,7 @@
 // Created by consti10 on 13.08.23.
 //
 
-#include "wifibroadcast-spdlog-fake.h"
+#include "wifibroadcast_spdlog_fake.h"
 
 void spdlog::logger::lool() {
 

diff --git a/src/wifibroadcast-spdlog-fake.h → src/wifibroadcast_spdlog_fake.h b/src/wifibroadcast-spdlog-fake.h → src/wifibroadcast_spdlog_fake.h