pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42116?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: xua_asp_fsm: Remove obvious comments
......................................................................
xua_asp_fsm: Remove obvious comments
Those can already be interpretred directly by the ENSURE_* macros.
No need to clog the file with more lines describing stuff.
Change-Id: Idec06646c48fbce4cbe200e88f987dfb3e9d5a39
---
M src/xua_asp_fsm.c
1 file changed, 0 insertions(+), 18 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index cdbb0da..34419a4 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -531,13 +531,11 @@
switch (event) {
case XUA_ASP_E_M_ASP_UP_REQ:
- /* only if role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* Send M3UA_MSGT_ASPSM_ASPUP and start t_ack */
peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPSM_ASPUP);
break;
case XUA_ASP_E_ASPSM_ASPUP_ACK:
- /* only if role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* Optional ASP Identifier */
if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) {
@@ -549,7 +547,6 @@
send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP,
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_ASPSM_ASPUP:
- /* only if role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* Optional ASP Identifier: Store for NTFY */
if ((asp_id_ie = xua_msg_find_tag(data, SUA_IEI_ASP_ID))) {
@@ -564,7 +561,6 @@
PRIM_OP_INDICATION);
break;
case XUA_ASP_E_ASPSM_ASPDN:
- /* only if role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* The SGP MUST send an ASP Down Ack message in response
* to a received ASP Down message from the ASP even if
@@ -634,7 +630,6 @@
send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_UP,
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_ASPTM_ASPAC_ACK:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* transition state and inform layer manager */
osmo_fsm_inst_state_chg(fi, XUA_ASP_S_ACTIVE, 0, 0);
@@ -642,7 +637,6 @@
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_ASPSM_ASPDN_ACK:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* transition state and inform layer manager */
osmo_fsm_inst_state_chg(fi, XUA_ASP_S_DOWN, 0, 0);
@@ -651,7 +645,6 @@
break;
case XUA_ASP_E_ASPTM_ASPAC:
xua_in = data;
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
if (xua_msg_find_tag(xua_in, M3UA_IEI_TRAF_MODE_TYP)) {
traf_mode = xua_msg_get_u32(xua_in,
M3UA_IEI_TRAF_MODE_TYP);
@@ -702,7 +695,6 @@
PRIM_OP_INDICATION);
break;
case XUA_ASP_E_ASPSM_ASPDN:
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* send ACK */
peer_send(fi, XUA_ASP_E_ASPSM_ASPDN_ACK, NULL);
@@ -712,7 +704,6 @@
PRIM_OP_INDICATION);
break;
case XUA_ASP_E_ASPSM_ASPUP:
- /* only if role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* If an ASP Up message is received and internally the
* remote ASP is already in the ASP-INACTIVE state, an
@@ -721,7 +712,6 @@
peer_send(fi, XUA_ASP_E_ASPSM_ASPUP_ACK, NULL);
break;
case XUA_ASP_E_ASPTM_ASPIA:
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
peer_send(fi, XUA_ASP_E_ASPTM_ASPIA_ACK, NULL);
break;
@@ -759,7 +749,6 @@
send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_ACTIVE,
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_ASPSM_ASPDN_ACK:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
osmo_fsm_inst_state_chg(fi, XUA_ASP_S_DOWN, 0, 0);
/* inform layer manager */
@@ -767,7 +756,6 @@
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_ASPTM_ASPIA_ACK:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
osmo_fsm_inst_state_chg(fi, XUA_ASP_S_INACTIVE, 0, 0);
/* inform layer manager */
@@ -775,19 +763,16 @@
PRIM_OP_CONFIRM);
break;
case XUA_ASP_E_M_ASP_DOWN_REQ:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* send M3UA_MSGT_ASPSM_ASPDN and star t_ack */
peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPSM_ASPDN);
break;
case XUA_ASP_E_M_ASP_INACTIVE_REQ:
- /* only in role ASP */
ENSURE_ASP_OR_IPSP(fi, event);
/* send M3UA_MSGT_ASPTM_ASPIA and star t_ack */
peer_send_and_start_t_ack(fi, XUA_ASP_E_ASPTM_ASPIA);
break;
case XUA_ASP_E_ASPTM_ASPIA:
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* send ACK */
peer_send(fi, XUA_ASP_E_ASPTM_ASPIA_ACK, NULL);
@@ -797,7 +782,6 @@
PRIM_OP_INDICATION);
break;
case XUA_ASP_E_ASPSM_ASPDN:
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* send ACK */
peer_send(fi, XUA_ASP_E_ASPSM_ASPDN_ACK, NULL);
@@ -807,7 +791,6 @@
PRIM_OP_INDICATION);
break;
case XUA_ASP_E_ASPSM_ASPUP:
- /* only if role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* an ASP Up Ack message is returned, as well as
* an Error message ("Unexpected Message), and the
@@ -821,7 +804,6 @@
break;
case XUA_ASP_E_ASPTM_ASPAC:
xua_in = data;
- /* only in role SG */
ENSURE_SG_OR_IPSP(fi, event);
/* send ACK */
peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, xua_in);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42116?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Idec06646c48fbce4cbe200e88f987dfb3e9d5a39
Gerrit-Change-Number: 42116
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
