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

[S] Change in osmo-upf[master]: n-sessions [1/4]: add generators for TEID and UE IP

by laforge

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37757?usp=email ) Change subject: n-sessions [1/4]: add generators for TEID and UE IP ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: commit log message should state it's about the pfcp-tool, not osmo-upf. In repositories that have multiple programs / build targets (like pysim, osmocom-bb, ...) we usually prefix the commit log message with an indication about what kind of program/tool is changed. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37757?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Iec164a222782d382aefe8d0342f398ebba1eac05 Gerrit-Change-Number: 37757 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 12:35:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 year, 1 month

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib: add systemd unit file

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?usp=email ) Change subject: contrib: add systemd unit file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?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: I8417821d2d8ead0ab1bcea87ee40a16c1b98ce69 Gerrit-Change-Number: 37729 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 12:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: fix typo

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37772?usp=email ) Change subject: pySim-shell: fix typo ...................................................................... pySim-shell: fix typo Change-Id: I1bd995ae9eb59a44a48da62a7b0262faa84a4f2b --- M pySim-shell.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 6e59e58..36cb839 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -373,7 +373,7 @@ first = True while 1: # TODO: Count consecutive failures, if more than N consecutive failures occur, then stop. - # The ratinale is: There may be a problem with the device, we do want to prevent that + # The rationale is: There may be a problem with the device, we do want to prevent that # all remaining cards are fired to the error bin. This is only relevant for situations # with large stacks, probably we do not need this feature right now. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1bd995ae9eb59a44a48da62a7b0262faa84a4f2b Gerrit-Change-Number: 37772 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib: add systemd unit file

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?usp=email ) Change subject: contrib: add systemd unit file ...................................................................... contrib: add systemd unit file Related: SYS#7040 Change-Id: I8417821d2d8ead0ab1bcea87ee40a16c1b98ce69 --- M Makefile A contrib/systemd/osmo-s1gw.service 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile b/Makefile index 52390d1..ad7b531 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ # directory paths for 'install' BINDIR ?= /usr/bin CONFDIR ?= /etc/osmocom +SYSTEMDUNITDIR ?= /lib/systemd/system all: build @@ -34,6 +35,8 @@ $(DESTDIR)$(BINDIR)/osmo-s1gw install -Dm0644 config/sys.config \ $(DESTDIR)$(CONFDIR)/osmo-s1gw.config + install -Dm0644 contrib/systemd/osmo-s1gw.service \ + $(DESTDIR)$(SYSTEMDUNITDIR)/osmo-s1gw.service clean: # Avoid running rebar3 clean if _build doesn't exist, since it would try diff --git a/contrib/systemd/osmo-s1gw.service b/contrib/systemd/osmo-s1gw.service new file mode 100644 index 0000000..f19354a --- /dev/null +++ b/contrib/systemd/osmo-s1gw.service @@ -0,0 +1,19 @@ +[Unit] +Description=Osmocom S1 Gateway +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +StateDirectory=osmo-s1gw +WorkingDirectory=%S/osmo-s1gw +User=osmocom +Group=osmocom +Environment="HOME=/var/lib/osmo-s1gw" +Environment="ERL_FLAGS=-config /etc/osmocom/osmo-s1gw.config" +ExecStart=/usr/bin/osmo-s1gw foreground +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8417821d2d8ead0ab1bcea87ee40a16c1b98ce69 Gerrit-Change-Number: 37729 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

1 year, 1 month

1
0
0 0

[XS] Change in osmo-mgw[master]: mgcp_network: use an uint16_t to store the port number

by laforge

Attention is currently required from: dexter, neels. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email ) Change subject: mgcp_network: use an uint16_t to store the port number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I392b07b243389a78d4ad1d784cdfdc28ec59b487 Gerrit-Change-Number: 37776 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Aug 2024 15:34:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Makefile: add 'install' target

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email ) Change subject: Makefile: add 'install' target ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File Makefile: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728/comment/a935fd7f_314f… : PS2, Line 36: install -m 0644 -T config/sys.config $(DESTDIR)$(CONFDIR)/osmo-s1gw.config As in the other patch, I suggest using install -Dm644 etc. instead, -D to let it create the directory -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?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: If4901adb648c98d52dbc0abd97413c20503fb278 Gerrit-Change-Number: 37728 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 07:45:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[S] Change in pysim[master]: ara_m: fix --apdu-filter setting

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37640?usp=email ) Change subject: ara_m: fix --apdu-filter setting ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37640?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib5fb388972fde0d50c3db0082ebf40bcca404681 Gerrit-Change-Number: 37640 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Aug 2024 17:37:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[M] Change in ...osmo-s1gw[master]: add debian package files

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37730?usp=email ) Change subject: add debian package files ...................................................................... add debian package files Related: SYS#7040 Change-Id: I5446c70c1c1f232a2a45de60be7068cfd683a99c --- A contrib/generate_build_dep.sh A debian/changelog A debian/compat A debian/control A debian/postinst A debian/rules A debian/source/format 7 files changed, 78 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 0000000..3237ae3 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +# delete erlang bytecode +find _checkouts/ -iname '*beam' -delete +tar czf build_dep.tar.gz ./_checkouts diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..dd7edc9 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +osmo-s1gw (0.1.0) unstable; urgency=medium + + * Initial debian packaging + + -- Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Mon, 05 Aug 2024 20:42:11 +0700 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4062ee8 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: osmo-s1gw +Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> +Section: net +Priority: optional +Build-Depends: erlang-nox, + libpcap-dev, + rebar3, + debhelper (>= 10) +Standards-Version: 4.5.0 + +Package: osmo-s1gw +Architecture: any +Depends: erlang-nox +Multi-Arch: allowed +Description: Osmocom S1 gateway + This can be used on the S1 interface between eNB and MME/CN, and + acts as separation between the eNB-facing IP network and the + CN-facing IP network, which may be separate without routing in between. diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..d4857a2 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,22 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ffd896c --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic + +%: + dh $@ + +override_dh_auto_build: + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi + dh_auto_build diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I5446c70c1c1f232a2a45de60be7068cfd683a99c Gerrit-Change-Number: 37730 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

1 year, 1 month

1
0
0 0

[XS] Change in pysim[master]: pySim.cards: Make file_exists() check for activated/deactivated

by laforge

laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37778?usp=email ) Change subject: pySim.cards: Make file_exists() check for activated/deactivated ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I73bd1ab3780e475c96a10cd5dbdd45b829c67335 Gerrit-Change-Number: 37778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 07 Aug 2024 14:10:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: smlc: import current configs from docker-playground

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email ) Change subject: smlc: import current configs from docker-playground ...................................................................... smlc: import current configs from docker-playground Import the current configs, replacing the IPs used with 127.0.0.x. Before this patch, attempting to run the testsuite without containers fails because of the wrong IP range: 20240718122103706 DLGLOBAL NOTICE unable to bind socket: (172.18.23.20|fd02:db8:23::20):2905: Cannot assign requested address (socket.c:1042) Change-Id: I3ed9e971daf32458bc554fa0a7f4698b4a461bfa --- M smlc/SMLC_Tests.cfg M smlc/osmo-smlc.cfg M smlc/osmo-stp.cfg 3 files changed, 31 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved daniel: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/smlc/SMLC_Tests.cfg b/smlc/SMLC_Tests.cfg index cc9fd6e..f1a7001 100644 --- a/smlc/SMLC_Tests.cfg +++ b/smlc/SMLC_Tests.cfg @@ -7,10 +7,27 @@ # Local configuration below [LOGGING] +*.JUnitLogger.testsuite_name := "SMLC_Tests" [TESTPORT_PARAMETERS] +*.SMLCVTY.CTRL_HOSTNAME := "127.0.0.20" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.20" [MODULE_PARAMETERS] +SMLC_Tests.mp_smlc_ip := "127.0.0.20"; +SMLC_Tests.mp_test_ip := "127.0.0.203"; +SMLC_Tests.mp_bssap_le_cfg := { + { + sccp_service_type := "mtp3_itu", + sctp_addr := { 23905, "127.0.0.203", 2905, "127.0.0.200" }, + own_pc := 187, /* 0.23.3 first BSC emulation */ + own_ssn := 250, /* BSC side SSN */ + peer_pc := 190, /* 0.23.6 osmo-smlc */ + peer_ssn := 252, /* SMLC side SSN */ + sio := '83'O, + rctx := 1 + } +}; [MAIN_CONTROLLER] diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index 7da2163..ffc5a4f 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -1,4 +1,4 @@ -log gsmtap 172.18.23.203 +log gsmtap 127.0.0.203 logging level set-all debug logging filter all 1 log stderr @@ -17,10 +17,8 @@ cs7 instance 0 asp asp-clnt-msc-0 2905 2905 m3ua - local-ip 172.18.23.20 - local-ip fd02:db8:23::20 - remote-ip 172.18.23.200 - remote-ip fd02:db8:23::200 + local-ip 127.0.0.20 + remote-ip 127.0.0.200 role asp sctp-role client cells diff --git a/smlc/osmo-stp.cfg b/smlc/osmo-stp.cfg index e2568e2..f1491a7 100644 --- a/smlc/osmo-stp.cfg +++ b/smlc/osmo-stp.cfg @@ -2,29 +2,23 @@ ! OsmoSTP (0.8.1) configuration saved from vty !! ! +log gsmtap 127.0.0.203 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 + logging print level 1 logging print category 1 - logging timestamp 1 + logging print category-hex 0 logging print extended-timestamp 1 - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice + logging print file basename last + logging level set-all notice logging level lss7 debug logging level lsccp debug logging level lsua debug logging level lm3ua debug - logging level lmgcp notice ! line vty no login @@ -32,8 +26,8 @@ cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted asp virt-bsc0-0 23905 2905 m3ua - local-ip 127.0.0.1 - remote-ip 127.0.0.1 + local-ip 127.0.0.200 + remote-ip 127.0.0.203 role sg sctp-role server as virt-bsc0 m3ua @@ -44,3 +38,4 @@ update route 0.23.3 7.255.7 linkset virt-bsc0 listen m3ua 2905 accept-asp-connections dynamic-permitted + local-ip 127.0.0.200 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3ed9e971daf32458bc554fa0a7f4698b4a461bfa Gerrit-Change-Number: 37705 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024