pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28253 )

Change subject: hnodeb: Update primitives to audio SAPI version 1 ......................................................................

hnodeb: Update primitives to audio SAPI version 1

Audio SAPI version 1 has been added recently in osmo-hnodeb.git I860d18b80c1041bf63a1570d435e0568c0f6b01b. Let's update our HNBLLIF emulation to support and use it.

Related: SYS#5516 Change-Id: I9af56f5e6a70b350f2fffa2e04be384d101b52ed --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/HNBLLIF_Templates.ttcn M library/HNBLLIF_Types.ttcn 3 files changed, 19 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/28253/1

diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index a92ac9e..6ce2faf 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -177,7 +177,7 @@ hnbllif_sk_path := HNBLL_SOCK_DEFAULT, hnbllif_sapi_iuh_version := 0, hnbllif_sapi_gtp_version := 0, - hnbllif_sapi_audio_version := 0, + hnbllif_sapi_audio_version := 1, hnbgw_addr := "127.0.0.1", hnodeb_addr := "127.0.0.1", hnbgw_port := 29169, diff --git a/library/HNBLLIF_Templates.ttcn b/library/HNBLLIF_Templates.ttcn index 6aee659..5333215 100644 --- a/library/HNBLLIF_Templates.ttcn +++ b/library/HNBLLIF_Templates.ttcn @@ -275,6 +275,17 @@ return ss; }

+private function f_rfcis_default() return HNBLLIF_AUDIO_RFCIs +{ + var HNBLLIF_AUDIO_RFCIs rfcis; + + for (var integer i := 0; i < HNBLLIF_MAX_RFCIS; i := i + 1) { + rfcis[i] := i; + } + + return rfcis; +} + template (value) HNBLLIF_Message ts_HNBLLIF_AUDIO_CONN_ESTABLISH_REQ(template (value) uint32_t context_id, template (value) uint16_t remote_rtp_port, template (value) HNBLLIF_AddrType remote_rtp_address_type, @@ -286,7 +297,8 @@ template (value) uint8_t num_subflows := 3, template (value) HNBLLIF_AUDIO_SubflowSizes subflow_sizes := f_subflow_sizes_default(), template (value) uint8_t IPTIs_present := 0, - template (value) HNBLLIF_AUDIO_IPTIs IPTIs := IPTIs_default) := { + template (value) HNBLLIF_AUDIO_IPTIs IPTIs := IPTIs_default, + template (value) HNBLLIF_AUDIO_RFCIs rfci := f_rfcis_default()) := { sapi := HNBLL_IF_SAPI_AUDIO, u := { audio := { @@ -308,7 +320,8 @@ num_subflows := num_subflows, subflow_sizes := subflow_sizes, IPTIs_present := IPTIs_present, - IPTIs := IPTIs + IPTIs := IPTIs, + rfci := rfci } } } diff --git a/library/HNBLLIF_Types.ttcn b/library/HNBLLIF_Types.ttcn index fa44f11..375a026 100644 --- a/library/HNBLLIF_Types.ttcn +++ b/library/HNBLLIF_Types.ttcn @@ -246,6 +246,7 @@ type record length(HNBLLIF_MAX_RFCIS) of uint8_t HNBLLIF_AUDIO_IPTIs; type record length(HNBLLIF_MAX_SUBFLOWS) of uint16_t HNBLLIF_AUDIO_RFCI_SubflowSizes; type record length(HNBLLIF_MAX_RFCIS) of HNBLLIF_AUDIO_RFCI_SubflowSizes HNBLLIF_AUDIO_SubflowSizes; +type record length(HNBLLIF_MAX_RFCIS) of uint8_t HNBLLIF_AUDIO_RFCIs;

/* CONN_ESTABLISH */ type record HNBLLIF_AUDIO_conn_establish_req { @@ -261,7 +262,8 @@ uint8_t num_subflows, HNBLLIF_AUDIO_SubflowSizes subflow_sizes, uint8_t IPTIs_present, /* 1=present; 0=not present */ - HNBLLIF_AUDIO_IPTIs IPTIs /* values range 0-15, 4 bits */ + HNBLLIF_AUDIO_IPTIs IPTIs, /* values range 0-15, 4 bits */ + HNBLLIF_AUDIO_RFCIs rfci } with { variant "" };

type record HNBLLIF_AUDIO_conn_establish_cnf {