<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26444">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hnodeb: Add audio SAPI<br><br>Change-Id: I20544f67c2450bc3cd4bcb3ee638de1958bf5783<br>---<br>M hnodeb/HNBGW_ConnectionHandler.ttcn<br>M hnodeb/HNB_Tests.ttcn<br>M library/HNBLLIF_Templates.ttcn<br>M library/HNBLLIF_Types.ttcn<br>4 files changed, 383 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn</span><br><span>index 554c35f..3c4bc6f 100644</span><br><span>--- a/hnodeb/HNBGW_ConnectionHandler.ttcn</span><br><span>+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn</span><br><span>@@ -27,6 +27,9 @@</span><br><span> </span><br><span> import from Iuh_Emulation all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from RTP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from RTP_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> import from HNBLLIF_CodecPort all;</span><br><span> import from HNBLLIF_Types all;</span><br><span> import from HNBLLIF_Templates all;</span><br><span>@@ -40,6 +43,9 @@</span><br><span> port HNBLLIF_CODEC_PT LLSK;</span><br><span> var integer g_llsk_conn_id;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var RTP_Emulation_CT vc_RTPEM;</span><br><span style="color: hsl(120, 100%, 40%);">+ port RTPEM_CTRL_PT RTPEM_CTRL;</span><br><span style="color: hsl(120, 100%, 40%);">+ port RTPEM_DATA_PT RTPEM_DATA;</span><br><span> var TestHdlrParams g_pars;</span><br><span> </span><br><span> var boolean g_vty_initialized := false;</span><br><span>@@ -102,6 +108,13 @@</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for HNBLLIF HELLO.REQ SAPI=IUH");</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(t_SD_HNBLLIF(hnbllif_conn_id, ts_HNBLLIF_CTL_HELLO_REQ(HNBLL_IF_SAPI_AUDIO, 0)));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_hnbllif_hello_cnf(pt, hnbllif_conn_id, last_hello_cnf, HNBLL_IF_SAPI_AUDIO, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for HNBLLIF HELLO.REQ SAPI=AUDIO");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> type record TestHdlrParams {</span><br><span>@@ -109,6 +122,7 @@</span><br><span> charstring hnbgw_addr,</span><br><span> charstring hnodeb_addr,</span><br><span> integer hnbgw_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer hnbgw_rtp_port,</span><br><span> uint16_t rnc_id,</span><br><span> charstring hNB_Identity_Info,</span><br><span> uint16_t mcc,</span><br><span>@@ -126,6 +140,7 @@</span><br><span> hnbgw_addr := "127.0.0.1",</span><br><span> hnodeb_addr := "127.0.0.1",</span><br><span> hnbgw_port := 29169,</span><br><span style="color: hsl(120, 100%, 40%);">+ hnbgw_rtp_port := 9000,</span><br><span> rnc_id := 23,</span><br><span> hNB_Identity_Info := "OsmoHNodeB",</span><br><span> mcc := 1,</span><br><span>@@ -185,6 +200,38 @@</span><br><span> HNBAP.send(ts_HNBAP_HNBRegisterAccept(g_pars.rnc_id));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Initialize and start the RTP emulation component for a ConnHdlr */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_HNBGW_rtpem_activate(inout octetstring payload,</span><br><span style="color: hsl(120, 100%, 40%);">+ HostName remote_host,</span><br><span style="color: hsl(120, 100%, 40%);">+ PortNumber remote_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ RtpemConfig cfg := c_RtpemDefaultCfg,</span><br><span style="color: hsl(120, 100%, 40%);">+ RtpemMode mode := RTPEM_MODE_BIDIR)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on HNBGW_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Step 0: initialize, connect and start the emulation component */</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM");</span><br><span style="color: hsl(120, 100%, 40%);">+ map(vc_RTPEM:RTP, system:RTP);</span><br><span style="color: hsl(120, 100%, 40%);">+ map(vc_RTPEM:RTCP, system:RTCP);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_RTPEM:CTRL, self:RTPEM_CTRL);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_RTPEM:DATA, self:RTPEM_DATA);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_RTPEM.start(RTP_Emulation.f_main());</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Configure the RTP parameters (TCH/FS). TODO: IuUP */</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer payload_len := 33;</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring hdr := 'D0'O;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pad the payload to conform the expected length */</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := f_pad_oct(hdr & payload, payload_len, '00'O);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.tx_fixed_payload := payload;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_configure(RTPEM_CTRL, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Bind the RTP emulation to the configured address */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_bind(RTPEM_CTRL, g_pars.hnbgw_addr, g_pars.hnbgw_rtp_port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Connect to the IUT's address/port parsed from CRCX ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_connect(RTPEM_CTRL, remote_host, remote_port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set the given RTP emulation mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_mode(RTPEM_CTRL, mode);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> }</span><br><span>diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn</span><br><span>index 59dd1ee..05cd2bf 100644</span><br><span>--- a/hnodeb/HNB_Tests.ttcn</span><br><span>+++ b/hnodeb/HNB_Tests.ttcn</span><br><span>@@ -24,6 +24,7 @@</span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span> import from IPL4asp_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Native_Functions all;</span><br><span> </span><br><span> import from Osmocom_CTRL_Functions all;</span><br><span> import from Osmocom_CTRL_Types all;</span><br><span>@@ -44,6 +45,9 @@</span><br><span> import from HNBGW_ConnectionHandler all;</span><br><span> import from Iuh_Emulation all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import from RTP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from RTP_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> import from HNBLLIF_CodecPort all;</span><br><span> import from HNBLLIF_Types all;</span><br><span> import from HNBLLIF_Templates all;</span><br><span>@@ -63,6 +67,7 @@</span><br><span> const hexstring ranap_auth_req := '00144032000002001040262505120217dc146aeac56cb5ff6d5fb51f47f19220108ca5a6d0c8110000b9e9272498872764003b400100'H;</span><br><span> const hexstring ranap_auth_resp := '001440140000010010400d0c0554ccbdd0302104002f3ae4'H;</span><br><span> const hexstring ranap_paging := '000e401e0000030003400100001740095000010100000000f10040400500b6cf4773'H;</span><br><span style="color: hsl(120, 100%, 40%);">+const hexstring ranap_rab_ass_req := '0000005900000100364052000001003500487824cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f4a0000400100'H;</span><br><span> const hexstring iu_release_compl := '20010003000000'H;</span><br><span> </span><br><span> type component test_CT extends CTRL_Adapter_CT {</span><br><span>@@ -277,11 +282,89 @@</span><br><span> f_shutdown_helper();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_cs_mo_call(charstring id) runs on HNBGW_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ const integer context_id := 30;</span><br><span style="color: hsl(120, 100%, 40%);">+ const bitstring context_id_bstr := '000000000000000000011110'B; /* encoded context_id */</span><br><span style="color: hsl(120, 100%, 40%);">+ const Establishment_Cause est_cause := normal_call;</span><br><span style="color: hsl(120, 100%, 40%);">+ var HNBLLIF_send_data sd;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_RTP rtp_pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring rtp_payload;</span><br><span style="color: hsl(120, 100%, 40%);">+ var HostName hnodeb_rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PortNumber hnodeb_rtp_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer Tu;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_handle_hnbap_hnb_register_req();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.receive(f_llsk_rx(tr_HNBLLIF_IUH_CONFIGURE_IND(g_pars.mcc, g_pars.mnc, g_pars.cell_identity,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.lac, g_pars.rac, g_pars.sac, g_pars.rnc_id)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now an UE attempts CM Service Request: */</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.send(f_llsk_tx(ts_HNBLLIF_IUH_CONN_ESTABLISH_REQ(context_id, 0, enum2int(est_cause), hex2oct(ranap_cm_service_req))));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The related RUA Connect + RANAP message is received on Iuh: */</span><br><span style="color: hsl(120, 100%, 40%);">+ RUA.receive(tr_RUA_Connect(cs_domain, context_id_bstr, est_cause, hex2oct(ranap_cm_service_req)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now HNBGW answers with RUA-DirectTransfer(RANAP-RabASsReq) */</span><br><span style="color: hsl(120, 100%, 40%);">+ RUA.send(ts_RUA_DirectTransfer(cs_domain, context_id_bstr, hex2oct(ranap_rab_ass_req)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now on LLSK first the Conn establishment is confirmed and then we receive data */</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.receive(f_llsk_rx(tr_HNBLLIF_IUH_CONN_ESTABLISH_CNF(context_id, 0, 0)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.receive(f_llsk_rx(tr_HNBLLIF_IUH_CONN_DATA_IND(context_id, 0, hex2oct(ranap_rab_ass_req))));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now LLSK provides the remote TransportLayerAddress from RabAssReq and asks SUT to provide a local address: */</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.send(f_llsk_tx(ts_HNBLLIF_AUDIO_CONN_ESTABLISH_REQ(context_id, g_pars.hnbgw_rtp_port, HNBLL_IF_ADDR_TYPE_IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_HNBLLIF_Addr(HNBLL_IF_ADDR_TYPE_IPV4, g_pars.hnbgw_addr))));</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.receive(f_llsk_rx(tr_HNBLLIF_AUDIO_CONN_ESTABLISH_CNF(context_id, 0, ?, HNBLL_IF_ADDR_TYPE_IPV4, ?))) -> value sd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hnodeb_rtp_addr := f_inet_ntoa(sd.data.u.audio.u.conn_establish.u.cnf.local_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(g_pars.hnodeb_addr, hnodeb_rtp_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "hnodeb RTP local address doesn't match expectations");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ hnodeb_rtp_port := sd.data.u.audio.u.conn_establish.u.cnf.local_rtp_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_payload := f_rnd_octstring(6);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_HNBGW_rtpem_activate(rtp_payload, hnodeb_rtp_addr, hnodeb_rtp_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure that Uplink frames are received at the HNBGW */</span><br><span style="color: hsl(120, 100%, 40%);">+ RTPEM_DATA.clear;</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.send(f_llsk_tx(ts_HNBLLIF_AUDIO_CONN_DATA_REQ(context_id, rtp_payload)));</span><br><span style="color: hsl(120, 100%, 40%);">+ Tu.start(2.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RTPEM_DATA.receive(PDU_RTP:?) -> value rtp_pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rtp_pdu.data != rtp_payload) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Unexpected RTP payload received!");</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RTPEM_DATA.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] Tu.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for Uplink speech frames");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ Tu.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We should also have received some RTP from the HNBGW: */</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.receive(f_llsk_rx(tr_HNBLLIF_AUDIO_CONN_DATA_IND(context_id, rtp_payload)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_mode(RTPEM_CTRL, RTPEM_MODE_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.send(f_llsk_tx(ts_HNBLLIF_AUDIO_CONN_RELEASE_REQ(context_id)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UE sends Iu Release Complete to release the conn */</span><br><span style="color: hsl(120, 100%, 40%);">+ LLSK.send(f_llsk_tx(ts_HNBLLIF_IUH_CONN_RELEASE_REQ(context_id, 0, 0, 0, hex2oct(iu_release_compl))));</span><br><span style="color: hsl(120, 100%, 40%);">+ RUA.receive(tr_RUA_Disconnect(cs_domain, context_id_bstr, ts_RUA_Cause(normal), hex2oct(iu_release_compl)));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_cs_mo_call() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var HNBGW_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_cs_mo_call));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> control {</span><br><span> execute( TC_hnb_register_request_accept() );</span><br><span> execute( TC_hnb_register_request_reject() );</span><br><span> execute( TC_mo_conn() );</span><br><span> execute( TC_paging() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_cs_mo_call() );</span><br><span> }</span><br><span> </span><br><span> }</span><br><span>diff --git a/library/HNBLLIF_Templates.ttcn b/library/HNBLLIF_Templates.ttcn</span><br><span>index f330fdf..3fa49b7 100644</span><br><span>--- a/library/HNBLLIF_Templates.ttcn</span><br><span>+++ b/library/HNBLLIF_Templates.ttcn</span><br><span>@@ -248,4 +248,123 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/**********************</span><br><span style="color: hsl(120, 100%, 40%);">+ * AUDIO SAPI</span><br><span style="color: hsl(120, 100%, 40%);">+ **********************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) HNBLLIF_Message ts_HNBLLIF_AUDIO_CONN_ESTABLISH_REQ(template (value) uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) uint16_t remote_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) HNBLLIF_AddrType remote_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) HNBLLIF_Addr remote_addr) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := HNBLL_IF_SAPI_AUDIO,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ audio := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prim := HNBLL_IF_AUDIO_MSG_CONN_ESTABLISH,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_establish := {</span><br><span style="color: hsl(120, 100%, 40%);">+ op := HNBLL_IF_OP_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ context_id := context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_rtp_port := remote_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ reserved := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_rtp_address_type := remote_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_addr := remote_addr</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (present) HNBLLIF_Message tr_HNBLLIF_AUDIO_CONN_ESTABLISH_CNF(template (present) uint32_t context_id := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) uint8_t error_code := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) uint16_t local_rtp_port:= ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) HNBLLIF_AddrType local_rtp_address_type := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) HNBLLIF_Addr local_addr := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := HNBLL_IF_SAPI_AUDIO,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ audio := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prim := HNBLL_IF_AUDIO_MSG_CONN_ESTABLISH,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_establish := {</span><br><span style="color: hsl(120, 100%, 40%);">+ op := HNBLL_IF_OP_CONFIRM,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ cnf := {</span><br><span style="color: hsl(120, 100%, 40%);">+ context_id := context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_rtp_port := local_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ error_code := error_code,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_rtp_address_type := local_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_addr := local_addr</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) HNBLLIF_Message ts_HNBLLIF_AUDIO_CONN_RELEASE_REQ(template (value) uint32_t context_id) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := HNBLL_IF_SAPI_AUDIO,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ audio := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prim := HNBLL_IF_AUDIO_MSG_CONN_RELEASE,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_release := {</span><br><span style="color: hsl(120, 100%, 40%);">+ op := HNBLL_IF_OP_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ context_id := context_id</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (present) HNBLLIF_Message tr_HNBLLIF_AUDIO_CONN_DATA_IND(template (present) uint32_t context_id := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (present) octetstring data := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := HNBLL_IF_SAPI_AUDIO,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ audio := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prim := HNBLL_IF_AUDIO_MSG_CONN_DATA,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_data := {</span><br><span style="color: hsl(120, 100%, 40%);">+ op := HNBLL_IF_OP_INDICATION,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ context_id := context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ data_len := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ data := data</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) HNBLLIF_Message ts_HNBLLIF_AUDIO_CONN_DATA_REQ(template (value) uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) octetstring data) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := HNBLL_IF_SAPI_AUDIO,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ audio := {</span><br><span style="color: hsl(120, 100%, 40%);">+ prim := HNBLL_IF_AUDIO_MSG_CONN_DATA,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_data := {</span><br><span style="color: hsl(120, 100%, 40%);">+ op := HNBLL_IF_OP_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ context_id := context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ data_len := lengthof(data),</span><br><span style="color: hsl(120, 100%, 40%);">+ data := data</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> } with { encode "RAW" variant "BYTEORDER(first)" };</span><br><span>diff --git a/library/HNBLLIF_Types.ttcn b/library/HNBLLIF_Types.ttcn</span><br><span>index f9c8cc5..befd7bb 100644</span><br><span>--- a/library/HNBLLIF_Types.ttcn</span><br><span>+++ b/library/HNBLLIF_Types.ttcn</span><br><span>@@ -232,15 +232,121 @@</span><br><span> other, OTHERWISE)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/**********************</span><br><span style="color: hsl(120, 100%, 40%);">+ * AUDIO SAPI</span><br><span style="color: hsl(120, 100%, 40%);">+ **********************/</span><br><span style="color: hsl(120, 100%, 40%);">+type enumerated HNBLLIF_AUDIO_MsgType {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_AUDIO_MSG_CONN_ESTABLISH ('0000'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_AUDIO_MSG_CONN_RELEASE ('0001'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_AUDIO_MSG_CONN_DATA ('0002'O)</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "FIELDLENGTH(16)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* CONN_ESTABLISH */</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_conn_establish_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t remote_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reserved,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AddrType remote_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_Addr remote_addr</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_conn_establish_cnf {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t local_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t error_code,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AddrType local_rtp_address_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_Addr local_addr</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type union HNBLLIF_AUDIO_PrimOpUnion_conn_establish {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_conn_establish_req req,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_conn_establish_cnf cnf,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring other</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_PrimOp_conn_establish {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_Operation op,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOpUnion_conn_establish u</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (u) "CROSSTAG( req, op = HNBLL_IF_OP_REQUEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ cnf, op = HNBLL_IF_OP_CONFIRM;</span><br><span style="color: hsl(120, 100%, 40%);">+ other, OTHERWISE)"</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* CONN_RELEASE */</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_conn_release_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t context_id</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type union HNBLLIF_AUDIO_PrimOpUnion_conn_release {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_conn_release_req req,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring other</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_PrimOp_conn_release {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_Operation op,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOpUnion_conn_release u</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (u) "CROSSTAG( req, op = HNBLL_IF_OP_REQUEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ other, OTHERWISE)"</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* CONN_DATA */</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_conn_data_ind {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring data /* RANAP message */</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (data_len) "LENGTHTO (data)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_conn_data_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t context_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t data_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring data /* RANAP message */</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (data_len) "LENGTHTO (data)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type union HNBLLIF_AUDIO_PrimOpUnion_conn_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_conn_data_req req,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_conn_data_ind ind,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring other</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_PrimOp_conn_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_Operation op,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOpUnion_conn_data u</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (u) "CROSSTAG( req, op = HNBLL_IF_OP_REQUEST;</span><br><span style="color: hsl(120, 100%, 40%);">+ ind, op = HNBLL_IF_OP_INDICATION;</span><br><span style="color: hsl(120, 100%, 40%);">+ other, OTHERWISE)"</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type union HNBLLIF_AUDIO_PrimUnion {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOp_conn_establish conn_establish,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOp_conn_release conn_release,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimOp_conn_data conn_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring other</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type record HNBLLIF_AUDIO_PrimHdr {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_MsgType prim,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimUnion u</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant (u) "CROSSTAG( conn_establish, prim = HNBLL_IF_AUDIO_MSG_CONN_ESTABLISH;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_release, prim = HNBLL_IF_AUDIO_MSG_CONN_RELEASE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_data, prim = HNBLL_IF_AUDIO_MSG_CONN_DATA;</span><br><span style="color: hsl(120, 100%, 40%);">+ other, OTHERWISE)"</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /**********************</span><br><span> * General</span><br><span> **********************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+type enumerated HNBLLIF_AddrType {</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_ADDR_TYPE_UNSPEC ('00'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_ADDR_TYPE_IPV4 ('01'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_ADDR_TYPE_IPV6 ('02'O)</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "FIELDLENGTH(8)" };</span><br><span style="color: hsl(120, 100%, 40%);">+type octetstring HNBLLIF_Addr length(16);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type enumerated HNBLLIF_Sapi {</span><br><span> HNBLL_IF_SAPI_CTL (-1),</span><br><span style="color: hsl(0, 100%, 40%);">- HNBLL_IF_SAPI_IUH ('00000001'O)//,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_SAPI_IUH ('00000001'O),</span><br><span> //HNBLL_IF_SAPI_GTP ('00000002'O),</span><br><span style="color: hsl(0, 100%, 40%);">- //HNBLL_IF_SAPI_AUDIO ('00000003'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLL_IF_SAPI_AUDIO ('00000003'O)</span><br><span> } with { variant "FIELDLENGTH(32)"</span><br><span> variant "COMP(2scompl)"</span><br><span> };</span><br><span>@@ -255,6 +361,7 @@</span><br><span> type union HNBLLIF_SapiUnion {</span><br><span> HNBLLIF_CTL_PrimHdr ctl,</span><br><span> HNBLLIF_IUH_PrimHdr iuh,</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBLLIF_AUDIO_PrimHdr audio,</span><br><span> octetstring other</span><br><span> } with { variant "" };</span><br><span> </span><br><span>@@ -263,6 +370,7 @@</span><br><span> HNBLLIF_SapiUnion u</span><br><span> } with { variant (u) "CROSSTAG( ctl, sapi = HNBLL_IF_SAPI_CTL;</span><br><span> iuh, sapi = HNBLL_IF_SAPI_IUH;</span><br><span style="color: hsl(120, 100%, 40%);">+ audio, sapi = HNBLL_IF_SAPI_AUDIO;</span><br><span> other, OTHERWISE)"</span><br><span> };</span><br><span> </span><br><span>@@ -271,5 +379,29 @@</span><br><span> external function dec_HNBLLIF_Message(in octetstring stream) return HNBLLIF_Message</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_HNBLLIF_AF2addr_type(AddressFamily address_family)</span><br><span style="color: hsl(120, 100%, 40%);">+return HNBLLIF_AddrType {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (address_family == AF_INET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return HNBLL_IF_ADDR_TYPE_IPV4;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (address_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return HNBLL_IF_ADDR_TYPE_IPV6;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return HNBLL_IF_ADDR_TYPE_UNSPEC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function f_HNBLLIF_Addr(HNBLLIF_AddrType addr_type, charstring addr_str)</span><br><span style="color: hsl(120, 100%, 40%);">+return HNBLLIF_Addr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var HNBLLIF_Addr addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addr_type == HNBLL_IF_ADDR_TYPE_IPV4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ addr := f_inet_addr(addr_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ addr := f_inet6_addr(addr_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return addr;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> } with { encode "RAW" variant "BYTEORDER(first)" };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26444">change 26444</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26444"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I20544f67c2450bc3cd4bcb3ee638de1958bf5783 </div>
<div style="display:none"> Gerrit-Change-Number: 26444 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>