ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() 

There is no need to pass session state from f_main_mo() to a
choosen EUSE handler (e.g. f_ss_echo), because a handler
itself is capable to extract the session state IE.

Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6
This commit is contained in:
Vadim Yanitskiy 2018-11-02 02:42:32 +07:00
parent e0bb4f0cee
commit d686a8a548
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hlr/HLR_EUSE.ttcn
View File

@ -50,14 +50,17 @@ private function f_init(charstring hlr_ip, uint16_t hlr_gsup_port, charstring na
}
}
type function f_euse_cb(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU;
type function f_euse_cb(GSUP_PDU rx_pdu) return GSUP_PDU;
function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU {
function f_ss_echo_continue(GSUP_PDU rx_pdu) return GSUP_PDU {
var GSUP_SessionState ss_next_state;
var GSUP_IeValue ss_ie;
var GSUP_IeValue ss_ie, state_ie;
var SS_FacilityInformation dec_fac, rsp_fac;
var octetstring ss_rsp;
f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, state_ie);
var GSUP_SessionState ss_state := state_ie.session_state;
f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie);
dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info);
log("dec_fac: ", dec_fac);
@ -74,7 +77,7 @@ function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return
ss_next_state, ss_rsp));
}
function f_ss_echo(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU {
function f_ss_echo(GSUP_PDU rx_pdu) return GSUP_PDU {
var GSUP_IeValue ss_ie;
var SS_FacilityInformation dec_fac, rsp_fac;
var octetstring ss_rsp;
@ -100,15 +103,8 @@ runs on HLR_EUSE_CT {
while (true) {
alt {
[] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_BEGIN)) -> value rx_pdu {
EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_BEGIN, rx_pdu));
}
[] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_CONTINUE)) -> value rx_pdu {
EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_CONTINUE, rx_pdu));
}
[] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_END)) -> value rx_pdu {
EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_END, rx_pdu));
[] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, ?)) -> value rx_pdu {
EUSE.send(cb_fn.apply(rx_pdu));
}