cbc: Test ETWS msg over SBc-AP
So far only non-emergency CBS messages were tested, which require a
slighlty idfferent encoding on the protocol side.
Related: OS#4945
Change-Id: I506322fc8a664716db8cd79217c2091b0b926836
diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn
index 4bcc853..c49461a 100644
--- a/cbc/MME_ConnectionHandler.ttcn
+++ b/cbc/MME_ConnectionHandler.ttcn
@@ -102,10 +102,15 @@
runs on MME_ConnHdlr {
var template (present) SBC_AP_PDU rx_templ;
var SBC_AP_RecvFrom rf;
- rx_templ := tr_SBCAP_WRITE_WARNING(int2bit(msg.msg_id, 16),
- int2bit(msg.ser_nr, 16),
- msg.rep_period,
- msg.num_bcast_req);
+ if (msg_id_is_etws(msg.msg_id)) {
+ rx_templ := tr_SBCAP_WRITE_WARNING_REQ_ETWS(
+ int2bit(msg.msg_id, 16), int2bit(msg.ser_nr, 16),
+ msg.rep_period, msg.num_bcast_req, hex2oct('018'H & int2hex(msg.msg_id - 4352, 1)));
+ } else {
+ rx_templ := tr_SBCAP_WRITE_WARNING_REQ_CBS(
+ int2bit(msg.msg_id, 16), int2bit(msg.ser_nr, 16),
+ msg.rep_period, msg.num_bcast_req);
+ }
alt {
[] SBC_AP[idx].receive(tr_SBC_AP_Recv(g_SBC_AP_conn_id[idx], rx_templ)) -> value rf {
log ("received expected req:", rf);