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

[M] Change in ...osmo-epdg[master]: Bump version: 0.1.1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39026?usp=email ) Change subject: Bump version: 0.1.1 ...................................................................... Bump version: 0.1.1 Prepare a release to fix the build with newer erlang versions for the osmocom:latest repository too. Fill out the missing changelog for 0.1.0 while at it. Fixes: OS#6661 Change-Id: I34615dd880ded0f17cd6dc5f8fe3a69eda046fe4 --- M debian/changelog 1 file changed, 208 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/26/39026/1 diff --git a/debian/changelog b/debian/changelog index a551727..4f9ad76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,211 @@ +osmo-epdg (0.1.1) unstable; urgency=medium + + [ Harald Welte ] + * add notice about NLnet found ation to README.md + * README.md: Use NLnet suggested language for funding acknowledgement + * README.md: Update user manual section; we now have one. + + [ Oliver Smith ] + * rebar.lock: update gtplib commit + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 04 Dec 2024 15:24:46 +0100 + +osmo-epdg (0.1.0) unstable; urgency=medium + + [ Oliver Smith ] + * gitreview: new file + * debian/source/format: new file + * debian/rules: extract build_dep.tar.gz first + + [ Pau Espin Pedrol ] + * Fix typo in osmo_epdg.app.src + + [ Alexander Couzens ] + * add general project files + + [ Pau Espin Pedrol ] + * osmo_epdg_app: Log app started + * cosmetic: gsup_client: Fix indentation + + [ Alexander Couzens ] + * epdg_diameter_swx: fix SAR message + + [ Pau Espin Pedrol ] + * cosmetic: epdg_diameter_swx.erl: Indentation fixes + * Initial GSUP server support + * Initial GSUP Auth handler support + * epdg_diameter_swx: parse the result code of the MAA + * gsup_server: call the server_assignment_request() on location update request + * Several fixes and improvement around env config use + * Add config envvars to change GSUP server listen IP addr and port + * osmo_epdg_app: Fix formatting error in log string + * diameter_swx: Fix MAA and SAA parsing mixed + * README.md: Fix path to config file + * Makefile: pass config file to 'make run' + * Makefile: Add shell target + * diameter_3gpp_ts29_273_swx.dia: Fix whitespace + * Makefile: run 'rebar3 clean' upon make clean + * Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp + * diameter: Add spec definitions for S6b (TS 28.273 and dep RFC 5777) + * Initial S6b support + * Fix sysmocom copyright typo + * s2b: Implement GTPv2C DeleteBearerReq + + [ Alexander Couzens ] + * dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA + * dia: 3gpp_ts29_273_s6b: add missing include of rfc4004 + * epdg_gtpc_s2b: add TLV Serving Network + * epdg_gtpc_s2b: fix encoding of the IP address + + [ Pau Espin Pedrol ] + * gsup_server: Remove incorrect log about reconnecting + * gsup_server: Improve log line when listening on gsup + * diameter: Allow configuring (re)connect timer in s6b and swx + * diameter: Make diameter_watchdog_config configurable + * swx: Rename diameter related parameters + * cosmetic: sys.config: Clean up formatting of logging section + * Update osmo_gsup dependency in rebar.config and update rebar.lock + * Forward IP Address from CreateSessionresponse in GSUP EPDG Tunnel Result + * Introduce ue_fsm + * Make CreateSession Req+Resp procedure async + * gsup_server: Use new GSUP Cause defines from osmo_gsup + * gsup_server: Introduce tx_gsup() internal function + * Use call() instead of cast() in ue_fsm + * Implement UE-initiated Detach + * Rename s/ue_fsm/epdg_ue_fsm/g + * s6b: Answer Diameter STR with STA + * Rename s/epdg_diameter_swx/aaa_diameter_swx + * Split auth_handler module into SWm files for ePDG and AAA Server + * Make SWm MAR+MAA asynchronous + * s6b: Trigger SAR towards HSS when receiving AAR from PGW + * Make Auth Compl procedure more similar to specs + * UE-initiated detach: Do STR+STA ePDG<->AAA-Server + * AAA-Server: Process S6b, SWx requests async through new aaa_ue_fsm + * Send SAR(DEREGISTRATION) to HSS when all sessions are terminated + * aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE + * epdg: Do SWm STR+STA upon rx of Delete Bearer Req + * epdg: Do CEAI CancelLocationReq upon rx of S2B Delete Bearer Req + * s2b: Session can contain several bearers + * s2b: Answer CreateBearerReq with CreateBearerResp + * Fix all sets() lookup functions + * epdg_ue_fsm: Terminate UE FSM when reciving STA from AAA-Server + * AAA-Server: Convert binary Imsi coming from internal SWm to string + * gsup_server: Log error if epdg_ue_fsm:auth_request() fails + * gsup_server: Delete session if initial auth failed + * AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module + * gsup_server: Fix removal of session from set + * epdg_diameter_swm: Update PID if session already exists + * epdg_ue_fsm: Introduce public function to get pid from imsi + + [ Alexander Couzens ] + * diameter: rfc7155: move Framed-* AVP into a separate file + * GTPv2/S2b: use correct instance id in the F-TEID + + [ Pau Espin Pedrol ] + * Make PDP-Type and APN from GSUP AuthInfoReq available through all layers + * Add defines for PDP Address Type Nr + * Keep gtp2c specificities in its module file + * Create PDP Context in tunnel after rx S6b CreateSessionResp + * config: Drop unused sasl section + * gsup_server: Allow receiveing AuthInfo without PdpInfo + * Expect NAI instead of Imsi in S6b AAR + * s2b: Fix FTEID interface in CreateSessionResponse + * Use gtp_u_kmod to create a gtp tundev + * Create pdp context in the tundev + * cosmetic: s2b: Drop done TODO comment + * s2b: Use provided APN in CreateSessionReq + * s2b: Increment gtp SeqNo after transmitting message + * s2b: Take unused local TEIC/TEID when new one is needed + * epdg_ue_fsm: Allow re-auth procedure + * epdg_ue_fsm: Move s2b CreateSession to its own state + * gtp_u_tun: Fix call to gtp_u_kmod create_pdp_context + * epdg_ue_fsm: Add new state 'active' + * Delete PDP Context when moving out of active state + * config: Do not set up VRF + * s2b: Announce proper GTPU Local Address during CreateSessionReq + * Send correct APN in GSUP CEAI Tunnel Response + * rebar.lock: Update after dependency fixes/updates + * debian: Fixes in systemd service + + [ Harald Welte ] + * README.md: Major update with the usual information + + [ Pau Espin Pedrol ] + * gsup_server: Log rx of all GSUP messages + * s2b: Reorder some CreateSessionReq according to spec + * Use osmocom gtplib pointing to newer version of code + * Forward PCO from GSUP ePDG Tunnel Req to SMF CreateSessionRequest + * Update osmo_ss7 to gerrit remote with latest patches + * s2b: Spawn process for each received packet + * s2b: Handle CreateSession with failed Cause + * epdg_ue_fsm: Increase timeout waiting for gtp response + * aaa_diameter_swx_cb.erl: Fix undef handle_error/5 + * aaa_diameter_swx: Make tx timeout configurable and increase default to 10 seconds + * epdg_ue_fsm.erl: Log unexpected event + * Forward PGW Address HSS->AAA->ePDG + * diameter_3gpp_ts29_273_swx.dia: Fix missing dependency RFC4004 + * Forward PGW Address PGW->AAA->HSS + * Avoid propagating full diameter Swx MAA message to epdg gsup module + * gsups_server: Monitor epdg_ue_fsm instead of linking it + * epdg_ue_fsm: Allow UE restarting authentication + * Forward failure SWx MAA -> GSUP AuthInfo Error + * aaa_ue_fsm: Fix format error during log + * Migrate S6b to use new epdg_dia_rc record + * Move spawn_wait_ret() to a new misc.erl file + * gsup_server: Move rx_gsup path to its own function + * gsup_server: Look up epdg_ue_fsm process each time it needs to be accessed + * gsup_server: Spawn one process per rx message + * Implement sim auth resync + * cosmetic: diameter_3gpp_ts29_229.dia: Fix trailing whitespace + * diameter_3gpp_ts29_229.dia: Fix enum Reason-Code not defined + * aaa_diameter_swm: Look up aaa_ue_fsm process each time it needs to be accessed + * AAA: Swx: Answer RTR with RTA + * aaa_diameter_s6b.erl: Get rid of unused code + * epdg_ue_fsm: Fix order of params in stop_and_reply + * gsup_server: Fix format error in log line + * jenkins.sh: use available Makefile, clean before building + * rebar.config: Update required OTP version 25.2.3 + * Implement RTR Deregistration-Reason PERMANENT_TERMINATION + * SWx: Answer PPR with PPA + * aaa_ue_fsm: Separate states using comment blocks + * {aaa,epdg}_diameter_swm: Prepend tx/rx to identify direction + * aaa_ue_fsm: Prepend rx_ prefix to SWm events missing it + * Propagate SWx PPR as SWm Authorization Update towards ePDG + * dia/diameter_3gpp_ts29_273_s6b.dia: Fix missing whitespace + * Propagate SWx PPR as S6b Re-Auth-Request + * epdg_diameter_swm: Fix typo in log line + * epdg_diameter_swm: Look up epdg_ue_fsm process each time it needs to be accessed + * Rename code paths Tx/Rx of Diameter Swm DER/DEA + * epdg_diameter_swm: Rename gen_server events to easily identify direction + * epdg_diameter_swm: Convert Tx calls to casts + * epdg: Tx SWm RAA from within epdg_ue_fsm + * epdg: Trigger AAR+AAA upon rx of RAR + * epdg_ue_fsm: Properly define type of field in record + + [ Alexander Couzens ] + * docs: add basic manual of the osmo-epdg + * docs: add chapter operating + * docs: add acknowledgement to nlnet for funding this project + + [ Oliver Smith ] + * contrib/systemd: use StateDirectory + * contrib/systemd: run as osmocom user + + [ Vadim Yanitskiy ] + * README.md: fix copy-pasted 'osmo-bsc' and a broken link + + [ Oliver Smith ] + * contrib/jenkins_manuals: new file + * gitignore: add manuals related + * debian: add oemo-epdg-doc subpackage + + [ Harald Welte ] + * add COPYING file with the license (and the additional terms) + * add license header to source files where it's missing + * use https instead of http for all URLs + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 04 Dec 2024 15:24:23 +0100 + osmo-epdg (0.0.0) unstable; urgency=medium Initial -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39026?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I34615dd880ded0f17cd6dc5f8fe3a69eda046fe4 Gerrit-Change-Number: 39026 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in ...osmo-epdg[master]: rebar.lock: update gtplib commit

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39025?usp=email ) Change subject: rebar.lock: update gtplib commit ...................................................................... rebar.lock: update gtplib commit Let the commit point at the tree that was just rebased, so building with a newer erlang version on debian unstable is fixed. Fix for: [ 619s] ===> Compiling _checkouts/gtplib/src/gtp_packet.erl failed [ 619s] gtp_packet.erl:252:1: syntax error before: 'maybe' Fixes: OS#6661 Change-Id: I44bd92b9d9ca90fe396d85f67a064cba08b3f6c3 --- M rebar.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/25/39025/1 diff --git a/rebar.lock b/rebar.lock index ab13202..cd1bc6e 100644 --- a/rebar.lock +++ b/rebar.lock @@ -23,7 +23,7 @@ 0}, {<<"gtplib">>, {git,"https://github.com/osmocom/gtplib", - {ref,"526a7e5d6ba4e76aaae87c31421f26a71dd79d33"}}, + {ref,"08781f86f340aeaa4708166bfbeccf754217023e"}}, 0}, {<<"lager">>, {git,"https://github.com/erlang-lager/lager", -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/39025?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I44bd92b9d9ca90fe396d85f67a064cba08b3f6c3 Gerrit-Change-Number: 39025 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: Remove rspro_client.c which is not used anyway

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email ) Change subject: Remove rspro_client.c which is not used anyway ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/rspro_client_fsm.h: https://gerrit.osmocom.org/c/osmo-remsim/+/39021/comment/dea8f2e3_fff7f3f7?… : PS2, Line 23: struct osmo_rspro_client { > it seems you're correct. To be honest, I don't recall by now why this was implemented.... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3bacae853101a79804553175ebd4482acb188597 Gerrit-Change-Number: 39021 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 14:06:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-remsim[master]: Fix uninitialized return value

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39022?usp=email ) Change subject: Fix uninitialized return value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39022?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If90892ff6e00be38cea6f6d3161bf2386351bb21 Gerrit-Change-Number: 39022 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 14:05:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Assert explicitly about non-null ptr

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39024?usp=email ) Change subject: ipaccess: Assert explicitly about non-null ptr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I78b570f67002d6ebb32c6e6b3b521f4379239bc5 Gerrit-Change-Number: 39024 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 14:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-hlr[master]: gsup_client: Avoid double memset 0

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39006?usp=email ) Change subject: gsup_client: Avoid double memset 0 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I66515fc893ffc64a36abedc01a75b57aed7e932d Gerrit-Change-Number: 39006 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 14:02:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-hlr[master]: gsup_client: Avoid double memset 0

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39006?usp=email ) Change subject: gsup_client: Avoid double memset 0 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS2: > Oh nice, now with the new suggested approach tests are failing here. […] Looks more like a sporadic failure. I cannot reproduce it locally and don't see how it can be the cause. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I66515fc893ffc64a36abedc01a75b57aed7e932d Gerrit-Change-Number: 39006 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Dec 2024 14:02:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-remsim[master]: Remove rspro_client.c which is not used anyway

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Remove rspro_client.c which is not used anyway ...................................................................... Remove rspro_client.c which is not used anyway rspro_client.c was already removed ~6 years ago in 511c51313d4b1994eaa5faebcf01e8e24fb8b5a5, so those APIs where not really implemented and hence used. Remove the header. Related: OS#5896 Change-Id: I3bacae853101a79804553175ebd4482acb188597 --- M debian/libosmo-rspro-dev.install M include/osmocom/rspro/Makefile.am D include/osmocom/rspro/rspro_client.h 3 files changed, 0 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/21/39021/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3bacae853101a79804553175ebd4482acb188597 Gerrit-Change-Number: 39021 Gerrit-PatchSet: 4 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[L] Change in osmo-msc[master]: Use gsup_client_mux from libosmo-gsup-client

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/39019?usp=email ) Change subject: Use gsup_client_mux from libosmo-gsup-client ...................................................................... Use gsup_client_mux from libosmo-gsup-client gsup_client_mux code was cloned a couple months ago to libosmo-gsup-client, use it in osmo-msc and drop its own copy. The code was not dropped at the time because it required tweaking the unit tests, because they were wrapping some underlaying functions which cannot be wrapped anymore since the code using them is now inside the separate already-linked libosmo-gsup-client.so. Solve it by actually wrapping one layer up in the gsup_client_mux itself since it now something we mantain here anymore. Change-Id: I34d02ae219f3ec8daf47942c46f52b21eab21242 --- M TODO-RELEASE M include/osmocom/msc/Makefile.am D include/osmocom/msc/gsup_client_mux.h M src/libmsc/Makefile.am M src/libmsc/e_link.c M src/libmsc/gsm_04_11_gsup.c M src/libmsc/gsm_09_11.c D src/libmsc/gsup_client_mux.c M src/libmsc/msc_net_init.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c 13 files changed, 49 insertions(+), 250 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 35467f3..67fa293 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-sigtran >2.0.1 osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc() +libosmo-gsup-client >1.8.0 gsup_client_mux.h \ No newline at end of file diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index b6901b9..61ed586 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -17,7 +17,6 @@ gsm_data.h \ gsm_data_shared.h \ gsm_subscriber.h \ - gsup_client_mux.h \ mncc.h \ mncc_call.h \ mncc_int.h \ diff --git a/include/osmocom/msc/gsup_client_mux.h b/include/osmocom/msc/gsup_client_mux.h deleted file mode 100644 index f327786..0000000 --- a/include/osmocom/msc/gsup_client_mux.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include <osmocom/gsm/gsup.h> - -struct gsup_client_mux; -struct ipaccess_unit; - -struct gsup_client_mux_rx_cb { - int (* func )(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg); - void *data; -}; - -/* A GSUP client shared between code paths for various GSUP Message Classes. - * The main task is to dispatch GSUP messages to code paths corresponding to the respective Message Class, i.e. - * subscriber management, SMS, SS/USSD and inter-MSC messaging. - * If a GSUP Message Class IE is present in the message, the received message is dispatched directly to the rx_cb entry - * for that Message Class. Otherwise, the Message Class is determined by a switch() on the Message Type.*/ -struct gsup_client_mux { - struct osmo_gsup_client *gsup_client; - - /* Target clients by enum osmo_gsup_message_class */ - struct gsup_client_mux_rx_cb rx_cb[OSMO_GSUP_MESSAGE_CLASS_ARRAYSIZE]; -}; - -struct gsup_client_mux *gsup_client_mux_alloc(void *talloc_ctx); -int gsup_client_mux_start(struct gsup_client_mux *gcm, const char *gsup_server_addr_str, uint16_t gsup_server_port, - struct ipaccess_unit *ipa_dev); - -int gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_msg); -void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm, struct osmo_gsup_message *gsup_msg); -void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_orig, - enum gsm48_gmm_cause cause); - -int gsup_client_mux_rx(struct osmo_gsup_client *gsup_client, struct msgb *msg); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 3cda322..22543cb 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -41,7 +41,6 @@ gsm_04_14.c \ gsm_04_80.c \ gsm_09_11.c \ - gsup_client_mux.c \ mncc.c \ mncc_builtin.c \ mncc_sock.c \ diff --git a/src/libmsc/e_link.c b/src/libmsc/e_link.c index 5107c22..4b61ec7 100644 --- a/src/libmsc/e_link.c +++ b/src/libmsc/e_link.c @@ -25,7 +25,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/e_link.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_roles.h> diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 3566e76..96fdbc6 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -32,7 +32,7 @@ #include <osmocom/msc/debug.h> #include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/msc_a.h> /* Common helper for preparing to be encoded GSUP message */ diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 86b4a4f..0b85cbd 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -50,7 +50,7 @@ #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/paging.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> /* FIXME: choose a proper range */ static uint32_t new_callref = 0x20000001; diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c deleted file mode 100644 index e27b664..0000000 --- a/src/libmsc/gsup_client_mux.c +++ /dev/null @@ -1,191 +0,0 @@ -/* Directing individual GSUP messages to their respective handlers. */ -/* - * (C) 2019 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> - * All Rights Reserved - * - * Author: Neels Hofmeyr - * - * SPDX-License-Identifier: AGPL-3.0+ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - */ -#include <errno.h> - -#include <osmocom/gsupclient/gsup_client.h> - -#include <osmocom/msc/debug.h> -#include <osmocom/msc/gsup_client_mux.h> - -static enum osmo_gsup_message_class gsup_client_mux_classify(struct gsup_client_mux *gcm, - const struct osmo_gsup_message *gsup_msg) -{ - if (gsup_msg->message_class) - return gsup_msg->message_class; - - LOGP(DLGSUP, LOGL_DEBUG, "No explicit GSUP Message Class, trying to guess from message type %s\n", - osmo_gsup_message_type_name(gsup_msg->message_type)); - - switch (gsup_msg->message_type) { - case OSMO_GSUP_MSGT_PROC_SS_REQUEST: - case OSMO_GSUP_MSGT_PROC_SS_RESULT: - case OSMO_GSUP_MSGT_PROC_SS_ERROR: - return OSMO_GSUP_MESSAGE_CLASS_USSD; - - /* GSM 04.11 code implementing MO SMS */ - case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: - case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT: - case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR: - case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT: - case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: - return OSMO_GSUP_MESSAGE_CLASS_SMS; - - default: - return OSMO_GSUP_MESSAGE_CLASS_SUBSCRIBER_MANAGEMENT; - } -} - -/* Non-static for unit tests */ -int gsup_client_mux_rx(struct osmo_gsup_client *gsup_client, struct msgb *msg) -{ - struct gsup_client_mux *gcm = gsup_client->data; - struct osmo_gsup_message gsup; - enum osmo_gsup_message_class message_class; - int rc; - - rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup); - if (rc < 0) { - LOGP(DLGSUP, LOGL_ERROR, "Failed to decode GSUP message: '%s' (%d) [ %s]\n", - get_value_string(gsm48_gmm_cause_names, -rc), -rc, osmo_hexdump(msg->data, msg->len)); - goto msgb_free_and_return; - } - - if (!gsup.imsi[0]) { - LOGP(DLGSUP, LOGL_ERROR, "Failed to decode GSUP message: missing IMSI\n"); - if (OSMO_GSUP_IS_MSGT_REQUEST(gsup.message_type)) - gsup_client_mux_tx_error_reply(gcm, &gsup, GMM_CAUSE_INV_MAND_INFO); - rc = -GMM_CAUSE_INV_MAND_INFO; - goto msgb_free_and_return; - } - - message_class = gsup_client_mux_classify(gcm, &gsup); - - if (message_class <= OSMO_GSUP_MESSAGE_CLASS_UNSET || message_class >= ARRAY_SIZE(gcm->rx_cb)) { - LOGP(DLGSUP, LOGL_ERROR, "Failed to classify GSUP message target\n"); - rc = -EINVAL; - goto msgb_free_and_return; - } - - if (!gcm->rx_cb[message_class].func) { - LOGP(DLGSUP, LOGL_ERROR, "No receiver set up for GSUP Message Class %s\n", osmo_gsup_message_class_name(message_class)); - rc = -ENOTSUP; - goto msgb_free_and_return; - } - - rc = gcm->rx_cb[message_class].func(gcm, gcm->rx_cb[message_class].data, &gsup); - -msgb_free_and_return: - msgb_free(msg); - return rc; -} - -/* Make it clear that struct gsup_client_mux should be talloc allocated, so that it can be used as talloc parent. */ -struct gsup_client_mux *gsup_client_mux_alloc(void *talloc_ctx) -{ - return talloc_zero(talloc_ctx, struct gsup_client_mux); -} - -/* Start a GSUP client to serve this gsup_client_mux. */ -int gsup_client_mux_start(struct gsup_client_mux *gcm, const char *gsup_server_addr_str, uint16_t gsup_server_port, - struct ipaccess_unit *ipa_dev) -{ - gcm->gsup_client = osmo_gsup_client_create2(gcm, ipa_dev, - gsup_server_addr_str, - gsup_server_port, - &gsup_client_mux_rx, NULL); - if (!gcm->gsup_client) - return -ENOMEM; - gcm->gsup_client->data = gcm; - return 0; -} - -int gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_msg) -{ - struct msgb *msg; - int rc; - - if (!gcm || !gcm->gsup_client) { - LOGP(DLGSUP, LOGL_ERROR, "GSUP link is down, cannot send GSUP message\n"); - return -ENOTSUP; - } - - msg = osmo_gsup_client_msgb_alloc(); - rc = osmo_gsup_encode(msg, gsup_msg); - if (rc < 0) { - LOGP(DLGSUP, LOGL_ERROR, "Failed to encode GSUP message: '%s'\n", strerror(-rc)); - return rc; - } - - return osmo_gsup_client_send(gcm->gsup_client, msg); -} - -/* Set GSUP source_name to our local IPA name */ -void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm, - struct osmo_gsup_message *gsup_msg) -{ - const char *local_msc_name; - - if (!gcm) - return; - if (!gcm->gsup_client) - return; - if (!gcm->gsup_client->ipa_dev) - return; - local_msc_name = gcm->gsup_client->ipa_dev->serno; - if (!local_msc_name) - return; - gsup_msg->source_name = (const uint8_t *) local_msc_name; - gsup_msg->source_name_len = strlen(local_msc_name) + 1; -} - -/* Transmit GSUP error in response to original message */ -void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_orig, - enum gsm48_gmm_cause cause) -{ - struct osmo_gsup_message gsup_reply; - - /* No need to answer if we couldn't parse an ERROR message type, only REQUESTs need an error reply. */ - if (!OSMO_GSUP_IS_MSGT_REQUEST(gsup_orig->message_type)) - return; - - gsup_reply = (struct osmo_gsup_message){ - .cause = cause, - .message_type = OSMO_GSUP_TO_MSGT_ERROR(gsup_orig->message_type), - .message_class = gsup_orig->message_class, - .destination_name = gsup_orig->source_name, - .destination_name_len = gsup_orig->source_name_len, - - /* RP-Message-Reference is mandatory for SM Service */ - .sm_rp_mr = gsup_orig->sm_rp_mr, - }; - - OSMO_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi); - gsup_client_mux_tx_set_source(gcm, &gsup_reply); - - /* For SS/USSD, it's important to keep both session state and ID IEs */ - if (gsup_orig->session_state != OSMO_GSUP_SESSION_STATE_NONE) { - gsup_reply.session_state = OSMO_GSUP_SESSION_STATE_END; - gsup_reply.session_id = gsup_orig->session_id; - } - - if (osmo_gsup_client_enc_send(gcm->gsup_client, &gsup_reply)) - LOGP(DLGSUP, LOGL_ERROR, "Failed to send Error reply (imsi=%s)\n", - osmo_quote_str(gsup_orig->imsi, -1)); -} diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 5f10e6c..8edca05 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -29,7 +29,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/gsm_04_11_gsup.h> #include <osmocom/msc/gsm_09_11.h> diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 8a1dee5..32c2fbb 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -34,7 +34,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/vlr/vlr_sgs.h> #include <osmocom/vlr/vlr.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/paging.h> #include <netinet/in.h> diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 5e99b4d..2238e2b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -71,7 +71,7 @@ #include <osmocom/msc/msub.h> #include <osmocom/msc/call_leg.h> #include <osmocom/msc/msc_ho.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/e_link.h> #include <osmocom/msc/mncc_call.h> diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index cbdd6a4..1e332ef 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -20,8 +20,8 @@ $(NULL) AM_LDFLAGS = \ - -Wl,--wrap=osmo_gsup_client_create2 \ - -Wl,--wrap=osmo_gsup_client_send \ + -Wl,--wrap=gsup_client_mux_start \ + -Wl,--wrap=gsup_client_mux_tx \ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=osmo_get_rand_id \ -Wl,--wrap=ran_peers_down_paging \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index c1ae650..376b2a4 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -30,7 +30,7 @@ #include <osmocom/core/application.h> #include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/gsm/gsup.h> -#include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/gsupclient/gsup_client_mux.h> #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsm_04_08.h> @@ -136,6 +136,26 @@ gsm48_hdr_msg_type(gh)); } +static int _gsup_client_mux_rx(struct gsup_client_mux *gcm, struct msgb *msg) +{ + struct osmo_gsup_message gsup; + int rc; + + rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup); + if (rc < 0) { + LOGP(DLGSUP, LOGL_ERROR, "Failed to decode GSUP message: '%s' (%d) [ %s]\n", + get_value_string(gsm48_gmm_cause_names, -rc), -rc, osmo_hexdump(msg->data, msg->len)); + goto msgb_free_and_return; + } + + OSMO_ASSERT(gcm->rx_cb[gsup.message_class].func); + rc = gcm->rx_cb[gsup.message_class].func(gcm, gcm->rx_cb[gsup.message_class].data, &gsup); + +msgb_free_and_return: + msgb_free(msg); + return rc; +} + void gsup_rx(const char *rx_hex, const char *expect_tx_hex) { int rc; @@ -149,7 +169,7 @@ fprintf(stderr, "<-- GSUP rx %s: %s\n", label, osmo_hexdump_nospc(msgb_l2(msg), msgb_l2len(msg))); /* GSUP read cb takes ownership of msgb */ - rc = gsup_client_mux_rx(net->gcm->gsup_client, msg); + rc = _gsup_client_mux_rx(net->gcm, msg); fprintf(stderr, "<-- GSUP rx %s: vlr_gsupc_read_cb() returns %d\n", label, rc); if (expect_tx_hex) @@ -810,27 +830,32 @@ return 0; } +/* override, requires '-Wl,--wrap=gsup_client_mux_start' */ struct osmo_gsup_client * -__real_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, - unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oap_config); +__real_gsup_client_mux_start(struct gsup_client_mux *gcm, const char *gsup_server_addr_str, uint16_t gsup_server_port, + struct ipaccess_unit *ipa_dev); struct osmo_gsup_client * -__wrap_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr, - unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oap_config) +__wrap_gsup_client_mux_start(struct gsup_client_mux *gcm, const char *gsup_server_addr_str, uint16_t gsup_server_port, + struct ipaccess_unit *ipa_dev) { - struct osmo_gsup_client *gsupc; - gsupc = talloc_zero(msc_vlr_tests_ctx, struct osmo_gsup_client); - OSMO_ASSERT(gsupc); - return gsupc; + return 0; } -/* override, requires '-Wl,--wrap=gsup_client_send' */ -int __real_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); -int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) +/* override, requires '-Wl,--wrap=gsup_client_mux_tx' */ +int __real_gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_msg); +int __wrap_gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct osmo_gsup_message *gsup_msg) { uint8_t buf[512]; int len; + struct msgb *msg; + int rc; + + msg = osmo_gsup_client_msgb_alloc(); + rc = osmo_gsup_encode(msg, gsup_msg); + if (rc < 0) { + fprintf(stderr, "Failed to encode GSUP message: '%s'\n", strerror(-rc)); + return rc; + } fprintf(stderr, "GSUP --> HLR: %s: %s\n", osmo_gsup_message_type_name(msg->data[0]), osmo_hexdump_nospc(msg->data, msg->len)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39019?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34d02ae219f3ec8daf47942c46f52b21eab21242 Gerrit-Change-Number: 39019 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org>

6 months, 3 weeks

1
0
0 0

[L] Change in osmo-msc[master]: Use gsup_client_mux from libosmo-gsup-client

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/39019?usp=email ) Change subject: Use gsup_client_mux from libosmo-gsup-client ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: Fixed comments as suggested and an extra typo in found, re-adding votes and merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39019?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34d02ae219f3ec8daf47942c46f52b21eab21242 Gerrit-Change-Number: 39019 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 04 Dec 2024 13:51:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024