May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File library/IuUP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190/comment/afe8cbc3_f2b0… PS2, Line 29: type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList missing ';' -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:29:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:27:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188/comment/e12d885f_e40d… PS1, Line 9: Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce SYS#xxxx? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 08:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in libosmocore[master]: cosmetic: iuup.h: Fix indentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28193 ) Change subject: cosmetic: iuup.h: Fix indentation ...................................................................... cosmetic: iuup.h: Fix indentation Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 --- M include/osmocom/gsm/iuup.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/28193/1 diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index db3d5e0..ab6b8ac 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -44,10 +44,10 @@ }; struct osmo_iuup_rfci { uint8_t used:1, - spare1:1, - id:6; + spare1:1, + id:6; uint8_t spare2:4, - IPTI:4; /* values range 0-15, 4 bits */; + IPTI:4; /* values range 0-15, 4 bits */; uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; }; struct osmo_iuup_rnl_config { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I10a2d2a872fd6fdae8b4af94995300af3144b551 Gerrit-Change-Number: 28193 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... rtp: Update code to libosmogsm IuUP API changes NOTICE: This commit implies an API change when using libosmogsm. However, the previous API was never available in any libosmogsm release, and only available in both libosmogsm and osmo-hnodeb master, so we are only breaking compatibility between different master versions, which is acceptable. Related: SYS#5969 Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 --- M src/osmo-hnodeb/rtp.c 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c index 0435c81..c0d96a9 100644 --- a/src/osmo-hnodeb/rtp.c +++ b/src/osmo-hnodeb/rtp.c @@ -45,13 +45,17 @@ cfg->supported_versions_mask = ce_req->supported_versions_mask; cfg->num_rfci = ce_req->num_rfci; cfg->num_subflows = ce_req->num_subflows; - OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes)); - OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0])); - for (i = 0; i < cfg->num_rfci; i++) - memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); cfg->IPTIs_present = ce_req->IPTIs_present; - if (cfg->IPTIs_present) - memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci); + OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci)); + OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes)); + for (i = 0; i < cfg->num_rfci; i++) { + cfg->rfci[i].used = true; + cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */ + if (cfg->IPTIs_present) + cfg->rfci[i].IPTI = ce_req->IPTIs[i]; + if (cfg->num_subflows > 0) + memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); + } cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 17:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-hnodeb[master]: rtp: Update code to libosmogsm IuUP API changes

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 ) Change subject: rtp: Update code to libosmogsm IuUP API changes ...................................................................... rtp: Update code to libosmogsm IuUP API changes NOTICE: This commit implies an API change when using libosmogsm. However, the previous API was never available in any libosmogsm release, and only available in both libosmogsm and osmo-hnodeb master, so we are only breaking compatibility between different master versions, which is acceptable. Related: SYS#5969 Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 --- M src/osmo-hnodeb/rtp.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/92/28192/1 diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c index 0435c81..c0d96a9 100644 --- a/src/osmo-hnodeb/rtp.c +++ b/src/osmo-hnodeb/rtp.c @@ -45,13 +45,17 @@ cfg->supported_versions_mask = ce_req->supported_versions_mask; cfg->num_rfci = ce_req->num_rfci; cfg->num_subflows = ce_req->num_subflows; - OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->subflow_sizes)); - OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->subflow_sizes[0])); - for (i = 0; i < cfg->num_rfci; i++) - memcpy(&cfg->subflow_sizes[i][0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); cfg->IPTIs_present = ce_req->IPTIs_present; - if (cfg->IPTIs_present) - memcpy(cfg->IPTIs, ce_req->IPTIs, cfg->num_rfci); + OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci)); + OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes)); + for (i = 0; i < cfg->num_rfci; i++) { + cfg->rfci[i].used = true; + cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */ + if (cfg->IPTIs_present) + cfg->rfci[i].IPTI = ce_req->IPTIs[i]; + if (cfg->num_subflows > 0) + memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); + } cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; cfg->t_ta = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia26a945147d68511bb1750d51ed91909e48b4139 Gerrit-Change-Number: 28192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 to look at the new patch set (#2). Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 4 files changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/28190/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... IuUP: Encode Initialization according to cfg Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 --- M library/IuUP_Emulation.ttcn 1 file changed, 45 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/28189/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 899ba50..1bb2bb2 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -35,6 +35,7 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_12_2(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {81, 103, 60}, 1); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); +template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ @@ -63,7 +64,7 @@ cfg := { active_init := act_init, data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1) } + rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } }, state := ST_INIT, tx_next_frame_nr := 0, @@ -120,6 +121,48 @@ self.stop; } +private function f_ts_IuUP_INIT(inout IuUP_Entity st) return IuUP_PDU +{ + var IuUP_PDU pdu; + var uint4_t data_pdu_type; + var template (omit) IuUP_InitRfci rfci := omit; + var IuUP_IPTI_List IPTIs := {}; + var uint4_t num_rfci := lengthof(st.cfg.rab_flow_combs); + + if (st.cfg.data_pdu_type_0 == true) { + data_pdu_type := 0; + } else { + data_pdu_type := 1; + } + + /* Build RFCI list: */ + for (var integer remain := num_rfci; remain > 0; remain := remain - 1) { + var IuUP_RabFlowCombination comb := st.cfg.rab_flow_combs[remain - 1]; + var boolean lri := false; + if (remain == num_rfci) { + lri := true; + } + rfci := ts_IuUP_InitRfci(lri, false, comb.rfci, comb.sub_flow_bits, omit, rfci) + } + + /* Build IPTI list: */ + for (var integer i := 0; i < num_rfci; i := i + 1) { + IPTIs := IPTIs & { st.cfg.rab_flow_combs[i].ipti }; + } + + template (value) IuUP_PDU14_ProcSending_INIT tpl := ts_IuUP_PDU14_ProcSending_INIT( + ti := true, + subflows_per_rfci := num_rfci, + chain_ind := false, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := '0000000000000001'B, + data_pdu_type := data_pdu_type + ); + pdu := valueof(ts_IuUP_INIT(tpl)); + return pdu; +} + function f_IuUP_Em_tx_encap(inout IuUP_Entity st, in octetstring payload) return octetstring { var IuUP_PDU pdu; select (st.state) { @@ -127,7 +170,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); + pdu := f_ts_IuUP_INIT(st); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 3 files changed, 42 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/28190/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 1bb2bb2..6f13a1e 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -26,6 +26,7 @@ /* IPTI value in number of ITIs for the corresponding RFCI */ uint8_t ipti }; +type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList template (value) IuUP_RabFlowCombination t_IuUP_RFC(IuUP_RFCI rfci, RecOfU8 subflow_bits, uint8_t ipti) := { rfci := rfci, @@ -37,21 +38,50 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); + +const IuUP_RabFlowCombinationList c_IuUP_Config_RabFlowCombination_def := { + { + rfci := 0, + sub_flow_bits := {81, 103, 60}, + ipti := 1 + }, { + rfci := 1, + sub_flow_bits := {34, 0, 0}, + ipti := 7 + }, { + rfci := 2, + sub_flow_bits := {0, 0, 0}, + ipti := 1 + } +}; type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ boolean active_init, boolean data_pdu_type_0, /* RAB Flow Combinations */ - record of IuUP_RabFlowCombination rab_flow_combs + IuUP_RabFlowCombinationList rab_flow_combs }; +template (value) IuUP_Config t_IuUP_Config(boolean active_init := true, + boolean data_pdu_type_0 := true, + template (value) IuUP_RabFlowCombinationList rab_flow_combs := + c_IuUP_Config_RabFlowCombination_def) := { + active_init := active_init, + data_pdu_type_0 := true, + rab_flow_combs := rab_flow_combs +} + +const IuUP_Config c_IuUP_Config_def := { + active_init := true, + data_pdu_type_0 := true, + rab_flow_combs := c_IuUP_Config_RabFlowCombination_def +} + type enumerated IuUP_Em_State { ST_INIT, ST_DATA_TRANSFER_READY }; - - type record IuUP_Entity { IuUP_Config cfg, IuUP_Em_State state, @@ -60,12 +90,8 @@ IuUP_PDU pending_tx_pdu optional }; -template (value) IuUP_Entity t_IuUP_Entity(boolean act_init) := { - cfg := { - active_init := act_init, - data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } - }, +template (value) IuUP_Entity t_IuUP_Entity(template (value) IuUP_Config cfg) := { + cfg := cfg, state := ST_INIT, tx_next_frame_nr := 0, rx_last_frame_nr := omit, diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index f4d926e..eaff017 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -161,7 +161,7 @@ octetstring tx_fixed_payload optional, octetstring rx_fixed_payload optional, boolean iuup_mode, - boolean iuup_tx_init + IuUP_Config iuup_cfg }; const RtpemConfig c_RtpemDefaultCfg := { @@ -172,7 +172,7 @@ tx_fixed_payload := '01020304'O, rx_fixed_payload := '01020304'O, iuup_mode := false, - iuup_tx_init := true + iuup_cfg := c_IuUP_Config_def } signature RTPEM_bind(in HostName local_host, inout PortNumber local_port); @@ -384,7 +384,7 @@ os_error_code := 111, os_error_text := ? /* "Connection refused" */}}; - g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_tx_init)); + g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_cfg)); while (true) { alt { @@ -488,7 +488,7 @@ } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; - g_iuup_ent.cfg.active_init := g_cfg.iuup_tx_init; + g_iuup_ent.cfg := g_cfg.iuup_cfg; CTRL.reply(RTPEM_configure:{cfg}); } [] CTRL.getcall(RTPEM_stats_get:{?, ?}) -> param (is_rtcp) { diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 9defea7..de00e9d 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2482,7 +2482,7 @@ flow[0].rtp_cfg := c_RtpemDefaultCfg; flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2493,7 +2493,7 @@ flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; flow[1].rtp_cfg.iuup_mode := true; - flow[1].rtp_cfg.iuup_tx_init := false; + flow[1].rtp_cfg.iuup_cfg.active_init := false; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); @@ -2601,7 +2601,7 @@ flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022