- gerrit-log - lists.osmocom.org

[L] Change in ...osmo-s1gw[master]: pfcp_peer: initial PFCP peer implementation
by fixeria 20 Jun '24

20 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37268?usp=email ) Change subject: pfcp_peer: initial PFCP peer implementation ...................................................................... pfcp_peer: initial PFCP peer implementation Change-Id: I7bad0069dca2111006039d12e744a2bd6d2cb86e --- M config/sys.config M src/osmo_s1gw.app.src M src/osmo_s1gw_sup.erl A src/pfcp_peer.erl 4 files changed, 253 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/68/37268/1 diff --git a/config/sys.config b/config/sys.config index 5ccd43d..20d409d 100644 --- a/config/sys.config +++ b/config/sys.config @@ -13,7 +13,9 @@ {osmo_s1gw, [{s1gw_bind_addr, "127.0.1.1"}, %% S1GW bind address for incoming eNB connections {mme_loc_addr, "127.0.2.1"}, %% local address for outgoing connections to the MME - {mme_rem_addr, "127.0.2.10"} %% remote address for outgoing connections to the MME + {mme_rem_addr, "127.0.2.10"}, %% remote address for outgoing connections to the MME + {upf_loc_addr, "127.0.1.1"}, %% local address for outgoing connections to the UPF + {upf_rem_addr, "127.0.1.2"} %% remote address for outgoing connections to the UPF ]}, %% ================================================================================ %% kernel config diff --git a/src/osmo_s1gw.app.src b/src/osmo_s1gw.app.src index 6fd8174..8bb89de 100644 --- a/src/osmo_s1gw.app.src +++ b/src/osmo_s1gw.app.src @@ -7,7 +7,8 @@ {applications, [ kernel, stdlib, - logger_color_formatter + logger_color_formatter, + pfcplib ]}, {modules, []}, {mod, {osmo_s1gw_app, []}}, diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index e13cd1a..a0652c3 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -47,6 +47,8 @@ -define(ENV_DEFAULT_MME_LOC_ADDR, "127.0.2.1"). -define(ENV_DEFAULT_MME_REM_ADDR, "127.0.2.10"). -define(ENV_DEFAULT_MME_REM_PORT, ?S1AP_PORT). +-define(ENV_DEFAULT_UPF_LOC_ADDR, "127.0.1.1"). +-define(ENV_DEFAULT_UPF_REM_ADDR, "127.0.1.2"). %% ------------------------------------------------------------------ %% supervisor API @@ -62,6 +64,9 @@ MmeLocAddr = get_env(mme_loc_addr, ?ENV_DEFAULT_MME_LOC_ADDR), MmeRemAddr = get_env(mme_rem_addr, ?ENV_DEFAULT_MME_REM_ADDR), MmeRemPort = get_env(mme_rem_port, ?ENV_DEFAULT_MME_REM_PORT), + UpfLocAddr = get_env(upf_loc_addr, ?ENV_DEFAULT_UPF_LOC_ADDR), + UpfRemPort = get_env(upf_rem_addr, ?ENV_DEFAULT_UPF_REM_ADDR), + SctpServer = {sctp_server, {sctp_server, start_link, [S1GWBindAddr, S1GWBindPort, {{MmeLocAddr, MmeRemAddr}, MmeRemPort}]}, @@ -69,7 +74,14 @@ 5000, worker, [sctp_server]}, - {ok, {{one_for_all, 5, 10}, [SctpServer]}}. + PfcpPeer = {pfcp_peer, {pfcp_peer, start_link, + [UpfLocAddr, UpfRemPort]}, + permanent, + 5000, + worker, + [pfcp_peer]}, + + {ok, {{one_for_all, 5, 10}, [SctpServer, PfcpPeer]}}. %% ------------------------------------------------------------------ diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl new file mode 100644 index 0000000..ced3a5e --- /dev/null +++ b/src/pfcp_peer.erl @@ -0,0 +1,226 @@ +%% Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +%% Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> +%% +%% All Rights Reserved +%% +%% SPDX-License-Identifier: AGPL-3.0-or-later +%% +%% This program is free software; you can redistribute it and/or modify +%% it under the terms of the GNU Affero General Public License as +%% published by the Free Software Foundation; either version 3 of the +%% License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU Affero General Public License +%% along with this program. If not, see <https://www.gnu.org/licenses/>. +%% +%% Additional Permission under GNU AGPL version 3 section 7: +%% +%% If you modify this Program, or any covered work, by linking or +%% combining it with runtime libraries of Erlang/OTP as released by +%% Ericsson on https://www.erlang.org (or a modified version of these +%% libraries), containing parts covered by the terms of the Erlang Public +%% License (https://www.erlang.org/EPLICENSE), the licensors of this +%% Program grant you additional permission to convey the resulting work +%% without the need to license the runtime libraries of Erlang/OTP under +%% the GNU Affero General Public License. Corresponding Source for a +%% non-source form of such a combination shall include the source code +%% for the parts of the runtime libraries of Erlang/OTP used as well as +%% that of the covered work. + +-module(pfcp_peer). +-behaviour(gen_statem). + +-export([init/1, + callback_mode/0, + connecting/3, + connected/3, + code_change/4, + terminate/3]). +-export([start_link/2, + shutdown/0]). + +-include_lib("kernel/include/logger.hrl"). +-include_lib("pfcplib/include/pfcp_packet.hrl"). + +%% 3GPP TS 29.244, section 4.2 "UDP Header and Port Numbers" +-define(PFCP_PORT, 8805). + +-type pfcp_seq_nr() :: pos_integer(). +-type pfcp_msg_type() :: atom(). +-type pfcp_msg_ies() :: [term()] | map() | binary(). +-type pfcp_msg() :: {pfcp_msg_type(), pfcp_msg_ies()}. + +-record(peer_state, {sock :: gen_udp:socket(), + loc_addr :: inet:ip_address(), + rem_addr :: inet:ip_address(), + tx_seq_nr :: pfcp_seq_nr() + }). + +-type peer_state() :: #peer_state{}. + +%% ------------------------------------------------------------------ +%% public API +%% ------------------------------------------------------------------ + +start_link(LocAddr, RemAddr) -> + gen_statem:start_link({local, ?MODULE}, ?MODULE, + [LocAddr, RemAddr], + []). + + +shutdown() -> + gen_statem:stop(?MODULE). + + +%% ------------------------------------------------------------------ +%% gen_server API +%% ------------------------------------------------------------------ + +init([LocAddrStr, RemAddr]) when is_list(LocAddrStr) -> + {ok, LocAddr} = inet:parse_address(LocAddrStr), + init([LocAddr, RemAddr]); + +init([LocAddr, RemAddrStr]) when is_list(RemAddrStr) -> + {ok, RemAddr} = inet:parse_address(RemAddrStr), + init([LocAddr, RemAddr]); + +init([LocAddr, RemAddr]) -> + process_flag(trap_exit, true), + {ok, Sock} = gen_udp:open(?PFCP_PORT, [binary, + {ip, LocAddr}, + {reuseaddr, true}, + {active, true}]), + ?LOG_INFO("PFCP peer @ ~p will talk to UPF @ ~p", [LocAddr, RemAddr]), + {ok, connecting, #peer_state{sock = Sock, + loc_addr = LocAddr, + rem_addr = RemAddr, + tx_seq_nr = 0}}. + + +callback_mode() -> + [state_functions, state_enter]. + + +%% CONNECTING state +connecting(enter, OldState, + #peer_state{tx_seq_nr = TxSeqNr} = S) -> + ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + %% Tx PFCP Association Setup + ok = send_assoc_setup(S), + {next_state, connecting, S#peer_state{tx_seq_nr = TxSeqNr + 1}, + [{state_timeout, 2_000, assoc_setup_timeout}]}; + +%% Handle Association Setup timeout +connecting(state_timeout, assoc_setup_timeout, _S) -> + {stop, {shutdown, assoc_setup_timeout}}; + +%% Handle incoming PFCP PDU(s) +connecting(info, {udp, Sock, _FromIp, _FromPort, Data}, + #peer_state{sock = Sock} = S) -> + case decode_pdu(S, Data) of + {association_setup_response, #{pfcp_cause := 'Request accepted'}} -> + ?LOG_INFO("Rx Association Setup Response (Request accepted)"), + {next_state, connected, S}; + {association_setup_response, #{pfcp_cause := Cause}} -> + ?LOG_ERROR("Rx Association Setup Response (~p)", [Cause]), + {stop, {shutdown, assoc_setup_nack}}; + PDU -> + ?LOG_NOTICE("Rx unexpected PFCP PDU: ~p", [PDU]), + {keep_state, S} + end; + +connecting(Event, EventData, S) -> + ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), + {keep_state, S}. + + +%% CONNECTED state +connected(enter, OldState, S) -> + ?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), + {keep_state, S}; + +%% Catch-all handler for this state +connected(Event, EventData, S) -> + ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), + {keep_state, S}. + + +code_change(_Vsn, State, S, _Extra) -> + {ok, State, S}. + + +terminate(Reason, State, S) -> + ?LOG_NOTICE("Terminating in state ~p, reason ~p", [State, Reason]), + case State of + connected -> + send_assoc_release(S); + _ -> + nop + end, + gen_udp:close(S#peer_state.sock), + ok. + + +%% ------------------------------------------------------------------ +%% private API +%% ------------------------------------------------------------------ + +-spec decode_pdu(peer_state(), binary()) -> pfcp_msg(). +decode_pdu(_S, Data) -> + ?LOG_DEBUG("Rx encoded PFCP PDU: ~p", [Data]), + PDU = pfcp_packet:decode(Data), + ?LOG_DEBUG("Rx PFCP PDU: ~p", [PDU]), + %% TODO: check PDU#pfcp.seq_no + %% TODO: there can be batched PDUs + {PDU#pfcp.type, PDU#pfcp.ie}. + + +-spec send_data(peer_state(), binary()) -> ok | {error, term()}. +send_data(#peer_state{sock = Sock, rem_addr = RemAddr}, Data) -> + ?LOG_DEBUG("Tx encoded PFCP PDU: ~p", [Data]), + gen_udp:send(Sock, RemAddr, ?PFCP_PORT, Data). + + +-spec send_pdu(peer_state(), pfcp_msg()) -> ok | {error, term()}. +send_pdu(S, {MsgType, IEs}) -> + TxSeqNr = S#peer_state.tx_seq_nr, + PDU = #pfcp{version = v1, + type = MsgType, + seid = undefined, + seq_no = TxSeqNr, + ie = IEs}, + ?LOG_DEBUG("Tx PFCP PDU: ~p", [PDU]), + Data = pfcp_packet:encode(PDU), + send_data(S, Data). + + +-spec get_node_id(peer_state()) -> binary(). +get_node_id(#peer_state{loc_addr = LocAddr}) -> + list_to_binary(tuple_to_list(LocAddr)). + + +-spec get_recovery_timestamp() -> pos_integer(). +get_recovery_timestamp() -> + {NowMS, NowS, _NowUS} = erlang:timestamp(), + %% erlang:timestamp() returns time relative to the UNIX epoch (1970), + %% but for PFCP we need time relative to the NTP era 0 (1900). + %% 2208988800 is the diff between 1900 and 1970. + NowMS * 1_000_000 + NowS + 2208988800. + + +send_assoc_setup(S) -> + IEs = #{node_id => #node_id{id = get_node_id(S)}, + recovery_time_stamp => #recovery_time_stamp{time = get_recovery_timestamp()}}, + send_pdu(S, {association_setup_request, IEs}). + + +send_assoc_release(S) -> + IEs = #{node_id => #node_id{id = get_node_id(S)}}, + send_pdu(S, {association_release_request, IEs}). + +%% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37268?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7bad0069dca2111006039d12e744a2bd6d2cb86e Gerrit-Change-Number: 37268 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-abis[master]: trau_rtp_conv.c cosmetic: fix typo in name of static function
by falconia 20 Jun '24

20 Jun '24

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37251?usp=email ) Change subject: trau_rtp_conv.c cosmetic: fix typo in name of static function ...................................................................... trau_rtp_conv.c cosmetic: fix typo in name of static function Change I7a6d13d406484c01210594bb6d2f0aff7c1341ab introduced a static function in src/trau/trau_rtp_conv.c that was intended to be named twts002_hr16_set_extra_flags(). However, a typo crept in unnoticed, and the patch was merged with this function name misspelled as twtw002_hr16_set_extra_flags(). Fix it. Related: OS#6448 Change-Id: I63bb678f7a1f26fefba070ddc10850db24cb88b3 --- M src/trau/trau_rtp_conv.c 1 file changed, 19 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index f347cca..91bf228 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -162,7 +162,7 @@ FT_NO_DATA = 7, }; -static void twtw002_hr16_set_extra_flags(uint8_t *out, const struct osmo_trau_frame *tf) +static void twts002_hr16_set_extra_flags(uint8_t *out, const struct osmo_trau_frame *tf) { if (tf->c_bits[16]) /* DTXd */ out[0] |= 0x08; @@ -223,7 +223,7 @@ if (emit_twts002) { if (tf->c_bits[11] && sidc == OSMO_GSM631_SID_CLASS_SPEECH) out[0] = FT_BFI_WITH_DATA << 4; - twtw002_hr16_set_extra_flags(out, tf); + twts002_hr16_set_extra_flags(out, tf); /* invalid SID frames are truncated in TW-TS-002 */ if (sidc == OSMO_GSM631_SID_CLASS_INVALID) return 1; @@ -243,7 +243,7 @@ bad_frame: if (emit_twts002) { out[0] = FT_NO_DATA << 4; - twtw002_hr16_set_extra_flags(out, tf); + twts002_hr16_set_extra_flags(out, tf); return 1; } else return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37251?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I63bb678f7a1f26fefba070ddc10850db24cb88b3 Gerrit-Change-Number: 37251 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-abis[master]: rtp2trau_hr16: use osmo_hr_check_sid()
by falconia 20 Jun '24

20 Jun '24

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email ) Change subject: rtp2trau_hr16: use osmo_hr_check_sid() ...................................................................... rtp2trau_hr16: use osmo_hr_check_sid() The code in libosmotrau previously used its own local function to check incoming 112-bit HRv1 frames against the possibility of perfect SID (all 79 bits of SID field set to 1). However, there is a public API function in libosmocodec that does the exact same job - use the common library function. Until recently, the implementation of osmo_hr_check_sid() in libosmocodec was quite inefficient (the local version in libosmotrau was faster) and contained a logic error in the handling of zero-length input in the place of a received frame. However, both of these defects in osmo_hr_check_sid() have now been fixed in libosmocore, clearing the way for this common library function to be used. Depends: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd (libosmocore) Change-Id: Ia8fe7e9ea65fadf7f5c136355ca8c24c89f09ef2 --- M TODO-RELEASE M src/trau/trau_rtp_conv.c 2 files changed, 26 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve falconia: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index e3ad20a..515adef 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmotrau struct osmo_trau2rtp_state extended (ABI break) libosmogsm >1.9.0 rtp_extensions.h new header +libosmocodec >1.9.0 bugfix in osmo_hr_check_sid() in case length=0 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 15d5a08..f347cca 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -162,8 +162,6 @@ FT_NO_DATA = 7, }; -static const uint8_t rtp_hr_sid[14] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - static void twtw002_hr16_set_extra_flags(uint8_t *out, const struct osmo_trau_frame *tf) { if (tf->c_bits[16]) /* DTXd */ @@ -446,21 +444,6 @@ return 0; } -/* does the RTP HR payload resemble a SID frame or not */ -static bool is_rtp_hr_sid(const uint8_t *data, const uint8_t data_len) -{ - int i; - - if (data_len < GSM_HR_BYTES) - return false; - - for (i = 0; i < GSM_HR_BYTES; i++) { - if ((data[i] & rtp_hr_sid[i]) != rtp_hr_sid[i]) - return false; - } - return true; -} - static int rtp2trau_hr16(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) { /* accept both TS 101 318 and RFC 5993 payloads */ @@ -503,7 +486,7 @@ tf->c_bits[11] = 1; else tf->c_bits[11] = 0; - if (is_rtp_hr_sid(data, data_len)) { + if (osmo_hr_check_sid(data, data_len)) { /* SID=2 is a valid SID frame */ tf->c_bits[12] = 1; tf->c_bits[13] = 0; @@ -519,7 +502,7 @@ tf->c_bits[12] = 1; /* C13: spare */ tf->c_bits[13] = 1; /* C14: spare */ tf->c_bits[14] = 1; /* C15: spare */ - if (is_rtp_hr_sid(data, data_len)) + if (osmo_hr_check_sid(data, data_len)) tf->c_bits[15] = 0; /* C16: SP */ else tf->c_bits[15] = 1; /* C16: SP */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia8fe7e9ea65fadf7f5c136355ca8c24c89f09ef2 Gerrit-Change-Number: 37250 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-abis[master]: rtp2trau_hr16: use osmo_hr_check_sid()
by falconia 20 Jun '24

20 Jun '24

falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email ) Change subject: rtp2trau_hr16: use osmo_hr_check_sid() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ia8fe7e9ea65fadf7f5c136355ca8c24c89f09ef2 Gerrit-Change-Number: 37250 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jun 2024 18:02:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: pjsip.conf: Avoid advertising support for +g.3gpp.smsip
by pespin 20 Jun '24

20 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37261?usp=email ) Change subject: ttcn3-asterisk: pjsip.conf: Avoid advertising support for +g.3gpp.smsip ...................................................................... ttcn3-asterisk: pjsip.conf: Avoid advertising support for +g.3gpp.smsip Asterisk doesn't so far support SMS over IMS, so avoid announcing it during REGISTER. Related: SYS#6981 Change-Id: I1546b7106d25ebfb1c92c1a27db1f44c51b0413a --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/61/37261/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index f3ac374..019a6e5 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -94,7 +94,7 @@ expiration=600000 ims_aka=yes contact_user=volte_ims -contact_header_params=+g.3gpp.icsi-ref="urn\%3Aurn-7\%3A3gpp-service.ims.icsi.mmtel"\;+g.3gpp.smsip\;audio\;+sip.instance="<urn:gsma:imei:35876110-027790-0>" +contact_header_params=+g.3gpp.icsi-ref="urn\%3Aurn-7\%3A3gpp-service.ims.icsi.mmtel"\;audio\;+sip.instance="<urn:gsma:imei:35876110-027790-0>" endpoint=volte_ims line=yes manual_register=yes -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37261?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1546b7106d25ebfb1c92c1a27db1f44c51b0413a Gerrit-Change-Number: 37261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf
by pespin 20 Jun '24

20 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37263?usp=email ) Change subject: ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf ...................................................................... ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf Since recently, the testsuite validates the IMEI received at IMS Core over REGISTER Contact header matches the one configured at Asterisk config file. Hence, add the same value to Asterisk_Tests.cfg so it can match the value. Depends: osmo-ttcn3-hacks.git Change-Id I866d89ec137d264e257b05226900b744a93c257e Related: SYS#6877 Change-Id: Id8bb7886ffcea506348496148e17f71cef1edc90 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/37263/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index 35eb420..840cbf7 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -24,6 +24,7 @@ Asterisk_Tests.mp_local_ims_port := 5060 Asterisk_Tests.mp_ims_domain := "ims.mnc001.mcc238.3gppnetwork.org" Asterisk_Tests.mp_ims_imsi := "238010000090828" +Asterisk_Tests.mp_ims_imei := "35876110-027790-0"; Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" IMS_ConnectionHandler.mp_ipsec_setup_script_path := "/osmo-ttcn3-hacks/asterisk/IMS_ipsec_setup.sh" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id8bb7886ffcea506348496148e17f71cef1edc90 Gerrit-Change-Number: 37263 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: pjsip.conf: Use reliable provisional responses if pee...
by pespin 20 Jun '24

20 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37262?usp=email ) Change subject: ttcn3-asterisk: pjsip.conf: Use reliable provisional responses if peer supports it ...................................................................... ttcn3-asterisk: pjsip.conf: Use reliable provisional responses if peer supports it The default 100rel=yes won't use reliable provisional responses unless the peer "requires" it, while we should instead be using them if the peer "supports" it. Related: SYS#6980 Change-Id: I40764e24f2c80ce48d6634e09797fefe97d99e51 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/37262/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 019a6e5..8dc4e6c 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -110,6 +110,7 @@ rewrite_contact=yes direct_media=no ims_aka=yes +100rel=peer_supported [volte_ims] type=auth -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I40764e24f2c80ce48d6634e09797fefe97d99e51 Gerrit-Change-Number: 37262 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: ttcn3-s1gw-test: run eNB/MME domains in separate networks
by fixeria 20 Jun '24

20 Jun '24

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37256?usp=email ) Change subject: ttcn3-s1gw-test: run eNB/MME domains in separate networks ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4c72cb58eeb2d0ccca307dcfcfb04d09bfb0834e Gerrit-Change-Number: 37256 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: check Contact attributes on IMS side
by pespin 20 Jun '24

20 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37260?usp=email ) Change subject: asterisk: check Contact attributes on IMS side ...................................................................... asterisk: check Contact attributes on IMS side Related: SYS#6877 Related: SYS#6981 Change-Id: I866d89ec137d264e257b05226900b744a93c257e --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn 2 files changed, 78 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/37260/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 30f04fd..05b1638 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -39,6 +39,7 @@ integer mp_local_ims_port := 5060; charstring mp_ims_domain := "ims.mnc001.mcc238.3gppnetwork.org" charstring mp_ims_imsi := "238010000090828"; + charstring mp_ims_imei := "35876110-027790-0"; /* Asterisk AMI: */ charstring mp_ami_remote_host := "127.0.0.1"; @@ -86,6 +87,7 @@ mp_local_ims_port, mp_ims_domain, mp_ims_imsi, + mp_ims_imei, cp := cp); return valueof(pars); } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index d396268..bf9f2df 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -73,9 +73,12 @@ charstring remote_sip_host optional, uint16_t remote_sip_port optional, charstring imsi, + charstring imei, charstring display_name, charstring password, charstring msisdn, + boolean support_video, + boolean support_smsip, /* Expected User-Location-Info in P-Access-Network-Info */ charstring uli_str, IMS_AuthVector auth, @@ -160,6 +163,7 @@ uint16_t local_sip_port, charstring domain, charstring imsi, + charstring imei, charstring msisdn := "90828", charstring display_name := "Anonymous", charstring password := "secret", @@ -167,9 +171,12 @@ remote_sip_host := omit, remote_sip_port := omit, imsi := imsi, + imei := imei, display_name := f_sip_str_quote(display_name), password := password, msisdn := msisdn, + support_video := false, + support_smsip := false, uli_str := "2380100010000101", auth := { /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ @@ -207,6 +214,7 @@ uint16_t local_sip_port, charstring domain, charstring imsi, + charstring imei, template (omit) IMS_CallPars cp := omit) := { t_guard := 60.0, realm := domain, @@ -215,7 +223,9 @@ registrar_sip_req_uri := valueof(ts_SipUrlHost(domain)), local_via := ts_Via_from(ts_HostPort(local_sip_host, local_sip_port)), server_name := valueof(ts_Server({c_sip_server_name})), - subscr := t_IMS_SubscrPars(local_sip_host, local_sip_port, domain := domain, imsi := imsi, cp := cp) + subscr := t_IMS_SubscrPars(local_sip_host, local_sip_port, + domain := domain, imsi := imsi, + imei := imei, cp := cp) } private altstep as_Tguard() runs on IMS_ConnHdlr { @@ -316,19 +326,61 @@ } -private function f_ims_validate_register_contact(Contact rx_contact) +private function f_ims_validate_register_contact(Contact rx_contact) runs on IMS_ConnHdlr { -/* IMS contact shows up like this: - * Contact: <sip:8adf9f3d-9342-4060-aa4f-a909f37fd6f6@192.168.101.2:5060>;+g.3gpp.accesstype="cellular2";video;audio;+g.3gpp.smsip;+g.3gpp.nw-init-ussi;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel";+sip.instance="<urn:gsma:imei:35589811-338445-0>" - */ - /* TODO: "that the UE must include the IMS Communication Service Identifier (ICSI) -in the contact: header to indicate IMS Multimedia Telephony." */ - /* TODO: "The UE must include an IMEI URN in the +sip.instance header field -parameter of the contact: header." */ - /* TODO: "If the UE supports SMS over IP, it must include the feature tag -“+g.3gpp.smsip” in the contact: header." */ - /* TODO: "If the UE supports conversational audio and video service, then this must -be indicated by adding a “video” media feature tag to the contact: header." */ + /* IMS contact shows up like this: + * Contact: <sip:8adf9f3d-9342-4060-aa4f-a909f37fd6f6@192.168.101.2:5060>;+g.3gpp.accesstype="cellular2";video;audio;+g.3gpp.smsip;+g.3gpp.nw-init-ussi;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel";+sip.instance="<urn:gsma:imei:35589811-338445-0>" + */ + if (ischosen(rx_contact.contactBody.wildcard)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected Contact wildcard := ", rx_contact)); + } + var ContactAddress_List caddrs := rx_contact.contactBody.contactAddresses; + for (var integer i := 0; i < lengthof(caddrs); i := i + 1) { + var ContactAddress caddr := caddrs[i]; + var template (omit) GenericParam param_tpl; + var boolean rx_supported; + f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn\\%3Aurn-7\\%3A3gpp-service.ims.icsi.mmtel\""); + f_sip_param_match_value_or_fail(caddr.contactParams, "+sip.instance", "\"<urn:gsma:imei:" & g_pars.subscr.imei & ">\""); + f_sip_param_match_value_or_fail(caddr.contactParams, "audio", omit); + + /* Check video support */ + param_tpl := f_sip_param_find(caddr.contactParams, "video"); + rx_supported := not istemplatekind(param_tpl, "omit"); + if (rx_supported) { + /* This attribute never has a value: */ + if (not istemplatekind(param_tpl.paramValue, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with 'video' attribute containing a value := ", rx_contact)); + } + if (not g_pars.subscr.support_video) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with unexpected 'video' attribute := ", rx_contact)); + } + } else if (g_pars.subscr.support_video) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with missing 'video' attribute := ", rx_contact)); + } + + /* Check smsip support */ + param_tpl := f_sip_param_find(caddr.contactParams, "+g.3gpp.smsip"); + rx_supported := not istemplatekind(param_tpl, "omit"); + if (rx_supported) { + /* This attribute never has a value: */ + if (not istemplatekind(param_tpl.paramValue, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with '+g.3gpp.smsip' attribute containing a value := ", rx_contact)); + } + if (not g_pars.subscr.support_smsip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with unexpected '+g.3gpp.smsip' attribute := ", rx_contact)); + } + } else if (g_pars.subscr.support_smsip) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received Contact with missing '+g.3gpp.smsip' attribute := ", rx_contact)); + } + } + } /* Validate P-Access-Network-Info: RFC7315 6.4 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37260?usp=email 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: I866d89ec137d264e257b05226900b744a93c257e Gerrit-Change-Number: 37260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-iuh[master]: support Paging in cn_ranap_rx_initiating_msg_co
by pespin 20 Jun '24

20 Jun '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email ) Change subject: support Paging in cn_ranap_rx_initiating_msg_co ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/37254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e66eee1cc4553799e128580d39f3d40f79dcf5 Gerrit-Change-Number: 37254 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jun 2024 13:50:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log