summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/bsu/beacon/test/utest/src/beacon.c39
-rw-r--r--cesar/bsu/beacon/test/utest/src/test.c6
-rw-r--r--cesar/interface/sniffer/test/src/test-sniffer.c4
-rw-r--r--cesar/interface/test/src/test-interface.c2
4 files changed, 22 insertions, 29 deletions
diff --git a/cesar/bsu/beacon/test/utest/src/beacon.c b/cesar/bsu/beacon/test/utest/src/beacon.c
index 8a668572a5..35c36c39ff 100644
--- a/cesar/bsu/beacon/test/utest/src/beacon.c
+++ b/cesar/bsu/beacon/test/utest/src/beacon.c
@@ -36,9 +36,6 @@ test_case_beacon_write_read (test_t t)
pbproc_tx_beacon_params_t params;
bsu_beacon_t beacon, beacon_recv;
mac_config_t mac_config;
- u8 tei;
- u64 mac_addr;
- bsu_beacon_type_t type;
test_mac_config_init (&mac_config);
memset (&beacon, 0, sizeof (bsu_beacon_t));
memset (&beacon_recv, 0, sizeof (bsu_beacon_t));
@@ -59,18 +56,17 @@ test_case_beacon_write_read (test_t t)
{
bool returned;
pbbeacon->phy_pb.pb_rx.pb_measurement.crc_error = false;
- returned = bsu_beacon_read (pbbeacon, &beacon_recv, &type, &tei,
- &mac_addr);
+ returned = bsu_beacon_read (pbbeacon, &beacon_recv);
/* The bpsto value is set by the PBProc.*/
beacon_recv.bmis.bpsto.bpsto = beacon.bmis.bpsto.bpsto;
test_fail_unless (returned == true);
test_fail_unless (
memcmp (&beacon, &beacon_recv, sizeof (bsu_beacon_t)) == 0);
- test_fail_unless (mac_addr == mac_config.sta_mac_address);
- test_fail_unless (tei == mac_config.tei);
+ test_fail_unless (beacon_recv.bmis.mac_address.mac_address ==
+ mac_config.sta_mac_address);
+ test_fail_unless (beacon_recv.vf.stei == mac_config.tei);
pbbeacon->phy_pb.pb_rx.pb_measurement.crc_error = true;
- returned = bsu_beacon_read (pbbeacon, &beacon_recv, &type, &tei,
- &mac_addr);
+ returned = bsu_beacon_read (pbbeacon, &beacon_recv);
test_fail_unless (returned == false);
blk_release_desc ((blk_t*) pbbeacon);
}
@@ -193,9 +189,6 @@ test_case_beacon_variant_fields_error (test_t test)
bsu_beacon_t beacon;
pb_beacon_t *phy_beacon;
pbproc_tx_beacon_params_t params;
- bsu_beacon_type_t type;
- u8 tei;
- u64 mac_addr;
bool returned;
test_mac_config_init (&mac_config);
/* Change network mode type. */
@@ -205,8 +198,7 @@ test_case_beacon_variant_fields_error (test_t test)
phy_beacon = bsu_beacon_write (&beacon, BSU_BEACON_TYPE_CENTRAL,
&mac_config, &params);
phy_beacon->phy_pb.pb_rx.pb_measurement.crc_error = false;
- test_fail_unless (bsu_beacon_read (phy_beacon, &beacon,
- &type, &tei, &mac_addr) == false);
+ test_fail_unless (bsu_beacon_read (phy_beacon, &beacon) == false);
blk_release_desc ((blk_t*) phy_beacon);
/* Reset network mode type. */
bsu_beacon_test_create_beacon (&beacon);
@@ -214,9 +206,8 @@ test_case_beacon_variant_fields_error (test_t test)
&mac_config, &params);
phy_beacon->phy_pb.pb_rx.pb_measurement.crc_error = false;
bitstream_direct_write (phy_beacon->data, 32, BSU_BEACON_TYPE_NB, 3);
- returned = bsu_beacon_read (phy_beacon, &beacon, &type, &tei,
- &mac_addr);
- test_fail_unless (type == BSU_BEACON_TYPE_NB);
+ returned = bsu_beacon_read (phy_beacon, &beacon);
+ test_fail_unless (beacon.vf.bt == BSU_BEACON_TYPE_NB);
test_fail_unless (returned == false);
blk_release_desc ((blk_t*) phy_beacon);
}
@@ -257,9 +248,6 @@ test_case_beacon_bmi_vendor_bentry (test_t test)
bsu_beacon_t beacon;
pb_beacon_t *phy_beacon;
pbproc_tx_beacon_params_t params;
- bsu_beacon_type_t type;
- u8 tei;
- u64 mac_addr;
bool returned;
test_mac_config_init (&mac_config);
/* Change network mode type. */
@@ -267,11 +255,16 @@ test_case_beacon_bmi_vendor_bentry (test_t test)
phy_beacon = bsu_beacon_write (&beacon, BSU_BEACON_TYPE_CENTRAL,
&mac_config, &params);
phy_beacon->phy_pb.pb_rx.pb_measurement.crc_error = false;
- bitstream_direct_write (phy_beacon->data, 72,
+ /* Change the number of bmis 15->16 */
+ bitstream_direct_write (phy_beacon->data, 64, 16, 8);
+ /* Add a vendor specific bentry after all the other ones */
+ bitstream_direct_write (phy_beacon->data, 8*90 + 72,
BSU_BEACON_ENTRY_HEADER_VENDOR, 8);
+ /* Set a null size for the vendor bentry */
+ bitstream_direct_write (phy_beacon->data, 8*90 + 80,
+ 0, 8);
memset (&beacon, 0, sizeof (bsu_beacon_t));
- returned = bsu_beacon_read (phy_beacon, &beacon, &type, &tei,
- &mac_addr);
+ returned = bsu_beacon_read (phy_beacon, &beacon);
test_fail_unless (returned == true);
blk_release_desc ((blk_t*) phy_beacon);
}
diff --git a/cesar/bsu/beacon/test/utest/src/test.c b/cesar/bsu/beacon/test/utest/src/test.c
index 07c19691da..7e819021a6 100644
--- a/cesar/bsu/beacon/test/utest/src/test.c
+++ b/cesar/bsu/beacon/test/utest/src/test.c
@@ -82,7 +82,6 @@ bsu_beacon_test_create_beacon (bsu_beacon_t *beacon)
beacon->vf.rtsbf = false;
beacon->vf.nm = BSU_BEACON_NM_CSMA_ONLY;
beacon->vf.ccocap = 0;
- beacon->vf.rsvd = 0;
/* Regions. */
beacon->bmis.region.nb = 2;
beacon->bmis.region.region[0].rt = BSU_BEACON_REGION_BEACON;
@@ -133,7 +132,8 @@ bsu_beacon_test_create_beacon (bsu_beacon_t *beacon)
beacon->bmis.change_snid.snidccd = 4;
beacon->bmis.change_snid.new_snid = 0xf;
/* Mac address. */
- beacon->bmis.mac_address_present.present = true;
+ beacon->bmis.mac_address.present = true;
+ beacon->bmis.mac_address.mac_address = 0x123456789abcull;
/* Number of beacon entries. */
beacon->bmis.nbe = 15;
}
@@ -267,7 +267,7 @@ bsu_beacon_test_beacon_check_generation (test_t t,
nb_ps++;
break;
case BSU_BEACON_ENTRY_HEADER_MAC_ADDRESS:
- test_fail_unless (beacon->bmis.mac_address_present.present ==
+ test_fail_unless (beacon->bmis.mac_address.present ==
true);
test_fail_unless (mac_config->sta_mac_address ==
bitstream_read_large (&stream, 48));
diff --git a/cesar/interface/sniffer/test/src/test-sniffer.c b/cesar/interface/sniffer/test/src/test-sniffer.c
index 5ec8f88609..96ae5054f0 100644
--- a/cesar/interface/sniffer/test/src/test-sniffer.c
+++ b/cesar/interface/sniffer/test/src/test-sniffer.c
@@ -520,8 +520,8 @@ test_sniffer_beacon_create (bsu_beacon_t *beacon)
beacon->bmis.change_snid.snidccd = 4;
beacon->bmis.change_snid.new_snid = 0xf;
/* Mac address. */
- beacon->bmis.mac_address_present.present = true;
- beacon->bmis.mac_address_present.mac_address = 0x123456789abcull;
+ beacon->bmis.mac_address.present = true;
+ beacon->bmis.mac_address.mac_address = 0x123456789abcull;
/* Number of beacon entries. */
beacon->bmis.nbe = 15;
}
diff --git a/cesar/interface/test/src/test-interface.c b/cesar/interface/test/src/test-interface.c
index f941c7cc75..d45cc5424f 100644
--- a/cesar/interface/test/src/test-interface.c
+++ b/cesar/interface/test/src/test-interface.c
@@ -135,7 +135,7 @@ test_create_beacon (bsu_beacon_t *beacon)
beacon->bmis.change_snid.snidccd = 4;
beacon->bmis.change_snid.new_snid = 0xf;
/* Mac address. */
- beacon->bmis.mac_address_present.present = true;
+ beacon->bmis.mac_address.present = true;
/* Number of beacon entries. */
beacon->bmis.nbe = 14;
}