lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40566?usp=email ) Change subject: RAW_NS: SNS: allow to set the transaction id of Add/Chg/Del procedures ...................................................................... RAW_NS: SNS: allow to set the transaction id of Add/Chg/Del procedures Using hardcoded transaction ids are working, but for the TC_SNS_del it would result in descending transaction ids. Related: OS#6751 Change-Id: I1ea0424232ed925fee623568eb0edccdf1ae0368 --- M library/RAW_NS.ttcnpp 1 file changed, 15 insertions(+), 15 deletions(-) Approvals: daniel: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index a7cdb8a..e7f32d2 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -498,7 +498,7 @@ NSCP[idx].send(ts_SNS_ACK(g_nsconfig.nsei, rx.pDU_SNS_Add.transactionID)); } -function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit) +function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit, integer tid := 23) runs on RAW_NS_CT { log("f_outgoing_sns_add(idx_add=", idx_add, ")"); var PDU_NS rx; @@ -512,8 +512,8 @@ if (isvalue(cause) and valueof(cause) == NS_CAUSE_UNKNOWN_IP_ENDPOINT) { ack_v4 := v4; } - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, ack_v4)); + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, tid, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, cause, ack_v4)); } else { var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, @@ -522,8 +522,8 @@ if (isvalue(cause) and valueof(cause) == NS_CAUSE_UNKNOWN_IP_ENDPOINT) { ack_v6 := v6; } - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, ack_v6)); + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, tid, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, cause, omit, ack_v6)); } } @@ -549,7 +549,7 @@ } -function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) +function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, integer tid := 24) runs on RAW_NS_CT { log("f_outgoing_sns_del(idx_del=", idx_del, ")"); var PDU_NS rx; @@ -558,18 +558,18 @@ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4)); + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, tid, omit, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, omit, v4)); } else { var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6)); + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, tid, omit, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, omit, omit, v6)); } } -function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) +function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0, integer tid := 25) runs on RAW_NS_CT { log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); var PDU_NS rx; @@ -578,14 +578,14 @@ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit)); + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, tid, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, omit, omit)); } else { var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, omit)); + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, tid, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, tid, omit, omit, omit)); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ea0424232ed925fee623568eb0edccdf1ae0368 Gerrit-Change-Number: 40566 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: pespin <pespin@sysmocom.de>