- gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: erab_fsm: fix copy-paste in a log message
by fixeria 22 Jan '25

22 Jan '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39393?usp=email ) Change subject: erab_fsm: fix copy-paste in a log message ...................................................................... erab_fsm: fix copy-paste in a log message Change-Id: I50f78ac99ddb82244107ff9847acec64d2e9fce1 --- M src/erab_fsm.erl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/93/39393/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index b249cd4..0b4904d 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -336,7 +336,7 @@ session_delete(state_timeout, _Timeout, #erab_state{from = From}) -> - ?LOG_ERROR("PFCP session modification timeout"), + ?LOG_ERROR("PFCP session deletion timeout"), {stop_and_reply, {shutdown, timeout}, {reply, From, {error, {timeout, ?FUNCTION_NAME}}}}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39393?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I50f78ac99ddb82244107ff9847acec64d2e9fce1 Gerrit-Change-Number: 39393 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: add more logging to clarify timeout events
by fixeria 22 Jan '25

22 Jan '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39394?usp=email ) Change subject: erab_fsm: add more logging to clarify timeout events ...................................................................... erab_fsm: add more logging to clarify timeout events Change-Id: Iad64ce88e747951c0699074d95d504ccf9f61603 --- M src/erab_fsm.erl 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/94/39394/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 0b4904d..ea1c11b 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -249,6 +249,7 @@ [{state_timeout, ?ERAB_T_WAIT_SETUP_RSP, ?FUNCTION_NAME}]}; erab_wait_setup_rsp(state_timeout, _Timeout, _S) -> + ?LOG_ERROR("Timeout waiting for E-RAB SETUP Rsp"), {stop, {shutdown, timeout}}; erab_wait_setup_rsp({call, From}, @@ -377,6 +378,7 @@ [{state_timeout, ?ERAB_T_WAIT_RELEASE_RSP, ?FUNCTION_NAME}]}; erab_wait_release_rsp(state_timeout, _Timeout, _S) -> + ?LOG_ERROR("Timeout waiting for E-RAB RELEASE Rsp"), {stop, {shutdown, timeout}}; erab_wait_release_rsp(cast, erab_release_rsp, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39394?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Iad64ce88e747951c0699074d95d504ccf9f61603 Gerrit-Change-Number: 39394 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-pcap[master]: server: zero-copy msgb from tcp read to file write
by fixeria 22 Jan '25

22 Jan '25

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39370?usp=email ) Change subject: server: zero-copy msgb from tcp read to file write ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39370?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Iae9b9eaec42ad8ec86d1a8144d676115fa057766 Gerrit-Change-Number: 39370 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Jan 2025 12:11:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly ...
by fixeria 22 Jan '25

22 Jan '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email ) Change subject: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period ...................................................................... trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period Since fake_trx beginning in 3187c8e6 (target/fake_trx: initial release of virtual transceiver) CLCKGen was tuned to emitting ticks with sleep period being time of 1 GSM frame _decreased_ a bit by "Average loop back delay". The idea for this decrease probably was to compensate the time spent in each tick handler, so that combined sleep + tick work would occupy time of 1 GSM frame more or less. The idea of using hardcoded compensation turned out to be not very good, because for the overall tick period to be exactly as defined the compensation should be dynamic and take into account time spent in each tick handler. For example on one machine "loopback delay" is one value, while on another it will be another value. And if we attach more work to tick handler, like it already happened with adding tx queue, the compensation needs to take all that into account as well. abc63d8d (trx_toolkit/clck_gen.py: Fix clock generator not to accumulate timing error) explains the problem in detail and adds dynamic compensation so that the tick period stays as defined instead of drifting. But it missed to adjust CLCKgen to stop decreasing desired tick period a bit by "average loop back delay". So after that patch, because CLCKgen now follows desired period without drifting, its period was 4.615ms - 0.09ms instead of exact 4.615ms, which resulted in e.g. fake_trx and bts-trx clocks to become constantly dissynchronized with the following emitted by bts-trx non-stop: 20250122135431420 <0006> scheduler_trx.c:576 GSM clock skew: old fn=0, new fn=102 20250122135431882 <0006> scheduler_trx.c:604 We were 3 FN slower than TRX, compensated 20250122135432344 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135432805 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135433267 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135433728 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135434190 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135434651 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135435113 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135435575 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436036 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436498 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436959 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135437421 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated ... What happens here is that there are ~ 216 GSM frames every second, and since fake_trx drifts by 0.09ms every frame, it results in drifting by ~ 20ms every second. Which results in "2 FN slower than TRX" emitted approximately twice per second as above log excerpt confirms. -> Fix this by adjusting CLCKgen to emit ticks with exactly GSM frame period by default. Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 --- M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/test_clck_gen.py 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index bf56f64..c6da8f6 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -34,9 +34,6 @@ SEC_DELAY_US = 1000 * 1000 GSM_FRAME_US = 4615.0 - # Average loop back delay - LO_DELAY_US = 90.0 - def __init__(self, clck_links, clck_start = 0, ind_period = 102): # This event is needed to control the thread self._breaker = threading.Event() @@ -47,7 +44,7 @@ self.clck_start = clck_start # Calculate counter time - self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US + self.ctr_interval = self.GSM_FRAME_US self.ctr_interval /= self.SEC_DELAY_US # (Optional) clock consumer diff --git a/src/target/trx_toolkit/test_clck_gen.py b/src/target/trx_toolkit/test_clck_gen.py index a920ce1..92e5e55 100644 --- a/src/target/trx_toolkit/test_clck_gen.py +++ b/src/target/trx_toolkit/test_clck_gen.py @@ -63,6 +63,11 @@ finally: clck.stop() + # verify that default tick interval is 1 TDMA frame exactly + def test_period_is_gsm_frame(self): + clck = clck_gen.CLCKGen([]) + self.assertEqual(clck.ctr_interval, 4.615e-3) + if __name__ == '__main__': unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 Gerrit-Change-Number: 39392 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly ...
by fixeria 22 Jan '25

22 Jan '25

Attention is currently required from: kirr. fixeria has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email ) Change subject: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 Gerrit-Change-Number: 39392 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: kirr <kirr(a)nexedi.com> Gerrit-Comment-Date: Wed, 22 Jan 2025 12:04:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly ...
by pespin 22 Jan '25

22 Jan '25

Attention is currently required from: kirr. pespin has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email ) Change subject: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 Gerrit-Change-Number: 39392 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: kirr <kirr(a)nexedi.com> Gerrit-Comment-Date: Wed, 22 Jan 2025 11:57:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly ...
by kirr 22 Jan '25

22 Jan '25

kirr has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email ) Change subject: trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period ...................................................................... trx_toolkit/clck_gen: Fix clock generator to emit ticks with exactly GSM frame period Since fake_trx beginning in 3187c8e6 (target/fake_trx: initial release of virtual transceiver) CLCKGen was tuned to emitting ticks with sleep period being time of 1 GSM frame _decreased_ a bit by "Average loop back delay". The idea for this decrease probably was to compensate the time spent in each tick handler, so that combined sleep + tick work would occupy time of 1 GSM frame more or less. The idea of using hardcoded compensation turned out to be not very good, because for the overall tick period to be exactly as defined the compensation should be dynamic and take into account time spent in each tick handler. For example on one machine "loopback delay" is one value, while on another it will be another value. And if we attach more work to tick handler, like it already happened with adding tx queue, the compensation needs to take all that into account as well. abc63d8d (trx_toolkit/clck_gen.py: Fix clock generator not to accumulate timing error) explains the problem in detail and adds dynamic compensation so that the tick period stays as defined instead of drifting. But it missed to adjust CLCKgen to stop decreasing desired tick period a bit by "average loop back delay". So after that patch, because CLCKgen now follows desired period without drifting, its period was 4.615ms - 0.09ms instead of exact 4.615ms, which resulted in e.g. fake_trx and bts-trx clocks to become constantly dissynchronized with the following emitted by bts-trx non-stop: 20250122135431420 <0006> scheduler_trx.c:576 GSM clock skew: old fn=0, new fn=102 20250122135431882 <0006> scheduler_trx.c:604 We were 3 FN slower than TRX, compensated 20250122135432344 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135432805 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135433267 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135433728 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135434190 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135434651 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135435113 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135435575 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436036 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436498 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135436959 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated 20250122135437421 <0006> scheduler_trx.c:604 We were 2 FN slower than TRX, compensated ... What happens here is that there are ~ 216 GSM frames every second, and since fake_trx drifts by 0.09ms every frame, it results in drifting by ~ 20ms every second. Which results in "2 FN slower than TRX" emitted approximately twice per second as above log excerpt confirms. -> Fix this by adjusting CLCKgen to emit ticks with exactly GSM frame period by default. Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 --- M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/test_clck_gen.py 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/39392/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index bf56f64..c6da8f6 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -34,9 +34,6 @@ SEC_DELAY_US = 1000 * 1000 GSM_FRAME_US = 4615.0 - # Average loop back delay - LO_DELAY_US = 90.0 - def __init__(self, clck_links, clck_start = 0, ind_period = 102): # This event is needed to control the thread self._breaker = threading.Event() @@ -47,7 +44,7 @@ self.clck_start = clck_start # Calculate counter time - self.ctr_interval = self.GSM_FRAME_US - self.LO_DELAY_US + self.ctr_interval = self.GSM_FRAME_US self.ctr_interval /= self.SEC_DELAY_US # (Optional) clock consumer diff --git a/src/target/trx_toolkit/test_clck_gen.py b/src/target/trx_toolkit/test_clck_gen.py index a920ce1..92e5e55 100644 --- a/src/target/trx_toolkit/test_clck_gen.py +++ b/src/target/trx_toolkit/test_clck_gen.py @@ -63,6 +63,11 @@ finally: clck.stop() + # verify that default tick interval is 1 TDMA frame exactly + def test_period_is_gsm_frame(self): + clck = clck_gen.CLCKGen([]) + self.assertEqual(clck.ctr_interval, 4.615e-3) + if __name__ == '__main__': unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie12fbe8138bac1398805fa270b869e7a333fcba0 Gerrit-Change-Number: 39392 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: cosmetic: fix wrong arity in comment
by fixeria 22 Jan '25

22 Jan '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email ) Change subject: s1ap_proxy: cosmetic: fix wrong arity in comment ...................................................................... s1ap_proxy: cosmetic: fix wrong arity in comment Change-Id: Idfe81c8905a61a23f2a44057ddcf17184e75b85f --- M src/s1ap_proxy.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 3414e79..365f141 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -574,7 +574,7 @@ %% Iterate over the given list of 'ProtocolIE-Field' IEs, -%% calling function handle_ie/1 for IEs matching the given IEI. +%% calling function handle_ie/3 for IEs matching the given IEI. %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. -spec handle_ies(s1ap_ie_id(), list(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Idfe81c8905a61a23f2a44057ddcf17184e75b85f Gerrit-Change-Number: 39387 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix IEI path leak in handle_ies/4
by fixeria 22 Jan '25

22 Jan '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email ) Change subject: s1ap_proxy: fix IEI path leak in handle_ies/4 ...................................................................... s1ap_proxy: fix IEI path leak in handle_ies/4 Function handle_ies/3 prepends a new item to the IEI path and calls function handle_ies/4. The later was expected to remove that item from the IEI path upon returning the new #proxy_state. This was done correctly in the successful scenario, however the error case was overlooked in 00f51fe. As a result of this, whenever handle_ie/3 returns an error, the IEI path is not properly cleaned and stale IEIs remain in the #proxy_state. Fix this by removing the head IEI in the same place where we push it. Change-Id: I64629a215c05e8d577a8943ae872945d61b5107c Fixes: 00f51fe ("s1ap_proxy: handle_ies(): pass IEI path to handle_ie()") Related: SYS#7288 --- M src/s1ap_proxy.erl 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Verified Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 365f141..f04fb61 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -578,8 +578,12 @@ %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. -spec handle_ies(s1ap_ie_id(), list(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -handle_ies(IEI, IEs, #proxy_state{path = P} = S) -> - handle_ies([], IEI, IEs, S#proxy_state{path = [IEI | P]}). +handle_ies(IEI, IEs, #proxy_state{path = P} = S0) -> + %% prepend IEI to the path and call handle_ies/4 + {Result, S1} = handle_ies([], IEI, IEs, + S0#proxy_state{path = [IEI | P]}), + %% remove IEI from the path and return the result + {Result, S1#proxy_state{path = P}}. handle_ies(Acc, IEI, [IE | IEs], #proxy_state{path = P} = S0) -> @@ -610,10 +614,9 @@ handle_ies([IE | Acc], IEI, IEs, S0) end; -handle_ies(Acc, IEI, [], - #proxy_state{path = [IEI | P]} = S) -> +handle_ies(Acc, _IEI, [], S) -> IEs = lists:reverse(Acc), - {{ok, IEs}, S#proxy_state{path = P}}. + {{ok, IEs}, S}. build_erab_setup_response_failure(#proxy_state{erabs = ERABs, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I64629a215c05e8d577a8943ae872945d61b5107c Gerrit-Change-Number: 39388 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix IEI path leak in handle_ies/4
by osmith 22 Jan '25

22 Jan '25

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email ) Change subject: s1ap_proxy: fix IEI path leak in handle_ies/4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I64629a215c05e8d577a8943ae872945d61b5107c Gerrit-Change-Number: 39388 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Jan 2025 10:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log