summaryrefslogtreecommitdiff
path: root/cesar/cp
diff options
context:
space:
mode:
authorNélio Laranjeiro2011-02-08 09:33:59 +0100
committerNélio Laranjeiro2011-02-18 17:21:09 +0100
commitce70279f0dd0ec89e9ba7f7a4b8dcfc369fd04bd (patch)
tree965dcd1d8454cadc236a62997fde30d7f0cf63f9 /cesar/cp
parentf99e8d8af617bc3aff976be5ccd81aa66ccab4c0 (diff)
cesar/bsu/beacon: rename mac_address_present bentry
Diffstat (limited to 'cesar/cp')
-rw-r--r--cesar/cp/beacon/src/beacon.c8
-rw-r--r--cesar/cp/beacon/test/src/beacon.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/cesar/cp/beacon/src/beacon.c b/cesar/cp/beacon/src/beacon.c
index a1df940117..f81f65a7c6 100644
--- a/cesar/cp/beacon/src/beacon.c
+++ b/cesar/cp/beacon/src/beacon.c
@@ -251,8 +251,8 @@ cp_beacon_fill (cp_t *ctx, bsu_beacon_t *beacon)
beacon->bmis.relocation.present = false;
beacon->bmis.aclsc.present = false;
beacon->bmis.cns.present = false;
- beacon->bmis.mac_address_present.present = true;
- beacon->bmis.mac_address_present.mac_address =
+ beacon->bmis.mac_address.present = true;
+ beacon->bmis.mac_address.mac_address =
cp_sta_own_data_get_mac_address (ctx);
}
@@ -384,8 +384,8 @@ cp_beacon_update_sta_peer (cp_t *ctx, bsu_beacon_t *beacon, cp_net_t *net)
mac_t mac;
dbg_assert (net);
/** Handle the absence of Mac address bentry in the Central beacon. */
- if (beacon->bmis.mac_address_present.present)
- mac = beacon->bmis.mac_address_present.mac_address;
+ if (beacon->bmis.mac_address.present)
+ mac = beacon->bmis.mac_address.mac_address;
else
mac = MAC_BROADCAST;
sta = cp_sta_mgr_sta_add (ctx, net, beacon->vf.stei, mac);
diff --git a/cesar/cp/beacon/test/src/beacon.c b/cesar/cp/beacon/test/src/beacon.c
index 003fe0a470..d6cc87e82d 100644
--- a/cesar/cp/beacon/test/src/beacon.c
+++ b/cesar/cp/beacon/test/src/beacon.c
@@ -59,7 +59,7 @@ test_new_beacon (void)
beacon->bmis.change_snid.present = true;
beacon->bmis.change_snid.snidccd = 3;
beacon->bmis.change_snid.new_snid = 0xC;
- beacon->bmis.mac_address_present.present = true;
+ beacon->bmis.mac_address.present = true;
beacon->bmis.region.nb = 1;
beacon->bmis.region.region[0].end_time_atu = 3907;
beacon->bmis.region.region[0].rt = CP_CCO_REGION_TYPE_BEACON;
@@ -276,7 +276,7 @@ test_beacon_bentries (test_t test, bsu_beacon_t *beacon,
}
/* others. */
test_fail_unless (beacon->bmis.bpsto.present == true);
- test_fail_unless (beacon->bmis.mac_address_present.present == true);
+ test_fail_unless (beacon->bmis.mac_address.present == true);
test_fail_unless (beacon->bmis.relocation.present == false);
test_fail_unless (beacon->bmis.aclsc.present == false);
test_fail_unless (beacon->bmis.cns.present == false);
@@ -1315,7 +1315,7 @@ test_suite_beacon_mac_address_bentry (test_t test)
own->nid_track = 1;
/** Create a central beacon. */
beacon = test_new_beacon ();
- beacon->bmis.mac_address_present.present = false;
+ beacon->bmis.mac_address.present = false;
/* launch the test. */
cp_beacon_receive (&cp, beacon);
cp_beacon_get_and_process_beacon (&cp);