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

[S] Change in pysim[master]: global_platform: Add --suppress-key-check option to put_key command

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35890?usp=email ) Change subject: global_platform: Add --suppress-key-check option to put_key command ...................................................................... global_platform: Add --suppress-key-check option to put_key command In some cases we may not want to auto-generate the Key Check Values. Change-Id: I244b717b3e3aae6eb3ad512f9e23ff0b65958bb7 --- M pySim/global_platform/__init__.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/35890/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index ca99f5f..4d553a7 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -515,12 +515,17 @@ put_key_parser.add_argument('--key-type', choices=KeyType.ksymapping.values(), action='append', required=True, help='Key Type') put_key_parser.add_argument('--key-data', type=is_hexstr, action='append', required=True, help='Key Data Block') put_key_parser.add_argument('--key-check', type=is_hexstr, action='append', help='Key Check Value') + put_key_parser.add_argument('--suppress-key-check', action='store_true', help='Suppress generation of Key Check Values') @cmd2.with_argparser(put_key_parser) def do_put_key(self, opts): """Perform the GlobalPlatform PUT KEY command in order to store a new key on the card. See GlobalPlatform CardSpecification v2.3 Section 11.8 for details. + The KCV (Key Check Values) can either be explicitly specified using `--key-check`, or will + otherwise be automatically generated for DES and AES keys. You can suppress the latter using + `--suppress-key-check`. + Example (SCP80 KIC/KID/KIK): put_key --key-version-nr 1 --key-id 0x01 --key-type aes --key-data 000102030405060708090a0b0c0d0e0f --key-type aes --key-data 101112131415161718191a1b1c1d1e1f @@ -537,6 +542,8 @@ for i in range(0, len(opts.key_type)): if opts.key_check and len(opts.key_check) > i: kcv = opts.key_check[i] + elif opts.suppress_key_check: + kcv = '' else: kcv_bin = compute_kcv(opts.key_type[i], h2b(opts.key_data[i])) or b'' kcv = b2h(kcv_bin) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I244b717b3e3aae6eb3ad512f9e23ff0b65958bb7 Gerrit-Change-Number: 35890 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Fix all sets() lookup functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35887?usp=email ) Change subject: Fix all sets() lookup functions ...................................................................... Fix all sets() lookup functions Previous logic was wrong, since the accumulator function was not really matching properly as the parameter was shadowed and didn't include the value from the outer function. The lookup is fixed here by passing the input lookup key (eg Imsi) as part of the default/initial value of the fold() function. Change-Id: I3a4a473b45fa54e857c2092d8d2b1e68ff9535e1 --- M src/aaa_diameter_swm.erl M src/epdg_diameter_swm.erl M src/epdg_gtpc_s2b.erl M src/gsup_server.erl 4 files changed, 47 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/87/35887/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 9458383..d425ed6 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -148,12 +148,13 @@ % returns swm_session if found, undefined if not find_swm_session_by_imsi(Imsi, State) -> - sets:fold( - fun(UEsIt = #swm_session{imsi = Imsi}, _AccIn) -> UEsIt; - (_, AccIn) -> AccIn - end, - undefined, - State#swm_state.ues). + {Imsi, Res} = sets:fold( + fun(UEsIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, UEsIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#swm_state.ues), + Res. find_or_new_swm_session(Imsi, State) -> UE = find_swm_session_by_imsi(Imsi, State), diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index bfb8f2d..2e4d738 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -163,12 +163,13 @@ % returns Sess if found, undefined it not find_swm_session_by_imsi(Imsi, State) -> - sets:fold( - fun(SessIt = #swm_session{imsi = Imsi}, _AccIn) -> SessIt; + {Imsi, Res} = sets:fold( + fun(SessIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; (_, AccIn) -> AccIn end, - undefined, - State#swm_state.sessions). + {Imsi, undefined}, + State#swm_state.sessions), + Res. find_or_new_swm_session(Imsi, Pid, State) -> Sess = find_swm_session_by_imsi(Imsi, State), diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 712e484..bc1a076 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -219,12 +219,13 @@ % returns Sess if found, undefined it not find_gtp_session_by_imsi(Imsi, State) -> - sets:fold( - fun(SessIt = #gtp_session{imsi = Imsi}, _AccIn) -> SessIt; - (_, AccIn) -> AccIn - end, - undefined, - State#gtp_state.sessions). + {Imsi, Res} = sets:fold( + fun(SessIt = #gtp_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#gtp_state.sessions), + Res. find_or_new_gtp_session(Imsi, Pid, State) -> Sess = find_gtp_session_by_imsi(Imsi, State), @@ -289,12 +290,13 @@ % returns Sess if found, undefined it not find_gtp_session_by_local_teic(LocalControlTei, State) -> - sets:fold( - fun(SessIt = #gtp_session{local_control_tei = LocalControlTei}, _AccIn) -> SessIt; - (_, AccIn) -> AccIn + {LocalControlTei, Res} = sets:fold( + fun(SessIt = #gtp_session{local_control_tei = LookupLTEIC}, {LookupLTEIC, _AccIn}) -> {LookupLTEIC, SessIt}; + (_, AccIn) -> AccIn end, - undefined, - State#gtp_state.sessions). + {LocalControlTei, undefined}, + State#gtp_state.sessions), + Res. %% connect/2 connect(Name, {Socket, RemoteAddr, RemotePort}) -> diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 8659c95..5c536fc 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -381,12 +381,13 @@ % returns gsups_ue if found, undefined it not find_gsups_ue_by_imsi(Imsi, State) -> - sets:fold( - fun(UEsIt = #gsups_ue{imsi = Imsi}, _AccIn) -> UEsIt; - (_, AccIn) -> AccIn - end, - undefined, - State#gsups_state.ues). + {Imsi, Res} = sets:fold( + fun(SessIt = #gsups_ue{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, SessIt}; + (_, AccIn) -> AccIn + end, + {Imsi, undefined}, + State#gsups_state.ues), + Res. find_or_new_gsups_ue(Imsi, State) -> UE = find_gsups_ue_by_imsi(Imsi, State), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35887?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: I3a4a473b45fa54e857c2092d8d2b1e68ff9535e1 Gerrit-Change-Number: 35887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: s2b: Answer CreateBearerReq with CreateBearerResp

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35886?usp=email ) Change subject: s2b: Answer CreateBearerReq with CreateBearerResp ...................................................................... s2b: Answer CreateBearerReq with CreateBearerResp Change-Id: I230e71661b289735c11bc7c576f7ff87bc41620d --- M src/epdg_gtpc_s2b.erl 1 file changed, 79 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/86/35886/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 3762ec3..712e484 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -253,6 +253,18 @@ Sess#gtp_session.bearers), Res. +gtp_session_add_bearer(Sess, Bearer) -> + lager:debug("Add bearer ~p to session ~p~n", [Bearer, Sess]), + Sess#gtp_session{bearers = sets:add_element(Bearer, Sess#gtp_session.bearers)}. + +gtp_session_del_bearer(Sess, Bearer) -> + lager:debug("Remove bearer ~p from session ~p~n", [Bearer, Sess]), + Sess1 = Sess#gtp_session{bearers = sets:del_element(Bearer, Sess#gtp_session.bearers)}, + case Sess1#gtp_session.default_bearer_id of + Ebi when Ebi == Bearer#gtp_bearer.ebi -> Sess1#gtp_session{default_bearer_id = undefined}; + _ -> Sess1 + end. + gtp_session_default_bearer(Sess) -> gtp_session_find_bearer_by_ebi(Sess, Sess#gtp_session.default_bearer_id). @@ -318,17 +330,43 @@ {noreply, State1} end; -rx_gtp(Req = #gtp{version = v2, type = delete_bearer_request}, State) -> +rx_gtp(Req = #gtp{version = v2, type = create_bearer_request, ie = IEs}, State) -> + Sess = find_gtp_session_by_local_teic(Req#gtp.tei, State), + case Sess of + undefined -> + lager:error("Rx unknown TEI ~p: ~p~n", [Req#gtp.tei, Req]), + {noreply, State}; + Sess -> + #{{v2_bearer_context,0} := #v2_bearer_context{instance = 0, group = BearerIE}} = IEs, + #{{v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}} = BearerIE, + #{{v2_fully_qualified_tunnel_endpoint_identifier,Ebi} := + #v2_fully_qualified_tunnel_endpoint_identifier{ + instance = Ebi, + interface_type = _Interface, + key = RemoteDataTei, ipv4 = _IP4, ipv6 = _IP6}} = BearerIE, + Sess1 = gtp_session_add_bearer(Sess, #gtp_bearer{ebi = Ebi, remote_data_tei = RemoteDataTei}), % TODO: teid + State1 = update_gtp_session(Sess, Sess1, State), + Resp = gen_create_bearer_response(Req, Sess1, request_accepted, State1), + tx_gtp(Resp, State1), + {noreply, State} + end; + +rx_gtp(Req = #gtp{version = v2, type = delete_bearer_request, ie = IEs}, State) -> Sess = find_gtp_session_by_local_teic(Req#gtp.tei, State), case Sess of undefined -> lager:error("Rx unknown TEI ~p: ~p~n", [Req#gtp.tei, Req]), {noreply, State}; Sess -> + #{{v2_cause,0} := _CauseIE, + {v2_eps_bearer_id,0} := #v2_eps_bearer_id{instance = 0, eps_bearer_id = Ebi}} = IEs, + % GtpCause = gtp_utils:enum_v2_cause(CauseIE#v2_cause.v2_cause) + Bearer = gtp_session_find_bearer_by_ebi(Sess, Ebi), Resp = gen_delete_bearer_response(Req, Sess, request_accepted, State), tx_gtp(Resp, State), epdg_ue_fsm:received_gtpc_delete_bearer_request(Sess#gtp_session.pid), - State1 = delete_gtp_session(Sess, State), + Sess1 = gtp_session_del_bearer(Sess, Bearer), + State1 = update_gtp_session(Sess, Sess1, State), {noreply, State1} end; @@ -398,6 +436,36 @@ ], #gtp{version = v2, type = delete_session_request, tei = RemoteCtlTEI, seq_no = SeqNo, ie = IEs}. +gen_create_bearer_response(Req = #gtp{version = v2, type = create_bearer_request}, + Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, + GtpCause, + #gtp_state{laddr = LocalAddr, + restart_counter = RCnt}) -> + Bearer = gtp_session_default_bearer(Sess), + BearersIE = [#v2_bearer_level_quality_of_service{ + pci = 1, pl = 10, pvi = 0, label = 8, + maximum_bit_rate_for_uplink = 0, + maximum_bit_rate_for_downlink = 0, + guaranteed_bit_rate_for_uplink = 0, + guaranteed_bit_rate_for_downlink = 0 + }, + #v2_eps_bearer_id{eps_bearer_id = Bearer#gtp_bearer.ebi}, + #v2_fully_qualified_tunnel_endpoint_identifier{ + instance = 0, + interface_type = 31, %% "S2b-U ePDG GTP-U" + key = Bearer#gtp_bearer.local_data_tei, + ipv4 = gtp_utils:ip_to_bin(LocalAddr) + } + ], + IEs = [#v2_cause{v2_cause = GtpCause}, + #v2_bearer_context{group = BearersIE}, + #v2_recovery{restart_counter = RCnt} + ], + #gtp{version = v2, + type = create_bearer_response, + tei = RemoteCtlTEI, + seq_no = Req#gtp.seq_no, + ie = IEs}. gen_delete_bearer_response(Req = #gtp{version = v2, type = delete_bearer_request}, Sess = #gtp_session{remote_control_tei = RemoteCtlTEI}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35886?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: I230e71661b289735c11bc7c576f7ff87bc41620d Gerrit-Change-Number: 35886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35888?usp=email ) Change subject: epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server ...................................................................... epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server Change-Id: Ib79af9f965ef2c6aa878b3bfe692e3b139bdffc3 --- M src/epdg_ue_fsm.erl 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/88/35888/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 3d325a0..21f59da 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -277,7 +277,7 @@ {keep_state, Data, [{reply,From,{error,unexpected_event}}]}. state_wait_swm_session_termination_answer(enter, _OldState, Data) -> - % TODO: Send STR towards AAA-Server + % Send STR towards AAA-Server % % 3GPP TS 29.273 7.1.2.3 lager:info("ue_fsm state_wait_swm_session_termination_answer event=enter, ~p~n", [Data]), case epdg_diameter_swm:session_termination_request(Data#ue_fsm_data.imsi) of @@ -301,7 +301,7 @@ end; false -> ok end, - {keep_state, Data, [{reply,From,ok}]}; + {stop_and_reply, normal, [{reply,From,ok}], Data}; state_wait_swm_session_termination_answer({call, From}, Event, Data) -> lager:error("ue_fsm state_wait_delete_session_resp: Unexpected call event ~p, ~p~n", [Event, Data]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35888?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: Ib79af9f965ef2c6aa878b3bfe692e3b139bdffc3 Gerrit-Change-Number: 35888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Session can contain several bearers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35885?usp=email ) Change subject: s2b: Session can contain several bearers ...................................................................... s2b: Session can contain several bearers Change-Id: I0ccb05a03e808122db085df73c6f0c56cec1b523 --- M src/epdg_gtpc_s2b.erl 1 file changed, 32 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/85/35885/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 349aac6..3762ec3 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -75,7 +75,7 @@ seq_no :: 0..16#ffffffff, next_local_control_tei = 1 :: 0..16#ffffffff, next_local_data_tei = 1 :: 0..16#ffffffff, - sessions = sets:new() + sessions = sets:new() :: sets:set() }). -record(gtp_bearer, { @@ -91,7 +91,8 @@ ue_ip :: inet:ip_address(), local_control_tei = 0 :: non_neg_integer(), remote_control_tei = 0 :: non_neg_integer(), - bearer :: gtp_bearer %% FIXME: only one bearer for now + default_bearer_id :: non_neg_integer(), + bearers = sets:new() :: sets:set() }). start_link(LocalAddr, LocalPort, RemoteAddr, RemotePort, Options) -> @@ -200,7 +201,7 @@ new_gtp_session(Imsi, Pid, State) -> % TODO: find non-used local TEI inside State - Bearer = #gtp_bearer{ + DefaultBearer = #gtp_bearer{ ebi = 5, local_data_tei = State#gtp_state.next_local_data_tei }, @@ -208,7 +209,8 @@ pid = Pid, apn = ?APN, local_control_tei = State#gtp_state.next_local_control_tei, - bearer = Bearer + default_bearer_id = DefaultBearer#gtp_bearer.ebi, + bearers = sets:add_element(DefaultBearer, sets:new()) }, NewSt = State#gtp_state{next_local_control_tei = State#gtp_state.next_local_control_tei + 1, next_local_data_tei = State#gtp_state.next_local_data_tei + 1, @@ -242,6 +244,19 @@ SetRemoved = sets:del_element(Sess, State#gtp_state.sessions), State#gtp_state{sessions = SetRemoved}. +gtp_session_find_bearer_by_ebi(Sess, Ebi) -> + {Ebi, Res} = sets:fold( + fun(BearerIt = #gtp_bearer{ebi = LookupEbi}, {LookupEbi, _AccIn}) -> {LookupEbi, BearerIt}; + (_, AccIn) -> AccIn + end, + {Ebi, undefined}, + Sess#gtp_session.bearers), + Res. + +gtp_session_default_bearer(Sess) -> + gtp_session_find_bearer_by_ebi(Sess, Sess#gtp_session.default_bearer_id). + + update_gtp_session_from_create_session_response_ie(none, Sess) -> Sess; update_gtp_session_from_create_session_response_ie({_, @@ -329,11 +344,11 @@ %% 7.2.1 Create Session Request gen_create_session_request(#gtp_session{imsi = Imsi, apn = Apn, - local_control_tei = LocalCtlTEI, - bearer = Bearer}, + local_control_tei = LocalCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, restart_counter = RCnt, seq_no = SeqNo}) -> + Bearer = gtp_session_default_bearer(Sess), BearersIE = [#v2_bearer_level_quality_of_service{ pci = 1, pl = 10, pvi = 0, label = 8, maximum_bit_rate_for_uplink = 0, @@ -369,10 +384,10 @@ #gtp{version = v2, type = create_session_request, tei = 0, seq_no = SeqNo, ie = IEs}. %% 7.2.9 Delete Session Request -gen_delete_session_request(#gtp_session{remote_control_tei = RemoteCtlTEI, - bearer = Bearer}, +gen_delete_session_request(#gtp_session{remote_control_tei = RemoteCtlTEI} = Sess, #gtp_state{laddr = LocalAddr, seq_no = SeqNo}) -> + Bearer = gtp_session_default_bearer(Sess), IEs = [#v2_eps_bearer_id{eps_bearer_id = Bearer#gtp_bearer.ebi}, #v2_fully_qualified_tunnel_endpoint_identifier{ instance = Bearer#gtp_bearer.ebi, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35885?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: I0ccb05a03e808122db085df73c6f0c56cec1b523 Gerrit-Change-Number: 35885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: AAA-Server: Convert binary Imsi coming from internal SWm to string

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35889?usp=email ) Change subject: AAA-Server: Convert binary Imsi coming from internal SWm to string ...................................................................... AAA-Server: Convert binary Imsi coming from internal SWm to string ePDG handles Imsi as binary, but since all diameter uses strings, better keep it as a string everywhere inside AAA-Server. This fixes matching and finding sessions by Imsi. Change-Id: Iba07ca02d9ca2bd6227d92b1d9c727107f37d9cd --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl M src/epdg_diameter_swm.erl 3 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/89/35889/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index d425ed6..bcedcac 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -12,7 +12,7 @@ }). -record(swm_session, { - imsi :: binary(), + imsi :: string(), pid :: pid() }). diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index e395d58..52918d2 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -45,7 +45,7 @@ -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3]). -record(ue_fsm_data, { - imsi = unknown :: binary(), + imsi = unknown :: string(), apn :: string(), epdg_sess_active = false :: boolean(), pgw_sess_active = false :: boolean(), @@ -53,7 +53,7 @@ }). start_link(Imsi) -> - ServerName = lists:concat([?NAME, "_", binary_to_list(Imsi)]), + ServerName = lists:concat([?NAME, "_", Imsi]), lager:info("ue_fsm start_link(~p)~n", [ServerName]), gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 2e4d738..57c0921 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -11,7 +11,7 @@ }). -record(swm_session, { - imsi :: binary(), + imsi :: string(), pid :: pid() }). @@ -34,7 +34,9 @@ auth_request(Imsi) -> - Result = gen_server:call(?SERVER, {epdg_auth_req, Imsi}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {epdg_auth_req, ImsiStr}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_auth_response(self(), Result), @@ -44,7 +46,9 @@ % Rx "GSUP CEAI LU Req" is our way of saying Rx "Swm Diameter-EAP REQ (DER) with EAP AVP containing successuful auth": auth_compl_request(Imsi, Apn) -> - Result = gen_server:call(?SERVER, {epdg_auth_compl_req, Imsi, Apn}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {epdg_auth_compl_req, ImsiStr, Apn}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_auth_compl_response(self(), Result), @@ -54,7 +58,9 @@ % 3GPP TS 29.273 7.1.2.3 session_termination_request(Imsi) -> - Result = gen_server:call(?SERVER, {str, Imsi}), + % In Diameter we use Imsi as strings, as done by diameter module. + ImsiStr = binary_to_list(Imsi), + Result = gen_server:call(?SERVER, {str, ImsiStr}), case Result of {ok, _Mar} -> epdg_ue_fsm:received_swm_session_terminate_answer(self(), Result), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35889?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: Iba07ca02d9ca2bd6227d92b1d9c727107f37d9cd Gerrit-Change-Number: 35889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_ho_lte_to_wifi

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?usp=email ) Change subject: epdg: Introduce test TC_ho_lte_to_wifi ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > it's great that we have *that* kind of exotic test coverage. […] Most of the stuff is really on other nodes, in ePDG/AAA it's just about adding Create/DeleteBearerRequest, and it helps me have the full state model in place. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?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: Ibdfeda1fa5d7016b1952d64b306cd501cb33f61b Gerrit-Change-Number: 35884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 Feb 2024 17:51:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_ho_lte_to_wifi

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?usp=email ) Change subject: epdg: Introduce test TC_ho_lte_to_wifi ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: it's great that we have *that* kind of exotic test coverage. In general I would suggest to make sure the basic functioanlity works fully end-to-end, before thinkign about inter-rat handover etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35884?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: Ibdfeda1fa5d7016b1952d64b306cd501cb33f61b Gerrit-Change-Number: 35884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 17:48:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: comment: gsm_04_08.h: add a spec hint

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email ) Change subject: comment: gsm_04_08.h: add a spec hint ...................................................................... comment: gsm_04_08.h: add a spec hint Change-Id: I2a606047db88ea47317397a790611048dead6403 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 5d1da74..075b6ca 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -2233,7 +2233,8 @@ }; /*! GSM 04.08 Bearer Capability: Speech Version Indication - * (See also 3GPP TS 24.008, Table 10.5.103) */ + * (See also 3GPP TS 24.008, Table 10.5.103 + * and 3GPP TS 26.103, Table 4.1 "Support of Codec Types in Radio Access Technologies") */ enum gsm48_bcap_speech_ver { GSM48_BCAP_SV_FR = 0, /*!< GSM FR V1 (GSM FR) */ GSM48_BCAP_SV_HR = 1, /*!< GSM HR V1 (GSM HR) */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a606047db88ea47317397a790611048dead6403 Gerrit-Change-Number: 35871 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: comment: gsm_04_08.h: add a spec hint

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email ) Change subject: comment: gsm_04_08.h: add a spec hint ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35871?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a606047db88ea47317397a790611048dead6403 Gerrit-Change-Number: 35871 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Feb 2024 17:47:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024