Split dot11.h and dot11.cpp into several files.

2026-01-30 05:24:26 +01:00 · 2013-05-31 22:16:56 -03:00
parent eeb62add59
commit ec8374be60
54 changed files with 6971 additions and 5925 deletions
--- a/tests/src/dot11/ack.cpp
+++ b/tests/src/dot11/ack.cpp
@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
+#include "dot11/dot11_control.h"
 #include "tests/dot11.h"


@@ -83,12 +80,12 @@ TEST_F(Dot11AckTest, CopyAssignmentOperator) {

 TEST_F(Dot11AckTest, ClonePDU) {
    Dot11Ack dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11Ack> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11Ack>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11AckTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11Ack *inner = dot11->find_pdu<Dot11Ack>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/assoc_request.cpp
+++ b/tests/src/dot11/assoc_request.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_assoc.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -71,12 +68,12 @@ TEST_F(Dot11AssocRequestTest, ListenInterval) {

 TEST_F(Dot11AssocRequestTest, ClonePDU) {
    Dot11AssocRequest dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11AssocRequest> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11AssocRequest>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11AssocRequestTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11AssocRequest *inner = dot11->find_pdu<Dot11AssocRequest>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/assoc_response.cpp
+++ b/tests/src/dot11/assoc_response.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_assoc.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -79,12 +76,12 @@ TEST_F(Dot11AssocResponseTest, AID) {

 TEST_F(Dot11AssocResponseTest, ClonePDU) {
    Dot11AssocResponse dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11AssocResponse> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11AssocResponse>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11AssocResponseTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11AssocResponse *inner = dot11->find_pdu<Dot11AssocResponse>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/authentication.cpp
+++ b/tests/src/dot11/authentication.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_auth.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -87,12 +84,12 @@ TEST_F(Dot11AuthenticationTest, AuthAlgorithm) {

 TEST_F(Dot11AuthenticationTest, ClonePDU) {
    Dot11Authentication dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11Authentication> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11Authentication>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11AuthenticationTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11Authentication *inner = dot11->find_pdu<Dot11Authentication>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/beacon.cpp
+++ b/tests/src/dot11/beacon.cpp
@@ -1,10 +1,7 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
+#include "dot11/dot11_beacon.h"
 #include "rsn_information.h"
-#include "tests/dot11.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -109,7 +106,7 @@ TEST_F(Dot11BeaconTest, SeqNum) {
 }

 TEST_F(Dot11BeaconTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11Beacon *beacon = dot11->find_pdu<Dot11Beacon>();
    ASSERT_TRUE(beacon);
--- a/tests/src/dot11/block_ack_request.cpp
+++ b/tests/src/dot11/block_ack_request.cpp
@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
+#include "dot11/dot11_control.h"
 #include "tests/dot11.h"


@@ -75,12 +72,12 @@ TEST_F(Dot11BlockAckRequestTest, ClonePDU) {
    dot1.fragment_number(6);
    dot1.start_sequence(0x294);
    dot1.bar_control(0x9);
-    std::auto_ptr<Dot11BlockAckRequest> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11BlockAckRequest>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11BlockAckRequestTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11BlockAckRequest *inner = dot11->find_pdu<Dot11BlockAckRequest>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/cfend.cpp
+++ b/tests/src/dot11/cfend.cpp
@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "tests/dot11_control.h"


 using namespace std;
@@ -59,12 +55,12 @@ TEST_F(Dot11CFEndTest, CopyAssignmentOperator) {

 TEST_F(Dot11CFEndTest, ClonePDU) {
    Dot11CFEnd dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11CFEnd> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11CFEnd>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11CFEndTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11CFEnd *inner = dot11->find_pdu<Dot11CFEnd>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/cfendack.cpp
+++ b/tests/src/dot11/cfendack.cpp
@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "tests/dot11_control.h"


 using namespace std;
@@ -59,12 +55,12 @@ TEST_F(Dot11EndCFAckTest, CopyAssignmentOperator) {

 TEST_F(Dot11EndCFAckTest, ClonePDU) {
    Dot11EndCFAck dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11EndCFAck> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11EndCFAck>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11EndCFAckTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11EndCFAck *inner = dot11->find_pdu<Dot11EndCFAck>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/data.cpp
+++ b/tests/src/dot11/data.cpp
@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "cxxstd.h"
-#include "tests/dot11.h"
+#include "tests/dot11_data.h"


 using namespace std;
--- a/tests/src/dot11/deauthentication.cpp
+++ b/tests/src/dot11/deauthentication.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_auth.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -69,12 +66,12 @@ TEST_F(Dot11DeauthenticationTest, ReasonCode) {

 TEST_F(Dot11DeauthenticationTest, ClonePDU) {
    Dot11Deauthentication dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11Deauthentication> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11Deauthentication>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11DeauthenticationTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11Deauthentication *inner = dot11->find_pdu<Dot11Deauthentication>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/disassoc.cpp
+++ b/tests/src/dot11/disassoc.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_assoc.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -70,12 +67,12 @@ TEST_F(Dot11DisassocTest, ReasonCode) {

 TEST_F(Dot11DisassocTest, ClonePDU) {
    Dot11Disassoc dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11Disassoc> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11Disassoc>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11DisassocTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11Disassoc *inner = dot11->find_pdu<Dot11Disassoc>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/dot11.cpp
+++ b/tests/src/dot11/dot11.cpp
@@ -1,9 +1,4 @@
 #include <gtest/gtest.h>
-#include <cstring>
-#include <string>
-#include <algorithm>
-#include <stdint.h>
-#include "dot11.h"
 #include "tests/dot11.h"
 #include "utils.h"

--- a/tests/src/dot11/probe_request.cpp
+++ b/tests/src/dot11/probe_request.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_probe.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -60,12 +57,12 @@ TEST_F(Dot11ProbeRequestTest, CopyAssignmentOperator) {

 TEST_F(Dot11ProbeRequestTest, ClonePDU) {
    Dot11ProbeRequest dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11ProbeRequest> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11ProbeRequest>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11ProbeRequestTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11ProbeRequest *inner = dot11->find_pdu<Dot11ProbeRequest>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/probe_response.cpp
+++ b/tests/src/dot11/probe_response.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_probe.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -78,12 +75,12 @@ TEST_F(Dot11ProbeResponseTest, Timestamp) {

 TEST_F(Dot11ProbeResponseTest, ClonePDU) {
    Dot11ProbeResponse dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11ProbeResponse> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11ProbeResponse>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11ProbeResponseTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11ProbeResponse *inner = dot11->find_pdu<Dot11ProbeResponse>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/pspoll.cpp
+++ b/tests/src/dot11/pspoll.cpp
@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "tests/dot11_control.h"


 using namespace std;
@@ -59,12 +55,12 @@ TEST_F(Dot11PSPollTest, CopyAssignmentOperator) {

 TEST_F(Dot11PSPollTest, ClonePDU) {
    Dot11PSPoll dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11PSPoll> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11PSPoll>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11PSPollTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11PSPoll *inner = dot11->find_pdu<Dot11PSPoll>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/reassoc_request.cpp
+++ b/tests/src/dot11/reassoc_request.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_assoc.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -78,12 +75,12 @@ TEST_F(Dot11ReAssocRequestTest, CurrentAP) {

 TEST_F(Dot11ReAssocRequestTest, ClonePDU) {
    Dot11ReAssocRequest dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11ReAssocRequest> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11ReAssocRequest>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11ReAssocRequestTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11ReAssocRequest *inner = dot11->find_pdu<Dot11ReAssocRequest>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/reassoc_response.cpp
+++ b/tests/src/dot11/reassoc_response.cpp
@@ -1,9 +1,6 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "dot11/dot11_assoc.h"
+#include "tests/dot11_mgmt.h"


 using namespace std;
@@ -67,12 +64,12 @@ TEST_F(Dot11ReAssocResponseTest, CopyAssignmentOperator) {

 TEST_F(Dot11ReAssocResponseTest, ClonePDU) {
    Dot11ReAssocResponse dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11ReAssocResponse> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11ReAssocResponse>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11ReAssocResponseTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11ReAssocResponse *inner = dot11->find_pdu<Dot11ReAssocResponse>();
    ASSERT_TRUE(inner);
--- a/tests/src/dot11/rts.cpp
+++ b/tests/src/dot11/rts.cpp
@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <algorithm>
-#include <memory>
-#include <stdint.h>
-#include "dot11.h"
-#include "tests/dot11.h"
+#include "tests/dot11_control.h"


 using namespace std;
@@ -59,12 +55,12 @@ TEST_F(Dot11RTSTest, CopyAssignmentOperator) {

 TEST_F(Dot11RTSTest, ClonePDU) {
    Dot11RTS dot1(expected_packet, sizeof(expected_packet));
-    std::auto_ptr<Dot11RTS> dot2(dot1.clone());
+    Internals::smart_ptr<Dot11RTS>::type dot2(dot1.clone());
    test_equals(dot1, *dot2);
 }

 TEST_F(Dot11RTSTest, FromBytes) {
-    std::auto_ptr<PDU> dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
+    Internals::smart_ptr<PDU>::type dot11(Dot11::from_bytes(expected_packet, sizeof(expected_packet)));
    ASSERT_TRUE(dot11.get());
    const Dot11RTS *inner = dot11->find_pdu<Dot11RTS>();
    ASSERT_TRUE(inner);
--- a/tests/src/radiotap.cpp
+++ b/tests/src/radiotap.cpp
@@ -3,7 +3,8 @@
 #include <string>
 #include <stdint.h>
 #include "radiotap.h"
-#include "dot11.h"
+#include "dot11/dot11_data.h"
+#include "dot11/dot11_beacon.h"
 #include "utils.h"

 using namespace std;
--- a/tests/src/wep_decrypt.cpp
+++ b/tests/src/wep_decrypt.cpp
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include "crypto.h"
 #include "arp.h"
-#include "dot11.h"
+#include "dot11/dot11_data.h"

 using namespace Tins;