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

[S] Change in libosmo-abis[rel-1.5.1]: Bump version: 1.5.0.5-aa34 → 1.5.1
by fixeria 26 Jan '24

26 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email ) Change subject: Bump version: 1.5.0.5-aa34 → 1.5.1 ...................................................................... Bump version: 1.5.0.5-aa34 → 1.5.1 Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 --- M debian/changelog 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/19/35719/1 diff --git a/debian/changelog b/debian/changelog index bddca01..347a2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libosmo-abis (1.5.1) unstable; urgency=medium + + [ Harald Welte ] + * dahdi: Log context (e1inpt_ts name) when opening timeslot devices + * dahdi: Fix compilation with ancient DAHDI + + [ Keith ] + * DAHDI: Log hexdump of TX at level DEBUG, not ERROR + + [ Vadim Yanitskiy ] + * trau/osmo_ortp: support building without OrtpMemoryFunctions API + * build: include git-version-gen into the release tarball + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Sat, 27 Jan 2024 03:36:30 +0700 + libosmo-abis (1.5.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: rel-1.5.1 Gerrit-Change-Id: I88b987d714a88728b62f74a60c44d9c3532b5686 Gerrit-Change-Number: 35719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects
by fixeria 26 Jan '24

26 Jan '24

Attention is currently required from: daniel, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: -Code-Review (2 comments) File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/2f45f8f6_fe9e2b38 PS1, Line 9: The OsmoMGW program exposes an MGCP interface towards a MGPC call agent > Done AFAICS, not addressed: `s/a/an/`. File README.md: https://gerrit.osmocom.org/c/osmo-mgw/+/35718/comment/b2c920c8_c2245245 PS2, Line 9: MGPC wait, it's MGCP, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 19:01:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: Convert README to README.md and expand like in other projects
by fixeria 26 Jan '24

26 Jan '24

Attention is currently required from: daniel, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email ) Change subject: Convert README to README.md and expand like in other projects ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9a78ccc0d10f0e3a9d832ac4c4988cfbb8ddb3c Gerrit-Change-Number: 35718 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 18:59:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: s6b: Trigger SAR towards HSS when receiving AAR from PGW
by pespin 26 Jan '24

26 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35697?usp=email ) Change subject: s6b: Trigger SAR towards HSS when receiving AAR from PGW ...................................................................... s6b: Trigger SAR towards HSS when receiving AAR from PGW As described in 3GPP TS 29.273 9.1.2.2.3 mentioning procedure from clause 8.1.2.2.2 (SAR/SAA). Change-Id: I7e0bf449ac6cae550a5934d9d518bb3f2bf64d5b --- M src/aaa_diameter_s6b_cb.erl 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index 81757a9..8651383 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -49,6 +49,7 @@ lager:error("Request error: ~p~n", [Reason]), ?UNEXPECTED. +% 3GPP TS 29.273 9.1.2.2 handle_request(#diameter_packet{msg = Req, errors = []}, _SvcName, {_, Caps}) when is_record(Req, 'AAR') -> lager:info("S6b Rx from ~p: ~p~n", [Caps, Req]), % extract relevant fields from DIAMETER AAR @@ -56,13 +57,20 @@ #'AAR'{'Session-Id' = SessionId, 'Auth-Application-Id' = AuthAppId, 'Auth-Request-Type' = AuthReqType, - 'User-Name' = _UserName} = Req, + 'User-Name' = UserName} = Req, + Result = aaa_diameter_swx:server_assignment_request(UserName, 1, "internet"), + case Result of + {ok, _} -> + ResultCode = 2001; + {error, _Err} -> + ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' + end, Resp = #'AAA'{'Session-Id'=SessionId, 'Auth-Application-Id' = AuthAppId, 'Auth-Request-Type' = AuthReqType, - 'Result-Code'=2001, - 'Origin-Host'=OH, - 'Origin-Realm'=OR}, + 'Result-Code' = ResultCode, + 'Origin-Host' = OH, + 'Origin-Realm' = OR}, lager:info("S6b Tx to ~p: ~p~n", [Caps, Resp]), {reply, Resp}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7e0bf449ac6cae550a5934d9d518bb3f2bf64d5b Gerrit-Change-Number: 35697 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo-epdg[master]: Make SWm MAR+MAA asynchronous
by pespin 26 Jan '24

26 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35691?usp=email ) Change subject: Make SWm MAR+MAA asynchronous ...................................................................... Make SWm MAR+MAA asynchronous Change-Id: Ie7762843e463f404cd4f0c5fcf03a9566dcf173b --- M src/aaa_diameter_swm.erl M src/epdg_diameter_swm.erl M src/epdg_ue_fsm.erl 3 files changed, 108 insertions(+), 22 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 6aef1b2..c8ae250 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -29,26 +29,31 @@ auth_request(Imsi) -> - gen_server:call(?SERVER, {epdg_auth_req, Imsi}). + gen_server:cast(?SERVER, {epdg_auth_req, Imsi}). -handle_call({epdg_auth_req, Imsi}, From, State) -> +handle_cast({epdg_auth_req, Imsi}, State) -> % request the diameter code for a tuple CKey = [], IntegrityKey = [], Result = aaa_diameter_swx:multimedia_auth_request(Imsi, 1, "EAP-AKA", 1, CKey, IntegrityKey), case Result of - {ok, Mar} -> {reply, {ok, Mar}, State}; - {error, Err} -> {reply, {error, Err}, State}; - {_, _} -> {reply, {error, unknown}, State} - end. + {ok, _MAA} -> epdg_diameter_swm:auth_response(Imsi, Result); + {error, Err} -> epdg_diameter_swm:auth_response(Imsi, Result); + _ -> epdg_diameter_swm:auth_response(Imsi, {error, unknown}) + end, + {noreply, State}; handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. + handle_info(Info, S) -> error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. +handle_call(Request, From, S) -> + error_logger:error_report(["unknown handle_call", {module, ?MODULE}, {request, Request}, {from, From}, {state, S}]), + {noreply, S}. stop() -> gen_server:call(?MODULE, stop). diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 9c3145b..dbb764f 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -7,13 +7,20 @@ -include_lib("diameter_3gpp_ts29_273_swx.hrl"). -record(swm_state, { + sessions = sets:new() }). +-record(swm_session, { + imsi :: binary(), + pid :: pid() + }). + -export([start_link/0]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). -export[(auth_request/1)]. +-export[(auth_response/2)]. -define(SERVER, ?MODULE). @@ -27,17 +34,31 @@ auth_request(Imsi) -> - gen_server:call(?SERVER, {epdg_auth_req, Imsi}). - -handle_call({epdg_auth_req, Imsi}, _From, State) -> - % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: - Result = aaa_diameter_swm:auth_request(Imsi), + Result = gen_server:call(?SERVER, {epdg_auth_req, Imsi}), case Result of - {ok, Mar} -> {reply, {ok, Mar}, State}; - {error, Err} -> {reply, {error, Err}, State}; - {_, _} -> {reply, {error, unknown}, State} + {ok, _Mar} -> + epdg_ue_fsm:received_swm_auth_response(self(), Result), + ok; + _ -> Result end. + +handle_call({epdg_auth_req, Imsi}, {Pid, _Tag} = _From, State0) -> + % we yet don't implement the Diameter SWm interface on the wire, we process the call internally: + {_Sess, State1} = find_or_new_swm_session(Imsi, Pid, State0), + ok = aaa_diameter_swm:auth_request(Imsi), + {reply, ok, State1}. + +handle_cast({epdg_auth_resp, Imsi, Result}, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + epdg_ue_fsm:received_swm_auth_response(Sess#swm_session.pid, Result); + undefined -> + error_logger:error_report(["unknown swm_session", {module, ?MODULE}, {imsi, Imsi}, {state, State}]) + end, + {noreply, State}; + handle_cast(Info, S) -> error_logger:error_report(["unknown handle_cast", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. @@ -54,3 +75,36 @@ terminate(Reason, _S) -> lager:info("terminating ~p with reason ~p~n", [?MODULE, Reason]). + +%% Emulation from the wire (DIAMETER SWm), called from internal AAA Server: +auth_response(Imsi, Result) -> + ok = gen_server:cast(?SERVER, {epdg_auth_resp, Imsi, Result}). + +%% ------------------------------------------------------------------ +%% Internal Function Definitions +%% ------------------------------------------------------------------ + +new_swm_session(Imsi, Pid, State) -> + Sess = #swm_session{imsi = Imsi, + pid = Pid + }, + NewSt = State#swm_state{sessions = sets:add_element(Sess, State#swm_state.sessions)}, + {Sess, NewSt}. + +% returns Sess if found, undefined it not +find_swm_session_by_imsi(Imsi, State) -> + sets:fold( + fun(SessIt = #swm_session{imsi = Imsi}, _AccIn) -> SessIt; + (_, AccIn) -> AccIn + end, + undefined, + State#swm_state.sessions). + +find_or_new_swm_session(Imsi, Pid, State) -> + Sess = find_swm_session_by_imsi(Imsi, State), + case Sess of + #swm_session{imsi = Imsi} -> + {Sess, State}; + undefined -> + new_swm_session(Imsi, Pid, State) + end. \ No newline at end of file diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 787689d..9d20a73 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -40,8 +40,9 @@ -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). +-export([received_swm_auth_response/2]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2]). --export([state_new/3,state_authenticated/3, state_wait_delete_session_resp/3]). +-export([state_new/3, state_wait_auth_resp/3, state_authenticated/3, state_wait_delete_session_resp/3]). -record(ue_fsm_data, { imsi @@ -88,6 +89,15 @@ {error, Err} end. +received_swm_auth_response(Pid, Result) -> + lager:info("ue_fsm received_swm_auth_response ~p~n", [Result]), + try + gen_statem:call(Pid, {received_swm_auth_response, Result}) + catch + exit:Err -> + {error, Err} + end. + received_gtpc_create_session_response(Pid, Msg) -> lager:info("ue_fsm received_gtpc_create_session_response ~p~n", [Msg]), try @@ -128,19 +138,27 @@ state_new({call, From}, auth_request, Data) -> lager:info("ue_fsm state_new event=auth_request, ~p~n", [Data]), - Auth = epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi), - gsup_server:auth_response(Data#ue_fsm_data.imsi, Auth), - case Auth of - {ok, _} -> - {next_state, state_authenticated, Data, [{reply,From,ok}]}; - {error, Err} -> - {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} + case epdg_diameter_swm:auth_request(Data#ue_fsm_data.imsi) of + ok -> {next_state, state_wait_auth_resp, Data, [{reply,From,ok}]}; + {error, Err} -> {stop_and_reply, Err, Data, [{reply,From,{error,Err}}]} end; state_new({call, From}, purge_ms_request, Data) -> lager:info("ue_fsm state_new event=purge_ms_request, ~p~n", [Data]), {stop_and_reply, purge_ms_request, Data, [{reply,From,ok}]}. +state_wait_auth_resp({call, From}, {received_swm_auth_response, Auth}, Data) -> + lager:info("ue_fsm state_wait_auth_resp event=received_swm_auth_response, ~p~n", [Data]), + gsup_server:auth_response(Data#ue_fsm_data.imsi, Auth), + case Auth of + {ok, _} -> + {next_state, state_authenticated, Data, [{reply,From,ok}]}; + {error, Err} -> + {next_state, state_new, Data, [{reply,From,{error,Err}}]}; + _ -> + {next_state, state_new, Data, [{reply,From,{error,unknown}}]} + end. + state_authenticated({call, From}, lu_request, Data) -> lager:info("ue_fsm state_authenticated event=lu_request, ~p~n", [Data]), Result = aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, 1, "internet"), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ie7762843e463f404cd4f0c5fcf03a9566dcf173b Gerrit-Change-Number: 35691 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: s6b: Trigger SAR towards HSS when receiving AAR from PGW
by pespin 26 Jan '24

26 Jan '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35697?usp=email ) Change subject: s6b: Trigger SAR towards HSS when receiving AAR from PGW ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7e0bf449ac6cae550a5934d9d518bb3f2bf64d5b Gerrit-Change-Number: 35697 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 18:08:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo-epdg[master]: Make SWm MAR+MAA asynchronous
by pespin 26 Jan '24

26 Jan '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35691?usp=email ) Change subject: Make SWm MAR+MAA asynchronous ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ie7762843e463f404cd4f0c5fcf03a9566dcf173b Gerrit-Change-Number: 35691 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 Jan 2024 18:08:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: Validate IPCP identifier in answer matches the one in the request
by pespin 26 Jan '24

26 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35701?usp=email ) Change subject: ggsn: Validate IPCP identifier in answer matches the one in the request ...................................................................... ggsn: Validate IPCP identifier in answer matches the one in the request Related: https://github.com/open5gs/open5gs/pull/2920 Related: SYS#6582 Change-Id: I0e0cefaeb303b4e284173011231170554e225561 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 22 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index d7de443..c949dc9 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1489,8 +1489,9 @@ f_init(); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); + var uint8_t ipcp_req_id := oct2int(f_rnd_octstring(1)); var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); - ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP(ipcp_req_id)); f_pdp_ctx_act(ctx); f_PCO_ensure_no_duplicates(ctx.pco_neg); /* verify IPCP is at all contained */ @@ -1499,9 +1500,13 @@ } /* verify IPCP contains both primary and secondary DNS */ var IpcpPacket ipcp := dec_IpcpPacket(f_PCO_extract_proto(ctx.pco_neg, '8021'O)); - if (not match(ipcp, tr_IPCP_Ack_DNS(0, ggsn_ip4_dns1, ggsn_ip4_dns2))) { - if (not match(ipcp, tr_IPCP_Ack_DNS(0))) { - setverdict(fail, "Primary/Secondary DNS PCO IPCP option not found"); + if (not match(ipcp, tr_IPCP_Ack_DNS(ipcp_req_id, ggsn_ip4_dns1, ggsn_ip4_dns2))) { + if (not match(ipcp, tr_IPCP_Ack_DNS(ipcp_req_id))) { + if (not match(ipcp, tr_IPCP_Ack_DNS(?))) { + setverdict(fail, "Primary/Secondary DNS PCO IPCP option not found"); + } else { + setverdict(fail, "Primary/Secondary DNS PCO IPCP option found but not matching expected identifier"); + } } else { setverdict(fail, "Primary/Secondary DNS PCO IPCP option found but not matching expected values"); } diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 3788725..30346d4 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -973,13 +973,13 @@ } } - template (value) ProtConfigOptions ts_PCO_IPv4_DNS_IPCP modifies ts_PCO := { + template (value) ProtConfigOptions ts_PCO_IPv4_DNS_IPCP(uint8_t ipcp_req_id := 0) modifies ts_PCO := { protocols := { /* dummy PAP entry to check if our parser in the GGSN can properly iterate over * the list of protocols, see Change-Id Icc2e6716c33d78d3c3e000f529806228d8aa155e */ { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS)) } + enc_IpcpPacket(valueof(ts_IPCP_ReqDNS(ipcp_req_id))) } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0e0cefaeb303b4e284173011231170554e225561 Gerrit-Change-Number: 35701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: vlr: Use new libosmogsm struct osmo_gsup_pdp_info fields
by pespin 26 Jan '24

26 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35631?usp=email ) Change subject: vlr: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... vlr: Use new libosmogsm struct osmo_gsup_pdp_info fields This also makes sure it doesn't compile against older libosmogsm gsup versions which would break ABI. Related: OS#6091 Depends: libosmocore.git Change-Id 70be3560659c58f24b8db529c4fc85da4bb0ec04 Change-Id: Ia002fd6e0334d56de34d352a0bf1a8604e2e9fd3 --- M TODO-RELEASE M src/libvlr/vlr.c 2 files changed, 22 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..8b07972 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm >1.9.0 ABI breakage in struct osmo_gsup_pdp_info, use new fields pdp_type_* and pdp_address. \ No newline at end of file diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index fb034cf..e2e02bf 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -731,7 +731,9 @@ struct llist_head list; unsigned int context_id; - uint16_t pdp_type; + enum gsm48_pdp_type_org pdp_type_org; + enum gsm48_pdp_type_nr pdp_type_nr; + struct osmo_sockaddr pdp_address[2]; char apn_str[GSM_APN_LENGTH]; uint8_t qos_subscribed[20]; size_t qos_subscribed_len; @@ -1024,7 +1026,10 @@ } OSMO_ASSERT(pdp_data != NULL); - pdp_data->pdp_type = pdp_info->pdp_type; + pdp_data->pdp_type_org = pdp_info->pdp_type_org; + pdp_data->pdp_type_nr = pdp_info->pdp_type_nr; + memcpy(&pdp_data->pdp_address[0], &pdp_info->pdp_address[0], sizeof(pdp_data->pdp_address[0])); + memcpy(&pdp_data->pdp_address[1], &pdp_info->pdp_address[1], sizeof(pdp_data->pdp_address[1])); osmo_apn_to_str(pdp_data->apn_str, pdp_info->apn_enc, pdp_info->apn_enc_len); memcpy(pdp_data->qos_subscribed, pdp_info->qos_enc, pdp_info->qos_enc_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35631?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia002fd6e0334d56de34d352a0bf1a8604e2e9fd3 Gerrit-Change-Number: 35631 Gerrit-PatchSet: 2 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: vlr: Use new libosmogsm struct osmo_gsup_pdp_info fields
by pespin 26 Jan '24

26 Jan '24

Attention is currently required from: lynxis lazus, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35631?usp=email ) Change subject: vlr: Use new libosmogsm struct osmo_gsup_pdp_info fields ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35631?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia002fd6e0334d56de34d352a0bf1a8604e2e9fd3 Gerrit-Change-Number: 35631 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 26 Jan 2024 18:07:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0