September 2023 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo_dia2gsup[master]: server_cb: use a define for the VENDOR_3GPP code

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34282 ) Change subject: server_cb: use a define for the VENDOR_3GPP code ...................................................................... server_cb: use a define for the VENDOR_3GPP code Also use a proper variable name Change-Id: I9bd99998963624f7688b972cbb3908fae5686231 --- M src/server_cb.erl 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/82/34282/1 diff --git a/src/server_cb.erl b/src/server_cb.erl index a6450dd..7f30d2b 100644 --- a/src/server_cb.erl +++ b/src/server_cb.erl @@ -6,6 +6,7 @@ -include_lib("diameter_3gpp_ts29_272.hrl"). -include_lib("osmo_gsup/include/gsup_protocol.hrl"). +-define(DIA_VENDOR_3GPP, 10415). %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, prepare_request/3, prepare_retransmit/3, @@ -177,7 +178,7 @@ -define(GMM_CAUSE_INV_MAND_INFO, 16#60). -define(GMM_CAUSE_PROTO_ERR_UNSPEC, 16#6f). --define(EXP_RES(Foo), #'Experimental-Result'{'Vendor-Id'=10415, 'Experimental-Result-Code'=Foo}). +-define(EXP_RES(Exp), #'Experimental-Result'{'Vendor-Id'=?DIA_VENDOR_3GPP, 'Experimental-Result-Code'=Exp}). -type empty_or_intl() :: [] | [integer()]. -spec gsup_cause2dia(integer()) -> {empty_or_intl(), empty_or_intl()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I9bd99998963624f7688b972cbb3908fae5686231 Gerrit-Change-Number: 34282 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: rebar3: define a release

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34284 ) Change subject: rebar3: define a release ...................................................................... rebar3: define a release Further with the release, rebar3 will also start the application when calling `rebar3 shell`. Change-Id: I76cb16e28b5bc6fb231566be1bd7905235fdf56b --- M README.md M contrib/systemd/osmo_dia2gsup.service M rebar.config 3 files changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/84/34284/1 diff --git a/README.md b/README.md index 8d8dc01..76d7a95 100644 --- a/README.md +++ b/README.md @@ -27,20 +27,12 @@ ``` $ rebar3 shell -1> osmo_dia2gsup:start(). ``` Passing a config file: ``` $ rebar3 shell --config ./examples/sys.config -1> osmo_dia2gsup:start(). -``` - -Running it with one shell command: - -``` -$ rebar3 shell --config ./examples/sys.config --eval "osmo_dia2gsup:start()." ``` Running it as an escript: @@ -49,3 +41,8 @@ $ rebar3 escriptize $ ERL_FLAGS='-config ./examples/sys.config' _build/default/bin/osmo-dia2gsup ``` + +## Build a new release + +rebar3 release + diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index b57247b..d2347bd 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -9,7 +9,7 @@ Restart=always Environment="HOME=/var/lib/osmo_dia2gsup" ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup -ExecStart=/usr/bin/osmo-dia2gsup +ExecStart=/usr/bin/osmo-dia2gsup forground RestartSec=2 [Install] diff --git a/rebar.config b/rebar.config index 69013aa..3bda3e5 100644 --- a/rebar.config +++ b/rebar.config @@ -33,3 +33,12 @@ {escript_incl_apps, [osmo_dia2gsup]}. {escript_main_app, osmo_dia2gsup}. {escript_name, "osmo-dia2gsup"}. + +{relx, + [{release, {'osmo-dia2gsup', {git, long}}, + [osmo_dia2gsup]}, + {sys_config, "./config/sys.config"}, + {vm_args, "./config/vm.args"}, + {dev_mode, false}, + {include_erts, true}, + {extended_start_script, true}]}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I76cb16e28b5bc6fb231566be1bd7905235fdf56b Gerrit-Change-Number: 34284 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: gsup: convert all unknown causes into diameter UNABLE_TO_COMPLY

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34283 ) Change subject: gsup: convert all unknown causes into diameter UNABLE_TO_COMPLY ...................................................................... gsup: convert all unknown causes into diameter UNABLE_TO_COMPLY Change-Id: I7f19bf1fb3676a1302f0d6d7d7450a3f201ba5bb --- M src/server_cb.erl 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/83/34283/1 diff --git a/src/server_cb.erl b/src/server_cb.erl index 7f30d2b..a800781 100644 --- a/src/server_cb.erl +++ b/src/server_cb.erl @@ -159,6 +159,7 @@ % permanent (only in Experimental-Result-Code) -define(DIAMETER_ERROR_USER_UNKNOWN, 5001). -define(DIAMETER_ERROR_ROAMING_NOT_ALLOWED, 5004). +-define(DIAMETER_ERROR_UNABLE_TO_COMPLY, 5012). -define(DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION, 5420). -define(DIAMETER_ERROR_RAT_NOT_ALLOWED, 5421). -define(DIAMETER_ERROR_EQUIPMENT_UNKNOWN, 5422). @@ -195,8 +196,7 @@ gsup_cause2dia(?GMM_CAUSE_GSM_AUTH_UNACCEPT) -> {[], [?EXP_RES(?DIAMETER_ERROR_USER_UNKNOWN)]}; gsup_cause2dia(?GMM_CAUSE_INV_MAND_INFO) -> {[], [?EXP_RES(?DIAMETER_ERROR_UNKOWN_SERVING_NODE)]}; gsup_cause2dia(?GMM_CAUSE_PROTO_ERR_UNSPEC) -> {[], [?EXP_RES(?DIAMETER_ERROR_UNKOWN_SERVING_NODE)]}; -% TODO: more values -gsup_cause2dia(_) -> {fixme, []}. +gsup_cause2dia(_) -> {[], [?DIAMETER_ERROR_UNABLE_TO_COMPLY]}. % get the value for a tiven key in Map1. If not found, try same key in Map2. If not found, return Default -spec twomap_get(atom(), map(), map(), any()) -> any(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I7f19bf1fb3676a1302f0d6d7d7450a3f201ba5bb Gerrit-Change-Number: 34283 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[M] Change in ...osmo_dia2gsup[master]: gsup: implement a (re-)connect the GSUP link if it fails

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285 ) Change subject: gsup: implement a (re-)connect the GSUP link if it fails ...................................................................... gsup: implement a (re-)connect the GSUP link if it fails Change-Id: Id531d202ded123786d7a41dd0d7c3695af59fc2d --- M src/gsup_client.erl M src/osmo_dia2gsup_sup.erl 2 files changed, 51 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/85/34285/1 diff --git a/src/gsup_client.erl b/src/gsup_client.erl index 047078b..967bf99 100644 --- a/src/gsup_client.erl +++ b/src/gsup_client.erl @@ -39,9 +39,13 @@ -include_lib("osmo_ss7/include/ipa.hrl"). -define(IPAC_PROTO_EXT_GSUP, {osmo, 5}). +-define(GSUP_TIMEOUT_MS, 5000). -record(gsupc_state, { - socket, + address, + port, + ccmoptions, + socket, ipa_pid }). @@ -54,43 +58,46 @@ %% our exported API %% ------------------------------------------------------------------ -start_link(ServerAddr, ServerPort, Options) -> - gen_server:start_link(?MODULE, [ServerAddr, ServerPort, Options], [{debug, [trace]}]). +start_link(ServerAddr, ServerPort, GsupName) -> + gen_server:start_link(?MODULE, [ServerAddr, ServerPort, GsupName], [{debug, [trace]}]). %% ------------------------------------------------------------------ %% gen_server Function Definitions %% ------------------------------------------------------------------ -init([Address, Port, Options]) -> +init([Address, Port, GsupName]) -> ipa_proto:init(), % register the GSUP codec with the IPA core; ignore result as we might be doing this multiple times ipa_proto:register_codec(?IPAC_PROTO_EXT_GSUP, fun gsup_protocol:encode/1, fun gsup_protocol:decode/1), - connect([Address, Port, Options]). - -connect([Address, Port, Options]) -> lager:info("Connecting to GSUP HLR on IP ~s port ~p~n", [Address, Port]), - CcmOptions = #ipa_ccm_options{ - serial_number="HSS-00-00-00-00-00-00", - unit_id="0/0/0", - mac_address="00:00:00:00:00:00", - location="00:00:00:00:00:00", - unit_type="00:00:00:00:00:00", - equipment_version="00:00:00:00:00:00", - sw_version="00:00:00:00:00:00", - unit_name="HSS-00-00-00-00-00-00" - }, - case ipa_proto:connect(Address, Port, Options) of + CcmOptions = #ipa_ccm_options{ + serial_number=GsupName, + unit_id="0/0/0", + mac_address="00:00:00:00:00:00", + location="00:00:00:00:00:00", + unit_type="00:00:00:00:00:00", + equipment_version="00:00:00:00:00:00", + sw_version="00:00:00:00:00:00", + unit_name=GsupName + }, + State = #gsupc_state{address = Address, port = Port, ccmoptions = CcmOptions, socket = [], ipa_pid = []}, + case connect(State) of + {ok, State2} -> {ok, State2}; + {error, _, State2} -> {ok, State2, ?GSUP_TIMEOUT_MS} + end. + +connect(State) -> + #gsupc_state{address = Address, port = Port, ccmoptions = Options} = State, + case ipa_proto:connect(Address, Port, []) of {ok, {Socket, IpaPid}} -> - ipa_proto:set_ccm_options(Socket, CcmOptions), + ipa_proto:set_ccm_options(Socket, Options), lager:info("connected!~n", []), true = ipa_proto:register_stream(Socket, ?IPAC_PROTO_EXT_GSUP, {process_id, self()}), ipa_proto:unblock(Socket), - {ok, #gsupc_state{socket=Socket, ipa_pid=IpaPid}}; - {error, Reason} -> - lager:error("Connecting to GSUP HLR on IP ~s port ~p failed: ~p~n", [Address, Port, Reason]), - lager:info("Reconnecting to GSUP HLR in 5s...~n", []), - timer:sleep(5000), - connect([Address, Port, Options]) + {ok, State#gsupc_state{socket=Socket, ipa_pid=IpaPid}}; + {error, Error} -> + lager:info("Failed to GSUP HLR on IP ~s port ~p ~p~n", [Address, Port, Error]), + {error, Error, State} end. % send a given GSUP message and synchronously wait for message type ExpRes or ExpErr @@ -102,10 +109,9 @@ receive {ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := ExpRes, imsi := Imsi}} -> {reply, GsupMsgRx, State}; - {ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := ExpErr, imsi := Imsi}} -> {reply, GsupMsgRx, State} - after 5000 -> + after ?GSUP_TIMEOUT_MS -> {reply, timeout, State} end. @@ -114,8 +120,14 @@ {noreply, S}. handle_info({ipa_closed, _}, S) -> - lager:error("GSUP connection has been closed, supervisor should reconnect us"), - {stop, ipa_closed, S}; + lager:error("GSUP connection has been closed, Reconnecting in 5sec."), + {noreply, S, ?GSUP_TIMEOUT_MS}; +handle_info(timeout, S) -> + case connect(S) of + {ok, State} -> {noreply, State}; + {error, _, State} -> {noreply, State, ?GSUP_TIMEOUT_MS} + end; + handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. diff --git a/src/osmo_dia2gsup_sup.erl b/src/osmo_dia2gsup_sup.erl index 17b5a14..03c780d 100644 --- a/src/osmo_dia2gsup_sup.erl +++ b/src/osmo_dia2gsup_sup.erl @@ -12,7 +12,7 @@ % GSUP side HlrIp = application:get_env(osmo_dia2gsup, hlr_ip, "127.0.0.1"), HlrPort = application:get_env(osmo_dia2gsup, hlr_port, 4222), - Args = [{local, gsup_client}, gsup_client, [HlrIp, HlrPort, []], [{debug, [trace]}]], + Args = [{local, gsup_client}, gsup_client, [HlrIp, HlrPort, "HSS-00-00-00-00-00-00"], [{debug, [trace]}]], GsupChild = {gsup_client, {gen_server, start_link, Args}, permanent, 2000, worker, [gsup_client]}, % DIAMETER side DiaServer = {osmo_dia2gsup,{osmo_dia2gsup,start_link,[]}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Id531d202ded123786d7a41dd0d7c3695af59fc2d Gerrit-Change-Number: 34285 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277 ) Change subject: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277 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: I84f576f578ffc48c8b5e545bc1700000eb693efb Gerrit-Change-Number: 34277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 14:19:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276 ) Change subject: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK ...................................................................... Patch Set 1: (1 comment) File library/RTP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276/comment/1a46d5a9_5203… PS1, Line 100: var boolean g_loopback := false; why aren't we simply storing RtpemMode received from the port? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276 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: Iee8f736e1eebc357fc997353ee4b629d24dc09e7 Gerrit-Change-Number: 34276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 14:19:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: Translate GSUP Auth Info Answer error Cause in Diamater AIA

by lynxis lazus

Attention is currently required from: fixeria, pespin, daniel. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259 ) Change subject: Translate GSUP Auth Info Answer error Cause in Diamater AIA ...................................................................... Patch Set 1: (10 comments) Patchset: PS1: Hi Pau, do you found the translation table in TS 29.272 Annex A rel 17? (Diameter to the NAS cause codes and Annex B for the SGSN NAS codes.) File src/server_cb.erl: https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/3522f28a_… PS1, Line 187: DIAMETER_ERROR_RAT_NOT_ALLOWED DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/37072e48_… PS1, Line 189: gsup_cause2dia(?GMM_CAUSE_LA_NOTALLOWED) -> {[], [?EXP_RES(?DIAMETER_ERROR_RAT_NOT_ALLOWED)]}; Maybe DIAMETER_AUTHORIZATION_REJECTED would be better. https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/bea8ea79_… PS1, Line 191: DIAMETER_ERROR_UNKOWN_SERVING_NODE DIAMETER_ERROR_UNKNOWN_EPS_SUBSCRIPTION https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/7aac8f68_… PS1, Line 192: DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE 29.272 rel 17: Annex A and Annex B can be used to translate those. IMHO: This should be unable_to_comply https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/792fb42a_… PS1, Line 193: gsup_cause2dia(?GMM_CAUSE_CONGESTION) -> {[], [?EXP_RES(?DIAMETER_AUTHENTICATION_DATA_UNAVAILABLE)]}; I would send unable to comply here, even it is not defined. https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/bd2ed798_… PS1, Line 194: GMM_CAUSE_GSM_AUTH_UNACCEPT I would remove this. We should never get this error and we don't use it on the hlr so far. https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/a10c784f_… PS1, Line 195: DIAMETER_ERROR_UNKOWN_SERVING_NODE DIAMETER_MISSING_AVP https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/b994c2af_… PS1, Line 196: DIAMETER_ERROR_UNKOWN_SERVING_NODE DIAMETER_UNABLE_TO_COMPLY https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259/comment/85b97d0f_… PS1, Line 197: TODO: more values > This TODO can be removed I guess? not yet.I've a patch for this. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I32622713c2c1f40e1d9c5597ffab8cb211171fc2 Gerrit-Change-Number: 34259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 14:12:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[M] Change in libosmocore[master]: gm_12_21.h: Add cross-component parameter defaults (NSE timing)

by arehbein

Attention is currently required from: laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31877 ) Change subject: gm_12_21.h: Add cross-component parameter defaults (NSE timing) ...................................................................... Patch Set 2: (1 comment) File include/osmocom/gsm/protocol/gsm_12_21.h: https://gerrit.osmocom.org/c/libosmocore/+/31877/comment/e1215fd0_2d3cbb28 PS2, Line 294: enum abis_nm_par_defaults { > it makes no sense to have this as enums, because they are not different types of the same thing nor […] What's the drawback of using an enum here? These defaults were hardcoded in existing code. When that wasn't the case I checked with the specs (I think I may even have done that here, not sure anymore though since it's been a while). For instance: ``` osmo-bsc$ ag -A10 rlc_cfg_default src/osmo-bsc/bts.c 126:static const struct gprs_rlc_cfg rlc_cfg_default = { 127- .parameter = { 128- [RLC_T3142] = 20, 129- [RLC_T3169] = 5, 130- [RLC_T3191] = 5, 131- [RLC_T3193] = 160, /* 10ms */ 132- [RLC_T3195] = 5, 133- [RLC_N3101] = 10, 134- [RLC_N3103] = 4, 135- [RLC_N3105] = 8, 136- [CV_COUNTDOWN] = 15, ``` and the same I think for NSE timers. I think we had had a short back and forth about this already, iirc I did put these or similar values in the respective header for the standard defining the timers, but you were against that saying it was more related to abis/O&M since it's values communicated over PCU IF and gave pointers to this header or something similar. Whatever it is... where would you put default values such as these, if not here? Should we add a centralised `gsm_data.h` to libosmocore that keeps shared values? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I51d1fd8b596523ae2ac8fb6a186ce7a702334c27 Gerrit-Change-Number: 31877 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 14:00:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in ...osmo_dia2gsup[master]: Add GMM error cause present in osmo-hlr's gsm48_gmm_cause_vty_names

by lynxis lazus

Attention is currently required from: pespin, daniel. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34258 ) Change subject: Add GMM error cause present in osmo-hlr's gsm48_gmm_cause_vty_names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I77336cb2c76a516ecea5b46500da91fd4230176d Gerrit-Change-Number: 34258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 13:54:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[M] Change in osmo-bsc[master]: Includes: Remove enum/include from libosmocore instead

by arehbein

Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31304 ) Change subject: Includes: Remove enum/include from libosmocore instead ...................................................................... Patch Set 7: (4 comments) File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31304/comment/e264bb73_1a38a20c PS6, Line 657: uint16_t parameter[_NUM_NM_RLC_PAR_OFFSET]; > why changing the name? I don't see the point in adding _OFFSET it just makes stuff larger with no be […] I added the suffix, because this makes clear (self-documenting code and such) that their values aren't to be touched, since these values are used as offsets. The rest of the name change went along with moving the enums from separate headers (iirc all with basename `gsm_data.h`) in `osmo-bsc`/`osmo-bts` (and possibly `osmo-pcu`) to `libosmocore.git:include/osmocom/gsm/protocol/gsm_12_21.h` to avoid duplicating the same enum values across multiple projects when it makes more sense to have them centrally in a library. File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31304/comment/e499b600_ef3bdf5e PS1, Line 654: enum gprs_cs { > IIUC the one under gsm_44_06. […] ah yes they have different values and I grepped for the bitmask; it isn't always accessed by use of the enum identifiers either File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31304/comment/6557e52d_ba2cbf90 PS6, Line 173: for (offset = NM_RLC_T3142_OFFSET; offset <= NM_CV_COUNTDOWN_OFFSET; > why not simply memcpy? Tbh. we don't have to have a for loop here, I don't care much either way and it might be better to keep it the way it was: Line by line assignments. I have discarded the loop usage. Makes the patch easier to read as well since it's focussing on the core change. `memcpy()` doesn't make much sense since the source is an array of `uint16_t` and the destination is a regular byte-array. https://gerrit.osmocom.org/c/osmo-bsc/+/31304/comment/41b755e1_d62a592d PS6, Line 174: ++offset) > please don't use preincrement unless it really has a purpose over postincrement (code convention in […] Alright I'll keep it in mind, thank you -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2883aee12b501a717d5acecd5638882724336e72 Gerrit-Change-Number: 31304 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:59:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 ) Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:54:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_sock: improve log output (OsmoBTS/OsmoBSC)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34275 ) Change subject: pcuif_sock: improve log output (OsmoBTS/OsmoBSC) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 Gerrit-Change-Number: 34275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:54:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34274 ) Change subject: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd Gerrit-Change-Number: 34274 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for NAS key set identifier

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270 ) Change subject: NAS_Templates: add template for NAS key set identifier ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File library/NAS_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270/comment/5119c2fe_e1db… PS1, Line 330: const BIT3 c_NAS_KEY_SET_ID_NO_KEY := '111'B; > I am not sure, but I think c_NAS_KEY_SET_ID_NO_KEY is just a reserved value to say that NO_KEY is us […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270 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: I2df0c9d1bf4bf0073b5f7b77708b8de59f96a639 Gerrit-Change-Number: 34270 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:52:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: m3ua: Add some TODO comments on where we fall short of our potential

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34273 ) Change subject: m3ua: Add some TODO comments on where we fall short of our potential ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I75d7b8f3fb6a06f6941b6dff4072287fdbb1d33e Gerrit-Change-Number: 34273 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:51:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: fix ts_NAS_GUTI

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 ) Change subject: NAS_Templates: fix ts_NAS_GUTI ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 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: I9546993987b873e8ae921664238b234608e37bba Gerrit-Change-Number: 34267 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 12:50:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: MME_Tests: remove unusued timer variable

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34279 ) Change subject: MME_Tests: remove unusued timer variable ...................................................................... MME_Tests: remove unusued timer variable The Timer T in TC_RIM_RAN_INF is not used, let's remove it. Related: OS#5760 Change-Id: I3d18cda38789e5a42536fd17b6641efa725f757b --- M mme/MME_Tests.ttcn 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/34279/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 7a709fd..a517798 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -928,8 +928,6 @@ f_s1ap_setup(0); f_init_gtp(id); - timer T := 3.0; - var ConnHdlrPars pars := f_init_pars(ue_idx := 0); var ConnHdlr vc_conn; vc_conn := f_start_handler_with_pars(refers(f_TC_RIM_RAN_INF), pars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34279 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: I3d18cda38789e5a42536fd17b6641efa725f757b Gerrit-Change-Number: 34279 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for Tracking Area Update Reject

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34280 ) Change subject: NAS_Templates: add template for Tracking Area Update Reject ...................................................................... NAS_Templates: add template for Tracking Area Update Reject Change-Id: Id64e8a28e47235766efbef6df0114c3024cc2f47 Related: OS#5760 --- M library/NAS_Templates.ttcn 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/34280/1 diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index 4b98ee8..45f5f8d 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -335,6 +335,23 @@ tSC := tSC } +/* 8.2.28 Tracking Area Update Reject */ +template (present) PDU_NAS_EPS +tr_PDU_NAS_EPS_TrackingAreaUpdateReject(template (present) EMM_CauseV cause := ?) := { + protocolDiscriminator := c_EPS_NAS_PD_EMM, + ePS_messages := { + ePS_MobilityManagement := { + pDU_NAS_EPS_TrackingAreaUpdateReject := { + securityHeaderType := c_EPS_SEC_NONE, + messageType := '01001011'B, + emmCause := cause, + t3346 := *, + extendedEmmCause := * + } + } + } +} + /* 8.2.29 Tracking Area Update Request */ template (value) PDU_NAS_EPS ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(EPS_MobileIdentityLV old_guti) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34280 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: Id64e8a28e47235766efbef6df0114c3024cc2f47 Gerrit-Change-Number: 34280 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: MME_Tests: add new testcase TC_s1ap_tau_unknown_guti

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34281 ) Change subject: MME_Tests: add new testcase TC_s1ap_tau_unknown_guti ...................................................................... MME_Tests: add new testcase TC_s1ap_tau_unknown_guti A tracking area update that contains an OldGUTI (TMSI) that is unknown to the MME should be rejected. Related: OS#5760 Change-Id: I9306fea69ac930b9642528e2fd32a7091147081e --- M mme/MME_Tests.ttcn 1 file changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/34281/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index a517798..ddc1c0a 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -960,11 +960,60 @@ } } +/* Tracking area update with a GUTI (TMSI) that is unknown to the MME. The MME is expected to reject this TAU + * request. */ +private function f_TC_tau_unknown_guti(ConnHdlrPars pars) runs on ConnHdlr { + + f_init_handler(pars); + var template (value) EPS_MobileIdentityV mi := ts_NAS_MobileId_IMSI(pars.ue_pars.imsi); + var template (value) S1AP_PDU tx; + var template (value) PDU_NAS_EPS nas_tau; + timer T := 5.0; + + var hexstring mcc_mnc := f_convert_plmn(g_pars.enb_pars[g_pars.mme_idx].global_enb_id.pLMNidentity); + var EPS_MobileIdentityLV old_guti := valueof(ts_EPS_MobileId_GUTI(mcc_mnc, '0001'O, '01'O, 'AABBCCDD'O)); + nas_tau := ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(old_guti); + + tx := ts_S1AP_InitialUE(p_eNB_value := 0, p_nasPdu := enc_PDU_NAS_EPS(valueof(nas_tau)), + p_tAI := ts_enb_S1AP_TAI(g_pars.enb_pars[g_pars.mme_idx]), + p_eUTRAN_CGI := ts_enb_S1AP_CGI(g_pars.enb_pars[g_pars.mme_idx]), + p_rrcCause := mo_Signalling); + + S1AP.send(tx); + + T.start; + alt { + [] S1AP.receive(tr_PDU_NAS_EPS_TrackingAreaUpdateReject) { + setverdict(pass); + } + [] S1AP.receive { + setverdict(fail, "unexpected S1AP message from MME"); + } + [] T.timeout { + setverdict(fail, "no message from MME"); + } + } + +} +testcase TC_s1ap_tau_unknown_guti() runs on MTC_CT { + var charstring id := testcasename(); + + f_init_diameter(id); + f_init_s1ap(id, 4); + f_s1ap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_tau_unknown_guti), pars); + vc_conn.done; +} + control { execute( TC_s1ap_setup_wrong_plmn() ); execute( TC_s1ap_setup_wrong_tac() ); execute( TC_s1ap_setup() ); execute( TC_s1ap_attach() ); + execute( TC_s1ap_tau_unknown_guti() ); execute( TC_gn_echo_request() ); execute( TC_RIM_RAN_INF() ); execute( TC_s1ap_reset() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34281 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: I9306fea69ac930b9642528e2fd32a7091147081e Gerrit-Change-Number: 34281 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_data_rtp_tch* for CSD

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072 ) Change subject: BTS_Tests: add TC_data_rtp_tch* for CSD ...................................................................... Patch Set 3: (1 comment) This change is ready for review. Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072/comment/1b112452_e0fc… PS1, Line 10: temporarily > For now I am trying to get the basic stuff to work. […] Now that osmo-bts implements the rate adaptation, we cannot expect whatever we send on L1CTL to show up on the RTP (and vice versa). Implementing the rate adaptation in TTCN-3 would require more work and time, so instead of doing that I quickly implemented the loopback mode for the `RTP_Emulation` component. As the name suggests, in this mode all RTP PDUs received by the emulation component are simply echoed back. This allows us verifying the scheduling by sending something on Uplink and expecting the same payload on Downlink. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072 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: I9a0dc0fcf722f862d8dcf04660d4448662210f44 Gerrit-Change-Number: 33072 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 11:33:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277 ) Change subject: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable ...................................................................... BTS_Tests: f_rtpem_activate(): make RTP payload type configurable Change-Id: I84f576f578ffc48c8b5e545bc1700000eb693efb Related: OS#1572 --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/34277/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1b43797..cd13688 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2609,7 +2609,8 @@ /* Initialize and start the RTP emulation component for a ConnHdlr */ friend function f_rtpem_activate(inout octetstring payload, RtpemConfig cfg := c_RtpemDefaultCfg, - RtpemMode mode := RTPEM_MODE_BIDIR) + RtpemMode mode := RTPEM_MODE_BIDIR, + uint7_t rtp_pt := 0) runs on ConnHdlr { /* Step 0: initialize, connect and start the emulation component */ vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM"); @@ -2672,7 +2673,7 @@ ts_RSL_IPA_MDCX(g_chan_nr, conn_id, remote_ip := f_inet_addr(mp_rtpem_bind_ip), remote_port := rtpem_bind_port, - rtp_pt2 := 0), + rtp_pt2 := rtp_pt), tr_RSL_IPA_MDCX_ACK(g_chan_nr, conn_id, ?, ?, ?), "IPA MDCX ACK"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277 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: I84f576f578ffc48c8b5e545bc1700000eb693efb Gerrit-Change-Number: 34277 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: decouple payload generation from f_rtpem_activate()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34278 ) Change subject: BTS_Tests: decouple payload generation from f_rtpem_activate() ...................................................................... BTS_Tests: decouple payload generation from f_rtpem_activate() This function is going to be used by the upcoming testcases for CSD specific channel modes. Generating the Rx/Tx payload(s) now becomes the duty of the calling function. So far the only user of this API is f_TC_speech_rtp(), so move the speech payload generation there. Change-Id: I9e823c33b1dbbadd57bc63df25b8ddf368d76232 Related: OS#1572 --- M bts/BTS_Tests.ttcn 1 file changed, 51 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/34278/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cd13688..888abf5 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2607,9 +2607,8 @@ } /* Initialize and start the RTP emulation component for a ConnHdlr */ -friend function f_rtpem_activate(inout octetstring payload, - RtpemConfig cfg := c_RtpemDefaultCfg, - RtpemMode mode := RTPEM_MODE_BIDIR, +friend function f_rtpem_activate(RtpemConfig cfg := c_RtpemDefaultCfg, + RtpemMode mode := RTPEM_MODE_LOOPBACK, uint7_t rtp_pt := 0) runs on ConnHdlr { /* Step 0: initialize, connect and start the emulation component */ @@ -2621,38 +2620,6 @@ vc_RTPEM.start(RTP_Emulation.f_main()); /* Step 1: configure the RTP parameters */ - var integer payload_len := 0; - var octetstring hdr := ''O; - var OCT1 pad := '00'O; - - select (g_pars.chan_mode) { - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1)) /* TCH/FS */ - { payload_len := 33; hdr := 'D0'O; pad := 'FF'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1)) /* TCH/HS */ - { payload_len := 15; hdr := '00'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)) /* TCH/EFS */ - { payload_len := 31; hdr := 'C0'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3)) /* TCH/AFS */ - { - var integer amr_ft := get_start_amr_ft(); - payload_len := f_amrft_payload_len(amr_ft) + 2; - hdr := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); - } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3)) /* TCH/AHS */ - { - var integer amr_ft := get_start_amr_ft(); - payload_len := f_amrft_payload_len(amr_ft) + 2; - hdr := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); - } - case else { - setverdict(fail, "Unhandled RSL channel mode := ", g_pars.chan_mode); - Misc_Helpers.f_shutdown(__BFILE__, __LINE__); - } - } - - /* Pad the payload to conform the expected length */ - payload := f_pad_oct(hdr & payload, payload_len, pad); - cfg.tx_payloads[0].fixed_payload := payload; f_rtpem_configure(RTPEM_CTRL, cfg); /* Step 2: bind the RTP emulation to the configured address */ @@ -8351,9 +8318,9 @@ /* Verify handling of Downlink and Uplink speech frames */ private function f_TC_speech_rtp(charstring id) runs on ConnHdlr { + var octetstring payload; var L1ctlMessage l1_dl; var PDU_RTP rtp_pdu; - var octetstring pl; timer Td, Tu; log("Testing channel mode ", g_pars.chan_mode); @@ -8361,9 +8328,37 @@ f_l1_tune(L1CTL); f_est_dchan(); + select (g_pars.chan_mode) { + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1)) /* TCH/FS */ + { payload := f_pad_oct('D0'O & f_rnd_octstring(6), 33, 'FF'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1)) /* TCH/HS */ + { payload := f_pad_oct('00'O & f_rnd_octstring(6), 15, '00'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)) /* TCH/EFS */ + { payload := f_pad_oct('C0'O & f_rnd_octstring(6), 31, '00'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3)) /* TCH/AFS */ + { + var integer amr_ft := get_start_amr_ft(); + var integer payload_len := f_amrft_payload_len(amr_ft) + 2; + payload := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); + payload := f_pad_oct(payload & f_rnd_octstring(6), payload_len, '00'O); + } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3)) /* TCH/AHS */ + { + var integer amr_ft := get_start_amr_ft(); + var integer payload_len := f_amrft_payload_len(amr_ft) + 2; + payload := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); + payload := f_pad_oct(payload & f_rnd_octstring(6), payload_len, '00'O); + } + case else { + setverdict(fail, "Unhandled RSL channel mode := ", g_pars.chan_mode); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + /* Activate the RTP emulation */ - pl := f_rnd_octstring(6); - f_rtpem_activate(pl); + var RtpemConfig cfg := c_RtpemDefaultCfg; + cfg.tx_payloads[0].fixed_payload := payload; + f_rtpem_activate(cfg, RTPEM_MODE_BIDIR); /* Give the scheduler some time to fill up the buffers */ f_sleep(2.0); @@ -8373,7 +8368,7 @@ /* Make sure that Downlink frames are received at the UE */ Td.start(2.0); alt { - [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := pl)) -> value l1_dl { + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := payload)) -> value l1_dl { var octetstring data := l1_dl.payload.traffic_ind.data; log("TCH received (len=", lengthof(data), "): ", data); L1CTL.send(ts_L1CTL_TRAFFIC_REQ(g_chan_nr, l1_dl.dl_info.link_id, @@ -8383,7 +8378,7 @@ [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := ?)) -> value l1_dl { setverdict(fail, "Rx unexpected Downlink speech frame ", "(", l1_dl.payload.traffic_ind.data, ") ", - "expected (", pl, ")"); + "expected (", payload, ")"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } [] as_l1_sacch(); @@ -8401,7 +8396,7 @@ [] as_l1_tch_loop(); [] as_l1_sacch(); [] RTPEM_DATA.receive(PDU_RTP:?) -> value rtp_pdu { - if (rtp_pdu.data != pl) + if (rtp_pdu.data != payload) { repeat; } } [] RTPEM_DATA.receive { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34278 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: I9e823c33b1dbbadd57bc63df25b8ddf368d76232 Gerrit-Change-Number: 34278 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276 ) Change subject: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK ...................................................................... library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK Change-Id: Iee8f736e1eebc357fc997353ee4b629d24dc09e7 Related: OS#1572 --- M library/RTP_Emulation.ttcn 1 file changed, 38 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/34276/1 diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 539ea45..de2c877 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -97,6 +97,7 @@ var PortNumber g_local_port; /* state variables, change over time */ + var boolean g_loopback := false; var boolean g_rx_enabled := false; var boolean g_tx_connected := false; /* Set to true after connect() */ var LIN2_BO_LAST g_tx_next_seq := 0; @@ -116,7 +117,8 @@ RTPEM_MODE_NONE, RTPEM_MODE_TXONLY, RTPEM_MODE_RXONLY, - RTPEM_MODE_BIDIR + RTPEM_MODE_BIDIR, + RTPEM_MODE_LOOPBACK }; type record RtpemStats { @@ -512,12 +514,14 @@ [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_NONE}) { T_transmit.stop; g_rx_enabled := false; + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_NONE}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_TXONLY}) { /* start transmit timer */ T_transmit.start; g_rx_enabled := false; + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_TXONLY}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_RXONLY}) { @@ -529,6 +533,7 @@ RTCP.clear; g_rx_enabled := true; } + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_RXONLY}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_BIDIR}) { @@ -539,8 +544,20 @@ RTCP.clear; g_rx_enabled := true; } + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_BIDIR}); } + [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_LOOPBACK}) { + T_transmit.stop; + if (g_rx_enabled == false) { + /* flush queues */ + RTP.clear; + RTCP.clear; + g_rx_enabled := true; + } + g_loopback := true; + CTRL.reply(RTPEM_mode:{RTPEM_MODE_LOOPBACK}); + } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; g_iuup_ent.cfg := g_cfg.iuup_cfg; @@ -599,8 +616,16 @@ } } - /* Match the received payload against any of the predefined fixed rx payloads */ - f_check_fixed_rx_payloads(rx_rtp.msg.rtp.payload_type, rx_rtp.msg.rtp.data); + if (g_loopback) { + f_tx_rtp(rx_rtp.msg.rtp.data, rx_rtp.msg.rtp.payload_type); + /* update counters */ + g_stats_rtp.num_pkts_tx := g_stats_rtp.num_pkts_tx + 1; + g_stats_rtp.bytes_payload_tx := g_stats_rtp.bytes_payload_tx + + lengthof(rx_rtp.msg.rtp.data); + } else { + /* Match the received payload against any of the predefined fixed rx payloads */ + f_check_fixed_rx_payloads(rx_rtp.msg.rtp.payload_type, rx_rtp.msg.rtp.data); + } if (DATA.checkstate("Connected")) { DATA.send(rx_rtp.msg.rtp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276 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: Iee8f736e1eebc357fc997353ee4b629d24dc09e7 Gerrit-Change-Number: 34276 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in pysim[master]: README.md: add tshark to required debian packages

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/33834 ) Change subject: README.md: add tshark to required debian packages ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibe5b3cc3647e00307229efcb1c437492488d6fba Gerrit-Change-Number: 33834 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

8 months, 1 week

1
0
0 0

[S] Change in pysim[master]: requirements: add pyshark to requirements lists

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/33831 ) Change subject: requirements: add pyshark to requirements lists ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I885c7210aac3774a5f1f5201903ad2bff94c3120 Gerrit-Change-Number: 33831 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: abandon

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 ) Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 10:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_sock: improve log output (OsmoBTS/OsmoBSC)

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34275 ) Change subject: pcuif_sock: improve log output (OsmoBTS/OsmoBSC) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 Gerrit-Change-Number: 34275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 10:07:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34274 ) Change subject: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd Gerrit-Change-Number: 34274 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 10:07:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33829 ) Change subject: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH ...................................................................... Abandoned We have solved this in a better way, the decision is now made directly at the PCU. Doing so we can avoid this work-around. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaa3e5cdcf86578821e149b3e23482a0bcee19f7b Gerrit-Change-Number: 33829 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic, put a dot between "v" and version number

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 ) Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number ...................................................................... Patch Set 3: (2 comments) Patchset: PS3: See now: Ibe49064d04dff0617357e3e0b00fea961b657784 and Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd File src/osmobts_sock.c: https://gerrit.osmocom.org/c/osmo-pcu/+/34239/comment/235a175e_bede6cee PS2, Line 220: to OsmoBTS > Would be more useful to change this part to `to OsmoBTS/OsmoBSC` or even remove it completely, since […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f Gerrit-Change-Number: 34239 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 09:57:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34274 ) Change subject: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c ...................................................................... osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c since OsmoPCU is no longer exclusively used in co-location to OsmoBTS the module osmobts_sock (PCUIF) should get a more generic name. Related: OS#5927 Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd --- M src/Makefile.am R src/pcuif_sock.c 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/34274/1 diff --git a/src/Makefile.am b/src/Makefile.am index ded6632..8b8f31e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,7 @@ rlc_window.cpp \ rlc_window_dl.cpp \ rlc_window_ul.cpp \ - osmobts_sock.c \ + pcuif_sock.c \ gprs_codel.c \ coding_scheme.c \ egprs_rlc_compression.cpp \ diff --git a/src/osmobts_sock.c b/src/pcuif_sock.c similarity index 100% rename from src/osmobts_sock.c rename to src/pcuif_sock.c -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd Gerrit-Change-Number: 34274 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_sock: improve log output (OsmoBTS/OsmoBSC)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34275 ) Change subject: pcuif_sock: improve log output (OsmoBTS/OsmoBSC) ...................................................................... pcuif_sock: improve log output (OsmoBTS/OsmoBSC) When printing the PCUIF protocol version, we only mention OsmoBTS, but since OsmoPCU can also be used in co-location with OsmoBSC, we should also mention OsmoBSC here. Let's write "OsmoBTS/OsmoBSC" Related: OS#5927 Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 --- M src/pcuif_sock.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/34275/1 diff --git a/src/pcuif_sock.c b/src/pcuif_sock.c index c77605f..f8c0ecc 100644 --- a/src/pcuif_sock.c +++ b/src/pcuif_sock.c @@ -217,7 +217,7 @@ int pcu_l1if_open(void) { int rc; - LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v%u to OsmoBTS\n", PCU_IF_VERSION); + LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v%u to OsmoBTS/OsmoBSC\n", PCU_IF_VERSION); memset(&pcu_sock_state, 0x00, sizeof(pcu_sock_state)); INIT_LLIST_HEAD(&pcu_sock_state.upqueue); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 Gerrit-Change-Number: 34275 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic, put a dot between "v" and version number

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 ) Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f Gerrit-Change-Number: 34239 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

8 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: print SAPI and msg_id when sending confirmation

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 ) Change subject: pcu_sock: print SAPI and msg_id when sending confirmation ...................................................................... pcu_sock: print SAPI and msg_id when sending confirmation At the moment we do not print the SAPI, nor the msg_id when we send a confirmation back to the PCU Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 elated: OS#5927 --- M src/common/pcu_sock.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index e100464..f99c7d2 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -628,7 +628,8 @@ /* FIXME: allow multiple BTS */ bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); - LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); + LOGP(DPCU, LOGL_DEBUG, "Sending DATA.cnf: sapi=%s msg_id=%08x\n", + sapi_string[sapi], msg_id); msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 Gerrit-Change-Number: 34240 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 1 week

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a confirmation when the MAC block is sent. CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c --- M include/osmocom/bsc/pcu_if.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 60 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/bsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h index d2d3444..6a07f2e 100644 --- a/include/osmocom/bsc/pcu_if.h +++ b/include/osmocom/bsc/pcu_if.h @@ -24,8 +24,8 @@ int pcu_tx_rach_ind(struct gsm_bts *bts, int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit, enum ph_burst_type burst_type); -/* Confirm the sending of an immediate assignment to the pcu */ -int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t msg_id); +/* Confirm the sending of an AGCH or PCH MAC block to the pcu */ +int pcu_tx_data_cnf(struct gsm_bts *bts, uint32_t msg_id, uint8_t sapi); /* Open connection to PCU */ int pcu_sock_init(struct gsm_network *net); diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index aa22447..cd2a298 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -42,6 +42,7 @@ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ #define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_AGCH_2 0x09 /* assignment on AGCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -276,6 +277,18 @@ bool confirm; } __attribute__((packed)); +/* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via AGCH. The struct is sent as a data request + * (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */ +struct gsm_pcu_if_agch { + /* message id as reference for confirmation */ + uint32_t msg_id; + /* GSM mac-block (with immediate assignment message) */ + uint8_t data[GSM_MACBLOCK_LEN]; + /* Set to true in case the receiving end must send a confirmation + * when the MAC block (data) has been sent. */ + bool confirm; +} __attribute__((packed)); + struct gsm_pcu_if { /* context based information */ uint8_t msg_type; /* message type */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 76948c9..860e4a2 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -44,6 +44,7 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/core/talloc.h> #include <osmocom/bsc/pcu_if.h> +#include <osmocom/bsc/pcuif_proto.h> #include <osmocom/bsc/gsm_08_08.h> #include <osmocom/netif/rtp.h> #include <osmocom/core/tdef.h> @@ -2567,7 +2568,7 @@ else { msgb_pull(msg, 1); /* drop previous data to use msg_pull_u32 */ msg_id = msgb_pull_u32(msg); - pcu_tx_pch_confirm(sign_link->trx->bts, msg_id); + pcu_tx_data_cnf(sign_link->trx->bts, msg_id, PCU_IF_SAPI_PCH_2); } return 0; } diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 696d5f3..dc2b8e9 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -57,6 +57,7 @@ [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", [PCU_IF_SAPI_PCH_2] = "PCH_2", + [PCU_IF_SAPI_AGCH_2] = "AGCH_2", }; bool pcu_connected(const struct gsm_network *net) @@ -435,14 +436,14 @@ return pcu_sock_send(bts->network, msg); } -/* Confirm the sending of an immediate assignment to the pcu */ -int pcu_tx_pch_confirm(struct gsm_bts *bts, uint32_t msg_id) +int pcu_tx_data_cnf(struct gsm_bts *bts, uint32_t msg_id, uint8_t sapi) { struct msgb *msg; struct gsm_pcu_if *pcu_prim; struct gsm_pcu_if_data_cnf *data_cnf; - LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with message id\n"); + LOGP(DPCU, LOGL_DEBUG, "Sending DATA.cnf: sapi=%s msg_id=%08x\n", + sapi_string[sapi], msg_id); msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) @@ -450,7 +451,7 @@ pcu_prim = (struct gsm_pcu_if *) msg->data; data_cnf = &pcu_prim->u.data_cnf2; - data_cnf->sapi = PCU_IF_SAPI_PCH_2; + data_cnf->sapi = sapi; data_cnf->msg_id = msg_id; return pcu_sock_send(bts->network, msg); @@ -528,8 +529,9 @@ { uint8_t pag_grp; int rc = 0; - struct gsm_pcu_if_pch *pch; - struct gsm48_imm_ass *gsm48_imm_ass; + const struct gsm_pcu_if_pch *pch; + const struct gsm_pcu_if_agch *agch; + const struct gsm48_imm_ass *gsm48_imm_ass; LOG_BTS(bts, DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " "block=%d data=%s\n", sapi_string[data_req->sapi], @@ -537,9 +539,21 @@ osmo_hexdump(data_req->data, data_req->len)); switch (data_req->sapi) { - case PCU_IF_SAPI_AGCH: - if (rsl_imm_assign_cmd(bts, data_req->len, data_req->data)) - rc = -EIO; + case PCU_IF_SAPI_AGCH_2: + if (data_req->len < sizeof(struct gsm_pcu_if_agch)) { + LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with invalid/small length %d\n", + data_req->len); + break; + } + + agch = (struct gsm_pcu_if_agch *)data_req->data; + if (rsl_imm_assign_cmd(bts, GSM_MACBLOCK_LEN, agch->data)) + return -EIO; + + /* Send the confirmation immediately. This is as accurate as we can get since from this point on the + * BTS hardware is responsible to schedule the sending of the IMMEDIATE ASSIGNMENT */ + if (agch->confirm) + return pcu_tx_data_cnf(bts, agch->msg_id, PCU_IF_SAPI_AGCH_2); break; case PCU_IF_SAPI_PCH_2: if (data_req->len < sizeof(struct gsm_pcu_if_pch)) { @@ -558,7 +572,7 @@ if (pcu_rx_rr_paging_pch(bts, pag_grp, pch)) return -EIO; if (pch->confirm) - return pcu_tx_pch_confirm(bts, pch->msg_id); + return pcu_tx_data_cnf(bts, pch->msg_id, PCU_IF_SAPI_PCH_2); break; default: LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with " -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. In both cases we send a confirmation back to the PCU. For details see coresponding patch in osmo-pcu.git (see Depends) CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Depends: osmo-ttcn3-hacks.git Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 --- M include/osmo-bts/bts.h M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/bts.c M src/common/paging.c M src/common/pcu_sock.c 6 files changed, 67 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index b2dd024..d332935 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -442,4 +442,11 @@ int bts_set_c0_pwr_red(struct gsm_bts *bts, const uint8_t red); +/* Context information to be put in the control buffer (db) of the AGCH msg + * buffer */ +struct bts_agch_msg_cb { + uint32_t msg_id; + bool confirm; +} __attribute__ ((packed)); + #endif /* _BTS_H */ diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 4b37560..3563c5b 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -23,7 +23,7 @@ int pcu_tx_time_ind(uint32_t fn); int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); -int pcu_tx_pch_data_cnf(uint32_t msg_id); +int pcu_tx_data_cnf(uint32_t msg_id, uint8_t sapi); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); int pcu_sock_send(struct msgb *msg); diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 498d9d4..b47dc75 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -36,6 +36,7 @@ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ #define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_AGCH_2 0x09 /* assignment on AGCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -235,6 +236,18 @@ bool confirm; } __attribute__((packed)); +/* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via AGCH. The struct is sent as a data request + * (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */ +struct gsm_pcu_if_agch { + /* message id as reference for confirmation */ + uint32_t msg_id; + /* GSM mac-block (with immediate assignment message) */ + uint8_t data[GSM_MACBLOCK_LEN]; + /* Set to true in case the receiving end must send a confirmation + * when the MAC block (data) has been sent. */ + bool confirm; +} __attribute__((packed)); + struct gsm_pcu_if { /* context based information */ uint8_t msg_type; /* message type */ diff --git a/src/common/bts.c b/src/common/bts.c index 0f2a019..3cd91e7 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -47,6 +47,7 @@ #include <osmo-bts/bts_sm.h> #include <osmo-bts/dtx_dl_amr_fsm.h> #include <osmo-bts/pcuif_proto.h> +#include <osmo-bts/pcu_if.h> #include <osmo-bts/rsl.h> #include <osmo-bts/oml.h> #include <osmo-bts/signal.h> @@ -729,6 +730,7 @@ struct msgb *msg = NULL; int rc = 0; int is_empty = 1; + const struct bts_agch_msg_cb *msg_cb; /* Do queue house keeping. * This needs to be done every time a CCCH message is requested, since @@ -759,6 +761,11 @@ rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_SENT); + /* Confirm sending of the AGCH message towards the PCU */ + msg_cb = (struct bts_agch_msg_cb *) msg->cb; + if (msg_cb->confirm) + pcu_tx_data_cnf(msg_cb->msg_id, PCU_IF_SAPI_AGCH_2); + /* Copy AGCH message */ memcpy(out_buf, msgb_l3(msg), msgb_l3len(msg)); rc = msgb_l3len(msg); diff --git a/src/common/paging.c b/src/common/paging.c index 9738bd6..0d3877d 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -734,7 +734,7 @@ GSM_MACBLOCK_LEN); /* send a confirmation back (if required) */ if (pr[num_pr]->u.macblock.confirm) - pcu_tx_pch_data_cnf(pr[num_pr]->u.macblock.msg_id); + pcu_tx_data_cnf(pr[num_pr]->u.macblock.msg_id, PCU_IF_SAPI_PCH_2); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 333937a..e100464 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -60,6 +60,7 @@ [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", [PCU_IF_SAPI_PCH_2] = "PCH_2", + [PCU_IF_SAPI_AGCH_2] = "AGCH_2", }; /* @@ -618,7 +619,7 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t msg_id) +int pcu_tx_data_cnf(uint32_t msg_id, uint8_t sapi) { struct gsm_bts *bts; struct msgb *msg; @@ -634,7 +635,7 @@ return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; pcu_prim->u.data_cnf2 = (struct gsm_pcu_if_data_cnf) { - .sapi = PCU_IF_SAPI_PCH_2, + .sapi = sapi, .msg_id = msg_id, }; @@ -688,19 +689,30 @@ gsm_pcu_if_pch->imsi, gsm_pcu_if_pch->confirm, gsm_pcu_if_pch->data); break; } - case PCU_IF_SAPI_AGCH: - msg = msgb_alloc(data_req->len, "pcu_agch"); + case PCU_IF_SAPI_AGCH_2: + { + const struct gsm_pcu_if_agch *gsm_pcu_if_agch; + struct bts_agch_msg_cb *msg_cb; + + gsm_pcu_if_agch = (struct gsm_pcu_if_agch *)data_req->data; + + msg = msgb_alloc(GSM_MACBLOCK_LEN, "pcu_agch"); if (!msg) { rc = -ENOMEM; break; } - msg->l3h = msgb_put(msg, data_req->len); - memcpy(msg->l3h, data_req->data, data_req->len); + msg->l3h = msgb_put(msg, GSM_MACBLOCK_LEN); + memcpy(msg->l3h, gsm_pcu_if_agch->data, GSM_MACBLOCK_LEN); + + msg_cb = (struct bts_agch_msg_cb *) msg->cb; + msg_cb->confirm = gsm_pcu_if_agch->confirm; + msg_cb->msg_id = gsm_pcu_if_agch->msg_id; if (bts_agch_enqueue(bts, msg) < 0) { msgb_free(msg); rc = -EIO; } break; + } case PCU_IF_SAPI_PDTCH: case PCU_IF_SAPI_PTCCH: trx = gsm_bts_trx_num(bts, data_req->trx_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 1 week

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 When a downlink IMMEDIATE ASSIGNMENT message is sent through the PCH, an IMSI is always required in order to be able to calculate the paging group. However, when the downlink IMMEDIATE ASSIGNMENT has to be sent before the MS has completed the GMM ATTACH REQUEST, the IMSI is still unknown. In this case we may assume that the MS is still in non-DRX mode, which means it listens on all CCCH blocks (PCH and AGCH). This means we may send the IMMEDIATE ASSIGNMENT through the AGCH in this situation. This will also have the advantage that the scheduling through the AGCH will have less latency than the paging queue. Unfortunately the SAPI PCU_IF_SAPI_AGCH only supports sending whole MAC blocks, so it won't be possible to attach a TLLI that can be used for confirmation. To fix this, let's add a new SAPI_PCUI_IF_AGCH_2, that works similar as SAPI PCU_IF_SAPI_PCH_2 and use it to send the IMMEDIATE ASSIGNMENT through the AGCH. CAUTION: This patch breaks compatibility with current master osmo-bts and osmo-bsc (see "Depends") Related: OS#5927 Depends: osmo-bts.git I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/pcu_l1_if.cpp M src/pcu_l1_if.h 4 files changed, 98 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index aa22447..cd2a298 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -42,6 +42,7 @@ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ #define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_AGCH_2 0x09 /* assignment on AGCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -276,6 +277,18 @@ bool confirm; } __attribute__((packed)); +/* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via AGCH. The struct is sent as a data request + * (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */ +struct gsm_pcu_if_agch { + /* message id as reference for confirmation */ + uint32_t msg_id; + /* GSM mac-block (with immediate assignment message) */ + uint8_t data[GSM_MACBLOCK_LEN]; + /* Set to true in case the receiving end must send a confirmation + * when the MAC block (data) has been sent. */ + bool confirm; +} __attribute__((packed)); + struct gsm_pcu_if { /* context based information */ uint8_t msg_type; /* message type */ diff --git a/src/bts.cpp b/src/bts.cpp index 5c483d5..0950f7a 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1033,7 +1033,10 @@ rip->burst_type); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); if (plen >= 0) { - pcu_l1if_tx_agch(bts, bv, plen); + if (the_pcu->pcu_if_version >= 0x0b) + pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI); + else + pcu_l1if_tx_agch(bts, bv, plen); rc = 0; } else { rc = plen; @@ -1047,8 +1050,12 @@ bv, rip->ra, rip->rfn, rip->burst_type, (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1)); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ); - if (plen >= 0) - pcu_l1if_tx_agch(bts, bv, plen); + if (plen >= 0) { + if (the_pcu->pcu_if_version >= 0x0b) + pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI); + else + pcu_l1if_tx_agch(bts, bv, plen); + } bitvec_free(bv); /* rc was already properly set before goto */ return rc; @@ -1128,10 +1135,26 @@ GSM_L1_BURST_TYPE_ACCESS_0); if (plen >= 0) { bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF); - if (the_pcu->pcu_if_version >= 0x0b) - pcu_l1if_tx_pch2(bts, immediate_assignment, plen, true, tbf->imsi(), tbf->tlli()); - else + + if (the_pcu->pcu_if_version >= 0x0b) { + if (ms_imsi_is_valid(tbf->ms())) { + pcu_l1if_tx_pch2(bts, immediate_assignment, plen, true, tbf->imsi(), tbf->tlli()); + } else { + /* During GMM ATTACH REQUEST, the IMSI is not yet known to the PCU or SGSN. (It is + * requested after the GMM ATTACH REQUEST with the GMM IDENTITY REQUEST.) When the PCU + * has to assign a DL TBF but the IMSI is not known, then the IMMEDIATE ASSIGNMENT is + * sent on the AGCH. The reason for this is that without an IMSI we can not calculate + + the paging group, which would be necessary for transmission on PCH. Since the IMSI + * is usually only unknown during the GMM ATTACH REQUEST, we may assume that the MS + * is in non-DRX mode and hence it is listening on all CCCH blocks, including AGCH. + * + * See also: 3gpp TS 44.060, section 5.5.1.5 + * 3gpp TS 45.002, section 6.5.3, 6.5.6 */ + pcu_l1if_tx_agch2(bts, immediate_assignment, plen, true, tbf->tlli()); + } + } else { pcu_l1if_tx_pch(bts, immediate_assignment, plen, tbf->imsi()); + } } bitvec_free(immediate_assignment); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index f92f08e..4af6953 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -251,6 +251,8 @@ void pcu_l1if_tx_agch(struct gprs_rlcmac_bts *bts, bitvec *block, int plen) { + /* TODO: When PCUIF v.11 has become mainline, we will use pcu_l1if_tx_agch2() exclusively. + * This will make this function obsolote, so we can remove it. */ uint8_t data[GSM_MACBLOCK_LEN]; /* prefix PLEN */ /* FIXME: why does OpenBTS has no PLEN and no fill in message? */ @@ -263,10 +265,31 @@ pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, sizeof(data)); } +/* Send a MAC block via the access grant channel. This will (obviously) only work for MAC blocks that contain + * an IMMEDIATE ASSIGNMENT. In case the confirm flag is set, the receiving end is required to send a confirmation + * back when the IMMEDIATE ASSIGNMENT has been sent. */ +void pcu_l1if_tx_agch2(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, bool confirm, uint32_t msg_id) +{ + struct gsm_pcu_if_agch agch = { 0 }; + + agch.confirm = confirm; + agch.msg_id = msg_id; + agch.data[0] = (plen << 2) | 0x01; + bitvec_pack(block, agch.data + 1); + + if (the_pcu->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_AGCH)) + gsmtap_send(the_pcu->gsmtap, 0, 0, GSMTAP_CHANNEL_AGCH, 0, 0, 0, 0, agch.data, GSM_MACBLOCK_LEN); + + pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_AGCH_2, 0, 0, 0, (uint8_t*)&agch, sizeof(agch)); +} + #define IMSI_DIGITS_FOR_PAGING 3 /* Send a MAC block via the paging channel. (See also comment below) */ void pcu_l1if_tx_pch(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, const char *imsi) { + /* TODO: When PCUIF v.11 has become mainline, we will use pcu_l1if_tx_pch2() exclusively. + * This will make this function obsolote, so we can remove it. */ + uint8_t data[IMSI_DIGITS_FOR_PAGING + GSM_MACBLOCK_LEN]; /* prepend last three IMSI digits (if present) from which BTS/BSC will calculate the paging group */ @@ -561,6 +584,7 @@ switch (data_cnf->sapi) { case PCU_IF_SAPI_PCH_2: + case PCU_IF_SAPI_AGCH_2: bts_rcv_imm_ass_cnf(bts, NULL, data_cnf->msg_id); break; default: diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index 138636d..b6da337 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -147,6 +147,7 @@ uint32_t fn, uint8_t block_nr, uint8_t *data, size_t data_len); void pcu_l1if_tx_agch(struct gprs_rlcmac_bts *bts, bitvec *block, int len); +void pcu_l1if_tx_agch2(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, bool confirm, uint32_t msg_id); #endif #ifdef __cplusplus -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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-MessageType: merged

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for NAS key set identifier

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270 ) Change subject: NAS_Templates: add template for NAS key set identifier ...................................................................... Patch Set 1: (1 comment) File library/NAS_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270/comment/df5c2d07_4cd4… PS1, Line 330: const BIT3 c_NAS_KEY_SET_ID_NO_KEY := '111'B; > enum I am not sure, but I think c_NAS_KEY_SET_ID_NO_KEY is just a reserved value to say that NO_KEY is used. The other values may be just 3 bit integers. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34270 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: I2df0c9d1bf4bf0073b5f7b77708b8de59f96a639 Gerrit-Change-Number: 34270 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 08:43:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: add template for EPS update type

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269 ) Change subject: NAS_Templates: add template for EPS update type ...................................................................... Patch Set 1: (1 comment) File library/NAS_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269/comment/8f91c35b_1636… PS1, Line 320: const BIT3 c_EPS_UPD_TYPE_TA_UPD := '000'B; > this should be an enum afaiu. One could define the enum like so: type enumerated typeOfUpdate_t { c_EPS_UPD_TYPE_TA_UPD ('000'B), c_EPS_UPD_TYPE_COMB_TA_LA_UPD ('001'B), c_EPS_UPD_TYPE_COMB_TA_LA_UPD_IMSI_ATTACH ('010'B), c_EPS_UPD_TYPE_TA_UPD_PERIODIC ('011'B) }; But I can get this to work. When I use the type, then the compiler complains that the type is not a bitstring (!?), when I am stick using BIT3 it says there is no local or imported definition of.. Also in this file there are also other constants that are defined in the same way I did, so I am not sure if using two different ways to define/organize constants is a good idea anyway. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34269 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: I6ffac88cc1d3967dc8000e17a65cdba79a013cf7 Gerrit-Change-Number: 34269 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 08:41:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: m3ua: Add some TODO comments on where we fall short of our potential

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34273 ) Change subject: m3ua: Add some TODO comments on where we fall short of our potential ...................................................................... m3ua: Add some TODO comments on where we fall short of our potential Change-Id: I75d7b8f3fb6a06f6941b6dff4072287fdbb1d33e --- M src/m3ua.c M src/xua_as_fsm.c 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/73/34273/1 diff --git a/src/m3ua.c b/src/m3ua.c index 85ac974..f4dbf76 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -462,9 +462,11 @@ return NULL; } - if (xua->hdr.msg_class == M3UA_MSGC_XFER) + if (xua->hdr.msg_class == M3UA_MSGC_XFER) { + /* TODO: M3UA RFC says that multiple different streams within the SCTP association + * *may* be used, for example, by using the SLS value. Not required but makes sense. */ msgb_sctp_stream(msg) = 1; - else + } else msgb_sctp_stream(msg) = 0; msgb_sctp_ppid(msg) = M3UA_PPID; diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 2b16139..e239c74 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -158,6 +158,8 @@ asp = xua_as_select_asp_override(as); break; case OSMO_SS7_AS_TMOD_LOADSHARE: + /* TODO: actually use the SLS value to ensure same SLS goes through same ASP. Not + * strictly required by M3UA RFC, but would fit the overall principle. */ case OSMO_SS7_AS_TMOD_ROUNDROBIN: asp = xua_as_select_asp_roundrobin(as); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I75d7b8f3fb6a06f6941b6dff4072287fdbb1d33e Gerrit-Change-Number: 34273 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Don't expect a fixed SLS in IPA -> M3UA case

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 ) Change subject: stp: Don't expect a fixed SLS in IPA -> M3UA case ...................................................................... stp: Don't expect a fixed SLS in IPA -> M3UA case We are about to introduce a feature for SLS "randomization" in osmo-stp, so let's modifiy our STP tests to permit any SLS in the M3UA messages after IPA -> M3UA conversion. Change-Id: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0 Related: SYS#6543 --- M stp/STP_Tests.ttcn 1 file changed, 17 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/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 48214be..e2e5336 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -114,7 +114,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; - rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); @@ -148,7 +148,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL, - '00'O, '00'O, sccp_enc); + '00'O, ?, sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); f_clear_m3ua(); @@ -185,7 +185,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; - rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, enc_PDU_SCCP(sccp_exp)); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 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: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0 Gerrit-Change-Number: 34263 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Don't expect a fixed SLS in IPA -> M3UA case

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 ) Change subject: stp: Don't expect a fixed SLS in IPA -> M3UA case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 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: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0 Gerrit-Change-Number: 34263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 08:28:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 ) Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... Patch Set 2: (1 comment) File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/34264/comment/aa76543d_59939b31 PS1, Line 295: * \param[in] msg received message buffer. Callee takes ownership! > missing new param documentation Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 08:28:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by laforge

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 to look at the new patch set (#2). Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction when IPA/SCCPlite traffic traverses the osmo_ss7 stack, so far the SLS of the MTP3 label was always set to 0 (default initialization). However, in order to achieve a better distribution of signaling traffic in SS7 networks that actually utilize the SLS to select any links (or ASPs), it makes sense to use non-zero values. Instead of introducing some kind of new, configurable attribute for each ASP (IPA client connection), let's simply use the lower 4 bits of the file descriptor integer. Those file descriptors should have a roughly equal distribution, resulting in traffic (from multiple IPA clients) to be spread across the 4-bit SLS number space. Also, this mechanism ensures that traffic from one IPA client will always get the same SLS and hence routed the same way in any underlying CS7/SS7 network. Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Related: SYS#6543 --- M src/ipa.c M src/osmo_ss7.c M src/xua_internal.h 3 files changed, 35 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/34264/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 ) Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Why not have a global variable incrementing with each new conn instead of taking it from fd? That wo […] I am not sure a global variable would lead to better distribution, given that that would be one range split over all AS. So if you have an even number of ASs with an even number of ASPs and a fairly determinstic bring-up after restart / link-failure, you might end up having all of the ASPs within one AS in the same bucket. If you really wanted to do better, you'd need a per-AS variable, not a global one. And this would break both ABI + API (due to all related structs being public) and I thought it's not worth going there *just* for that. Chances are high that this patch improves the situation significantly. If it's still creating problems to users, we can always improve later. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 08:26:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: NAS_Templates: fix ts_NAS_GUTI

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 ) Change subject: NAS_Templates: fix ts_NAS_GUTI ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > So what you are saying is that ts_NAS_GUTI was wrong? The resulting MCC/MNC digits appear in a strange order I can not make sense of. The template is nowhere used yet, so I think something must be wrong. Also I think that the templates should not do format conversions of the MCC/MNC digits. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34267 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: I9546993987b873e8ae921664238b234608e37bba Gerrit-Change-Number: 34267 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Sep 2023 07:35:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log September 2023