August 2024 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: pfcp_peer: store local/remote Recovery Time Stamp in #peer_state

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37961?usp=email ) Change subject: pfcp_peer: store local/remote Recovery Time Stamp in #peer_state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37961?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: I4ad597e3f16058c91b16ad83ffc00c486817b3cf Gerrit-Change-Number: 37961 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 31 Aug 2024 13:05:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months

1
0
0 0

[XS] Change in osmo-dev[master]: osmo-uninstall.sh: add -x and -e

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37850?usp=email ) Change subject: osmo-uninstall.sh: add -x and -e ...................................................................... osmo-uninstall.sh: add -x and -e Change-Id: I226aed2ddce9a01fc9399a8ba656a2496b1efa61 --- M osmo-uninstall.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/osmo-uninstall.sh b/osmo-uninstall.sh index b223c4c..52da9d7 100755 --- a/osmo-uninstall.sh +++ b/osmo-uninstall.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -xe # Remove all osmocom installations from given prefix, default is /usr/local prefix="${1-/usr/local}" echo "$prefix" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I226aed2ddce9a01fc9399a8ba656a2496b1efa61 Gerrit-Change-Number: 37850 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

10 months

1
0
0 0

[XS] Change in osmo-dev[master]: osmo-uninstall.sh: more files

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37851?usp=email ) Change subject: osmo-uninstall.sh: more files ...................................................................... osmo-uninstall.sh: more files Change-Id: Ic7ae31f37aced3ac4d5dd4ab2472fda6c27966a0 --- M osmo-uninstall.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/osmo-uninstall.sh b/osmo-uninstall.sh index 52da9d7..dd0b354 100755 --- a/osmo-uninstall.sh +++ b/osmo-uninstall.sh @@ -8,6 +8,7 @@ rm -rf $prefix/lib/libosmo* rm -rf $prefix/lib/libsccp.* rm -rf $prefix/lib/libsmpp34* +rm -rf $prefix/lib/libxua.a rm -rf $prefix/lib/pkgconfig/libasn1c* rm -rf $prefix/lib/pkgconfig/libgtp.* rm -rf $prefix/lib/pkgconfig/libmtp.* @@ -16,7 +17,9 @@ rm -rf $prefix/lib/pkgconfig/libsmpp34* rm -rf $prefix/include/asn1c/ rm -rf $prefix/include/gtp.h +rm -rf $prefix/include/gsn.h rm -rf $prefix/include/gtpie.h +rm -rf $prefix/include/libgtpnl/ rm -rf $prefix/include/openbsc/ rm -rf $prefix/include/osmocom/ rm -rf $prefix/include/pdp.h -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic7ae31f37aced3ac4d5dd4ab2472fda6c27966a0 Gerrit-Change-Number: 37851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

10 months

1
0
0 0

[XS] Change in osmo-dev[master]: osmo-uninstall.sh: more files

by fixeria

Attention is currently required from: neels, osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-dev/+/37851?usp=email ) Change subject: osmo-uninstall.sh: more files ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic7ae31f37aced3ac4d5dd4ab2472fda6c27966a0 Gerrit-Change-Number: 37851 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Aug 2024 20:11:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months

1
0
0 0

[XS] Change in osmo-dev[master]: osmo-uninstall.sh: add -x and -e

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-dev/+/37850?usp=email ) Change subject: osmo-uninstall.sh: add -x and -e ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I226aed2ddce9a01fc9399a8ba656a2496b1efa61 Gerrit-Change-Number: 37850 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 30 Aug 2024 20:11:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

10 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: store local/remote Recovery Time Stamp in #peer_state

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37961?usp=email ) Change subject: pfcp_peer: store local/remote Recovery Time Stamp in #peer_state ...................................................................... pfcp_peer: store local/remote Recovery Time Stamp in #peer_state The local Recovery Time Stamp is also needed for the Heartbeat procedure, so we need to store it in the in #peer_state. The remote Recovery Time Stamp can be used for detecting restart of the remote peer and may be used for introspection later. Change-Id: I4ad597e3f16058c91b16ad83ffc00c486817b3cf --- M src/pfcp_peer.erl 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/61/37961/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 44956da..86d42d3 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -76,6 +76,8 @@ sock :: gen_udp:socket(), loc_addr :: inet:ip_address(), rem_addr :: inet:ip_address(), + loc_rts :: pos_integer(), + rem_rts :: undefined | pos_integer(), seq_nr :: pfcp_seq_nr(), registry :: dict:dict() }). @@ -142,6 +144,7 @@ loc_addr = LocAddr, rem_addr = RemAddr, seq_nr = 0, + loc_rts = get_recovery_timestamp(), registry = dict:new()}}. @@ -168,9 +171,11 @@ #peer_state{sock = Sock} = S) -> case decode_pdu(Data, S) of #pfcp{type = association_setup_response, - ie = #{pfcp_cause := 'Request accepted'}} -> + ie = #{pfcp_cause := 'Request accepted', + recovery_time_stamp := #recovery_time_stamp{time = RRTS}}} -> ?LOG_INFO("Rx Association Setup Response (Request accepted)"), - {next_state, connected, S}; + {next_state, connected, + S#peer_state{rem_rts = RRTS}}; #pfcp{type = association_setup_response, ie = #{pfcp_cause := Cause}} -> ?LOG_ERROR("Rx Association Setup Response (~p)", [Cause]), @@ -365,9 +370,9 @@ %% 6.2.6 PFCP Association Setup Procedure %% 7.4.4.1 PFCP Association Setup Request -send_assoc_setup(S) -> +send_assoc_setup(#peer_state{loc_rts = LRTS} = S) -> IEs = #{node_id => #node_id{id = get_node_id(S)}, - recovery_time_stamp => #recovery_time_stamp{time = get_recovery_timestamp()}}, + recovery_time_stamp => #recovery_time_stamp{time = LRTS}}, send_pdu({association_setup_request, IEs}, S). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37961?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: I4ad597e3f16058c91b16ad83ffc00c486817b3cf Gerrit-Change-Number: 37961 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: log IP address / port of {in,out}going PDUs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37962?usp=email ) Change subject: pfcp_peer: log IP address / port of {in,out}going PDUs ...................................................................... pfcp_peer: log IP address / port of {in,out}going PDUs Change-Id: I254853532d438440152e0d7cb3e0fe78ab75a98f --- M src/pfcp_peer.erl 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/62/37962/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 86d42d3..b190f12 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -167,9 +167,9 @@ {repeat_state, S}; %% Handle incoming PFCP PDU(s) -connecting(info, {udp, Sock, _FromIp, _FromPort, Data}, +connecting(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> - case decode_pdu(Data, S) of + case decode_pdu(Data, {FromIp, FromPort}, S) of #pfcp{type = association_setup_response, ie = #{pfcp_cause := 'Request accepted', recovery_time_stamp := #recovery_time_stamp{time = RRTS}}} -> @@ -213,9 +213,9 @@ {keep_state, S1, [{reply, From, Result}]}; %% Handle incoming PFCP PDU(s) -connected(info, {udp, Sock, _FromIp, _FromPort, Data}, +connected(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> - PDU = decode_pdu(Data, S), + PDU = decode_pdu(Data, {FromIp, FromPort}, S), route_pdu(PDU, S), {keep_state, S}; @@ -287,11 +287,13 @@ S#peer_state{registry = NReg}. --spec decode_pdu(binary(), peer_state()) -> pfcp_pdu(). -decode_pdu(Data, _S) -> - ?LOG_DEBUG("Rx encoded PFCP PDU: ~p", [Data]), +-spec decode_pdu(binary(), tuple(), peer_state()) -> pfcp_pdu(). +decode_pdu(Data, {FromIp, FromPort}, _S) -> + ?LOG_DEBUG("Rx encoded PFCP PDU from ~p:~p: ~p", + [Data, FromIp, FromPort]), PDU = pfcp_packet:decode(Data), - ?LOG_DEBUG("Rx PFCP PDU: ~p", [PDU]), + ?LOG_DEBUG("Rx PFCP PDU from ~p:~p: ~p", + [PDU, FromIp, FromPort]), %% TODO: check PDU#pfcp.seq_no %% TODO: there can be batched PDUs PDU. @@ -312,7 +314,8 @@ -spec send_data(binary(), peer_state()) -> ok | {error, term()}. send_data(Data, #peer_state{sock = Sock, rem_addr = RemAddr}) -> - ?LOG_DEBUG("Tx encoded PFCP PDU: ~p", [Data]), + ?LOG_DEBUG("Tx encoded PFCP PDU to ~p:~p: ~p", + [RemAddr, ?PFCP_PORT, Data]), gen_udp:send(Sock, RemAddr, ?PFCP_PORT, Data). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37962?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: I254853532d438440152e0d7cb3e0fe78ab75a98f Gerrit-Change-Number: 37962 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: do not route incoming PDUs without SEID

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37964?usp=email ) Change subject: pfcp_peer: do not route incoming PDUs without SEID ...................................................................... pfcp_peer: do not route incoming PDUs without SEID Change-Id: I7d33ec4e883b217b2b4f65e4866d9365c32c753d --- M src/pfcp_peer.erl 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/64/37964/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 8c29a9f..03993d7 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -227,8 +227,10 @@ %% 3GPP TS 29.244, 6.2.2.2 Heartbeat Request #pfcp{type = heartbeat_request} -> recv_heartbeat_request(PDU, {FromIp, FromPort}, S); + #pfcp{seid = SEID} when is_integer(SEID) -> + route_pdu(PDU, S); _ -> - route_pdu(PDU, S) + ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]) end, {keep_state, S}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37964?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: I7d33ec4e883b217b2b4f65e4866d9365c32c753d Gerrit-Change-Number: 37964 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: pfcp_peer: implement the Heartbeat procedure

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37963?usp=email ) Change subject: pfcp_peer: implement the Heartbeat procedure ...................................................................... pfcp_peer: implement the Heartbeat procedure Change-Id: Ic4682d49f2e1df08d241500b7b4e75edadaeb91a --- M src/pfcp_peer.erl 1 file changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/63/37963/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index b190f12..8c29a9f 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -169,7 +169,8 @@ %% Handle incoming PFCP PDU(s) connecting(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> - case decode_pdu(Data, {FromIp, FromPort}, S) of + PDU = decode_pdu(Data, {FromIp, FromPort}, S), + case PDU of #pfcp{type = association_setup_response, ie = #{pfcp_cause := 'Request accepted', recovery_time_stamp := #recovery_time_stamp{time = RRTS}}} -> @@ -180,7 +181,13 @@ ie = #{pfcp_cause := Cause}} -> ?LOG_ERROR("Rx Association Setup Response (~p)", [Cause]), {stop, {shutdown, assoc_setup_nack}}; - PDU -> + %% 3GPP TS 29.244, 6.2.2.2 Heartbeat Request + %% A CP function or UP function shall be prepared to receive a Heartbeat Request + %% at any time (even from unknown peers) and it shall reply with a Heartbeat Response. + #pfcp{type = heartbeat_request} -> + recv_heartbeat_request(PDU, {FromIp, FromPort}, S), + {keep_state, S}; + _ -> ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]), {keep_state, S} end; @@ -216,7 +223,13 @@ connected(info, {udp, Sock, FromIp, FromPort, Data}, #peer_state{sock = Sock} = S) -> PDU = decode_pdu(Data, {FromIp, FromPort}, S), - route_pdu(PDU, S), + case PDU of + %% 3GPP TS 29.244, 6.2.2.2 Heartbeat Request + #pfcp{type = heartbeat_request} -> + recv_heartbeat_request(PDU, {FromIp, FromPort}, S); + _ -> + route_pdu(PDU, S) + end, {keep_state, S}; %% Catch-all handler for this state @@ -409,4 +422,20 @@ send_session_delete_req(SEID, S) -> send_pdu(SEID, {session_deletion_request, []}, S). + +%% 6.2.2 Heartbeat Procedure +%% 7.4.2 Heartbeat Messages +recv_heartbeat_request(#pfcp{type = heartbeat_request, + seq_no = SeqNr, + ie = ReqIEs}, + {FromIp, FromPort}, + #peer_state{loc_rts = LRTS} = S) -> + ?LOG_INFO("Rx Heartbeat Request from ~p:~p: ~p", [FromIp, FromPort, ReqIEs]), + RspIEs = #{recovery_time_stamp => #recovery_time_stamp{time = LRTS}}, + %% Fake #peer_state to force the right destination and SeqNr + {Result, _} = send_pdu({heartbeat_response, RspIEs}, + S#peer_state{seq_nr = SeqNr, + rem_addr = FromIp}), + Result. + %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37963?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: Ic4682d49f2e1df08d241500b7b4e75edadaeb91a Gerrit-Change-Number: 37963 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

10 months

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: Fix testsuite.run() passing too many envvars to podman

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37954?usp=email ) Change subject: testenv: Fix testsuite.run() passing too many envvars to podman ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I haven't tested with `podman`, sorry for introducing a regression. I confirm that with this patch it still works without podman, so looks good to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8fca37b878323cd188035004b587c124598376e Gerrit-Change-Number: 37954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Aug 2024 18:16:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024