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

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on inner layer

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email ) Change subject: kernel-gtp: support IPv6 on inner layer ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/33797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I3df47b6c209f1e2f8254ba139581d6e622c6b35f Gerrit-Change-Number: 33797 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 09:41:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36031?usp=email ) Change subject: kernel-gtp: support IPv6 on outer layer ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I257fff1dcd9d030a7f9ea936b2693a3f13208230 Gerrit-Change-Number: 36031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 09:40:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: gtp_new: deduplicate create_and_bind_socket code

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36030?usp=email ) Change subject: gtp_new: deduplicate create_and_bind_socket code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Iff3cfdfb0c08033d869c51499754b3416c71732b Gerrit-Change-Number: 36030 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 09:39:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: README.md: Major update with the usual information

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36054?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: README.md: Major update with the usual information ...................................................................... README.md: Major update with the usual information Let's convert the README.md to actual markdown syntax and add the usual information such as project homepage, git repository, etc. Change-Id: I0e1d69e297095f59d27eb176db4b58f4d13361bc --- M README.md 1 file changed, 85 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/54/36054/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36054?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: I0e1d69e297095f59d27eb176db4b58f4d13361bc Gerrit-Change-Number: 36054 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: README.md: Major update with the usual information

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36054?usp=email ) Change subject: README.md: Major update with the usual information ...................................................................... README.md: Major update with the usual information Let's convert the README.md to actual markdown syntax and add the usual information such as project homepage, git repository, etc. Change-Id: I0e1d69e297095f59d27eb176db4b58f4d13361bc --- M README.md 1 file changed, 69 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/54/36054/1 diff --git a/README.md b/README.md index d425efc..8f964dc 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,63 @@ -= osmo-ePDG = +osmo-ePDG +========= -Implement an ePDG with an embedded AAA server. -osmo-ePDG also requires a modify strongswan. +This project is about the implementation of an ePDG (evolved Packet Data Gateway) +within the 3GPP EPC (Evolved Packet Core) architecture. It is part of the +[Osmocom](https://osmocom.org/) Open Source Mobile Communications project. -* [UE] <-> [strongswan] <-> [osmo-ePDG] <> [HSS] - <> [PGW] +The ePDG is what your smartphone talks to when performing so-called VoWiFi calls. -== Building == +This repostory contains the code implementing the signaling/control plane of +the ePDG functionality, together with an embedded AAA server. + +osmo-epdg requires the [Linux kernel GTP-U](https://osmocom.org/projects/linux-kernel-gtp-u/wiki) +as well as a [modified strongwan](https://gitea.osmocom.org/ims-volte-vowifi/strongswan/src/branch… + + [UE] <-> [strongswan] <-> [osmo-ePDG] <> [HSS] + <> [PGW] + + +Homepage +-------- + +For more information, please see the [osmo-epdg homepage](https://osmocom.org/projects/osmo-epdg/wiki/) and more +specifically the [osmo-epdg implementation plan](https://osmocom.org/projects/osmo-epdg/wiki/EPDG_implementation_plan) + + +GIT Repository +-------------- + +You can clone from the official osmo-bsc.git repository using + + git clone https://gitea.osmocom.org/erlang/osmo-epdg + +There is a web interface at <https://gitea.osmocom.org/erlang/osmo-epdg> + + +Documentation +------------- + +Once the project reaches a usable milestone, we will be working on a +user manual. Stay tuned. + + +Contributing +------------ + +Our coding standards are described at +<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards> + +We us a gerrit based patch submission/review process for managing +contributions. Please see +<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for +more details + +The current patch queue for osmo-bsc can be seen at +<https://gerrit.osmocom.org/#/q/project:osmo-epdg+status:open> + + +Building +-------- Install erlang and rebar3 packages (not "rebar", that's version 2! You may need to compile it from source in some distros). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36054?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: I0e1d69e297095f59d27eb176db4b58f4d13361bc Gerrit-Change-Number: 36054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: Use osmocom gtplib pointing to newer version of code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36052?usp=email ) Change subject: Use osmocom gtplib pointing to newer version of code ...................................................................... Use osmocom gtplib pointing to newer version of code Change-Id: Iaf2e195aaeac6d1b157a4b0dd6cd3d80deaa1308 --- M rebar.config M rebar.lock 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/52/36052/1 diff --git a/rebar.config b/rebar.config index 8541410..1dd0b08 100644 --- a/rebar.config +++ b/rebar.config @@ -4,7 +4,7 @@ {deps, [ {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.2"}}}, - {gtplib, "3.2.0"}, + {gtplib, {git, "https://github.com/osmocom/gtplib", {branch, "osmocom/master"}}}, {gtp_u_kmod, {git, "https://github.com/osmocom/gtp_u_kmod", {branch, "osmocom/master"}}}, {osmo_ss7, {git, "https://gitea.osmocom.org/erlang/osmo_ss7", {ref, "9f294d3612f998860004820d1d85b4264721577b"}}}, {osmo_gsup, {git, "https://gerrit.osmocom.org/erlang/osmo_gsup", {branch, "osmocom/epdg"}}} diff --git a/rebar.lock b/rebar.lock index 0a492b3..f300534 100644 --- a/rebar.lock +++ b/rebar.lock @@ -21,21 +21,24 @@ {git,"https://github.com/osmocom/gtp_u_kmod", {ref,"b3656ebb11528a2db3171dbf94f1a8bf0d6ffd00"}}, 0}, - {<<"gtplib">>,{pkg,<<"gtplib">>,<<"3.2.0">>},0}, + {<<"gtplib">>, + {git,"https://github.com/osmocom/gtplib", + {ref,"4a1458bed784693cabf1edbea9712f2201f2e7ca"}}, + 0}, {<<"lager">>, {git,"https://github.com/erlang-lager/lager", {ref,"459a3b2cdd9eadd29e5a7ce5c43932f5ccd6eb88"}}, 0}, {<<"osmo_gsup">>, {git,"https://gerrit.osmocom.org/erlang/osmo_gsup", - {ref,"1391d074f610e736368319d56fd958fa36e3addf"}}, + {ref,"25ace76f98f7f931691fb02d86667062b4f2c8ad"}}, 0}, {<<"osmo_ss7">>, {git,"https://gitea.osmocom.org/erlang/osmo_ss7", {ref,"9f294d3612f998860004820d1d85b4264721577b"}}, 0}, {<<"parse_trans">>, - {git,"https://github.com/uwiger/parse_trans", + {git,"https://github.com/uwiger/parse_trans.git", {ref,"d99fb36755c813a5db23e6f93741aa58323ef911"}}, 1}, {<<"pkt">>, @@ -47,11 +50,9 @@ {pkg_hash,[ {<<"cut">>, <<"1577F2F3BC0F2BF3B97903B7426F8A3D79523687B6A444D0F59A095EF69A0E81">>}, {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}, - {<<"gtplib">>, <<"41E8E14BE21DD6E08B2CBB9D708BCF8FDD47CA49D7FFA480219CAB29F5AE2760">>}, {<<"ppplib">>, <<"F9EC2690532BAF590277A305A2276FCFAD0285557E1055552F8A2FCAF1BF081A">>}]}, {pkg_hash_ext,[ {<<"cut">>, <<"1A4A25DB2B7C5565FD28B314A4EEB898B1ED3CAFFA1AB09149345FB5731ED04B">>}, {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>}, - {<<"gtplib">>, <<"264626E6993C17B00CA3C083B9BF23D16B88BEEDDDE35F62C954832C21B57AEF">>}, {<<"ppplib">>, <<"32440D630F55DD29F849847DD8F15F69175FDDC210AA88517AC8AD2854CD6FA1">>}]} ]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36052?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: Iaf2e195aaeac6d1b157a4b0dd6cd3d80deaa1308 Gerrit-Change-Number: 36052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: s2b: Reorder some CreateSessionReq according to spec

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36051?usp=email ) Change subject: s2b: Reorder some CreateSessionReq according to spec ...................................................................... s2b: Reorder some CreateSessionReq according to spec Change-Id: I5f9d4de12038cc3627bf6341ae1cf4d3655a5251 --- M src/epdg_gtpc_s2b.erl 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/51/36051/1 diff --git a/src/epdg_gtpc_s2b.erl b/src/epdg_gtpc_s2b.erl index 309ed79..f635036 100644 --- a/src/epdg_gtpc_s2b.erl +++ b/src/epdg_gtpc_s2b.erl @@ -482,8 +482,10 @@ ipv4 = conv:ip_to_bin(LocalAddrGtpu) } ], - IEs = [#v2_recovery{restart_counter = RCnt}, - #v2_international_mobile_subscriber_identity{imsi = Imsi}, + IEs = [#v2_international_mobile_subscriber_identity{imsi = Imsi}, + #v2_serving_network{ + plmn_id = gtp_utils:plmn_to_bin(?MCC, ?MNC, ?MNC_SIZE) + }, #v2_rat_type{rat_type = 3}, %% 3 = WLAN #v2_fully_qualified_tunnel_endpoint_identifier{ instance = 0, @@ -495,9 +497,7 @@ #v2_selection_mode{mode = 0}, #v2_pdn_address_allocation{type = ipv4, address = <<0,0,0,0>>}, #v2_bearer_context{group = BearersIE}, - #v2_serving_network{ - plmn_id = gtp_utils:plmn_to_bin(?MCC, ?MNC, ?MNC_SIZE) - } + #v2_recovery{restart_counter = RCnt} ], #gtp{version = v2, type = create_session_request, tei = 0, seq_no = SeqNo, ie = IEs}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36051?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: I5f9d4de12038cc3627bf6341ae1cf4d3655a5251 Gerrit-Change-Number: 36051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gsup_server: Log rx of all GSUP messages

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36050?usp=email ) Change subject: gsup_server: Log rx of all GSUP messages ...................................................................... gsup_server: Log rx of all GSUP messages Change-Id: I348e20f65e8bdb713819256615a84292ed4e9833 --- M src/gsup_server.erl 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/50/36050/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 6bb98ee..0af015c 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -228,6 +228,7 @@ % send auth info / requesting authentication tuples handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> + lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), case maps:find(pdp_info_list, GsupMsgRx) of {ok, [PdpInfo]} -> #{pdp_context_id := _PDPCtxId, @@ -258,7 +259,8 @@ % location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request % FIXME: add APN instead of hardcoded internet -handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}}, State) -> +handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, GsupMsgRx = #{message_type := location_upd_req, imsi := Imsi}}, State) -> + lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), UE = find_gsups_ue_by_imsi(Imsi, State), case UE of #gsups_ue{imsi = Imsi} -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36050?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: I348e20f65e8bdb713819256615a84292ed4e9833 Gerrit-Change-Number: 36050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: gsup: Add PCO IE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36049?usp=email ) Change subject: gsup: Add PCO IE ...................................................................... gsup: Add PCO IE This commit adds a new file PCO_Types.ttcn which allows generically encoding decoding PCOs. Change-Id: I9a1ae74712d6e8e0cd524ccd7fc2529b1a15dd97 --- M dia2gsup/gen_links.sh M epdg/EPDG_Tests.ttcn M epdg/gen_links.sh M hlr/gen_links.sh M library/GSUP_Templates.ttcn M library/GSUP_Types.ttcn A library/PCO_Types.ttcn M msc/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh 10 files changed, 181 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/36049/1 diff --git a/dia2gsup/gen_links.sh b/dia2gsup/gen_links.sh index e343bd2..d653781 100755 --- a/dia2gsup/gen_links.sh +++ b/dia2gsup/gen_links.sh @@ -40,7 +40,7 @@ FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " -FILES+="GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 2ad1b32..ff026cf 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -8,6 +8,7 @@ import from DNS_Helpers all; import from IPA_Emulation all; +import from PCO_Types all; import from GSUP_Types all; import from GSUP_Templates all; import from GSUP_Emulation all; @@ -600,7 +601,8 @@ /* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response. */ private function f_GSUP_EPDGTunnel_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; - GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi)); + var template (value) PCO_DATA pco := ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); + GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi, pco)); as_GTP2C_CreateSession_success(); /* Expect a positive response back to the translator; */ var template (present) GSUP_IEs pdp_info := { diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index c8eadc8..f981586 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -46,7 +46,7 @@ FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " -FILES+="GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " gen_links $DIR $FILES diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 52e01ba..e3a64d9 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -45,7 +45,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " -FILES+="GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 10c682c..d886088 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -17,6 +17,7 @@ import from General_Types all; import from Osmocom_Types all; +import from PCO_Types all; import from GSUP_Types all; function f_gsup_postprocess_decoded(inout GSUP_PDU gsup) { @@ -292,6 +293,14 @@ } } +template (value) GSUP_IE ts_GSUP_IE_PCO(template (value) PCO_DATA pco) := { + tag := OSMO_GSUP_PCO_IE, + len := 0, + val := { + pco := pco + } +} + template GSUP_PDU tr_GSUP(template GSUP_MessageType msgt := ?, template GSUP_IEs ies := *) := { msg_type := msgt, ies := ies @@ -496,11 +505,13 @@ /* EPDG Tunnel */ template (value) GSUP_PDU ts_GSUP_EPDGTunnel_REQ(hexstring imsi, + template (value) PCO_DATA pco, GSUP_Message_Class message_class := OSMO_GSUP_MESSAGE_CLASS_IPSEC_EPDG, GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS, template (omit) octetstring source_name := omit) := ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST, f_gen_ts_ies(imsi, message_class := message_class, + pco := pco, dom := dom, source_name := source_name)); @@ -1170,6 +1181,7 @@ template (omit) boolean pdp_info_compl := omit, template (omit) GSUP_Message_Class message_class := omit, template (omit) hexstring imei := omit, + template (omit) PCO_DATA pco := omit, template (omit) GSUP_CnDomain dom := omit, template (omit) octetstring source_name := omit, template (omit) octetstring destination_name := omit @@ -1190,6 +1202,10 @@ ies := ies & { valueof(ts_GSUP_IE_IMEI(valueof(imei))) }; } + if (isvalue(pco)) { + ies := ies & { valueof(ts_GSUP_IE_PCO(valueof(pco))) }; + } + if (isvalue(message_class)) { ies := ies & { valueof(ts_GSUP_IE_Message_Class(valueof(message_class))) }; } diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 0bab1d6..078347e 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -17,6 +17,7 @@ import from General_Types all; import from Osmocom_Types all; +import from PCO_Types all; type enumerated GSUP_IEI { OSMO_GSUP_IMSI_IE ('01'O), @@ -33,6 +34,7 @@ OSMO_GSUP_ACCESS_POINT_NAME_IE ('12'O), OSMO_GSUP_PDP_QOS_IE ('13'O), OSMO_GSUP_CHARG_CHAR_IE ('14'O), + OSMO_GSUP_PCO_IE ('15'O), OSMO_GSUP_RAND_IE ('20'O), OSMO_GSUP_SRES_IE ('21'O), @@ -257,10 +259,11 @@ hlr_number, tag = OSMO_GSUP_HLR_NUMBER_IE; cn_domain, tag = OSMO_GSUP_CN_DOMAIN_IE; pdp_info, tag = OSMO_GSUP_PDP_INFO_IE; + pdp_address, tag = OSMO_GSUP_PDP_ADDRESS_IE; apn, tag = OSMO_GSUP_ACCESS_POINT_NAME_IE; pdp_qos, tag = OSMO_GSUP_PDP_QOS_IE; - pdp_address, tag = OSMO_GSUP_PDP_ADDRESS_IE; charg_char, tag = OSMO_GSUP_CHARG_CHAR_IE; + pco, tag = OSMO_GSUP_PCO_IE; pdp_ctx_id, tag = OSMO_GSUP_PDP_CONTEXT_ID_IE; session_state, tag = OSMO_GSUP_SESSION_STATE_IE; session_id, tag = OSMO_GSUP_SESSION_ID_IE; @@ -323,6 +326,7 @@ octetstring pdp_qos, GSUP_PDP_Address pdp_address, octetstring charg_char, + PCO_DATA pco, /* Session information */ GSUP_SessionState session_state, OCT4 session_id, diff --git a/library/PCO_Types.ttcn b/library/PCO_Types.ttcn new file mode 100644 index 0000000..22b475a --- /dev/null +++ b/library/PCO_Types.ttcn @@ -0,0 +1,139 @@ +module PCO_Types { + +/* PCO_Types, defining abstract TTCN-3 data types for the Protocol Configuration Options (PCO). + * + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +/* 3GPP TS 24.008 10.5.6.3, 3GPP TS 29.060 7.7.31 */ + +import from General_Types all; +import from Osmocom_Types all; + +type enumerated PCO_P { + PCO_P_LCP ('C021'O), + PCO_P_PAP ('C023'O), + PCO_P_CHAP ('C223'O), + PCO_P_IPCP ('8021'O), + PCO_P_PCSCF_ADDR ('0001'O), + PCO_P_IM_CN_SS_F ('0002'O), + PCO_P_DNS_IPv6_ADDR ('0003'O), + PCO_P_POLICY_CTRL_REJ ('0004'O), /* only in Network->MS */ + PCO_P_MS_SUP_NETREQ_BCI ('0005'O), + /* reserved */ + PCO_P_DSMIPv6_HA_ADDR ('0007'O), + PCO_P_DSMIPv6_HN_PREF ('0008'O), + PCO_P_DSMIPv6_v4_HA_ADDR ('0009'O), + PCO_P_IP_ADDR_VIA_NAS ('000a'O), /* only MS->Network */ + PCO_P_IPv4_ADDR_VIA_DHCP ('000b'O), /* only MS->Netowrk */ + PCO_P_PCSCF_IPv4_ADDR ('000c'O), + PCO_P_DNS_IPv4_ADDR ('000d'O), + PCO_P_MSISDN ('000e'O), + PCO_P_IFOM_SUPPORT ('000f'O), + PCO_P_IPv4_LINK_MTU ('0010'O), + PCO_P_MS_SUPP_LOC_A_TFT ('0011'O), + PCO_P_PCSCF_RESEL_SUP ('0012'O), /* only MS->Network */ + PCO_P_NBIFOM_REQ ('0013'O), + PCO_P_NBIFOM_MODE ('0014'O), + PCO_P_NONIP_LINK_MTU ('0015'O), + PCO_P_APN_RATE_CTRL_SUP ('0016'O), + PCO_P_PS_DATA_OFF_UE ('0017'O), + PCO_P_REL_DATA_SVC ('0018'O) +} with { variant "FIELDLENGTH(16)"; + variant "BYTEORDER(last)" }; + +/* RFC 1332 IP Control Protocol options, extensions in RFC 1877 */ +type enumerated IPCP_OPT { + IPCP_OPT_IPADDR (3), /* RFC 1332 3.3 */ + IPCP_OPT_PRIMARY_DNS (129), /* RFC 1877 1.1 */ + IPCP_OPT_SECONDARY_DNS (131) /* RFC 1877 1.2 */ +} with { variant "FIELDLENGTH(8)" }; + +/* RFC 1334, section 3.2. Packet Format */ +type enumerated PAP_CODE_ { + PAP_CODE__IPADDR (1), + PAP_CODE__PRIMARY_DNS (2), + PAP_CODE__SECONDARY_DNS (3) +} with { variant "FIELDLENGTH(8)" }; + +type set of ProtocolElement ProtocolIDList; + +type record ProtocolElement { + PCO_P protocolID, + uint8_t lengthProtoID, + octetstring protoIDContents +} with { variant (lengthProtoID) "LENGTHTO(protoIDContents)" }; + +type record PCO_DATA { + BIT1 extension0, + BIT4 spare, + BIT3 configProtocol, + ProtocolIDList protocols +}; + +external function enc_PCO_DATA(in PCO_DATA pco_data) return octetstring +with { extension "prototype(convert)" extension "encode(RAW)" } + +external function dec_PCO_DATA(in octetstring pco_payload) return PCO_DATA +with { extension "prototype(convert) decode(RAW)" }; + +/********************** + * PCO_Templates: + **********************/ + +template (value) ProtocolElement ts_PCO_P_OCTSTR(template (value) PCO_P protocolID, + template (value) uint8_t lengthProtoID := 0, + template (value) octetstring protoIDContents := ''O) +:= { + protocolID := protocolID, + lengthProtoID := lengthProtoID, + protoIDContents := protoIDContents +} + +template (present) ProtocolElement tr_PCO_P_OCTSTR(template (present) PCO_P protocolID := ?, + template (present) uint8_t lengthProtoID := ?, + template (present) octetstring protoIDContents := ?) +:= { + protocolID := protocolID, + lengthProtoID := lengthProtoID, + protoIDContents := protoIDContents +} + + +template (value) ProtocolElement ts_PCO_P_DNS_IPv4(template (value) octetstring dns4 := ''O) := + ts_PCO_P_OCTSTR(PCO_P_DNS_IPv4_ADDR, protoIDContents := dns4); + +template (value) ProtocolElement ts_PCO_P_DNS_IPv6(template (value) octetstring dns6 := ''O) := + ts_PCO_P_OCTSTR(PCO_P_DNS_IPv6_ADDR, protoIDContents := dns6); + +template (value) ProtocolElement ts_PCO_P_PCSCF_IPv4(template (value) octetstring pcscf4 := ''O) := + ts_PCO_P_OCTSTR(PCO_P_PCSCF_IPv4_ADDR, protoIDContents := pcscf4); + +template (value) ProtocolElement ts_PCO_P_PCSCF_IPv6(template (value) octetstring pcscf6 := ''O) := + ts_PCO_P_OCTSTR(PCO_P_PCSCF_ADDR, protoIDContents := pcscf6); + +/* PCO send base template */ +template (value) PCO_DATA ts_PCO(template (value) ProtocolIDList protocols := {}) := { + extension0 := '1'B, + spare := '0000'B, + configProtocol := '000'B, + protocols := protocols +} +/* PCO receive base template */ +template (present) PCO_DATA tr_PCO(template (present) ProtocolIDList protocols := ?) := { + extension0 := '1'B, + spare := ?, + configProtocol := '000'B, + protocols := protocols +} + +template (value) PCO_DATA ts_PCO_IPv4_DNS(template (value) octetstring dns4 := ''O) := + ts_PCO({ ts_PCO_P_DNS_IPv4(dns4) }); + +} with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 8577208..8463976 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -94,7 +94,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " -FILES+="GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn L3_Common.ttcn " FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 23201a8..1a3bbe1 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -39,7 +39,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn GSUP_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn RSL_Types.ttcn BSSAP_CodecPort.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn PCO_Types.ttcn GSUP_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index afe6b02..3aa2d38 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -92,7 +92,7 @@ FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " -FILES+="GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " +FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36049?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: I9a1ae74712d6e8e0cd524ccd7fc2529b1a15dd97 Gerrit-Change-Number: 36049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: update osmocom-bb submodule

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email ) Change subject: ms: update osmocom-bb submodule ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0140f0a5333469f356c85a95660e10bbdd67cd25 Gerrit-Change-Number: 36048 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 21 Feb 2024 18:43:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024