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

[M] Change in osmo-ggsn[master]: Bump version: 1.12.0.37-cf65-dirty → 1.13.0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/39512?usp=email ) Change subject: Bump version: 1.12.0.37-cf65-dirty → 1.13.0 ...................................................................... Bump version: 1.12.0.37-cf65-dirty → 1.13.0 Change-Id: I7dbdd71d62fb13ba2ffc30d7d50fb4207a06340b --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libgtp11.install R debian/libgtp11.shlibs M debian/rules M gtp/Makefile.am 8 files changed, 58 insertions(+), 16 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 1e70d13..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,8 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp append new field dir_tun_flags in struct pdp_t (older users not using the field should be fine since struct pdp_t is allocated internally) -libgtp ABI break new field cb_create_context_ind in struct gsn_t -libgtp new API gtp_set_cb_update_context_ind(), gtp_update_context_resp() -libosmocore >1.10.0 osmo_tundev_get_fd() -libgtp new API gtp_set_talloc_ctx() diff --git a/configure.ac b/configure.ac index 945075a..cc5a459 100644 --- a/configure.ac +++ b/configure.ac @@ -154,9 +154,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index d36f674..1c1994b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +osmo-ggsn (1.13.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp} + * gtp: Store rx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp} + * gtp: Allow UpdatePDPContext initiated by GGSN + * gtp: Allow setting callback to receive update_context_ind + * ggsn: Mark internal cb function static + * ggsn: kernel gtpu: Support updating pdp ctx remote IP address and TEID + * Move apn allocation code out of vty file + * Move ggsn allocation code out of vty file + * Move g_ggsn_list declaration to ggsn.c + * vty: Fix missing newline in description of 'apn tun-device' cmd + * ggsn: Support announcing APN MTU over PCO + * ggsn: Support announcing APN MTU over ICMPv6 RA + * ggsn: use libosmocore tundev API to create apn tun device + * ggsn: Use osmo_netdev_addaddr() libosmocore API + * ggsn: apply configured APN MTU to tun + * doc: Fix typo in user manual + * doc: Remove reference to non longer existing osmo-ggsn.init + * doc: Fix typo: wrong interface named + * doc: Reorder some chapters + * tun: Fix null pointer derefence when in kernel gtp mode + * ggsn: Avoid forwarding IPv6 solicited-node multicast addr to tun device + * ggsn: Rename confusing functions + * tun.h: Remove non-existent tun_decaps() + * Rename tun_encaps -> tun_inject_pkt + * Refactor tun_t fields and alloc APIs + * tun: Use OSMO_STRLCPY_ARRAY + * doc: Document MTU features in User Manual and example config files + * doc: Update all iptables references with nftables + * jenkins.sh: Use --disable-doxygen configure param + + [ Alexander Couzens ] + * gtp_internal.h: add missing include to <stdint.h> + * gtpie: fix comment + * gtp.h: add more GTP cause code from 29.060 v15.3.30 + * gtp_new(): use talloc instead of calloc/free + * gtpie: add gtp_encaps a modern encapsulation method + * gtp: split gtp_req into 2 parts: transmit and fill header + + [ Daniel Willmann ] + * gtp: Make peer addr const in gtp_req/gtp_resp + * gtp: Rework gtp_resp() into gtp_resp_pdp() + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 12 Feb 2025 12:09:58 +0100 + osmo-ggsn (1.12.0) unstable; urgency=medium [ Daniel Willmann ] diff --git a/debian/control b/debian/control index e2f801e..d93a28b 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ pkg-config, libdpkg-perl, git, dh-autoreconf, - libosmocore-dev (>= 1.10.0), + libosmocore-dev (>= 1.11.0), osmo-gsm-manuals-dev (>= 1.6.0), libgtpnl-dev (>= 1.3.0) Standards-Version: 3.9.6 @@ -24,7 +24,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp10 +Package: libgtp11 Architecture: any Multi-Arch: same Section: libs @@ -49,7 +49,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp10 (= ${binary:Version}) + libgtp11 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -62,7 +62,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp10 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp11 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -82,7 +82,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp10 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp11 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp10.install b/debian/libgtp11.install similarity index 100% rename from debian/libgtp10.install rename to debian/libgtp11.install diff --git a/debian/libgtp6.shlibs b/debian/libgtp11.shlibs similarity index 69% rename from debian/libgtp6.shlibs rename to debian/libgtp11.shlibs index 43d45e7..e80f92d 100644 --- a/debian/libgtp6.shlibs +++ b/debian/libgtp11.shlibs @@ -1,2 +1,2 @@ # Most recent version of the package that added new symbols (OS#5318) -libgtp 6 libgtp6 (>= 1.8.0) +libgtp 11 libgtp11 (>= 1.13.0) diff --git a/debian/rules b/debian/rules index 48397a8..89d627a 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp10 --dbg-package=libgtp-dbg + dh_strip -plibgtp11 --dbg-package=libgtp-dbg override_dh_auto_configure: dh_auto_configure -- \ diff --git a/gtp/Makefile.am b/gtp/Makefile.am index db1942d..fe5abe8 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=10:0:0 +LIBVERSION=11:0:0 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/39512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7dbdd71d62fb13ba2ffc30d7d50fb4207a06340b Gerrit-Change-Number: 39512 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: Bump version: 1.5.1.34-ada6-dirty → 1.6.0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39505?usp=email ) Change subject: Bump version: 1.5.1.34-ada6-dirty → 1.6.0 ...................................................................... Bump version: 1.5.1.34-ada6-dirty → 1.6.0 Change-Id: I1cb4072b734c077c84877fa567c533fe0950c75b --- M TODO-RELEASE M configure.ac M contrib/libosmo-netif.spec.in M debian/changelog M debian/control M src/Makefile.am 6 files changed, 56 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index dfdbd89..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,8 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif add API osmo_stream_cli_set_{ip_dscp,priority}(), osmo_stream_srv_link_set_{ip_dscp,priority}() -libosmo-netif add API osmo-stream_cli_set_tx_queue_max_length(), osmo_stream_srv_link_set_tx_queue_max_length() -libosmo-netif add API struct osmo_ipa_ka_fsm_inst -libosmo-netif add API osmo_stream_{cli,srv}_set_segmentation_cb2() -libosmo-netif add API osmo_stream_srv_link_set_msgb_alloc_info() diff --git a/configure.ac b/configure.ac index ea8031b..454bd13 100644 --- a/configure.ac +++ b/configure.ac @@ -89,9 +89,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.11.0) AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in index 4ac1302..2c1385b 100644 --- a/contrib/libosmo-netif.spec.in +++ b/contrib/libosmo-netif.spec.in @@ -24,9 +24,9 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -BuildRequires: pkgconfig(libosmocore) >= 1.9.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.9.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.9.0 +BuildRequires: pkgconfig(libosmocore) >= 1.11.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.11.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.11.0 %description Network interface demuxer library for OsmoCom projects. diff --git a/debian/changelog b/debian/changelog index bb5adff..cb8dbbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +libosmo-netif (1.6.0) unstable; urgency=medium + + [ Harald Welte ] + * stream_test: don't check if uint8_t is negative + * src/stream.c: Use sctp_assoc_id 'canary' to detect misisng sinfo + + [ Neels Hofmeyr ] + * osmo_rtp_get_payload(): fix bounds check for padding + * coverity CID#216829 + * api doc: stream.h: hint at how to select modern vs legacy mode + + [ Pau Espin Pedrol ] + * rtp: osmo_rtp_get_payload(): Fix return ptr if RTP pkt contains padding + * Drop libosmo-abis cond dep together with examples/lapd-over-datagram + * stream_cli: Allow setting nodelay sockopt after opening sock + * examples/ipa-stream-client: Fix wrong call to osmo_ipa_process_msg() + * stream: Explicitly document MSG_NOTIFICATION case in recv() API + * stream: Improve logging around recv() failure + * stream_cli: Log all code paths ending up in close/reconnect + * stream_cli: Announce failed connect() if reconnect is disabled + * stream_cli: Add osmo_stream_cli_set_{ip_dscp,priority}() APIs + * stream_srv: Add osmo_stream_srv_link_set_{ip_dscp,priority}() APIs + * stream_cli: Rename private functions + * stream_cli: Move osmo_stream_cli_close() before osmo_stream_cli_reconnect() + * stream_cli: Support destroy object within user callback + * stream_cli: Add API osmo_stream_cli_set_tx_queue_max_length() + * stream_srv: Add API osmo_stream_srv_link_set_tx_queue_max_length() + * stream: Allow null ptr in destroy() functions + * stream_cli: steal talloc ctx upon delaying free to avoid use after free + * stream_cli: Assert reentrant disconnect_cb() never happens + * stream_cli: Explicitly ignore return code of stream_cli_close + * stream_cli: Explicitly ignore return code of internal functions + * stream_cli: Fix discard 1st msg received quick after connect + * ipa: Add osmo_ipa_ka_fsm_inst APIs + * stream: Introduce osmo_stream_{cli,srv}_set_segmentation_cb2 + * stream: Add osmo_stream_srv_link_set_msgb_alloc_info() + * stream: Undeprecate osmo_stream_srv_set_segmentation_cb() + * stream: osmo_stream_{cli,srv}_set_segmentation_cb(2): documentation improvements + + [ Mychaela N. Falconia ] + * include/osmocom/netif/Makefile.am cosmetic: make it easier to extend + * src/Makefile.am cosmetic: make it easier to extend + + [ Oliver Smith ] + * Revert "contrib: remove rpm spec file" + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 12 Feb 2025 11:01:12 +0100 + libosmo-netif (1.5.1) unstable; urgency=medium [ Daniel Willmann ] diff --git a/debian/control b/debian/control index 6259deb..4ff4249 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ libdpkg-perl, git, doxygen, - libosmocore-dev (>= 1.10.0), + libosmocore-dev (>= 1.11.0), pkg-config, libpcap0.8-dev, libsctp-dev diff --git a/src/Makefile.am b/src/Makefile.am index e3634be..98dc276 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=13:1:2 +LIBVERSION=14:0:3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39505?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1cb4072b734c077c84877fa567c533fe0950c75b Gerrit-Change-Number: 39505 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?usp=email ) Change subject: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I68efecf56866e04c71571165f61648d9c37fc173 Gerrit-Change-Number: 39525 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 13:01:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... Patch Set 1: (1 comment) File src/erab_fsm.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524/comment/7a938583_10d4… : PS1, Line 266: {next_state, session_delete, imho this may be wrong. You probably need to wait first for create resolution, then destroy it (if it was properly created). Don't you need the SEID returned during Create Response to be able to identify the session? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 13:00:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email ) Change subject: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523/comment/a86c296f_9a3d… : PS1, Line 9: There's no practical benefit(s) in blocking the caller while waiting specially since doing this while tons of sessions are allocated can take in the order of 100-200ms :) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If519334359c3ef331720cb87bdba2d969601816e Gerrit-Change-Number: 39523 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 12:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?usp=email ) Change subject: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic02e3cb390e7d8a7865b4027c29cd0115a94e14e Gerrit-Change-Number: 39522 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 12:53:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: fix return value

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39521?usp=email ) Change subject: {erab_fsm,sctp_proxy}: handle_event/4: fix return value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib8c10e0b1d888e005a593644c0ecead560b2f2ce Gerrit-Change-Number: 39521 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 12:52:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?usp=email ) Change subject: erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp ...................................................................... erab_fsm: handle RELEASE.ind in state erab_wait_release_rsp This can happen if both MME and eNB initiate the E-RAB RELEASE procedures simultaneously. Ignore subsequent release requests. Change-Id: I68efecf56866e04c71571165f61648d9c37fc173 Related: SYS#7318, SYS#7310 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/25/39525/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index c4dbbd6..dbd7ec1 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -385,6 +385,16 @@ ?LOG_DEBUG("Rx E-RAB RELEASE Rsp, we're done"), {stop, normal}; %% we're done! +erab_wait_release_rsp(cast, erab_release_cmd, + #erab_state{}) -> + ?LOG_INFO("Rx E-RAB RELEASE Cmd while releasing (ignored)"), + keep_state_and_data; + +erab_wait_release_rsp(cast, erab_release_ind, + #erab_state{}) -> + ?LOG_INFO("Rx E-RAB RELEASE Ind while releasing (ignored)"), + keep_state_and_data; + erab_wait_release_rsp(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 232446e..ea508dd 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -57,6 +57,8 @@ ?TC(fun test_erab_setup_release_ind_success/1)}, {"E-RAB RELEASE IND (in state erab_wait_setup_rsp) :: success", ?TC(fun test_erab_wait_setup_rsp_release_ind_success/1)}, + {"E-RAB RELEASE IND (in state erab_wait_release_rsp) :: success", + ?TC(fun test_erab_wait_release_rsp_release_ind_success/1)}, {"E-RAB release :: PFCP session deletion error", ?TC(fun test_erab_release_pfcp_delete_error/1)}]. @@ -141,6 +143,16 @@ ?_assertNot(erlang:is_process_alive(Pid))]. +%% test E-RAB RELEASE.ind received in state erab_wait_release_rsp +test_erab_wait_release_rsp_release_ind_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), + ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), %% ignored + ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + test_erab_release_pfcp_delete_error(Pid) -> %% pfcp_peer:session_delete_req/1 responds with a reject PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39525?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-s1gw Gerrit-Branch: master Gerrit-Change-Id: I68efecf56866e04c71571165f61648d9c37fc173 Gerrit-Change-Number: 39525 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp It can happen that either the eNB or the MME orders E-RAB release (directly or indirectly via UE CONTEXT RELEASE) *before* the E-RAB is fully setup (i.e. the erab_fsm state =/= erab_setup). Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Related: SYS#7318, SYS#7310 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 39 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/24/39524/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index bbb6dad..c4dbbd6 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -260,6 +260,18 @@ S#erab_state{from = From, u2a = U2A}}; +erab_wait_setup_rsp(cast, erab_release_cmd, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), + {next_state, session_delete, + S#erab_state{rel_kind = cmd}}; + +erab_wait_setup_rsp(cast, erab_release_ind, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB RELEASE Ind"), + {next_state, session_delete, + S#erab_state{rel_kind = ind}}; + erab_wait_setup_rsp(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index ec40e2e..232446e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -49,10 +49,14 @@ erab_release_test_() -> - [{"E-RAB RELEASE CMD :: success", - ?TC(fun test_erab_release_cmd_success/1)}, - {"E-RAB RELEASE IND :: success", - ?TC(fun test_erab_release_ind_success/1)}, + [{"E-RAB RELEASE CMD (in state erab_setup) :: success", + ?TC(fun test_erab_setup_release_cmd_success/1)}, + {"E-RAB RELEASE CMD (in state erab_wait_setup_rsp) :: success", + ?TC(fun test_erab_wait_setup_rsp_release_cmd_success/1)}, + {"E-RAB RELEASE IND (in state erab_setup) :: success", + ?TC(fun test_erab_setup_release_ind_success/1)}, + {"E-RAB RELEASE IND (in state erab_wait_setup_rsp) :: success", + ?TC(fun test_erab_wait_setup_rsp_release_ind_success/1)}, {"E-RAB release :: PFCP session deletion error", ?TC(fun test_erab_release_pfcp_delete_error/1)}]. @@ -105,7 +109,8 @@ ?_assertNot(erlang:is_process_alive(Pid))]. -test_erab_release_cmd_success(Pid) -> +%% test E-RAB RELEASE.{cmd,rsp} received in state erab_setup +test_erab_setup_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), @@ -113,13 +118,29 @@ ?_assertNot(erlang:is_process_alive(Pid))]. -test_erab_release_ind_success(Pid) -> +%% test E-RAB RELEASE.{cmd,rsp} received in state erab_wait_setup_rsp +test_erab_wait_setup_rsp_release_cmd_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), + ?_assertEqual(ok, erab_fsm:erab_release_rsp(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +%% test E-RAB RELEASE.ind received in state erab_setup +test_erab_setup_release_ind_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. +%% test E-RAB RELEASE.ind received in state erab_wait_setup_rsp +test_erab_wait_setup_rsp_release_ind_success(Pid) -> + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual(ok, erab_fsm:erab_release_ind(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + test_erab_release_pfcp_delete_error(Pid) -> %% pfcp_peer:session_delete_req/1 responds with a reject PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?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-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?usp=email ) Change subject: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls ...................................................................... {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls Change-Id: Ic02e3cb390e7d8a7865b4027c29cd0115a94e14e Related: SYS#7318 --- M src/erab_fsm.erl M src/sctp_proxy.erl 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/22/39522/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 9a654e5..9ee9abe 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -405,6 +405,10 @@ Reply = lists:filter(fun({_, V}) -> V =/= undefined end, Info), {keep_state_and_data, {reply, From, Reply}}; +handle_event(State, {call, From}, EventData, _S) -> + ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), + {keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}}; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index ed4af02..1c3228a 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -216,6 +216,10 @@ Reply = proplists:from_map(S2), {keep_state_and_data, {reply, From, Reply}}; +handle_event(State, {call, From}, EventData, _S) -> + ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), + {keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}}; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?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-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic02e3cb390e7d8a7865b4027c29cd0115a94e14e Gerrit-Change-Number: 39522 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025