Change in libosmo-sccp[master]: ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if known

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15862 )

Change subject: ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if known
......................................................................

ss7: Set Traffic mode and Route Ctx in ASPAC ACK msg if known

Change-Id: Ic99131489efaef87f882312a042f5feb6a60bb86
Related: OS#4220
---
M src/xua_asp_fsm.c
1 file changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index 1b39639..890a6b5 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -204,8 +204,9 @@
 		/* RFC3868 Ch. 3.6.2 */
 		xua->hdr = XUA_HDR(SUA_MSGC_ASPTM, SUA_ASPTM_ACTIVE_ACK);
 		/* Optional: Traffic Mode Type */
-		/* Mandatory: Routing Context */
-		//FIXME xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX,
+		xua_msg_copy_part(xua, M3UA_IEI_TRAF_MODE_TYP, in, M3UA_IEI_TRAF_MODE_TYP);
+		/* Optional: Routing Context */
+		xua_msg_copy_part(xua, M3UA_IEI_ROUTE_CTX, in, M3UA_IEI_ROUTE_CTX);
 		/* Optional: Info String */
 		break;
 	case XUA_ASP_E_ASPTM_ASPIA:
@@ -469,7 +470,7 @@
 			}
 		}
 		/* send ACK */
-		peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, NULL);
+		peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, xua_in);
 		/* transition state and inform layer manager */
 		osmo_fsm_inst_state_chg(fi, XUA_ASP_S_ACTIVE, 0, 0);
 		send_xlm_prim_simple(fi, OSMO_XLM_PRIM_M_ASP_ACTIVE,
@@ -509,6 +510,7 @@
 
 static void xua_asp_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
+	struct xua_msg *xua_in;
 	check_stop_t_ack(fi, event);
 	switch (event) {
 	case XUA_ASP_E_ASPSM_ASPDN_ACK:
@@ -573,10 +575,11 @@
 				     PRIM_OP_INDICATION);
 		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, NULL);
+		peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, xua_in);
 		break;
 	}
 }

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15862
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ic99131489efaef87f882312a042f5feb6a60bb86
Gerrit-Change-Number: 15862
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191028/7619a333/attachment.htm>