summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorNélio Laranjeiro2011-02-17 10:55:27 +0100
committerNélio Laranjeiro2011-02-17 10:55:27 +0100
commit0534f8d19f60de4eb13dc4c2a80972f5254a06ac (patch)
tree86a9227009e93229bcdb247420bf473c74aba043 /cesar
parent445a4cf3f77340f99ef837ef7d5661c844fe521e (diff)
cesar/cp/sta/action: track the snid for association in SC mode, closes #2207
Diffstat (limited to 'cesar')
-rw-r--r--cesar/cp/sta/action/src/assoc.c1
-rw-r--r--cesar/cp/sta/action/test/utest/src/sc.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/cesar/cp/sta/action/src/assoc.c b/cesar/cp/sta/action/src/assoc.c
index b9be594701..dcd72f8e76 100644
--- a/cesar/cp/sta/action/src/assoc.c
+++ b/cesar/cp/sta/action/src/assoc.c
@@ -68,6 +68,7 @@ cp_sta_action_sc_assoc_start (cp_t *ctx, cp_net_t *cco_net, cp_sta_t *cco)
MAC_TEI_UNASSOCIATED);
}
}
+ ctx->sta_action.assoc.snid = cp_net_get_snid (ctx, cco_net);
ctx->sta_action.assoc.retry = 3;
/* Trigger to_sc_assoc event. */
cp_fsm_trigger_new_event (ctx, bare, to_sc_assoc);
diff --git a/cesar/cp/sta/action/test/utest/src/sc.c b/cesar/cp/sta/action/test/utest/src/sc.c
index d9c015c66d..b0c0de9607 100644
--- a/cesar/cp/sta/action/test/utest/src/sc.c
+++ b/cesar/cp/sta/action/test/utest/src/sc.c
@@ -1010,7 +1010,7 @@ sc_basic_test_cases (test_t t)
/* Decode received message. */
SCENARIO_EVENT (cp_msg_cc_assoc_cnf_receive, .ok = true,
.result = CP_MSG_CC_ASSOC_CNF_RESULT_SUCCESS,
- .nid = nid, .snid = 0x1,
+ .nid = nid, .snid = 0x0,
.sta_tei = sc_add_peer.tei,
.lease_time_min = 10),
/* Become "associated". */
@@ -1285,7 +1285,7 @@ sc_basic_test_cases (test_t t)
/* Decode received message. */
SCENARIO_EVENT (cp_msg_cc_assoc_cnf_receive, .ok = true,
.result = CP_MSG_CC_ASSOC_CNF_RESULT_SUCCESS,
- .nid = nid, .snid = 0x1,
+ .nid = nid, .snid = 0x0,
.sta_tei = sc_add_peer.tei,
.lease_time_min = 10),
/* Become "associated". */