[MERGED] libosmo-sccp[master]: Add new ASP event XUA_ASP_E_SCTP_EST_IND

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Add new ASP event XUA_ASP_E_SCTP_EST_IND
......................................................................


Add new ASP event XUA_ASP_E_SCTP_EST_IND

For classic xUA this is not needed, as the server doesn't have to react
to establishment of the SCTP connection.  The client will start with an
ASP_UP_REQ.  However, in upcoming IPA support, the FSM will need to
react on this event.

Change-Id: Ib10914b27f8761ea44a0fdba96c045821223722a
---
M src/osmo_ss7.c
M src/xua_asp_fsm.c
M src/xua_asp_fsm.h
3 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 7a5b59e..2d34b53 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -1497,6 +1497,7 @@
 	osmo_stream_srv_set_data(srv, asp);
 
 	/* send M-SCTP_ESTABLISH.ind to Layer Manager */
+	osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_SCTP_EST_IND, 0);
 	xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_ESTABLISH, PRIM_OP_INDICATION);
 
 	return 0;
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index f4d9cf0..ce15038 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -55,6 +55,7 @@
 
 	{ XUA_ASP_E_SCTP_COMM_DOWN_IND,	"SCTP-COMM_DOWN.ind" },
 	{ XUA_ASP_E_SCTP_RESTART_IND,	"SCTP-RESTART.ind" },
+	{ XUA_ASP_E_SCTP_EST_IND,	"SCTP-EST.ind" },
 
 	{ XUA_ASP_E_ASPSM_ASPUP,	"ASPSM-ASP_UP" },
 	{ XUA_ASP_E_ASPSM_ASPUP_ACK,	"ASPSM-ASP_UP_ACK" },
@@ -368,6 +369,8 @@
 		 * the ASP is already marked as ASP-DOWN at the SGP. */
 		peer_send(fi, XUA_ASP_E_ASPSM_ASPDN_ACK, NULL);
 		break;
+	case XUA_ASP_E_SCTP_EST_IND:
+		break;
 	}
 }
 
@@ -597,7 +600,8 @@
 		.in_event_mask = S(XUA_ASP_E_M_ASP_UP_REQ) |
 				 S(XUA_ASP_E_ASPSM_ASPUP) |
 				 S(XUA_ASP_E_ASPSM_ASPUP_ACK) |
-				 S(XUA_ASP_E_ASPSM_ASPDN),
+				 S(XUA_ASP_E_ASPSM_ASPDN) |
+				 S(XUA_ASP_E_SCTP_EST_IND),
 		.out_state_mask = S(XUA_ASP_S_INACTIVE),
 		.name = "ASP_DOWN",
 		.action = xua_asp_fsm_down,
diff --git a/src/xua_asp_fsm.h b/src/xua_asp_fsm.h
index ea62484..60e09da 100644
--- a/src/xua_asp_fsm.h
+++ b/src/xua_asp_fsm.h
@@ -14,6 +14,7 @@
 
 	XUA_ASP_E_SCTP_COMM_DOWN_IND,
 	XUA_ASP_E_SCTP_RESTART_IND,
+	XUA_ASP_E_SCTP_EST_IND,
 
 	XUA_ASP_E_ASPSM_ASPUP,
 	XUA_ASP_E_ASPSM_ASPUP_ACK,

-- 
To view, visit https://gerrit.osmocom.org/2362
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib10914b27f8761ea44a0fdba96c045821223722a
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder