summaryrefslogtreecommitdiff
path: root/cesar/cp2
diff options
context:
space:
mode:
authorschodet2008-07-09 14:36:38 +0000
committerschodet2008-07-09 14:36:38 +0000
commita009b87299f83e6e086ee5a64a931adb4eed14c5 (patch)
tree5ee602f42f1b321284db084dd1dde83852fea607 /cesar/cp2
parentbd7526c8225b6bf91ee65af762aafe03a1106745 (diff)
* cp2/sta/action:
- update after FSM changes. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2581 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp2')
-rw-r--r--cesar/cp2/sta/action/assoc.h26
-rw-r--r--cesar/cp2/sta/action/doc/assoc.sdl2
-rw-r--r--cesar/cp2/sta/action/doc/cp_sta_action.odtbin238000 -> 238110 bytes
-rw-r--r--cesar/cp2/sta/action/drv.h4
-rw-r--r--cesar/cp2/sta/action/poweron.h25
5 files changed, 30 insertions, 27 deletions
diff --git a/cesar/cp2/sta/action/assoc.h b/cesar/cp2/sta/action/assoc.h
index 57c82fde2b..bc39777851 100644
--- a/cesar/cp2/sta/action/assoc.h
+++ b/cesar/cp2/sta/action/assoc.h
@@ -88,7 +88,7 @@
* Leaving
* -------
*
- * If the request comes from the sta, trigger the "leave" event. This will
+ * If the request comes from the STA, trigger the "to leave" event. This will
* send the CC_LEAVE.REQ message to the CCo and wait for response. If no
* response cames for three beacon periods, resend and go to the "leave wait"
* state.
@@ -142,8 +142,9 @@ cp_sta_action_assoc__unassociated__to_assoc (cp_t *ctx);
* \param mme received MME handle
*
* If the CCo accepted our association, update association information, send
- * the CM_GET_KEY.REQ, and post a TO_SUCCESS event. If the CCo refused, post
- * a TO_FAILURE and update the CCo information to remember the failure.
+ * the CM_GET_KEY.REQ, and go to ASSOCIATED state. If the CCo refused, go
+ * back to UNASSOCIATED state and update the CCo information to remember the
+ * failure.
*
* Update:
* - our TEI.
@@ -162,7 +163,7 @@ cp_sta_action_assoc__wait_assoc_cnf__cc_assoc_cnf (cp_t *ctx,
*
* If retry count is not zero, resend the CC_ASSOC.REQ.
*
- * If retry count is zero, post a TO_FAILURE.
+ * If retry count is zero, go back to UNASSOCIATED state.
*/
void
cp_sta_action_assoc__wait_assoc_cnf__timeout (cp_t *ctx);
@@ -172,9 +173,10 @@ cp_sta_action_assoc__wait_assoc_cnf__timeout (cp_t *ctx);
* \param ctx control plane context
* \param mme received MME handle
*
- * If this is a success, trigger a TO_SUCCESS event and update station status.
+ * If this is a success, go to AUTHENTICATED state and update station status.
*
- * If authentication has failed, remember this and trigger a TO_FAILURE.
+ * If authentication has failed, remember this and go back to UNASSOCIATED
+ * state.
*
* Update:
* - authenticated status.
@@ -189,8 +191,8 @@ cp_sta_action_assoc__associated__cm_get_key_cnf_pid_0 (cp_t *ctx,
* Handle ASSOCIATED => TIMEOUT.
* \param ctx control plane context
*
- * Authentication failed, trigger a TO_FAILURE and update the CCo information
- * to remember the failure.
+ * Authentication failed, go back to UNASSOCIATED and update the CCo
+ * information to remember the failure.
*/
void
cp_sta_action_assoc__associated__timeout (cp_t *ctx);
@@ -231,7 +233,7 @@ cp_sta_action_assoc__authenticated__cm_set_key_req_pid_1 (cp_t *ctx,
cp_mme_rx_t *mme);
/**
- * Handle AUTHENTICATED => TO_ASSOC.
+ * Handle AUTHENTICATED => TO_LEAVE.
* \param ctx control plane context
*
* Send the CC_LEAVE.REQ message to the CCo. Set a timeout in three beacon
@@ -245,8 +247,8 @@ cp_sta_action_assoc__authenticated__to_leave (cp_t *ctx);
* \param ctx control plane context
* \param mme received MME handle
*
- * The CCo request us to leave the AVLN. Send a response and trigger the
- * TO_LEAVE_WAIT event.
+ * The CCo request us to leave the AVLN. Send a response and go to LEAVE_WAIT
+ * event.
*/
void
cp_sta_action_assoc__authenticated__cc_leave_ind (cp_t *ctx,
@@ -257,7 +259,7 @@ cp_sta_action_assoc__authenticated__cc_leave_ind (cp_t *ctx,
* \param ctx control plane context
* \param mme received MME handle
*
- * Leave the AVLN, cleanup data plane and trigger the TO_SUCCESS event.
+ * Leave the AVLN and cleanup data plane.
*/
void
cp_sta_action_assoc__leaving__cc_leave_cnf (cp_t *ctx, cp_mme_rx_t *mme);
diff --git a/cesar/cp2/sta/action/doc/assoc.sdl b/cesar/cp2/sta/action/doc/assoc.sdl
index 8445bb7ee5..33240423e9 100644
--- a/cesar/cp2/sta/action/doc/assoc.sdl
+++ b/cesar/cp2/sta/action/doc/assoc.sdl
@@ -16,6 +16,6 @@
(authenticated) -CC_LEAVE.IND(6)-> (leave wait)
(leaving) -CC_LEAVE.CNF(7)-> (unassociated)
-(leaving) -timeout(5) (3pb)-> (leave wait)
+(leaving) -timeout(5) (3bp)-> (leave wait)
(leave wait) -timeout(7)-> (unassociated)
diff --git a/cesar/cp2/sta/action/doc/cp_sta_action.odt b/cesar/cp2/sta/action/doc/cp_sta_action.odt
index 31b42186af..0ef32be88e 100644
--- a/cesar/cp2/sta/action/doc/cp_sta_action.odt
+++ b/cesar/cp2/sta/action/doc/cp_sta_action.odt
Binary files differ
diff --git a/cesar/cp2/sta/action/drv.h b/cesar/cp2/sta/action/drv.h
index 37c572bbd7..1bb1bf87d1 100644
--- a/cesar/cp2/sta/action/drv.h
+++ b/cesar/cp2/sta/action/drv.h
@@ -164,10 +164,10 @@ cp_sta_action_drv__stopped__drv_sta_mac_start_req (cp_t *ctx,
* \param mme received MME handle
*
* If station is unassociated, cleanup everything and send a
- * DRV_STA_MAC_STOP.CNF, trigger a TO_STOPPED event.
+ * DRV_STA_MAC_STOP.CNF, go to STOPPED state.
*
* If the station is not unassociated, request to leave the AVLN and wait
- * until completed, trigger a TO_STOPPING event.
+ * until completed in the STOPPING state.
*/
void
cp_sta_action_drv__started__drv_sta_mac_stop_req (cp_t *ctx,
diff --git a/cesar/cp2/sta/action/poweron.h b/cesar/cp2/sta/action/poweron.h
index 262964806f..3105646878 100644
--- a/cesar/cp2/sta/action/poweron.h
+++ b/cesar/cp2/sta/action/poweron.h
@@ -61,11 +61,10 @@ cp_sta_action_poweron__poweron_usta__ustt_timeout (cp_t *ctx);
*
* No beacon has been received during the BTT timer. Look in the discovered
* STA list to see if there is a NID match. If a NID match and the station
- * should become CCo, trigger a TO_CCO event.
+ * should become CCo, go to CCO state.
*
- * In other cases, if there is at least one AVLN in the discovered list,
- * trigger a TO_USTA event. If there is no AVLN discovered, trigger a
- * TO_UCCO.
+ * In other cases, if there is at least one AVLN in the discovered list, go to
+ * USTA state. If there is no AVLN discovered, go to UCCO state.
*/
void
cp_sta_action_poweron__poweron__btt_timeout (cp_t *ctx);
@@ -76,9 +75,9 @@ cp_sta_action_poweron__poweron__btt_timeout (cp_t *ctx);
* \param net STA net
* \param sta STA emitting the beacon
*
- * When a beacon is received, if NID matches, trigger a TO_JOIN event and
- * start the association procedure. In the other case, select an AVLN to
- * track in the list of discovered AVLN and continue searching.
+ * When a beacon is received, if NID matches, go to corresponding JOINING
+ * states and start the association procedure. In the other case, select an
+ * AVLN to track in the list of discovered AVLN and continue searching.
*/
void
cp_sta_action_poweron__poweron_usta__beacon (cp_t *ctx, cp_net_t *net,
@@ -99,7 +98,7 @@ cp_sta_action_poweron__joining__unassociated (cp_t *ctx);
* \param net STA net
* \param sta STA emitting CM_UNASSOCIATED_STA.IND
*
- * If the NID match and the station should become CCo trigger a TO_CCO event.
+ * If the NID match and the station should become CCo go to CCO state.
*/
void
cp_sta_action_poweron__usta__usta_ind (cp_t *ctx, cp_net_t *net,
@@ -122,6 +121,8 @@ cp_sta_action_poweron__sta__beacon (cp_t *ctx, cp_net_t *net, cp_sta_t *sta);
*
* Increment the "beacon not received" counter. If it reaches the limit,
* restart the power-on procedure.
+ *
+ * Inform the assoc FSM.
*/
void
cp_sta_action_poweron__sta__beacon_not_received (cp_t *ctx);
@@ -130,8 +131,8 @@ cp_sta_action_poweron__sta__beacon_not_received (cp_t *ctx);
* Handle CCO => JOIN TIMEOUT.
* \param ctx control plane context
*
- * If there is at least one discovered AVLN, trigger a TO_USTA event. Else,
- * trigger a TO_UCCO event.
+ * If there is at least one discovered AVLN, go to USTA state. Else, go to
+ * UCCO state.
*/
void
cp_sta_action_poweron__cco__join_timeout (cp_t *ctx);
@@ -149,8 +150,8 @@ cp_sta_action_poweron__cco__sta_joined (cp_t *ctx);
* Handle CCO => ALL STA LEAVED.
* \param ctx control plane context
*
- * If there is at least one discovered AVLN, trigger a TO_USTA event. Else,
- * trigger a TO_UCCO event.
+ * If there is at least one discovered AVLN, go to USTA state. Else, go to
+ * UCCO state.
*/
void
cp_sta_action_poweron__cco__all_sta_leaved (cp_t *ctx);