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

Change in osmo-ttcn3-hacks[master]: ggsn: Submit RATType in CreatePDPContextReq

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 ) Change subject: ggsn: Submit RATType in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 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: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a Gerrit-Change-Number: 27051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 15:34:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: lua dissector: adjust usage instructions

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27053 ) Change subject: lua dissector: adjust usage instructions ...................................................................... lua dissector: adjust usage instructions ...as originally described in the first commit that added the file. Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5 --- M contrib/simtrace.lua 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/53/27053/1 diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index fa477d5..fadc01a 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -2,7 +2,10 @@ -- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild -- SPDX-License-Identifier: GPL-2.0+ -- --- Usage: Put this into your ~/.wireshark/init.lua [or include it from there] +-- Usage: Move this file to your "personal lua plugins" folder that +-- can be found in the Wireshark Help->About Wireshark->Folders tab +-- Windows: %APPDATA%\Wireshark\plugins. +-- Unix-like systems: ~/.local/lib/wireshark/plugins. usb_simtrace_protocol = Proto("USB_simtrace", "USB simtrace protocol") -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5 Gerrit-Change-Number: 27053 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: treewide: use almalinux instead of centos8

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27049 ) Change subject: treewide: use almalinux instead of centos8 ...................................................................... treewide: use almalinux instead of centos8 CentOS Linux 8 is EOL, attempting to install packages in it results in an error. CentOS Linux is a rebuild of RHEL (stable versions). The CentOS projects recommends to use CentOS Stream instead, which is a build of the "public development branch for RHEL". After the early EOL was announced on 2020-12-08, alternative projects AlmaLinux and Rocky Linux have been established as binary compatible forks of RHEL 8 (stable versions). Both Alma and Rocky seem to be solid projects, see related Wikipedia articles and their sources. Pick Alma and adjust the whole tree to use the almalinux:8 docker image instead of centos:centos8. Fix for: Error: Failed to download metadata for repo 'appstream': Cannot download repomd.xml: Cannot download repodata/repomd.xml: All mirrors were tried Related: SYS#5818 Related: https://www.centos.org/cl-vs-cs/ Related: https://www.centos.org/centos-linux-eol/ Related: https://bugs.centos.org/view.php?id=18394 Related: https://en.wikipedia.org/wiki/AlmaLinux Related: https://en.wikipedia.org/wiki/Rocky_Linux Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 --- M centos8-build/Dockerfile M centos8-build/Makefile M centos8-obs-latest/Dockerfile M centos8-obs-latest/Makefile M centos8-repo-install-test/Dockerfile M jenkins-common.sh M systemd/Dockerfile 7 files changed, 9 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index e36e3f0..26ef819 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" diff --git a/centos8-build/Makefile b/centos8-build/Makefile index cba5cee..a18eb5c 100644 --- a/centos8-build/Makefile +++ b/centos8-build/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO:=centos:centos8 +UPSTREAM_DISTRO:=almalinux:8 DISTRO:=centos8 include ../make/Makefile diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile index 4e180de..69eeb79 100644 --- a/centos8-obs-latest/Dockerfile +++ b/centos8-obs-latest/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" diff --git a/centos8-obs-latest/Makefile b/centos8-obs-latest/Makefile index cba5cee..a18eb5c 100644 --- a/centos8-obs-latest/Makefile +++ b/centos8-obs-latest/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO:=centos:centos8 +UPSTREAM_DISTRO:=almalinux:8 DISTRO:=centos8 include ../make/Makefile diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile index 27d7a59..2f1c345 100644 --- a/centos8-repo-install-test/Dockerfile +++ b/centos8-repo-install-test/Dockerfile @@ -1,6 +1,6 @@ ARG USER ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # dnf-utils: for repoquery diff --git a/jenkins-common.sh b/jenkins-common.sh index 1e9435a..7130fe2 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -39,9 +39,9 @@ docker_upstream_distro_from_image_name() { case "$1" in osmo-*-centos7) echo "centos:centos7"; ;; - osmo-*-centos8) echo "centos:centos8"; ;; + osmo-*-centos8) echo "almalinux:8"; ;; centos7-*) echo "centos:centos7" ;; - centos8-*) echo "centos:centos8" ;; + centos8-*) echo "almalinux:8" ;; debian9-*) echo "debian:stretch" ;; debian10-*) echo "debian:buster" ;; debian11-*) echo "debian:bullseye" ;; @@ -120,7 +120,7 @@ # name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir # where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile) # and UPSTREAM_DISTRO and DISTRO are passed accordingly (e.g. -# UPSTREAM_DISTRO=centos:centos8 DISTRO=centos8). This allows one +# UPSTREAM_DISTRO=almalinux:8 DISTRO=centos8). This allows one # Dockerfile for multiple distributions, without duplicating configs for # each distribution. Dependencies listed in docker_depends() are built # automatically too. diff --git a/systemd/Dockerfile b/systemd/Dockerfile index 8f1763d..63d4c40 100644 --- a/systemd/Dockerfile +++ b/systemd/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG DISTRO -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 Gerrit-Change-Number: 27049 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: treewide: use almalinux instead of centos8

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27049 ) Change subject: treewide: use almalinux instead of centos8 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 Gerrit-Change-Number: 27049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 10:02:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit User Location Information in CreatePDPContextReq

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 ) Change subject: ggsn: Submit User Location Information in CreatePDPContextReq ...................................................................... ggsn: Submit User Location Information in CreatePDPContextReq According to TS 29.060, sec 7.3.1 Create PDP Context Request: """ The SGSN shall include the User Location Information IE in the PDP Context Activation procedure. The SGSN shall include the CGI or SAI in the "Geographic Location" field of the User Location Information IE depending on whether the MS is in a cell or a service area respectively. """ Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 34 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/27052/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 28e34e9..634534f 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -84,7 +84,8 @@ OCT4 teid_remote, /* TEI (Control) remote side */ OCT4 teic_remote, - OCT1 ratType optional + OCT1 ratType optional, + UserLocationInformation uli optional } type component GT_CT { @@ -246,7 +247,15 @@ eua := eua, teid := f_rnd_tei(), teic := f_rnd_tei(), - ratType := ratType + ratType := ratType, + uli := { + type_gtpc := '98'O, + lengthf := 0 /* filled in by encoder */, + geographicLocationType := '00'O /* CGI */, + geographicLocation := { + geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) + } + } } /* send GTP-C for a given context and increment sequence number */ @@ -318,7 +327,7 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); T_default.start; d := activate(pingpong()); alt { diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 94f327e..8f6098a 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -301,11 +301,28 @@ return rt; } + template (value) GeographicLocationCGI + ts_GeographicLocationCGI(template (value) hexstring mcc, + template (value) hexstring mnc, + template (value) OCT2 lac, + template (value) OCT2 cI_value) := + { + mccDigit1 := mcc[0], + mccDigit2 := mcc[1], + mccDigit3 := mcc[2], + mncDigit3 := mnc[2], /* 'F'H for 2 digit MNC */ + mncDigit1 := mnc[0], + mncDigit2 := mnc[1], + lac := lac, + cI_value := cI_value + } + template GTPC_PDUs ts_CreatePdpPDU(hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, - template (omit) OCT1 ratType := omit) := { + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -345,7 +362,7 @@ commonFlags := omit, aPN_Restriction := omit, ratType := f_ts_RATType(ratType), - userLocationInformation := omit, + userLocationInformation := uli, mS_TimeZone := omit, imeisv := omit, camelChargingInformationContainer := omit, @@ -367,12 +384,13 @@ octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, - template (omit) OCT1 ratType := omit) := { + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 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: Iaea95e5779d4f878023ce3f160ac69f092452056 Gerrit-Change-Number: 27052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit RATType in CreatePDPContextReq

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 ) Change subject: ggsn: Submit RATType in CreatePDPContextReq ...................................................................... ggsn: Submit RATType in CreatePDPContextReq According to TS 29.060, sec 7.3.1 Create PDP Context Request: "The SGSN shall include the RAT Type IE during Primary PDP Context Activation procedure." Change-Id: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/27051/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index a0c7b16..28e34e9 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -83,7 +83,8 @@ /* TEI (Data) remote side */ OCT4 teid_remote, /* TEI (Control) remote side */ - OCT4 teic_remote + OCT4 teic_remote, + OCT1 ratType optional } type component GT_CT { @@ -236,7 +237,7 @@ /* define an (internal) representation of a PDP context */ template PdpContext t_DefinePDP(hexstring imsi, octetstring msisdn, octetstring apn, - EndUserAddress eua) := { + EndUserAddress eua, OCT1 ratType := '02'O /* GERAN */) := { imsi := imsi, msisdn := msisdn, nsapi := f_rnd_nsapi(), @@ -244,7 +245,8 @@ pco_req := omit, eua := eua, teid := f_rnd_tei(), - teic := f_rnd_tei() + teic := f_rnd_tei(), + ratType := ratType } /* send GTP-C for a given context and increment sequence number */ @@ -316,7 +318,7 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType)); T_default.start; d := activate(pingpong()); alt { diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 9c8d1b6..94f327e 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -287,10 +287,25 @@ padding := 'F'H } + function f_ts_RATType(template (omit) OCT1 ratType := omit) return template (omit) RATType { + var template (omit) RATType rt; + if (istemplatekind(ratType, "omit")) { + rt := omit; + } else { + rt := { + type_gtpc := '97'O, + lengthf := 1, + ratTypeValue := ratType + }; + } + return rt; + } + template GTPC_PDUs ts_CreatePdpPDU(hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, - octetstring msisdn, template ProtConfigOptions pco := omit) := { + octetstring msisdn, template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -329,7 +344,7 @@ omcId := omit, commonFlags := omit, aPN_Restriction := omit, - ratType := omit, + ratType := f_ts_RATType(ratType), userLocationInformation := omit, mS_TimeZone := omit, imeisv := omit, @@ -351,12 +366,13 @@ OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, - template ProtConfigOptions pco := omit) := { + template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco)), seq) + sgsn_ip_data, msisdn, pco, ratType)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 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: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a Gerrit-Change-Number: 27051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: So the linter suggests the following: include/osmocom/core/utils.h:113: ERROR:MULTISTATEMENT_MACRO_USE_DO_WHILE: Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects I tried doing this, and got lots of compilation errors like: logging.c:1430:9: error: expected ‘;’ before ‘tall_log_ctx’ The problem is that some OSMO_ASSERT statements in the code (not only in libosmocore) have no semicolon in the end. I suggest to ignore this warning, as I see no easy solution to this. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 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-Reviewer: pespin <pespin(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, 02 Feb 2022 08:37:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: treewide: use almalinux instead of centos8

by pespin

Attention is currently required from: osmith, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27049 ) Change subject: treewide: use almalinux instead of centos8 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 Gerrit-Change-Number: 27049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 02 Feb 2022 08:25:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27045 ) Change subject: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Gerrit-Change-Number: 27045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 08:19:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: make osmo-uecups-daemon more verbose

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 ) Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Gerrit-Change-Number: 27044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 08:18:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_sockaddr_from/to_octets()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27050 ) Change subject: add osmo_sockaddr_from/to_octets() ...................................................................... add osmo_sockaddr_from/to_octets() Shorthand for the INET/INET6 switch() to get/put the addr part, useful for encoding and decoding message buffers. Related: OS#5599 Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/27050/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 6d11e6f..fffc25c 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -127,6 +127,9 @@ int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, const struct osmo_sockaddr *b); +int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct osmo_sockaddr *os); +int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src, size_t src_len); + const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *sockaddr); char *osmo_sockaddr_to_str_buf(char *buf, size_t buf_len, const struct osmo_sockaddr *sockaddr); diff --git a/src/socket.c b/src/socket.c index 882ff02..1c75443 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1733,6 +1733,65 @@ return rc; } +/*! Copy the addr part, the IP address octets in network byte order, to a buffer. + * Useful for encoding network protocols. + * \param[out] dst Write octets to this buffer. + * \param[in] dst_maxlen Space available in buffer. + * \param[in] os Sockaddr to copy IP of. + * \return nr of octets written on success, negative on error. + */ +int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct osmo_sockaddr *os) +{ + const void *addr; + size_t l; + switch (os->u.sin.sin_family) { + case AF_INET: + addr = &os->u.sin.sin_addr; + l = sizeof(os->u.sin.sin_addr); + break; + case AF_INET6: + addr = &os->u.sin6.sin6_addr; + l = sizeof(os->u.sin6.sin6_addr); + break; + default: + return -ENOTSUP; + } + if (dst_maxlen < l) + return -ENOSPC; + memcpy(dst, addr, l); + return l; +} + +/*! Copy the addr part, the IP address octets in network byte order, from a buffer. + * Useful for decoding network protocols. + * \param[out] os Write IP address to this sockaddr. + * \param[in] src Source buffer to read IP address octets from. + * \param[in] src_len Number of octets to copy. + * \return number of octets read on success, negative on error. + */ +int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src, size_t src_len) +{ + void *addr; + size_t l; + *os = (struct osmo_sockaddr){0}; + switch (src_len) { + case sizeof(os->u.sin.sin_addr): + os->u.sin.sin_family = AF_INET; + addr = &os->u.sin.sin_addr; + l = sizeof(os->u.sin.sin_addr); + break; + case sizeof(os->u.sin6.sin6_addr): + os->u.sin6.sin6_family = AF_INET6; + addr = &os->u.sin6.sin6_addr; + l = sizeof(os->u.sin6.sin6_addr); + break; + default: + return -ENOTSUP; + } + memcpy(addr, src, l); + return l; +} + /*! Compare two osmo_sockaddr. * \param[in] a * \param[in] b -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 Gerrit-Change-Number: 27050 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27046 to look at the new patch set (#2). Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 --- M include/osmocom/core/utils.h 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27046/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27047 to look at the new patch set (#2). Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe --- M include/osmocom/core/utils.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/27047/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: treewide: use almalinux instead of centos8

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27049 ) Change subject: treewide: use almalinux instead of centos8 ...................................................................... treewide: use almalinux instead of centos8 CentOS Linux 8 is EOL, attempting to install packages in it results in an error. CentOS Linux is a rebuild of RHEL (stable versions). The CentOS projects recommends to use CentOS Stream instead, which is a build of the "public development branch for RHEL". After the early EOL was announced on 2020-12-08, alternative projects AlmaLinux and Rocky Linux have been established as binary compatible forks of RHEL 8 (stable versions). Both Alma and Rocky seem to be solid projects, see related Wikipedia articles and their sources. Pick Alma and adjust the whole tree to use the almalinux:8 docker image instead of centos:centos8. Fix for: Error: Failed to download metadata for repo 'appstream': Cannot download repomd.xml: Cannot download repodata/repomd.xml: All mirrors were tried Related: SYS#5818 Related: https://www.centos.org/cl-vs-cs/ Related: https://www.centos.org/centos-linux-eol/ Related: https://bugs.centos.org/view.php?id=18394 Related: https://en.wikipedia.org/wiki/AlmaLinux Related: https://en.wikipedia.org/wiki/Rocky_Linux Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 --- M centos8-build/Dockerfile M centos8-build/Makefile M centos8-obs-latest/Dockerfile M centos8-obs-latest/Makefile M centos8-repo-install-test/Dockerfile M jenkins-common.sh M systemd/Dockerfile 7 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/27049/1 diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index e36e3f0..26ef819 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" diff --git a/centos8-build/Makefile b/centos8-build/Makefile index cba5cee..a18eb5c 100644 --- a/centos8-build/Makefile +++ b/centos8-build/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO:=centos:centos8 +UPSTREAM_DISTRO:=almalinux:8 DISTRO:=centos8 include ../make/Makefile diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile index 4e180de..69eeb79 100644 --- a/centos8-obs-latest/Dockerfile +++ b/centos8-obs-latest/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" diff --git a/centos8-obs-latest/Makefile b/centos8-obs-latest/Makefile index cba5cee..a18eb5c 100644 --- a/centos8-obs-latest/Makefile +++ b/centos8-obs-latest/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO:=centos:centos8 +UPSTREAM_DISTRO:=almalinux:8 DISTRO:=centos8 include ../make/Makefile diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile index 27d7a59..2f1c345 100644 --- a/centos8-repo-install-test/Dockerfile +++ b/centos8-repo-install-test/Dockerfile @@ -1,6 +1,6 @@ ARG USER ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # dnf-utils: for repoquery diff --git a/jenkins-common.sh b/jenkins-common.sh index 1e9435a..7130fe2 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -39,9 +39,9 @@ docker_upstream_distro_from_image_name() { case "$1" in osmo-*-centos7) echo "centos:centos7"; ;; - osmo-*-centos8) echo "centos:centos8"; ;; + osmo-*-centos8) echo "almalinux:8"; ;; centos7-*) echo "centos:centos7" ;; - centos8-*) echo "centos:centos8" ;; + centos8-*) echo "almalinux:8" ;; debian9-*) echo "debian:stretch" ;; debian10-*) echo "debian:buster" ;; debian11-*) echo "debian:bullseye" ;; @@ -120,7 +120,7 @@ # name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir # where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile) # and UPSTREAM_DISTRO and DISTRO are passed accordingly (e.g. -# UPSTREAM_DISTRO=centos:centos8 DISTRO=centos8). This allows one +# UPSTREAM_DISTRO=almalinux:8 DISTRO=centos8). This allows one # Dockerfile for multiple distributions, without duplicating configs for # each distribution. Dependencies listed in docker_depends() are built # automatically too. diff --git a/systemd/Dockerfile b/systemd/Dockerfile index 8f1763d..63d4c40 100644 --- a/systemd/Dockerfile +++ b/systemd/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=centos:centos8 +ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG DISTRO -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30e1a773b901b1d2187214445116c7f2aecc4e36 Gerrit-Change-Number: 27049 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe --- M include/osmocom/core/utils.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/27047/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 30d8be6..e6225a0 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -111,7 +111,8 @@ * the predicate evaluates to false (0). */ #define OSMO_ASSERT(exp) \ - if (!(exp)) { \ + if (OSMO_LIKELY(exp)) ; \ + else { \ osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27048 ) Change subject: core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY ...................................................................... core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY Change-Id: Iff666b5fa0b320ae47b6c8c5dfd39debd2d9b8b7 --- M include/osmocom/core/msgb.h 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/27048/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 38e51dd..117fcb0 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -234,7 +234,7 @@ static inline unsigned char *msgb_put(struct msgb *msgb, unsigned int len) { unsigned char *tmp = msgb->tail; - if (msgb_tailroom(msgb) < (int) len) + if (OSMO_UNLIKELY(msgb_tailroom(msgb) < (int) len)) MSGB_ABORT(msgb, "Not enough tailroom msgb_put" " (allocated %u, head at %u, len %u, tailroom %u < want tailroom %u)\n", msgb->data_len - sizeof(struct msgb), @@ -282,7 +282,7 @@ */ static inline unsigned char *msgb_get(struct msgb *msgb, unsigned int len) { - if (msgb_length(msgb) < len) + if (OSMO_UNLIKELY(msgb_length(msgb) < len)) MSGB_ABORT(msgb, "msgb too small to get %u (len %u)\n", len, msgb_length(msgb)); msgb->tail -= len; @@ -334,7 +334,7 @@ */ static inline unsigned char *msgb_push(struct msgb *msgb, unsigned int len) { - if (msgb_headroom(msgb) < (int) len) + if (OSMO_UNLIKELY(msgb_headroom(msgb) < (int) len)) MSGB_ABORT(msgb, "Not enough headroom msgb_push" " (allocated %u, head at %u < want headroom %u, len %u, tailroom %u)\n", msgb->data_len - sizeof(struct msgb), @@ -397,7 +397,7 @@ */ static inline unsigned char *msgb_pull(struct msgb *msgb, unsigned int len) { - if (msgb_length(msgb) < len) + if (OSMO_UNLIKELY(msgb_length(msgb) < len)) MSGB_ABORT(msgb, "msgb too small to pull %u (len %u)\n", len, msgb_length(msgb)); msgb->len -= len; @@ -488,9 +488,9 @@ */ static inline int msgb_trim(struct msgb *msg, int len) { - if (len < 0) + if (OSMO_UNLIKELY(len < 0)) MSGB_ABORT(msg, "Negative length is not allowed\n"); - if (len > msg->data_len) + if (OSMO_UNLIKELY(len > msg->data_len)) return -1; msg->len = len; @@ -526,7 +526,7 @@ osmo_static_assert(size >= headroom, headroom_bigger); struct msgb *msg = msgb_alloc_c(ctx, size, name); - if (msg) + if (OSMO_LIKELY(msg)) msgb_reserve(msg, headroom); return msg; } @@ -548,7 +548,7 @@ osmo_static_assert(size >= headroom, headroom_bigger); struct msgb *msg = msgb_alloc(size, name); - if (msg) + if (OSMO_LIKELY(msg)) msgb_reserve(msg, headroom); return msg; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iff666b5fa0b320ae47b6c8c5dfd39debd2d9b8b7 Gerrit-Change-Number: 27048 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 ) Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 --- M include/osmocom/core/utils.h 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27046/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 327aa3d..30d8be6 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -38,6 +38,15 @@ /*! Copy a C-string into a sized buffer using sizeof to detect buffer's size */ #define OSMO_STRLCPY_ARRAY(array, src) osmo_strlcpy(array, src, sizeof(array)) +/*! Branch prediction optimizations */ +#if defined(__GNUC__) +#define OSMO_LIKELY(exp) __builtin_expect (!!(exp), 1) +#define OSMO_UNLIKELY(exp) __builtin_expect (!!(exp), 0) +#else +#define OSMO_LIKELY(exp) exp +#define OSMO_UNLIKELY(exp) exp +#endif + /*! A mapping between human-readable string and numeric value */ struct value_string { uint32_t value; /*!< numeric value */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27045 ) Change subject: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test ...................................................................... osmo-uecups-master: install iputils-ping for ttcn3-pgw-test In ttcn3-pgw-test we order osmo-uecups-daemon to execute `ping`, which is not available in Debian images. Install it. Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Related: SYS#5602 --- M osmo-uecups-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/45/27045/1 diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index e8767d1..74469e5 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -11,6 +11,7 @@ libosmocore-dev \ libosmo-netif-dev \ libsctp-dev \ + iputils-ping \ strace && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Gerrit-Change-Number: 27045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: make osmo-uecups-daemon more verbose

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 ) Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose ...................................................................... ttcn3-pgw-test: make osmo-uecups-daemon more verbose Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Related: SYS#5602 --- M ttcn3-pgw-test/osmo-uecups-daemon.cfg 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/44/27044/1 diff --git a/ttcn3-pgw-test/osmo-uecups-daemon.cfg b/ttcn3-pgw-test/osmo-uecups-daemon.cfg index 9f63bb7..e268277 100644 --- a/ttcn3-pgw-test/osmo-uecups-daemon.cfg +++ b/ttcn3-pgw-test/osmo-uecups-daemon.cfg @@ -8,7 +8,8 @@ logging timestamp 1 logging color 0 ! - logging level set-all info + logging level set-all debug + logging level linp info line vty bind 0.0.0.0 uecups -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Gerrit-Change-Number: 27044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: Allow configuration of interfaces/lines via VTY

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27016 ) Change subject: Allow configuration of interfaces/lines via VTY ...................................................................... Allow configuration of interfaces/lines via VTY So far, osmo-e1d automatically opened all compatible icE1usb devices and all E1 lines on those interfaces. Let's allow for 'interface' and 'line' configuration in the VTY. USB devices can be identified by their serial number string. If a given device (== E1 interface) has a VTY configuration, then only those E1 lines with VTY configuration opened. For each Line (icE1usb or vpair), the mode (channelized/superchannel) can also be set via VTY. Change-Id: I89b57b688b68901f87d9683ab9294772ee747d77 Closes: OS#5400 --- M src/e1d.h M src/intf_line.c M src/usb.c M src/vty.c 4 files changed, 261 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/e1d.h b/src/e1d.h index b76df7a..5d24c5a 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -34,7 +34,8 @@ enum e1d_vty_node { E1D_NODE = _LAST_OSMOVTY_NODE + 1, - LINE_NODE + INTF_NODE, + LINE_NODE, }; #define line_ctr_add(line, idx, add) rate_ctr_add(rate_ctr_group_get_ctr((line)->ctrs, idx), add) @@ -147,6 +148,11 @@ struct e1_daemon *e1d; uint8_t id; + struct { + char *serial_str; + } usb; + + bool vty_created; enum e1_driver drv; void *drv_data; @@ -171,6 +177,9 @@ struct e1_intf * e1d_find_intf(struct e1_daemon *e1d, uint8_t id); +struct e1_intf * +e1d_find_intf_by_usb_serial(struct e1_daemon *e1d, const char *serial_str); + void e1_intf_destroy(struct e1_intf *intf); diff --git a/src/intf_line.c b/src/intf_line.c index cb3f277..3fb9c9d 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -95,6 +95,18 @@ return NULL; } +struct e1_intf * +e1d_find_intf_by_usb_serial(struct e1_daemon *e1d, const char *serial_str) +{ + struct e1_intf *intf; + + llist_for_each_entry(intf, &e1d->interfaces, list) + if (intf->usb.serial_str && !strcmp(intf->usb.serial_str, serial_str)) + return intf; + + return NULL; +} + struct e1_line * e1_intf_find_line(struct e1_intf *intf, uint8_t id) { diff --git a/src/usb.c b/src/usb.c index 0100c31..c8920e5 100644 --- a/src/usb.c +++ b/src/usb.c @@ -529,9 +529,13 @@ struct e1_line *line; struct e1_usb_intf_data *intf_data; struct e1_usb_line_data *line_data; + struct libusb_device_descriptor dd; struct libusb_config_descriptor *cd; const struct libusb_interface_descriptor *id; + bool auto_create_lines; + char serial_str[64]; libusb_device_handle *devh; + int line_nr = 0; int i, j, ret; ret = libusb_open(dev, &devh); @@ -540,15 +544,57 @@ return ret; } - intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); - intf_data->devh = devh; + ret = libusb_get_device_descriptor(dev, &dd); + if (ret) { + LOGP(DE1D, LOGL_ERROR, "Failed to get device descriptor\n"); + libusb_close(devh); + return ret; + } - intf = e1_intf_new(e1d, -1, intf_data); - intf->drv = E1_DRIVER_USB; + /* this is actually a synchronous / blocking call, and if we detect a second icE1usb device while the + * first one is running, we might be delaying/blocking any important USB transfers. However, as we + * still only call this probe function once at start-up and don't support hot-plugging yet, we can get + * away with it. */ + ret = libusb_get_string_descriptor_ascii(devh, dd.iSerialNumber, (uint8_t *)serial_str, sizeof(serial_str)); + if (ret < 0) { + LOGP(DE1D, LOGL_ERROR, "Failed to get iSerialNumber string descriptor\n"); + libusb_close(devh); + return ret; + } + + /* try to find the matching interface config created by the vty */ + intf = e1d_find_intf_by_usb_serial(e1d, serial_str); + if (intf) { + LOGP(DE1D, LOGL_INFO, "Configuration for icE1usb serial '%s' found\n", serial_str); + auto_create_lines = false; + if (intf->drv_data) { + LOGP(DE1D, LOGL_ERROR, "New device with serial '%s', but E1 interface %u busy\n", + serial_str, intf->id); + libusb_close(devh); + return -EBUSY; + } + intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); + intf_data->devh = devh; + intf->drv_data = intf_data; + } else { + LOGP(DE1D, LOGL_NOTICE, "No configuration for icE1usb serial '%s' found, " + "auto-generating it\n", serial_str); + auto_create_lines = true; + intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data); + intf_data->devh = devh; + intf = e1_intf_new(e1d, -1, intf_data); + intf->drv = E1_DRIVER_USB; + osmo_talloc_replace_string(intf, &intf->usb.serial_str, serial_str); + } ret = libusb_get_active_config_descriptor(dev, &cd); if (ret) { LOGP(DE1D, LOGL_ERROR, "Failed to talk to usb device\n"); + intf_data->devh = NULL; + talloc_free(intf_data); + if (auto_create_lines) + e1_intf_destroy(intf); + libusb_close(devh); return ret; } @@ -561,17 +607,26 @@ if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 3)) continue; + line = e1_intf_find_line(intf, line_nr); + if (line) { + OSMO_ASSERT(auto_create_lines == false); + if (line->drv_data) { + LOGPLI(line, DE1D, LOGL_ERROR, "line busy but we are trying to open it again?\n"); + goto next_interface; + } + } + /* Get interface and set it up */ ret = libusb_claim_interface(devh, id->bInterfaceNumber); if (ret) { LOGP(DE1D, LOGL_ERROR, "Failed to claim interface %d\n", id->bInterfaceNumber); - return ret; + goto next_interface; } ret = libusb_set_interface_alt_setting(devh, id->bInterfaceNumber, 1); if (ret) { LOGP(DE1D, LOGL_ERROR, "Failed to set interface %d altsetting\n", id->bInterfaceNumber); - return ret; + goto next_interface; } /* Setup driver data and find endpoints */ @@ -605,10 +660,20 @@ if (!line_data->ep_in || !line_data->ep_out || !line_data->ep_fb || !line_data->pkt_size) { LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); - return -EINVAL; + goto next_interface; } - line = e1_line_new(intf, -1, line_data); + if (!line) { + if (!auto_create_lines) { + LOGPIF(intf, DE1D, LOGL_ERROR, "No configuration for line %d " + "iInterface=%d, skipping\n", line_nr, id->bInterfaceNumber); + goto next_interface; + } + line = e1_line_new(intf, line_nr, line_data); + } else { + OSMO_ASSERT(auto_create_lines == false); + line->drv_data = line_data; + } line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); @@ -620,6 +685,9 @@ if (line_data->ep_int) resubmit_irq(line); + +next_interface: + line_nr++; } return 0; diff --git a/src/vty.c b/src/vty.c index 2f2425c..fca56a4 100644 --- a/src/vty.c +++ b/src/vty.c @@ -47,15 +47,35 @@ 1, }; +static struct cmd_node intf_node = { + (enum node_type) INTF_NODE, + "%s(config-e1d-intf)# ", + 1, +}; + +static struct cmd_node line_node = { + (enum node_type) LINE_NODE, + "%s(config-e1d-intf-line)# ", + 1, +}; + #if 0 static void vty_dump_ts(struct vty *vty, const struct e1_ts *ts) { } #endif +static const char *intf_serno(const struct e1_intf *intf) +{ + if (intf->usb.serial_str) + return intf->usb.serial_str; + else + return "unnamed"; +} + static void vty_dump_intf(struct vty *vty, const struct e1_intf *intf) { - vty_out(vty, "Interface #%u, Driver: %s%s", intf->id, + vty_out(vty, "Interface #%u (%s), Driver: %s%s", intf->id, intf_serno(intf), get_value_string(e1_driver_names, intf->drv), VTY_NEWLINE); } @@ -100,8 +120,8 @@ }; const struct value_string e1_line_mode_names[] = { - { E1_LINE_MODE_CHANNELIZED, "CHANNELIZED" }, - { E1_LINE_MODE_SUPERCHANNEL, "SUPERCHANNEL" }, + { E1_LINE_MODE_CHANNELIZED, "channelized" }, + { E1_LINE_MODE_SUPERCHANNEL, "superchannel" }, { 0, NULL } }; @@ -109,8 +129,9 @@ { unsigned int tn; - vty_out(vty, "Interface #%u, Line #%u, Mode %s%s%s:%s", line->intf->id, line->id, - get_value_string(e1_line_mode_names, line->mode), + vty_out(vty, "Interface #%u (%s), Line #%u, Mode %s%s%s:%s", line->intf->id, + intf_serno(line->intf), line->id, + osmo_str_toupper(get_value_string(e1_line_mode_names, line->mode)), line->ts0.cur_errmask & E1L_TS0_RX_ALARM ? " [REMOTE-ALARM]" : "", line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR ? " [REMOTE-CRC-ERROR]" : "", VTY_NEWLINE); @@ -177,6 +198,109 @@ return CMD_SUCCESS; } +DEFUN(cfg_e1d_if_icE1usb, cfg_e1d_if_icE1usb_cmd, "interface <0-255> icE1usb", + "Configure an icE1usb E1 interface\n" + "E1 Interface Number\n") +{ + struct e1_intf *intf; + int intf_nr = atoi(argv[0]); + + intf = e1d_find_intf(vty_e1d, intf_nr); + if (!intf) { + intf = e1_intf_new(vty_e1d, intf_nr, NULL); + } + if (!intf) { + vty_out(vty, "%% Could not create interface%s", VTY_NEWLINE); + return CMD_WARNING; + } + intf->drv = E1_DRIVER_USB; + intf->vty_created = true; + + vty->index = intf; + vty->node = INTF_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_e1d_if_vpair, cfg_e1d_if_vpair_cmd, "interface <0-255> vpair", + "Configure a vpair member interface\n" + "E1 Interface Number\n") +{ + struct e1_intf *intf; + int intf_nr = atoi(argv[0]); + + intf = e1d_find_intf(vty_e1d, intf_nr); + if (!intf) { + vty_out(vty, "%% Could not find E1 interface %u, ddi you create it " + "using viertual-e1-pair?%s", intf_nr, VTY_NEWLINE); + return CMD_WARNING; + } + if (intf->drv != E1_DRIVER_VPAIR) { + vty_out(vty, "%% Interface %u is not a vpair interface%s", intf_nr, VTY_NEWLINE); + return CMD_WARNING; + } + intf->vty_created = true; + + vty->index = intf; + vty->node = INTF_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_e1d_if_usb_serial, cfg_e1d_if_usb_serial_cmd, + "usb-serial SERNO", + "Configure the USB serial number of an E1 interface device\n" + "iSerial string\n") +{ + struct e1_intf *intf = vty->index; + + if (intf->drv != E1_DRIVER_USB) + return CMD_WARNING; + + osmo_talloc_replace_string(intf, &intf->usb.serial_str, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_e1d_if_line, cfg_e1d_if_line_cmd, "line <0-255>", + "Configure an E1 line\n" + "E1 Interface Number\n") +{ + struct e1_intf *intf = vty->index; + struct e1_line *line; + int line_nr = atoi(argv[0]); + + line = e1_intf_find_line(intf, line_nr); + if (!line) + line = e1_line_new(intf, line_nr, NULL); + if (!line) { + vty_out(vty, "%% Could not create line%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vty->index = line; + vty->node = LINE_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_e1d_if_line_mode, cfg_e1d_if_line_mode_cmd, + "mode (channelized|superchannel)", + "Configure the mode of the E1 line\n" + "Channelized (64kBps timeslot) mode\n" + "Superchannel (1xHDLC over 31x64kBps) mode\n") +{ + struct e1_line *line = vty->index; + + line->mode = get_string_value(e1_line_mode_names, argv[0]); + return CMD_SUCCESS; +} + + +static int config_write_line(struct vty *vty, struct e1_line *line) +{ + vty_out(vty, " line %u%s", line->id, VTY_NEWLINE); + vty_out(vty, " mode %s%s", get_value_string(e1_line_mode_names, line->mode), VTY_NEWLINE); + + return 0; +} + static int config_write_e1d(struct vty *vty) { struct e1_intf *intf; @@ -204,6 +328,31 @@ vty_out(vty, " virtual-e1-pair %u%s", line_count, VTY_NEWLINE); } + + /* dump line config for those lines that were created by the vty */ + llist_for_each_entry(intf, &vty_e1d->interfaces, list) { + struct e1_line *line; + + if (!intf->vty_created) + continue; + + switch (intf->drv) { + case E1_DRIVER_USB: + vty_out(vty, " interface %u icE1usb%s", intf->id, VTY_NEWLINE); + if (intf->usb.serial_str && strlen(intf->usb.serial_str)) + vty_out(vty, " usb-serial %s%s", intf->usb.serial_str, VTY_NEWLINE); + break; + case E1_DRIVER_VPAIR: + vty_out(vty, " interface %u vpair%s", intf->id, VTY_NEWLINE); + break; + default: + break; + } + + llist_for_each_entry(line, &intf->lines, list) + config_write_line(vty, line); + } + return 0; } @@ -216,4 +365,13 @@ install_node(&e1d_node, config_write_e1d); install_element(CONFIG_NODE, &cfg_e1d_cmd); install_element(E1D_NODE, &cfg_vpair_cmd); + + install_node(&intf_node, NULL); + install_element(E1D_NODE, &cfg_e1d_if_icE1usb_cmd); + install_element(E1D_NODE, &cfg_e1d_if_vpair_cmd); + install_element(INTF_NODE, &cfg_e1d_if_line_cmd); + install_element(INTF_NODE, &cfg_e1d_if_usb_serial_cmd); + + install_node(&line_node, NULL); + install_element(LINE_NODE, &cfg_e1d_if_line_mode_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I89b57b688b68901f87d9683ab9294772ee747d77 Gerrit-Change-Number: 27016 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: Allow configuration of interfaces/lines via VTY

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27016 ) Change subject: Allow configuration of interfaces/lines via VTY ...................................................................... Patch Set 7: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I89b57b688b68901f87d9683ab9294772ee747d77 Gerrit-Change-Number: 27016 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Feb 2022 17:17:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1d[master]: Proper libusb error reporting in all error paths

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27040 ) Change subject: Proper libusb error reporting in all error paths ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id205f1cf1bbccd83b789f8ab31fe1d5d4e1fb8a9 Gerrit-Change-Number: 27040 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Feb 2022 17:12:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by tnt

Attention is currently required from: roox, laforge, roh. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 ) Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 17:06:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... bsc_nat_fsm: initial msc <> bsc msg forwarding Add an initial implementation of sccp_sap_up, that assumes one BSC and one MSC, and successfully forwards RESET and RESET ACK between both. Related: SYS#5560 Depends: libosmo-sccp I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M src/osmo-bsc-nat/bsc_nat_fsm.c 2 files changed, 110 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg index c3c5825..f56dcb0 100644 --- a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg +++ b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg @@ -3,12 +3,20 @@ asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua remote-ip 127.0.0.1 local-ip 127.0.0.3 + sccp-address msc + routing-indicator PC + point-code 0.23.1 + subsystem-number 254 cs7 instance 1 point-code 0.23.1 asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip 127.0.0.2 local-ip 127.0.0.4 + sccp-address bsc + routing-indicator PC + point-code 0.23.3 + subsystem-number 254 bsc-nat cs7-instance-cn 0 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 62059a3..403097a 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -25,7 +25,10 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/select.h> +#include <osmocom/gsm/gsm0808.h> + #include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> @@ -34,6 +37,18 @@ #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ +static char log_buf[255]; + +#define LOG_SCCP(ss7_inst, peer_addr, level, fmt, args...) do { \ + if (peer_addr) \ + osmo_sccp_addr_to_str_buf(log_buf, sizeof(log_buf), NULL, peer_addr); \ + LOGP(DMAIN, level, "(%s%s%s) " fmt, \ + peer_addr ? log_buf : "", \ + peer_addr ? " from " : "", \ + ss7_inst == g_bsc_nat->ran ? "RAN" : "CN", \ + ## args); \ +} while (0) + #define X(s) (1 << (s)) enum bsc_nat_fsm_states { @@ -47,11 +62,95 @@ BSC_NAT_FSM_EV_STOP, }; -static int sccp_sap_up(struct osmo_prim_hdr *oph, void *priv) +static struct bsc_nat_ss7_inst *ss7_inst_dest(struct bsc_nat_ss7_inst *src) { - LOGP(DMAIN, LOGL_NOTICE, "STUB: sccp_sap_up() called\n"); + if (src == g_bsc_nat->cn) + return g_bsc_nat->ran; + return g_bsc_nat->cn; +} - return 0; +static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) +{ + struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); + struct bsc_nat_ss7_inst *dest = ss7_inst_dest(src); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; + struct osmo_sccp_addr *my_addr; + struct osmo_sccp_addr *peer_addr; + char buf[255]; + int rc = -1; + + switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): + /* indication of new inbound connection request */ + peer_addr = &prim->u.connect.calling_addr; + LOG_SCCP(src, peer_addr, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): + /* connection-oriented data received */ + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): + /* indication of disconnect */ + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + break; + + case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): + /* connection-less data received */ + my_addr = &prim->u.unitdata.called_addr; + peer_addr = &prim->u.unitdata.calling_addr; + LOG_SCCP(src, peer_addr, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, my_addr)) { + osmo_sccp_addr_to_str_buf(buf, sizeof(buf), NULL, my_addr); + LOG_SCCP(src, peer_addr, LOGL_ERROR, "Called address %s is not the locally configured" + " address %s\n", buf, osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr)); + goto error; + } + + /* Figure out called party in dest. TODO: build and use a + * mapping of peer_addr + conn_id <--> dest_ss7. For now, this + * is simplified by assuming there is only one MSC, one BSC. */ + + struct osmo_ss7_instance *dest_ss7; + struct osmo_sccp_addr dest_called; + + dest_ss7 = osmo_ss7_instance_find(dest->ss7_id); + OSMO_ASSERT(dest_ss7); + + if (src == g_bsc_nat->ran) { + if (osmo_sccp_addr_by_name_local(&dest_called, "msc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr, LOGL_ERROR, "Could not find MSC in address book\n"); + goto error; + } + } else { + if (osmo_sccp_addr_by_name_local(&dest_called, "bsc", dest_ss7) < 0) { + LOG_SCCP(src, peer_addr, LOGL_ERROR, "Could not find BSC in address book\n"); + goto error; + } + } + + LOG_SCCP(src, peer_addr, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &dest_called), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + /* oph->msg stores oph and unitdata msg. Move oph->msg->data to + * unitdata msg and send it again. */ + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_unitdata(dest->scu, &dest->local_sccp_addr, &dest_called, oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + + default: + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + break; + } + +error: + msgb_free(oph->msg); + return rc; } static int ss7_inst_init(struct bsc_nat_ss7_inst *inst, const char *name, const char *default_pc_str, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 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-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 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: Tue, 01 Feb 2022 17:00:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: xua_asp_fsm: Fix gcc false positive warning

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 ) Change subject: xua_asp_fsm: Fix gcc false positive warning ...................................................................... xua_asp_fsm: Fix gcc false positive warning As of GCC 11.1.0, it starts printing a warning about uninitialized variable. It is a false positive since tmode is really only used in the case where traffic_mode is not zero, in which case tmode is set. Let's restrict the scope of tmode to fix the issue and also make it clearer where the variable is used. """ In file included from /git/libosmo-sccp/src/xua_asp_fsm.c:25: /git/libosmo-sccp/src/xua_asp_fsm.c: In function ‘xua_asp_fsm_inactive’: /git/libosmo-sccp/include/osmocom/sigtran/osmo_ss7.h:274:16: error: ‘tmode’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 274 | return get_value_string(osmo_ss7_as_traffic_mode_vals, mode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/libosmo-sccp/src/xua_asp_fsm.c:476:39: note: ‘tmode’ was declared here 476 | enum osmo_ss7_as_traffic_mode tmode; | """ Change-Id: I4fc38724aba3a3f178ba0b45444e1394db44d039 --- M src/xua_asp_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 5fe1d80..a93dbd2 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -473,7 +473,6 @@ struct osmo_ss7_as *as; struct xua_msg *xua_in; uint32_t traf_mode = 0; - enum osmo_ss7_as_traffic_mode tmode; struct xua_msg_part *part; int i; @@ -515,7 +514,6 @@ peer_send_error(fi, M3UA_ERR_UNSUPP_TRAF_MOD_TYP); return; } - tmode = osmo_ss7_tmode_from_xua(traf_mode); } if ((part = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) { for (i = 0; i < part->len / sizeof(uint32_t); i++) { @@ -529,6 +527,7 @@ } if (traf_mode) { /* if the peer has specified a traffic mode at all */ + enum osmo_ss7_as_traffic_mode tmode = osmo_ss7_tmode_from_xua(traf_mode); llist_for_each_entry(as, &asp->inst->as_list, list) { if (!osmo_ss7_as_has_asp(as, asp)) continue; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4fc38724aba3a3f178ba0b45444e1394db44d039 Gerrit-Change-Number: 27041 Gerrit-PatchSet: 2 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-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: xua_asp_fsm: Fix gcc false positive warning

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 ) Change subject: xua_asp_fsm: Fix gcc false positive warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4fc38724aba3a3f178ba0b45444e1394db44d039 Gerrit-Change-Number: 27041 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:59:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog_wait(): print more debugging info

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 ) Change subject: PGW_Tests: f_start_prog_wait(): print more debugging info ...................................................................... PGW_Tests: f_start_prog_wait(): print more debugging info Change-Id: I73314ccfdabd3860e15c732260b024f4c984bebf Related: SYS#5602 --- M pgw/PGW_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 75dcb83..2bb0ddc 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -402,6 +402,7 @@ run_as_user := mp_run_prog_as_user, tun_netns_name := g_pars.tun_netns_name }; + log("Starting a program: ", command); var UECUPS_StartProgramRes res := f_gtp2_start_program(sprog); if (res.result != OK) { setverdict(fail, "Unable to start program '", command, "'"); @@ -413,6 +414,7 @@ private function f_wait_term(integer pid, template (present) integer exit_code := 0, float tout := 10.0) runs on PGW_Session_CT { + var UECUPS_ProgramTermInd pti; timer T := tout; T.start; @@ -420,8 +422,8 @@ [] GTP2.receive(UECUPS_ProgramTermInd:{pid := pid, exit_code := exit_code}) { setverdict(pass); } - [] GTP2.receive(UECUPS_ProgramTermInd:?) { - setverdict(fail, "Received unexpected ProgramTermInd"); + [] GTP2.receive(UECUPS_ProgramTermInd:?) -> value pti { + setverdict(fail, "Received unexpected ProgramTermInd := ", pti); } [] T.timeout { setverdict(fail, "timeout waiting for user-plane program termination"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 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: I73314ccfdabd3860e15c732260b024f4c984bebf Gerrit-Change-Number: 27042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog_wait(): print more debugging info

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 ) Change subject: PGW_Tests: f_start_prog_wait(): print more debugging info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 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: I73314ccfdabd3860e15c732260b024f4c984bebf Gerrit-Change-Number: 27042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:59:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by laforge

Attention is currently required from: roox, tnt, roh. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 ) Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... Patch Set 3: (1 comment) File firmware/ice40-riscv/icE1usb/usb_str_app.txt: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017/comment/b81774a5_a4f5… PS2, Line 12: GPS-DO control > Actually while you're at it shifting things, could you put that string before DFU string and adapt t […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:58:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by laforge

Attention is currently required from: roox, laforge, roh. Hello Jenkins Builder, roox, tnt, roh, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 to look at the new patch set (#3). Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... icE1usb: Move GPS-DO USB control to separate USB interface doing so significantly simplifies the development of a Linux kernel driver, as the GPS-DO only exists once (not twice, like the per-E1-line interface), and Linux kernel USB drivers typically are for an interface. There is an option to write a usb_device_driver, but doing so will exclude the per-interface drivers from still being probed in their usual fashion. While we introduce this new USB Interface for the GPS-DO, we also move the related control endpoint requests from the device level to the interface level. Finally, some naming inconsistency between "enum ice1usb_gpsdo_antenna_state" vs. the member name antenna_status is resolved. Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/fw_app.c M firmware/ice40-riscv/icE1usb/gpsdo.c M firmware/ice40-riscv/icE1usb/ice1usb_proto.h M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_desc_ids.h M firmware/ice40-riscv/icE1usb/usb_dev.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.h M firmware/ice40-riscv/icE1usb/usb_str_app.txt 10 files changed, 172 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/17/27017/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Fix ordering of USB interface numbers

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 ) Change subject: icE1usb: Fix ordering of USB interface numbers ...................................................................... icE1usb: Fix ordering of USB interface numbers The USB spec requires interface numbers to be in sequential order, and the existing firmware fails that requirement, as is shown by the Chapter9 test suite ("USB30CV"). With this patch applied, the USB30CV Chapter9 test suite passes. Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 --- M firmware/ice40-riscv/icE1usb/usb_desc_ids.h 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index 3fbc417..dadf4c6 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -8,9 +8,9 @@ #pragma once #define USB_INTF_E1(p) (0 + (p)) -#define USB_INTF_DFU 2 -#define USB_INTF_GPS_CDC_CTL 3 -#define USB_INTF_GPS_CDC_DATA 4 +#define USB_INTF_GPS_CDC_CTL 2 +#define USB_INTF_GPS_CDC_DATA 3 +#define USB_INTF_DFU 4 #define USB_INTF_NUM 5 #define USB_EP_E1_IN(p) (0x82 + (3 * (p))) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 Gerrit-Change-Number: 27043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Fix ordering of USB interface numbers

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 ) Change subject: icE1usb: Fix ordering of USB interface numbers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 Gerrit-Change-Number: 27043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:54:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Fix ordering of USB interface numbers

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 ) Change subject: icE1usb: Fix ordering of USB interface numbers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 Gerrit-Change-Number: 27043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:44:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by tnt

Attention is currently required from: roox, laforge, roh. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 ) Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... Patch Set 2: (1 comment) File firmware/ice40-riscv/icE1usb/usb_str_app.txt: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017/comment/3c550f1a_6298… PS2, Line 12: GPS-DO control Actually while you're at it shifting things, could you put that string before DFU string and adapt the index in the descriptors ? Just to keep things in the same order. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 16:43:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by laforge

Attention is currently required from: roox, roh. Hello Jenkins Builder, roox, tnt, roh, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 to look at the new patch set (#2). Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... icE1usb: Move GPS-DO USB control to separate USB interface doing so significantly simplifies the development of a Linux kernel driver, as the GPS-DO only exists once (not twice, like the per-E1-line interface), and Linux kernel USB drivers typically are for an interface. There is an option to write a usb_device_driver, but doing so will exclude the per-interface drivers from still being probed in their usual fashion. While we introduce this new USB Interface for the GPS-DO, we also move the related control endpoint requests from the device level to the interface level. Finally, some naming inconsistency between "enum ice1usb_gpsdo_antenna_state" vs. the member name antenna_status is resolved. Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/fw_app.c M firmware/ice40-riscv/icE1usb/gpsdo.c M firmware/ice40-riscv/icE1usb/ice1usb_proto.h M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_desc_ids.h M firmware/ice40-riscv/icE1usb/usb_dev.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.h M firmware/ice40-riscv/icE1usb/usb_str_app.txt 10 files changed, 171 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/17/27017/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Fix ordering of USB interface numbers

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 ) Change subject: icE1usb: Fix ordering of USB interface numbers ...................................................................... icE1usb: Fix ordering of USB interface numbers The USB spec requires interface numbers to be in sequential order, and the existing firmware fails that requirement, as is shown by the Chapter9 test suite ("USB30CV"). With this patch applied, the USB30CV Chapter9 test suite passes. Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 --- M firmware/ice40-riscv/icE1usb/usb_desc_ids.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/43/27043/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index 3fbc417..dadf4c6 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -8,9 +8,9 @@ #pragma once #define USB_INTF_E1(p) (0 + (p)) -#define USB_INTF_DFU 2 -#define USB_INTF_GPS_CDC_CTL 3 -#define USB_INTF_GPS_CDC_DATA 4 +#define USB_INTF_GPS_CDC_CTL 2 +#define USB_INTF_GPS_CDC_DATA 3 +#define USB_INTF_DFU 4 #define USB_INTF_NUM 5 #define USB_EP_E1_IN(p) (0x82 + (3 * (p))) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a5434447ee20f77ce0ba9e7b1884cbd5b466439 Gerrit-Change-Number: 27043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog_wait(): print more debugging info

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 ) Change subject: PGW_Tests: f_start_prog_wait(): print more debugging info ...................................................................... PGW_Tests: f_start_prog_wait(): print more debugging info Change-Id: I73314ccfdabd3860e15c732260b024f4c984bebf Related: SYS#5602 --- M pgw/PGW_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/27042/1 diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 75dcb83..2bb0ddc 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -402,6 +402,7 @@ run_as_user := mp_run_prog_as_user, tun_netns_name := g_pars.tun_netns_name }; + log("Starting a program: ", command); var UECUPS_StartProgramRes res := f_gtp2_start_program(sprog); if (res.result != OK) { setverdict(fail, "Unable to start program '", command, "'"); @@ -413,6 +414,7 @@ private function f_wait_term(integer pid, template (present) integer exit_code := 0, float tout := 10.0) runs on PGW_Session_CT { + var UECUPS_ProgramTermInd pti; timer T := tout; T.start; @@ -420,8 +422,8 @@ [] GTP2.receive(UECUPS_ProgramTermInd:{pid := pid, exit_code := exit_code}) { setverdict(pass); } - [] GTP2.receive(UECUPS_ProgramTermInd:?) { - setverdict(fail, "Received unexpected ProgramTermInd"); + [] GTP2.receive(UECUPS_ProgramTermInd:?) -> value pti { + setverdict(fail, "Received unexpected ProgramTermInd := ", pti); } [] T.timeout { setverdict(fail, "timeout waiting for user-plane program termination"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27042 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: I73314ccfdabd3860e15c732260b024f4c984bebf Gerrit-Change-Number: 27042 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: xua_asp_fsm: Fix gcc false positive warning

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 ) Change subject: xua_asp_fsm: Fix gcc false positive warning ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4fc38724aba3a3f178ba0b45444e1394db44d039 Gerrit-Change-Number: 27041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 14:29:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 12:32:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... jobs/{master-builds,gerrit-*}: add osmo-bsc-nat Related: SYS#5560 Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 --- M jobs/gerrit-lint.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 3 files changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 45db681..0d98d9d 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -26,6 +26,7 @@ - openbsc - openggsn - osmo-bsc + - osmo-bsc-nat - osmo-bts - osmo-hnodeb - osmo-hnbgw diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a1fce4d..84fe805 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -89,6 +89,7 @@ cmd: '{timeout_cmd} ./contrib/jenkins.sh' - osmo-bsc + - osmo-bsc-nat - osmo-bts: slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10] diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0c2be30..0b226d1 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -107,6 +107,7 @@ trigger: > master-openbsc, master-osmo-bsc, + master-osmo-bsc-nat, master-osmo-iuh, master-osmo-msc, master-osmo-sgsn @@ -130,6 +131,7 @@ # -> master-libosmo-sccp # -> master-openbsc # -> master-osmo-bsc + # -> master-osmo-bsc-nat # -> master-osmo-iuh # -> master-osmo-msc # -> master-osmo-sgsn @@ -181,6 +183,7 @@ {docker_img} /build/contrib/jenkins.sh - osmo-bsc + - osmo-bsc-nat - osmo-bts: slave_axis: !!python/tuple [osmocom-master-debian9, rpi4-raspbian10] -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:14:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27022 ) Change subject: jobs/{master-builds,gerrit-*}: add osmo-bsc-nat ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I240cb614bf3905d04bccc6a00c72567a2ad722d8 Gerrit-Change-Number: 27022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:12:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 ) Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... Patch Set 7: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030/comment/fa55316c_3f774054 PS5, Line 142: oph->msg = NULL; > > Why are you doing this? […] patchset 7 uses osmo_sccp_tx_unitdata instead of osmo_sccp_tx_unitdata_msg, so I can just do one msgb_free() before the return. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:10:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... osmo_ss7_vty: add osmo_sccp_addr_by_name_local Add a new function similar to osmo_sccp_addr_by_name, but search in a specific ss7 instance's addressbook instead of searching in the global address book. This is needed for osmo-bsc-nat, which uses two separate instances at the same time. Related: SYS#5560 Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 --- M include/osmocom/sigtran/sccp_sap.h M src/osmo_ss7_vty.c 2 files changed, 24 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index adac606..2b41fed 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -301,6 +301,8 @@ int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); struct osmo_ss7_instance *osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, const char *name); +int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, + const struct osmo_ss7_instance *inst); const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr); diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 8ee3087..7dffe02 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1350,6 +1350,28 @@ return entry->inst; } +/*! \brief Lookup an SCCP address from the addressbook of a specific instance + * by its name. + * \param[out] dest_addr pointer to output the resulting sccp-address; + * (set to NULL if not interested) + * \param[in] name of the address to lookup + * \param[in] inst ss7 instance of which the address book will be searched + * \returns 0 on success; <0 on error */ +int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, + const struct osmo_ss7_instance *inst) +{ + struct osmo_sccp_addr_entry *entry; + + entry = addr_entry_by_name_local(name, inst); + if (!entry) + return -ENOENT; + + if (dest_addr) + *dest_addr = entry->addr; + + return 0; +} + /*! \brief Reverse lookup the lookup-name of a specified SCCP address. * \param[in] name of the address to lookup * \returns char pointer to the lookup-name; NULL on error */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 ) Change subject: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes ...................................................................... include/osmocom/sigtran/sccp_sap.h: cosmetic fixes Move return type to the same line as the name of the function to follow coding guidelines. Change-Id: I10475aa395a1cfd49ff62c758f99f9689a0038d0 --- M include/osmocom/sigtran/sccp_sap.h 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index d741644..adac606 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -281,8 +281,7 @@ void osmo_sccp_vty_init(void); -struct osmo_sccp_instance * -osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv); +struct osmo_sccp_instance *osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv); void osmo_sccp_instance_destroy(struct osmo_sccp_instance *inst); struct osmo_ss7_instance *osmo_sccp_get_ss7(const struct osmo_sccp_instance *sccp); struct osmo_sccp_instance *osmo_sccp_get_sccp(const struct osmo_sccp_user *scu); @@ -291,22 +290,17 @@ void osmo_sccp_user_set_priv(struct osmo_sccp_user *scu, void *priv); void *osmo_sccp_user_get_priv(struct osmo_sccp_user *scu); -struct osmo_sccp_user * -osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, - osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc); +struct osmo_sccp_user *osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name, + osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc); -struct osmo_sccp_user * -osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name, - osmo_prim_cb prim_cb, uint16_t ssn); -struct osmo_sccp_user * -osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc); +struct osmo_sccp_user *osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name, + osmo_prim_cb prim_cb, uint16_t ssn); +struct osmo_sccp_user *osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc); int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); -struct osmo_ss7_instance * -osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, - const char *name); +struct osmo_ss7_instance *osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, const char *name); const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I10475aa395a1cfd49ff62c758f99f9689a0038d0 Gerrit-Change-Number: 27026 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:08:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: osmo_ss7_vty: add osmo_sccp_addr_by_name_local

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 ) Change subject: osmo_ss7_vty: add osmo_sccp_addr_by_name_local ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Gerrit-Change-Number: 27027 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:08:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial msc <> bsc msg forwarding

by osmith

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 to look at the new patch set (#7). Change subject: bsc_nat_fsm: initial msc <> bsc msg forwarding ...................................................................... bsc_nat_fsm: initial msc <> bsc msg forwarding Add an initial implementation of sccp_sap_up, that assumes one BSC and one MSC, and successfully forwards RESET and RESET ACK between both. Related: SYS#5560 Depends: libosmo-sccp I0f38b0d038b0dd8cd355e7284e5b56d438811bd9 Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M src/osmo-bsc-nat/bsc_nat_fsm.c 2 files changed, 110 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/30/27030/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I4af398bb433341a98f818822e6c3af28b6d9dacd Gerrit-Change-Number: 27030 Gerrit-PatchSet: 7 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 ) Change subject: include/osmocom/sigtran/sccp_sap.h: cosmetic fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I10475aa395a1cfd49ff62c758f99f9689a0038d0 Gerrit-Change-Number: 27026 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Feb 2022 11:03:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log February 2022