lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

February 2024

  • 1 participants
  • 1748 discussions
[S] Change in ...osmo-epdg[master]: s2b: Increment gtp SeqNo after transmitting message
by pespin 12 Feb '24

12 Feb '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email ) Change subject: s2b: Increment gtp SeqNo after transmitting message ...................................................................... s2b: Increment gtp SeqNo after transmitting message Change-Id: Ia65ef7380f01d080ca05393887661d4af698646a --- M src/epdg_gtpc_s2b.erl 1 file changed, 17 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 313e101..95c4d10 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -146,19 +146,19 @@ #gtp_session{pid = Pid, apn = list_to_binary(Apn)}, State0), Req = gen_create_session_request(Sess0, State1), - %TODO: increment State.seq_no. tx_gtp(Req, State1), + State2 = inc_seq_no(State1), lager:debug("Waiting for CreateSessionResponse~n", []), - {reply, ok, State1}; + {reply, ok, State2}; handle_call({gtpc_delete_session_req, {Imsi}}, _From, State) -> Sess = find_gtp_session_by_imsi(Imsi, State), case Sess of #gtp_session{imsi = Imsi} -> Req = gen_delete_session_request(Sess, State), - %TODO: increment State.seq_no. tx_gtp(Req, State), - {reply, ok, State}; + State1 = inc_seq_no(State), + {reply, ok, State1}; undefined -> {reply, {error, imsi_unknown}, State} end. @@ -199,6 +199,10 @@ %% Internal Function Definitions %% ------------------------------------------------------------------ +inc_seq_no(State) -> + NewSeqNr = State#gtp_state.seq_no +1, + State#gtp_state{seq_no = NewSeqNr}. + new_gtp_session(Imsi, SessTpl, State) -> % TODO: find non-used local TEI inside State DefaultBearer = #gtp_bearer{ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?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: Ia65ef7380f01d080ca05393887661d4af698646a Gerrit-Change-Number: 35948 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
0 0
[M] Change in ...osmo-epdg[master]: s2b: Take unused local TEIC/TEID when new one is needed
by pespin 12 Feb '24

12 Feb '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?usp=email ) Change subject: s2b: Take unused local TEIC/TEID when new one is needed ...................................................................... s2b: Take unused local TEIC/TEID when new one is needed Change-Id: I7262402d14fc53ff17c4000cef385136b8de7e55 --- M src/epdg_gtpc_s2b.erl 1 file changed, 78 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 95c4d10..e795cd2 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -70,9 +70,9 @@ raddr :: inet:ip_address(), rport :: non_neg_integer(), restart_counter :: 0..255, - seq_no :: 0..16#ffffffff, - next_local_control_tei = 1 :: 0..16#ffffffff, - next_local_data_tei = 1 :: 0..16#ffffffff, + seq_no :: 0..16#ffffff, + next_local_control_tei :: 0..16#ffffffff, + next_local_data_tei :: 0..16#ffffffff, sessions = sets:new() :: sets:set() }). @@ -128,7 +128,9 @@ raddr = RemoteAddrInet, rport = RemotePort, restart_counter = 0, - seq_no = 0 + seq_no = rand:uniform(16#FFFFFF), + next_local_control_tei = rand:uniform(16#FFFFFFFE), + next_local_data_tei = rand:uniform(16#FFFFFFFE) }, {ok, St}; {error, Reason} -> @@ -203,19 +205,27 @@ NewSeqNr = State#gtp_state.seq_no +1, State#gtp_state{seq_no = NewSeqNr}. +% Skip 0 +inc_tei(Tei) when Tei >= 16#FFFFFFFE -> 16#00000001; +% Skip 0xffffffff +inc_tei(Tei) -> (Tei + 1) rem 16#FFFFFFFF. + +% Skip 0, 0xffffffff +dec_tei(Tei) when Tei =< 1 -> 16#FFFFFFFE; +dec_tei(Tei) -> (Tei - 1) rem 16#FFFFFFFF. + new_gtp_session(Imsi, SessTpl, State) -> - % TODO: find non-used local TEI inside State DefaultBearer = #gtp_bearer{ ebi = 5, - local_data_tei = State#gtp_state.next_local_data_tei + local_data_tei = find_unused_local_teid(State) }, Sess = SessTpl#gtp_session{imsi = Imsi, - local_control_tei = State#gtp_state.next_local_control_tei, + local_control_tei = find_unused_local_teic(State), 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, + NewSt = State#gtp_state{next_local_control_tei = inc_tei(Sess#gtp_session.local_control_tei), + next_local_data_tei = inc_tei(DefaultBearer#gtp_bearer.local_data_tei), sessions = sets:add_element(Sess, State#gtp_state.sessions)}, {Sess, NewSt}. @@ -256,6 +266,15 @@ Sess#gtp_session.bearers), Res. +gtp_session_find_bearer_by_local_teid(Sess, LocalTEID) -> + {LocalTEID, Res} = sets:fold( + fun(BearerIt = #gtp_bearer{ebi = LookupLocalTEID}, {LookupLocalTEID, _AccIn}) -> {LookupLocalTEID, BearerIt}; + (_, AccIn) -> AccIn + end, + {LocalTEID, undefined}, + 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)}. @@ -286,6 +305,47 @@ State#gtp_state.sessions), Res. +% returns Sess if found, undefined it not +find_gtp_session_by_local_teid(LocalControlTeid, State) -> + {LocalControlTeid, Res} = sets:fold( + fun(SessIt = #gtp_session{}, {LookupLTEID, AccIn}) -> + case gtp_session_find_bearer_by_local_teid(SessIt, LookupLTEID) of + undefined -> {LookupLTEID, AccIn}; + _ -> {LookupLTEID, SessIt} + end + end, + {LocalControlTeid, undefined}, + State#gtp_state.sessions), + Res. + +find_unused_local_teic(State, TeicEnd, TeicEnd) -> + case find_gtp_session_by_local_teic(TeicEnd, State) of + undefined -> TeicEnd; + _ -> undefined + end; +find_unused_local_teic(State, TeicIt, TeicEnd) -> + case find_gtp_session_by_local_teic(TeicIt, State) of + undefined -> TeicIt; + _ -> find_unused_local_teic(State, inc_tei(TeicIt), TeicEnd) + end. +find_unused_local_teic(State) -> + find_unused_local_teic(State, State#gtp_state.next_local_control_tei, + dec_tei(State#gtp_state.next_local_control_tei)). + +find_unused_local_teid(State, TeidEnd, TeidEnd) -> + case find_gtp_session_by_local_teid(TeidEnd, State) of + undefined -> TeidEnd; + _ -> undefined + end; +find_unused_local_teid(State, TeidIt, TeidEnd) -> + case find_gtp_session_by_local_teid(TeidIt, State) of + undefined -> TeidIt; + _ -> find_unused_local_teid(State, inc_tei(TeidIt), TeidEnd) + end. +find_unused_local_teid(State) -> + find_unused_local_teid(State, State#gtp_state.next_local_data_tei, + dec_tei(State#gtp_state.next_local_data_tei)). + %% connect/2 connect(Name, {Socket, RemoteAddr, RemotePort}) -> lager:info("~s connecting to IP ~s port ~p~n", [Name, RemoteAddr, RemotePort]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?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: I7262402d14fc53ff17c4000cef385136b8de7e55 Gerrit-Change-Number: 35949 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in ...osmo-epdg[master]: s2b: Take unused local TEIC/TEID when new one is needed
by pespin 12 Feb '24

12 Feb '24
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?usp=email ) Change subject: s2b: Take unused local TEIC/TEID when new one is needed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?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: I7262402d14fc53ff17c4000cef385136b8de7e55 Gerrit-Change-Number: 35949 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Feb 2024 16:27:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in ...osmo-epdg[master]: s2b: Increment gtp SeqNo after transmitting message
by pespin 12 Feb '24

12 Feb '24
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?usp=email ) Change subject: s2b: Increment gtp SeqNo after transmitting message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35948?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: Ia65ef7380f01d080ca05393887661d4af698646a Gerrit-Change-Number: 35948 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: Mon, 12 Feb 2024 16:27:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in ...osmo-epdg[master]: s2b: Use provided APN in CreateSessionReq
by pespin 12 Feb '24

12 Feb '24
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35947?usp=email ) Change subject: s2b: Use provided APN in CreateSessionReq ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35947?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: I9e48c531aec837aade44a8c87d61a67f6bb44ca9 Gerrit-Change-Number: 35947 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: Mon, 12 Feb 2024 16:27:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in ...osmo-epdg[master]: Create pdp context in the tundev
by pespin 12 Feb '24

12 Feb '24
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35944?usp=email ) Change subject: Create pdp context in the tundev ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35944?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: I4e0b3fe0e3e156c9a20df0ab8cdfc447fd9bb1eb Gerrit-Change-Number: 35944 Gerrit-PatchSet: 3 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: Mon, 12 Feb 2024 16:27:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[M] Change in ...osmo-epdg[master]: Use gtp_u_kmod to create a gtp tundev
by pespin 12 Feb '24

12 Feb '24
Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?usp=email ) Change subject: Use gtp_u_kmod to create a gtp tundev ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?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: Ie7718e1b161477bd738fa75f803ab37e9f35121d Gerrit-Change-Number: 35943 Gerrit-PatchSet: 7 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 12 Feb 2024 16:27:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[M] Change in ...osmo-epdg[master]: Use gtp_u_kmod to create a gtp tundev
by pespin 12 Feb '24

12 Feb '24
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Use gtp_u_kmod to create a gtp tundev ...................................................................... Use gtp_u_kmod to create a gtp tundev Adding gtp_u_kmod app in osmo_epdg.app.src makes the module app started and create gtp tunnel based on config file upon startup. No other operation is done yet on the tunnel, but this step already allows testing by manually creating pdp contexts outside of the app. The module gtp_u_kmod currently creates the tundev interface with name "gtp0" (hardcoded). The module gtp_u_kmod will fail if the gtp tundev is already created, so be sure to have it removed before starting osmo-epdg. Change-Id: Ie7718e1b161477bd738fa75f803ab37e9f35121d --- M config/sys.config M debian/osmo-epdg.install M debian/rules M rebar.config M rebar.lock M src/osmo_epdg.app.src 6 files changed, 76 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/43/35943/7 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35943?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: Ie7718e1b161477bd738fa75f803ab37e9f35121d Gerrit-Change-Number: 35943 Gerrit-PatchSet: 7 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset
1 0
0 0
[S] Change in ...osmo-epdg[master]: cosmetic: s2b: Drop done TODO comment
by pespin 12 Feb '24

12 Feb '24
Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35946?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: s2b: Drop done TODO comment ...................................................................... cosmetic: s2b: Drop done TODO comment Change-Id: Idf99168dccc7373ffc75e5871f2ea9516b9854c5 --- M src/epdg_gtpc_s2b.erl 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/46/35946/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35946?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: Idf99168dccc7373ffc75e5871f2ea9516b9854c5 Gerrit-Change-Number: 35946 Gerrit-PatchSet: 2 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-MessageType: newpatchset
1 0
0 0
[M] Change in ...osmo-epdg[master]: s2b: Take unused local TEIC/TEID when new one is needed
by pespin 12 Feb '24

12 Feb '24
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?usp=email ) Change subject: s2b: Take unused local TEIC/TEID when new one is needed ...................................................................... s2b: Take unused local TEIC/TEID when new one is needed Change-Id: I7262402d14fc53ff17c4000cef385136b8de7e55 --- M src/epdg_gtpc_s2b.erl 1 file changed, 78 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/49/35949/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 95c4d10..e795cd2 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -70,9 +70,9 @@ raddr :: inet:ip_address(), rport :: non_neg_integer(), restart_counter :: 0..255, - seq_no :: 0..16#ffffffff, - next_local_control_tei = 1 :: 0..16#ffffffff, - next_local_data_tei = 1 :: 0..16#ffffffff, + seq_no :: 0..16#ffffff, + next_local_control_tei :: 0..16#ffffffff, + next_local_data_tei :: 0..16#ffffffff, sessions = sets:new() :: sets:set() }). @@ -128,7 +128,9 @@ raddr = RemoteAddrInet, rport = RemotePort, restart_counter = 0, - seq_no = 0 + seq_no = rand:uniform(16#FFFFFF), + next_local_control_tei = rand:uniform(16#FFFFFFFE), + next_local_data_tei = rand:uniform(16#FFFFFFFE) }, {ok, St}; {error, Reason} -> @@ -203,19 +205,27 @@ NewSeqNr = State#gtp_state.seq_no +1, State#gtp_state{seq_no = NewSeqNr}. +% Skip 0 +inc_tei(Tei) when Tei >= 16#FFFFFFFE -> 16#00000001; +% Skip 0xffffffff +inc_tei(Tei) -> (Tei + 1) rem 16#FFFFFFFF. + +% Skip 0, 0xffffffff +dec_tei(Tei) when Tei =< 1 -> 16#FFFFFFFE; +dec_tei(Tei) -> (Tei - 1) rem 16#FFFFFFFF. + new_gtp_session(Imsi, SessTpl, State) -> - % TODO: find non-used local TEI inside State DefaultBearer = #gtp_bearer{ ebi = 5, - local_data_tei = State#gtp_state.next_local_data_tei + local_data_tei = find_unused_local_teid(State) }, Sess = SessTpl#gtp_session{imsi = Imsi, - local_control_tei = State#gtp_state.next_local_control_tei, + local_control_tei = find_unused_local_teic(State), 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, + NewSt = State#gtp_state{next_local_control_tei = inc_tei(Sess#gtp_session.local_control_tei), + next_local_data_tei = inc_tei(DefaultBearer#gtp_bearer.local_data_tei), sessions = sets:add_element(Sess, State#gtp_state.sessions)}, {Sess, NewSt}. @@ -256,6 +266,15 @@ Sess#gtp_session.bearers), Res. +gtp_session_find_bearer_by_local_teid(Sess, LocalTEID) -> + {LocalTEID, Res} = sets:fold( + fun(BearerIt = #gtp_bearer{ebi = LookupLocalTEID}, {LookupLocalTEID, _AccIn}) -> {LookupLocalTEID, BearerIt}; + (_, AccIn) -> AccIn + end, + {LocalTEID, undefined}, + 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)}. @@ -286,6 +305,47 @@ State#gtp_state.sessions), Res. +% returns Sess if found, undefined it not +find_gtp_session_by_local_teid(LocalControlTeid, State) -> + {LocalControlTeid, Res} = sets:fold( + fun(SessIt = #gtp_session{}, {LookupLTEID, AccIn}) -> + case gtp_session_find_bearer_by_local_teid(SessIt, LookupLTEID) of + undefined -> {LookupLTEID, AccIn}; + _ -> {LookupLTEID, SessIt} + end + end, + {LocalControlTeid, undefined}, + State#gtp_state.sessions), + Res. + +find_unused_local_teic(State, TeicEnd, TeicEnd) -> + case find_gtp_session_by_local_teic(TeicEnd, State) of + undefined -> TeicEnd; + _ -> undefined + end; +find_unused_local_teic(State, TeicIt, TeicEnd) -> + case find_gtp_session_by_local_teic(TeicIt, State) of + undefined -> TeicIt; + _ -> find_unused_local_teic(State, inc_tei(TeicIt), TeicEnd) + end. +find_unused_local_teic(State) -> + find_unused_local_teic(State, State#gtp_state.next_local_control_tei, + dec_tei(State#gtp_state.next_local_control_tei)). + +find_unused_local_teid(State, TeidEnd, TeidEnd) -> + case find_gtp_session_by_local_teid(TeidEnd, State) of + undefined -> TeidEnd; + _ -> undefined + end; +find_unused_local_teid(State, TeidIt, TeidEnd) -> + case find_gtp_session_by_local_teid(TeidIt, State) of + undefined -> TeidIt; + _ -> find_unused_local_teid(State, inc_tei(TeidIt), TeidEnd) + end. +find_unused_local_teid(State) -> + find_unused_local_teid(State, State#gtp_state.next_local_data_tei, + dec_tei(State#gtp_state.next_local_data_tei)). + %% connect/2 connect(Name, {Socket, RemoteAddr, RemotePort}) -> lager:info("~s connecting to IP ~s port ~p~n", [Name, RemoteAddr, RemotePort]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35949?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: I7262402d14fc53ff17c4000cef385136b8de7e55 Gerrit-Change-Number: 35949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • ...
  • 175
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.