July 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ci[master]: jobs/gerrit-binpkgs: don't hardcode distros

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33988 ) Change subject: jobs/gerrit-binpkgs: don't hardcode distros ...................................................................... jobs/gerrit-binpkgs: don't hardcode distros Make it possible to set a list of distributions to check in gerrit-verifications.yml instead of only having one boolean for testing two hardcoded rpm and deb distributions. Change-Id: I59487e3dc2f55057de1b6a322f088fff0d18654c --- M jobs/gerrit-binpkgs.yml M jobs/gerrit-verifications.yml M scripts/jenkins-gerrit/comment_generate.py 3 files changed, 109 insertions(+), 61 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml index 7a4e9e9..ecfbd52 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -5,13 +5,10 @@ - project: name: gerrit-binpkgs jobs: - - 'gerrit-binpkgs-{type}' - type: - - 'deb' - - 'rpm' + - 'gerrit-binpkgs' -- job-template: - name: 'gerrit-binpkgs-{type}' +- job: + name: 'gerrit-binpkgs' project-type: freestyle node: osmocom-gerrit concurrent: true @@ -21,7 +18,7 @@ days-to-keep: 30 num-to-keep: 1000 description: | - {type} package job of CI for patches sent to + binary packages job (deb/rpm) of CI for patches sent to <a href="https://gerrit.osmocom.org">gerrit</a> </br></br> Related issue: <a href="https://osmocom.org/issues/2385">OS#2385</a> @@ -44,6 +41,9 @@ - string: name: PROJECT_NAME description: project to test, e.g. 'libosmocore' (set by pipeline) + - string: + name: DISTRO + description: distribution to build for, e.g. 'debian:12' (set by pipeline) scm: - git: @@ -62,14 +62,13 @@ builders: - shell: |- - # Skip rpm build if .spec.in file is missing - if [ "{type}" = "rpm" ] && [ -z "$(find code-from-gerrit -name '*.spec.in')" ]; then - set +x - echo - echo "No *.spec.in file found, skipping rpm build." - echo - exit 0 - fi + # Make obvious which distro we build for, for humans and for parsing + # by scripts/jenkins-gerrit/comment_generate.py + set +x + echo + echo "Building binary packages for distro: '$DISTRO'" + echo + set -x # Clone osmo-ci.git rm -rf osmo-ci @@ -80,13 +79,6 @@ osmo-ci git -C osmo-ci log --oneline - # Get distro from type - case "{type}" in - deb) distro="debian:11" ;; - rpm) distro="almalinux:8" ;; - *) echo "unknown package format: '{type}'"; exit 1 ;; - esac - # Move code from gerrit to build_srcpkg.py's git cache cache_dir=osmo-ci/scripts/obs/_cache mkdir -p $cache_dir @@ -106,7 +98,7 @@ # Build binary package ./build_binpkg.py \ - --docker "$distro" \ + --docker "$DISTRO" \ "$PROJECT_NAME" wrappers: - ansicolor: diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index b77b0ca..f2c8bec 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -92,20 +92,21 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true - pipeline_binpkgs: true + pipeline_binpkgs: "almalinux:8 debian:11" pipeline_endianness: true # in alphabetical order repos: - asn1c: - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_lint: false - - cellmgr-ng + - cellmgr-ng: + pipeline_binpkgs: "debian:11" - docker-playground: pipeline_build: false - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_endianness: false - libasn1c @@ -125,7 +126,7 @@ - libsmpp34 - libtelnet: - pipeline_binpkgs: false + pipeline_binpkgs: "" - libusrp @@ -143,7 +144,7 @@ -e SMPP="$SMPP" \ -e MGCP="$MGCP" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - pipeline_binpkgs: false + pipeline_binpkgs: "" - openggsn: a1_name: GTP @@ -190,6 +191,7 @@ gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_endianness: false + pipeline_binpkgs: "debian:11" - osmo-e1-hardware: a2_name: JOB_TYPE @@ -206,11 +208,11 @@ -e JOB_TYPE="$JOB_TYPE" \ "$DOCKER_IMG" \ {timeout_cmd} /build/contrib/jenkins.sh - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-ci: pipeline_build: false - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_endianness: false - osmo-ggsn: @@ -229,12 +231,13 @@ - osmo-gsm-manuals: pipeline_endianness: false + pipeline_binpkgs: "debian:11" - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' cmd: '{docker_run_ccache} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-hlr - osmo-iuh @@ -290,6 +293,7 @@ repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' pipeline_endianness: false + pipeline_binpkgs: "debian:11" - osmo-sgsn: a1_name: IU @@ -309,7 +313,7 @@ repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_endianness: false - osmo-sip-connector @@ -336,39 +340,41 @@ "$DOCKER_IMG" {timeout_cmd} /build/contrib/jenkins.sh - osmocom-bb: - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-tetra: - pipeline_binpkgs: false + pipeline_binpkgs: "" - - osmo-sysmon + - osmo-sysmon: + pipeline_binpkgs: "debian:11" + - osmo-remsim - simtrace2 - osmo-opencm3-projects: cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-asf4-dfu: - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-ccid-firmware: - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-e1d - osmo-cbc - osmo-e1-recorder: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - pipeline_binpkgs: false + pipeline_binpkgs: "" - gapk: - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-uecups - osmo-el2tpd: - pipeline_binpkgs: false + pipeline_binpkgs: "" - osmo-smlc: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) @@ -413,7 +419,7 @@ {timeout_cmd} /build/contrib/jenkins.sh ;; esac - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_endianness: false - osmo-ttcn3-hacks: @@ -431,12 +437,12 @@ su build -c 'make clean'; su build -c 'make compile'; " - pipeline_binpkgs: false + pipeline_binpkgs: "" pipeline_endianness: false - dahdi-tools: pipeline_lint: false - pipeline_binpkgs: false + pipeline_binpkgs: "" jobs: - 'gerrit-{repos}' @@ -459,21 +465,26 @@ name: REPO_URL description: Clone URL, to be passed to jobs started in the pipeline default: '{obj:repos_url}' - - bool: + - string: name: PIPELINE_BINPKGS - description: Enable the binpkgs job (build deb/rpm packages) + description: | + Enable the binpkgs job (build deb/rpm packages) for the given space + separated distributions. Empty list disables the binpkgs job. The + distributions must have binary packages in the osmocom:master + repository. default: '{obj:pipeline_binpkgs}' - bool: name: PIPELINE_ENDIANNESS description: Run struct_endianness.py from libosmocore.git default: '{obj:pipeline_endianness}' dsl: | - def run_job(display_name, job_name, comment_type=null) {{ + def run_job(display_name, job_name, comment_type=null, distro=null) {{ try {{ echo "pipeline_${{display_name}}: running job ${{job_name}}" build job: job_name, parameters: [ string(name: "COMMENT_TYPE", value: comment_type), + string(name: "DISTRO", value: distro), string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), @@ -530,24 +541,42 @@ }} }} - stage("deb") {{ + // Generating binpkgs stages is not possible if we want to run + // them in parallel and not have another job that just waits + // until they complete. + + stage("binpkgs-0") {{ when {{ - expression {{ params.PIPELINE_BINPKGS }} + expression {{ params.PIPELINE_BINPKGS.split().size() > 0 }} }} steps {{ script {{ - run_job("deb", "gerrit-binpkgs-deb") + distro = params.PIPELINE_BINPKGS.split()[0] + run_job(distro, "gerrit-binpkgs", null, distro) }} }} }} - stage("rpm") {{ + stage("binpkgs-1") {{ when {{ - expression {{ params.PIPELINE_BINPKGS }} + expression {{ params.PIPELINE_BINPKGS.split().size() > 1 }} }} steps {{ script {{ - run_job("rpm", "gerrit-binpkgs-rpm") + distro = params.PIPELINE_BINPKGS.split()[1] + run_job(distro, "gerrit-binpkgs", null, distro) + }} + }} + }} + + stage("binpkgs-2") {{ + when {{ + expression {{ params.PIPELINE_BINPKGS.split().size() > 2 }} + }} + steps {{ + script {{ + distro = params.PIPELINE_BINPKGS.split()[2] + run_job(distro, "gerrit-binpkgs", null, distro) }} }} }} diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index 6689ee4..e96893c 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -9,8 +9,9 @@ jenkins_url = "https://jenkins.osmocom.org" re_start_build = re.compile("Starting building: gerrit-[a-zA-Z-_0-9]* #[0-9]*") -re_result = re.compile("^pipeline_([a-zA-Z-_0-9]*): (SUCCESS|FAILED)$") +re_result = re.compile("^pipeline_([a-zA-Z-_0-9:]*): (SUCCESS|FAILED)$") re_job_type = re.compile("JOB_TYPE=([a-zA-Z-_0-9]*),") +re_distro = re.compile("Building binary packages for distro: '([a-zA-Z0-9:].*)'") def parse_args(): @@ -31,16 +32,29 @@ return parser.parse_args() -def stage_from_job_name(job_name): +def stage_binpkgs_from_url(job_url): + """ Multiple gerrit-binpkgs jobs may be started to build binary packages + for multiple distributions. It is not clear from the job name / URL of + a job for which distro it is building, so read it from the log output. + :returns: a distro like "debian:12" """ + global re_distro + + url = f"{job_url}/consoleText" + with urllib.request.urlopen(url) as response: + content = response.read().decode("utf-8") + match = re_distro.search(content) + assert match, f"couldn't find distro name in log: {url}" + return match.group(1) + + +def stage_from_job_name(job_name, job_url): if job_name == "gerrit-verifications-comment": # The job that runs this script. Don't include it in the summary. return None if job_name == "gerrit-lint": return "lint" - if job_name == "gerrit-binpkgs-deb": - return "deb" - if job_name == "gerrit-binpkgs-rpm": - return "rpm" + if job_name == "gerrit-binpkgs": + return stage_binpkgs_from_url(job_url) if job_name == "gerrit-pipeline-endianness": return "endianness" if job_name.endswith("-build"): @@ -69,7 +83,7 @@ job_name = match.split(" ")[2] job_id = int(match.split(" ")[3].replace("#", "")) job_url = f"{jenkins_url}/jenkins/job/{job_name}/{job_id}" - stage = stage_from_job_name(job_name) + stage = stage_from_job_name(job_name, job_url) if stage: ret[stage] = {"url": job_url, "name": job_name, "id": job_id} -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I59487e3dc2f55057de1b6a322f088fff0d18654c Gerrit-Change-Number: 33988 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: Cosmetic: jobs/gerrit: update pipeline comment

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33986 ) Change subject: Cosmetic: jobs/gerrit: update pipeline comment ...................................................................... Cosmetic: jobs/gerrit: update pipeline comment Change-Id: If06af0e955240e1b9d678f1020767bbfb70b1d96 --- M jobs/gerrit-verifications.yml 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 7b6c1f8..2bbe261 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -24,7 +24,8 @@ # NOTE: after updating the job with Jenkins Job Builder as usual, check if a # new pipeline script was generated and approve it here: # https://jenkins.osmocom.org/jenkins/scriptApproval/ -# This happens when changing the pipeline script, when adding new projects etc. +# This used to be necessary when changing the pipeline script, adding new +# projects etc. But it seems to get auto-approved now. - project: name: gerrit @@ -466,11 +467,6 @@ name: PIPELINE_ENDIANNESS description: Run struct_endianness.py from libosmocore.git default: '{obj:pipeline_endianness}' - # NOTE: jenkins pipelines don't run unless the dsl-script was approved. - # Sadly this doesn't happen automatically when updating the job with - # Jenkins Job Builder. So if you change the pipeline script, update the job - # as usually with JJB and then approve the scripts here: - # https://jenkins.osmocom.org/jenkins/scriptApproval/ dsl: | pipeline {{ agent none -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If06af0e955240e1b9d678f1020767bbfb70b1d96 Gerrit-Change-Number: 33986 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: fix binpkgs for libusrp

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33989 ) Change subject: jobs/gerrit-verifications: fix binpkgs for libusrp ...................................................................... jobs/gerrit-verifications: fix binpkgs for libusrp Don't build libusrp for centos8/almalinux. libusrp does have a .spec.in file, but it needs SDCC for the build and SDCC is not available there. In theory we could build the rpm in CI for opensuse tumbleweed, but it requires adding support for building for opensuse in scripts/obs/data/build_binpkg.Dockerfile and scripts/obs/data/build_rpm.sh first, and since it works quite differently than centos8 and libusrp changes rarely (last code change in 2021) I've decided to not do that now. Fixes: OS#5898 Change-Id: If61765fe628321cae004307f4845d8927a1c7019 --- M jobs/gerrit-verifications.yml 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f2c8bec..7fbc328 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -128,7 +128,9 @@ - libtelnet: pipeline_binpkgs: "" - - libusrp + - libusrp: + # centos8/almalinux doesn't have SDCC (OS#5898) + pipeline_binpkgs: "debian:11" - openbsc: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If61765fe628321cae004307f4845d8927a1c7019 Gerrit-Change-Number: 33989 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: build for debian 10, 12

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33990 ) Change subject: jobs/gerrit-verifications: build for debian 10, 12 ...................................................................... jobs/gerrit-verifications: build for debian 10, 12 Build packages in CI for the oldest and newest debian release, for which we provide binary packages in the Osmocom OBS repositories. See "jobs: master/gerrit: use debian bookworm (12)" for reasoning: I079e55a1325083714c8d39f922b2563e843fc0bc Related: OS#6057 Change-Id: I959b466865bd327cc72cde4a1763ac13c2c2d797 --- M jobs/gerrit-verifications.yml 1 file changed, 23 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 7fbc328..1324df6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -92,7 +92,7 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true - pipeline_binpkgs: "almalinux:8 debian:11" + pipeline_binpkgs: "almalinux:8 debian:10 debian:12" pipeline_endianness: true # in alphabetical order @@ -102,7 +102,7 @@ pipeline_lint: false - cellmgr-ng: - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - docker-playground: pipeline_build: false @@ -130,7 +130,7 @@ - libusrp: # centos8/almalinux doesn't have SDCC (OS#5898) - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - openbsc: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) @@ -193,7 +193,7 @@ gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-e1-hardware: a2_name: JOB_TYPE @@ -233,7 +233,7 @@ - osmo-gsm-manuals: pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -295,7 +295,7 @@ repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-sgsn: a1_name: IU @@ -348,7 +348,7 @@ pipeline_binpkgs: "" - osmo-sysmon: - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-remsim - simtrace2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I959b466865bd327cc72cde4a1763ac13c2c2d797 Gerrit-Change-Number: 33990 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

9 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: make assert more verbose

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33991 ) Change subject: scripts/jenkins-gerrit: make assert more verbose ...................................................................... scripts/jenkins-gerrit: make assert more verbose Change-Id: I0ea40663220f7eb8ee72e43f3f6b776be5835db2 --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index e96893c..147faac 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -97,7 +97,8 @@ assert stage in ret, f"found result for stage {stage}, but" \ " didn't find where it was started. The" \ " re_start_build regex probably needs to be adjusted" \ - " to match the related gerrit-*-build job." + " to match the related gerrit-*-build job.\n\n" \ + f"ret: {ret}" ret[stage]["passed"] = (match.group(2) == "SUCCESS") return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ea40663220f7eb8ee72e43f3f6b776be5835db2 Gerrit-Change-Number: 33991 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

9 months, 1 week

1
0
0 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback

by daniel

Attention is currently required from: arehbein, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33652 ) Change subject: ipa: Add segmentation callback ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/6939048f_b997576f PS5, Line 375: #define MSG_CB_IPA_INFO_OFFSET 0 Unused, can be removed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 06:36:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: examples: Add extension header octet to example

by daniel

Attention is currently required from: arehbein, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33202 ) Change subject: examples: Add extension header octet to example ...................................................................... Patch Set 13: Code-Review+2 (1 comment) Patchset: PS13: Adding +2 from before -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I962b9edcba65cdc98da00d2f8753dc5acd481502 Gerrit-Change-Number: 33202 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 06:28:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110_rtp_encode(): properly set E1/E2/E3 bits

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33934 ) Change subject: csd_v110_rtp_encode(): properly set E1/E2/E3 bits ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Gerrit-Change-Number: 33934 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 30 Jul 2023 20:18:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')

by laforge

Attention is currently required from: osmith, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/common/csd_v110.c: https://gerrit.osmocom.org/c/osmo-bts/+/33832/comment/6d773655_85fd15ba PS4, Line 150: ra_bits[i] = (rtp[i] >> 7); > I am basically replicating the implementation from libosmocore here. Here is what I. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 5 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 30 Jul 2023 20:17:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: bsc (WIP): Make socket queue max. length configurable

by arehbein

Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892 ) Change subject: bsc (WIP): Make socket queue max. length configurable ...................................................................... Patch Set 2: (3 comments) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/be28330f_ed6aefd5 PS1, Line 2487: if (fd >= 0 && ((ofd = osmo_fd_get_by_fd(fd)) != NULL)) { > why do you care about the socket being opened here? […] I guess it doesn't really matter here. I viewed it as a check to make sure `pcu_sock_init()` has been run before, in case there are any other states permitting `net->pcu_state` without `net->pcu_state->upqueue` being allocated. I checked the code and it looks like there are no such states. https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/8d91cc21_656855d8 PS1, Line 2491: } > ah I thought there may be an API so I didn't see it sorry. […] I suppose it's possible to check if the current wqueue length is larger than the new maximum right inside this command when it's called, and then drop extra messages. Otherwise.. why should there be a new API? What kind? Do we really want to drop messages from previously 'legal' enqueue actions though? File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/da802a47_9e38c4c5 PS1, Line 956: net->pcu_sock_fd = rc; > That check is not needed imho. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 30 Jul 2023 18:33:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: bsc (WIP): Make socket queue max. length configurable

by arehbein

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 to look at the new patch set (#4). Change subject: bsc (WIP): Make socket queue max. length configurable ...................................................................... bsc (WIP): Make socket queue max. length configurable Title refers to the maximum length of the osmo_wqueue used for the PCU socket connection. Related: OS#5774 Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/pcu_sock.c 4 files changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/33892/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: bsc (WIP): Make socket queue max. length configurable

by arehbein

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 to look at the new patch set (#3). Change subject: bsc (WIP): Make socket queue max. length configurable ...................................................................... bsc (WIP): Make socket queue max. length configurable Title refers to the maximum length of the osmo_wqueue used for the PCU socket connection. Related: OS#5774 Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/pcu_sock.c 4 files changed, 51 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/33892/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: update obs-mirror include list

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34015 ) Change subject: update obs-mirror include list ...................................................................... update obs-mirror include list * add Debian 12 for latest and nightly package archive * replace nightly Ubuntu 22.04 with 23.04 * stop nightly Debian 10 archive (11 + 12 is sufficient) Change-Id: I4f4103732a6dc3d73ada85482c6a2f806b4100aa --- M contrib/obs-mirror/obs-mirror-include.txt 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/34015/1 diff --git a/contrib/obs-mirror/obs-mirror-include.txt b/contrib/obs-mirror/obs-mirror-include.txt index c69474c..6458090 100644 --- a/contrib/obs-mirror/obs-mirror-include.txt +++ b/contrib/obs-mirror/obs-mirror-include.txt @@ -2,15 +2,17 @@ latest/CentOS_8 latest/Debian_10 latest/Debian_11 +latest/Debian_12 latest/Raspbian_10 latest/Raspbian_11 latest/xUbuntu_18.04 latest/xUbuntu_20.04 latest/xUbuntu_21.04 latest/xUbuntu_22.04 +latest/xUbuntu_23.04 nightly/CentOS_8 -nightly/Debian_10 nightly/Debian_11 +nightly/Debian_12 nightly/Raspbian_11 -nightly/xUbuntu_22.04 +nightly/xUbuntu_23.04 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f4103732a6dc3d73ada85482c6a2f806b4100aa Gerrit-Change-Number: 34015 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 5 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: Sun, 30 Jul 2023 13:54:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: [HACK] l1sap: send all TCH.{ind,req} as RLP frames over GSMTAP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34014 ) Change subject: [HACK] l1sap: send all TCH.{ind,req} as RLP frames over GSMTAP ...................................................................... [HACK] l1sap: send all TCH.{ind,req} as RLP frames over GSMTAP Change-Id: I284ab83d86181ba906e5b8bc569fec38e3429be3 --- M src/common/l1sap.c 1 file changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/34014/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 13d271e..4e7481a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -468,6 +468,32 @@ return 0; switch (OSMO_PRIM_HDR(&l1sap->oph)) { + case OSMO_PRIM(PRIM_TCH, PRIM_OP_REQUEST): + uplink = 0; + /* fall through */ + case OSMO_PRIM(PRIM_TCH, PRIM_OP_INDICATION): + { + uint8_t rlp[240 / 8]; + + if (l1sap->oph.msg == NULL) + return 0; + if (msgb_l2(l1sap->oph.msg) == NULL) + return 0; + if (msgb_l2len(l1sap->oph.msg) != 240) + return 0; + + fn = l1sap->u.tch.fn; + tn = L1SAP_CHAN2TS(l1sap->u.tch.chan_nr); + signal_dbm = l1sap->u.tch.rssi; + + osmo_ubit2pbit_ext(&rlp[0], 0, msgb_l2(l1sap->oph.msg), 0, 240, 1); + gsmtap_send_ex(inst, GSMTAP_TYPE_GSM_RLP, + trx->arfcn | uplink, tn, + GSMTAP_CHANNEL_TCH_F, // XXX + 0, fn, signal_dbm, 0, + &rlp[0], sizeof(rlp)); + return 0; + } case OSMO_PRIM(PRIM_PH_DATA, PRIM_OP_REQUEST): uplink = 0; /* fall through */ @@ -2181,6 +2207,7 @@ rc = l1sap_ph_data_ind(trx, l1sap, &l1sap->u.data); break; case OSMO_PRIM(PRIM_TCH, PRIM_OP_INDICATION): + to_gsmtap(trx, l1sap); rc = l1sap_tch_ind(trx, l1sap, &l1sap->u.tch); break; case OSMO_PRIM(PRIM_PH_RACH, PRIM_OP_INDICATION): @@ -2210,9 +2237,14 @@ l1sap_log_ctx_sapi = get_common_sapi_by_trx_prim(trx, l1sap); log_set_context(LOG_CTX_L1_SAPI, &l1sap_log_ctx_sapi); - if (OSMO_PRIM_HDR(&l1sap->oph) == - OSMO_PRIM(PRIM_PH_DATA, PRIM_OP_REQUEST)) + switch (OSMO_PRIM_HDR(&l1sap->oph)) { + case OSMO_PRIM(PRIM_PH_DATA, PRIM_OP_REQUEST): + case OSMO_PRIM(PRIM_TCH, PRIM_OP_REQUEST): to_gsmtap(trx, l1sap); + break; + default: + break; + } return bts_model_l1sap_down(trx, l1sap); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I284ab83d86181ba906e5b8bc569fec38e3429be3 Gerrit-Change-Number: 34014 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110_rtp_encode(): properly set E1/E2/E3 bits

by fixeria

Attention is currently required from: fixeria. Hello osmith, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/33934 to look at the new patch set (#2). Change subject: csd_v110_rtp_encode(): properly set E1/E2/E3 bits ...................................................................... csd_v110_rtp_encode(): properly set E1/E2/E3 bits The E1/E2/E3 bits are set based on out-of-band knowledge of the current user data rate. The actual bit values are defined in 3GPP TS 44.021, Figure 4 "Coding of data rates". TODO: this is only valid for transparent services, for non-transparent services see 3GPP TS 48.020. TODO: lchan->csd_mode is never set to the actual CSD mode... Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Related: OS#1572 --- M include/osmo-bts/lchan.h M src/common/csd_v110.c M tests/csd/csd_test.c M tests/csd/csd_test.err 4 files changed, 64 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/34/33934/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Gerrit-Change-Number: 33934 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 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: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 Gerrit-Change-Number: 34004 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: Sun, 30 Jul 2023 09:00:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 ) Change subject: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 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: I34b31c292c00b6880311906ce6713a8e3c69a0d2 Gerrit-Change-Number: 34003 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: Sun, 30 Jul 2023 08:52:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995/comment/c874814c_28a0… PS1, Line 672: blocks Why "blocks" (plural), btw? I see this function is sending exactly one RLC/MAC block. Perhaps because one RLC/MAC can carry multiple LLC blocks (`record of LlcBlock`)? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 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: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 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: Sun, 30 Jul 2023 08:51:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by arehbein

Attention is currently required from: laforge, pespin, daniel. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 to look at the new patch set (#13). Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... stream: Add server-side (segmentation) support for IPA With this commit, IPA segmentation can be taken care of by setting the segmentation callback osmo_ipa_segmentation_cb(). Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c --- M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 5 files changed, 381 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/97/33197/13 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by arehbein

Attention is currently required from: laforge, pespin, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 12: (1 comment) Patchset: PS12: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comments/ac923843_f71a95… No idea how this slipped through the linter again (I have the pre-commit hook installed) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 19:01:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples: Add osmo_io based segmentation

by arehbein

arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33200 ) Change subject: examples: Add osmo_io based segmentation ...................................................................... Abandoned The decision has been made to not have this as a separate change -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibf5fd3a606da7888f23e6f75cc30fe433897a97b Gerrit-Change-Number: 33200 Gerrit-PatchSet: 11 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by Jenkins Builder

Attention is currently required from: laforge, pespin, daniel. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 12: (1 comment) File tests/stream/stream_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10226): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/ac923843_f71a95fa PS12, Line 641: } void function return statements are not generally useful -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:58:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by arehbein

Attention is currently required from: laforge, pespin, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add and use IPA send function ...................................................................... Patch Set 13: (10 comments) File examples/ipa-stream-client.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/39ea5790_a03fe733 PS11, Line 109: if (osmo_ipa_process_msg(msg) < 0) { > what about this comment? Done File examples/ipa-stream-server.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/1c6bc327_d66ed1a3 PS11, Line 54: if (osmo_ipa_process_msg(msg) < 0) { > Remove this, it's now handled in the segmentation_cb This had previously been done separately in change I53283ec7bd7f07dfa612681ae84af93d5cd098b9 . I have adapted the patch series now since your uploads incorporated removing this in previous changes of the series. https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/2a224216_0c1d18bc PS11, Line 60: osmo_ipa_stream_srv_send(conn, IPAC_PROTO_UNSPECIFIED, IPAC_PROTO_UNSPECIFIED, msg); > Using the proto/proto_ext getters here is more clear imho than using IPAC_PROTO_UNSPECIFIED and deal […] I've changed it and I couldn't agree more. File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/63e37189_6e441808 PS12, Line 57: #define IPAC_PROTO_UNSPECIFIED -1 > it's a bit strange to declare this here while others are probably declared somewhere else? Had renamed this to `OSMO_IPA_IPAC_PROTO_UNSPECIFIED` (the 'other' values are in `libosmocore.git:src/gsm/protocoll/ipaccess.h`; assumed you wouldn't have wanted a non-protocol value in there), but then removed the functionality using it due to another review comment. File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/aecfd2d5_12e68ed7 PS10, Line 475: void ipa_stream_srv_send > ah yes I wondered about this shortly... […] Done File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/b48a6481_d44cf902 PS11, Line 481: if (ipaccess_proto == IPAC_PROTO_UNSPECIFIED) { : ipaccess_proto = msg_get_ipa_proto(msg); : pe = msg_get_ipa_proto_ext(msg); : } > I wouldn't special-case this here. […] I assume by that you mean you don't want this functionality anymore, altogether (otherwise I have no idea where else this check should go). I removed it. File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/fb220732_d14da066 PS1, Line 1959: OSMO_ASSERT > Yes, because `conn` isn't used by this function before it is passed to `osmo_stream_srv_send()`, whi […] Done File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/2f907762_8cb5c868 PS5, Line 1947: /* msgb_l1(msg) is expected to be set */ > The idea was providing the possibility of quickly reusing the headers of a message received in IPA m […] Done File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/49e009ae_c9754cda PS11, Line 47: #include <osmocom/netif/ipa.h> > Unneeded Done https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/4545f5c3_3d7f354b PS11, Line 612: if (res == 0) { > Unrelated/Unneeded? Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:58:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 15: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/3a5990fc_7bb9dd87 PS13, Line 829: rc = clock_gettime(CLOCK_MONOTONIC, &start); > osmo_clock_gettime everywhere. See answer to the same comment on change 33197 https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comments/e3d5961c_a5eebe… -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 15 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:57:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by arehbein

Attention is currently required from: laforge, pespin, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 12: (8 comments) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/adea8e8a_d0c95623 PS10, Line 6: #include <osmocom/netif/stream.h> > Not sure why ipa. […] Done https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/c73a9db4_aa6ca599 PS10, Line 46: int osmo_ipa_segmentation_cb(struct msgb *msg); > This belongs in the previous commit Done File include/osmocom/netif/stream.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/94d3c33b_b4c08386 PS1, Line 28: /* TODO: Add protocols for > Done. […] Done File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/0f040a9f_fca3c3e7 PS10, Line 39: #include <osmocom/gsm/ipa.h> > Not needed. Done File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/51aa40c5_f016f6c5 PS10, Line 540: osmo_stream_cli_set_addr(osc, "127.0.0.11"); > better use 127.0.0.1 here, all IP addresses being available in linux specific iirc. I don't understand the second part of the sentence... I copied this from the existing test code for the other tests. Should that be changed as well then? Or can we just leave it at `127.0.0.11`? https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/74c8fd4e_21215fc2 PS10, Line 621: rc = clock_gettime(CLOCK_MONOTONIC, &start); > usually alarm() is used for this kind of stuff (exit process on timeout). What is the advantage of using `alarm()` instead, and how wouldn't I need to register some sort of (additional, if it's already handled in lower layers) alarm handling for SIGALRM if I wanted a diagnostic message? @daniel I prefer setting an amount of time to setting an amount of iterations, but maybe that's just me I'd like to leave it as is if possible. Did try it out and it worked... https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/b200fbbb_020e5415 PS10, Line 629: rc = clock_gettime(CLOCK_MONOTONIC, &now); > osmo_clock_gettime. […] (see Daniel's reply above) https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/21a51fea_fe787c15 PS10, Line 684: rc = test_segm_ipa_stream_srv_run(tall_test, host, port, srv); > we don't usually do this kind of return in tests. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:57:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback

by arehbein

Attention is currently required from: laforge, pespin, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33652 ) Change subject: ipa: Add segmentation callback ...................................................................... Patch Set 5: (3 comments) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/6a49898d_bb42ab28 PS4, Line 27: #define msgb_ipa_proto(__x) OSMO_MSGB_IPA_CB(__x)->proto > osmo_msgb_ipa_cb_proto […] I put `osmo_ipa_msgb_cb*`, because it's in `ipa.h` and not in `msgb.h` and because to me it seems less confusing to stick to filename prefixes. File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/80f13ef4_74d76a85 PS2, Line 378: MSG_CB_IPA_PROTO_EXT_IS_SET_OFFSET > We wouldn't need the IS_SET flag anyway, I'd expect proto_ext to only have a meaning if proto is IPA […] Concerning the idea of a struct, I deliberately did not go for a struct in order to avoid violating the strict aliasing rule, since `msg->cb` is an array of `unsigned long`. Seems like we don't care/looks like we use `-fno-strict-aliasing` everywhere anyways, so I'll keep that in mind. At least now I know where we stand on this https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/639e4653_5142065a PS2, Line 432: /* Below: Helper functions for addition of send_ipa functionality in later commit */ > Iirc the idea was to introduce ipa_check_pull_headers() AND use it in the segmentation_cb(). […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:57:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples: Add extension header octet to example

by arehbein

Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33202 ) Change subject: examples: Add extension header octet to example ...................................................................... Patch Set 13: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33202/comment/1f9edb38_b85dcf99 PS12, Line 22: struct msgb *osmo_ipa_ext_msg_alloc(int headroom); > this should imho be a un insigned int headroom or a size_t (yes I know the older API uses int, but i […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I962b9edcba65cdc98da00d2f8753dc5acd481502 Gerrit-Change-Number: 33202 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 18:57:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback

by arehbein

Attention is currently required from: arehbein, laforge, daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 to look at the new patch set (#5). Change subject: ipa: Add segmentation callback ...................................................................... ipa: Add segmentation callback Related: OS#5753 Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 --- M include/osmocom/netif/ipa.h M src/ipa.c 2 files changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/33652/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by arehbein

Attention is currently required from: arehbein, laforge, daniel. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 to look at the new patch set (#12). Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... stream: Add server-side (segmentation) support for IPA With this commit, IPA segmentation can be taken care of by setting the segmentation callback osmo_ipa_segmentation_cb(). Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c --- M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 5 files changed, 382 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/97/33197/12 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: examples: Add extension header octet to example

by arehbein

Attention is currently required from: arehbein, daniel. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33202 to look at the new patch set (#13). Change subject: examples: Add extension header octet to example ...................................................................... examples: Add extension header octet to example Mainly to make data/packets look (pseudo-)correct in Wireshark. Also: Add helper for allocating message buffers with extended headroom for IPA. Change-Id: I962b9edcba65cdc98da00d2f8753dc5acd481502 --- M examples/ipa-stream-client.c M include/osmocom/netif/ipa.h M src/ipa.c 3 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/02/33202/13 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I962b9edcba65cdc98da00d2f8753dc5acd481502 Gerrit-Change-Number: 33202 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: arehbein, daniel. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 to look at the new patch set (#15). Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... stream: Add client-side (segmentation) support for IPA With this commit, IPA segmentation is taken care of by setting the segmentation callback provided by libosmo-netif. The ipa-stream-server example needs to prepend IPA headers now because those are stripped by the segm. cb on both sides. Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 6 files changed, 366 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/98/33198/15 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 15 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by arehbein

Attention is currently required from: arehbein, laforge, daniel. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 to look at the new patch set (#13). Change subject: stream: Add and use IPA send function ...................................................................... stream: Add and use IPA send function Related OS#5753, OS#5751 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/ipa.h M src/ipa.c M tests/stream/stream_test.c 5 files changed, 68 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/33201/13 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[L] Change in dahdi-tools[master]: Initial support for trunkdev

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-tools/+/34013 ) Change subject: Initial support for trunkdev ...................................................................... Initial support for trunkdev The 'trunkdev' is a virtual DAHDI device driver that exposes the multiplexed E1 frames on a /dev/dahdi/trunkdev device. This is useful for all kinds of simulated setup, as well as in the context of using osmo-e1d for OCTOI (Osmocom TDMoIP). In order for the dahdi_trunkdev utility to be built, you will need to have installed dahdi header files of dahdi-linux with trunkdev support, currently located at https://gitea.osmocom.org/retronetworking/dahdi-linux/src/branch/laforge/tr… Change-Id: Ie05100c80fd978e7ac6f5a028e0ef6c828e0bcc3 --- M Makefile.am M configure.ac A trunkdev/Makefile.am A trunkdev/dahdi-sysfs.c A trunkdev/dahdi-sysfs.h A trunkdev/trunkdev-tool.c 6 files changed, 468 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-tools refs/changes/13/34013/1 diff --git a/Makefile.am b/Makefile.am index 9dd64b2..2c42d69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ #-Wformat=2 endif -SUBDIRS = xpp doc hotplug +SUBDIRS = xpp doc hotplug trunkdev if PPPD SUBDIRS += ppp diff --git a/configure.ac b/configure.ac index 826a7ec..e11eec7 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,7 @@ AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h]) DAHDI23_DIR="${DAHDI_DIR}" AST_C_DEFINE_CHECK([DAHDI23], [DAHDI_CONFIG_NTTE], [dahdi/user.h]) +AST_C_DEFINE_CHECK([TRUNKDEV], [DAHDI_TRUNKDEV_CREATE], [dahdi/user.h]) AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h]) AST_EXT_LIB_CHECK([PCAP], [pcap], [pcap_compile], [pcap.h]) @@ -193,6 +194,7 @@ AM_CONDITIONAL([PBX_NEWT], [test "$PBX_NEWT" = "1"]) AM_CONDITIONAL([PBX_PCAP], [test "$PBX_PCAP" = "1" -a "$DAHDI_TXMIRROR" = "1"]) +AM_CONDITIONAL([PBX_TRUNKDEV], [test "$PBX_TRUNKDEV" = "1"]) AC_CHECK_FUNCS([semtimedop]) AC_CHECK_FUNCS([alarm bzero gettimeofday memset pow regcomp select socket strcasecmp strchr strdup strerror strrchr strstr strtol strtoul]) @@ -390,6 +392,7 @@ xpp/xtalk/Makefile xpp/oct612x/Makefile xpp/perl_modules/Makefile + trunkdev/Makefile ]) AC_OUTPUT diff --git a/trunkdev/Makefile.am b/trunkdev/Makefile.am new file mode 100644 index 0000000..af230f4 --- /dev/null +++ b/trunkdev/Makefile.am @@ -0,0 +1,14 @@ +CFLAGS += -g -Wall -O2 $(DAHDI_INCLUDE) + +if PBX_TRUNKDEV + +sbin_PROGRAMS = \ + dahdi_trunkdev \ + $(NULL) + +dahdi_trunkdev_SOURCES = \ + trunkdev-tool.c \ + dahdi-sysfs.c \ + $(NULL) + +endif diff --git a/trunkdev/dahdi-sysfs.c b/trunkdev/dahdi-sysfs.c new file mode 100644 index 0000000..63324e9 --- /dev/null +++ b/trunkdev/dahdi-sysfs.c @@ -0,0 +1,88 @@ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <fcntl.h> +#include <limits.h> + +#include "dahdi-sysfs.h" + +/* read a sysfs attribute from a file, stripping any trailing newline */ +char *sysfs_read_attr(const char *path) +{ + FILE *f; + char *buf; + + f = fopen(path, "r"); + if (!f) + return NULL; + + buf = malloc(256); + if (!buf) + goto out_close; + + if (!fgets(buf, 256, f)) + goto out_free; + + if (strlen(buf) && buf[strlen(buf)-1] == '\n') + buf[strlen(buf)-1] = '\0'; + + fclose(f); + printf("%s: %s\n", path, buf); + return buf; + +out_free: + free(buf); +out_close: + fclose(f); + return NULL; +} + +static char *sysfs_read_span_attr(unsigned int spanno, const char *name) +{ + char path[PATH_MAX]; + snprintf(path, sizeof(path), "/sys/bus/dahdi_spans/devices/span-%u/%s", spanno, name); + return sysfs_read_attr(path); +} + +static int sysfs_read_span_attr_int(unsigned int spanno, const char *name) +{ + char *attr; + int attr_int; + + attr = sysfs_read_span_attr(spanno, name); + if (!attr) + return -1; + + attr_int = atoi(attr); + free(attr); + + return attr_int; +} + +/* return number of channels in span */ +int dahdi_span_get_basechan(unsigned int spanno) +{ + return sysfs_read_span_attr_int(spanno, "basechan"); +} + +/* return number of channels in span */ +int dahdi_span_get_channels(unsigned int spanno) +{ + return sysfs_read_span_attr_int(spanno, "channels"); +} + +char *dahdi_span_get_name(unsigned int spanno) +{ + return sysfs_read_span_attr(spanno, "name"); +} + +char *dahdi_span_get_desc(unsigned int spanno) +{ + return sysfs_read_span_attr(spanno, "desc"); +} + +char *dahdi_span_get_spantype(unsigned int spanno) +{ + return sysfs_read_span_attr(spanno, "spantype"); +} diff --git a/trunkdev/dahdi-sysfs.h b/trunkdev/dahdi-sysfs.h new file mode 100644 index 0000000..2a8eaf7 --- /dev/null +++ b/trunkdev/dahdi-sysfs.h @@ -0,0 +1,9 @@ +#pragma once + +char *sysfs_read_attr(const char *path); + +int dahdi_span_get_basechan(unsigned int spanno); +int dahdi_span_get_channels(unsigned int spanno); +char *dahdi_span_get_name(unsigned int spanno); +char *dahdi_span_get_desc(unsigned int spanno); +char *dahdi_span_get_spantype(unsigned int spanno); diff --git a/trunkdev/trunkdev-tool.c b/trunkdev/trunkdev-tool.c new file mode 100644 index 0000000..355c5d0 --- /dev/null +++ b/trunkdev/trunkdev-tool.c @@ -0,0 +1,334 @@ +/* + * trunkdev configuration program for DAHDI Telephony Interface + * + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> + * Copyright (C) 2001-2008 Digium, Inc. + * + * All rights reserved. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2 as published by the + * Free Software Foundation. See the LICENSE file included with + * this program for more details. + */ + +#include <stdint.h> +#include <stdbool.h> +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <errno.h> +#include <fcntl.h> +#include <sys/ioctl.h> + +#include <sys/socket.h> +#include <dahdi/user.h> + +#include "dahdi-sysfs.h" + +static int g_fd = -1; + + +/* wrapper around DAHDI_TRUNKDEV_CREATE */ +static int trunkdev_create(int fd, const char *name) +{ + struct dahdi_trunkdev_create td_c = { 0 }; + int rc; + + strncpy(td_c.name, name, sizeof(td_c.name)); + td_c.name[sizeof(td_c.name)-1] = 0; + + rc = ioctl(fd, DAHDI_TRUNKDEV_CREATE, &td_c); + if (rc) + fprintf(stderr, "Error creating trunkdev '%s': %s\n", name, strerror(errno)); + + return rc; +} + +/* wrapper around DAHDI_TRUNKDEV_DELETE */ +static int trunkdev_delete(int fd, const char *name) +{ + struct dahdi_trunkdev_delete td_d = { 0 }; + int rc; + + strncpy(td_d.name, name, sizeof(td_d.name)); + td_d.name[sizeof(td_d.name)-1] = 0; + + rc = ioctl(fd, DAHDI_TRUNKDEV_DELETE, &td_d); + if (rc) + fprintf(stderr, "Error deleting trunkdev '%s': %s\n", name, strerror(errno)); + + return rc; +} + +/* wrapper around DAHDI_TRUNKDEV_SPECIFY */ +static int trunkdev_specify(int fd, const char *name) +{ + struct dahdi_trunkdev_open td_o = { 0 }; + int rc; + + strncpy(td_o.name, name, sizeof(td_o.name)); + td_o.name[sizeof(td_o.name)-1] = 0; + + rc = ioctl(fd, DAHDI_TRUNKDEV_OPEN, &td_o); + if (rc < 0) { + fprintf(stderr, "Error opening trunkdev '%s': %s\n", name, strerror(errno)); + return rc; + } + return td_o.spanno; +} + +/* wrapper around DAHDI_SPANCONFIG (assuming E1 with CRC4) */ +static int spanconfig(int fd, int spanno) +{ + struct dahdi_lineconfig dlc = { + .span = spanno, + .lbo = 0, + .lineconfig = DAHDI_CONFIG_CRC4, + .sync = 0, + }; + + return ioctl(fd, DAHDI_SPANCONFIG, &dlc); +} + +/* wrapper around DAHDI_CHANCONFIG (assuming E1/ALAW/CLEAR; unless dchan -> HDLCFCS) */ +static int chanconfig(int fd, int channo, bool dchan) +{ + struct dahdi_chanconfig dcc = { + .chan = channo, + .sigtype = DAHDI_SIG_CLEAR, + .deflaw = DAHDI_LAW_ALAW, + .master = 0, + .idlebits = 0, + }; + if (dchan) + dcc.sigtype = DAHDI_SIG_HDLCFCS; + + return ioctl(fd, DAHDI_CHANCONFIG, &dcc); +} + +static int chanconfig_hdlc_master(int fd, int channo, const char *netdev_name) +{ + struct dahdi_chanconfig dcc = { + .chan = channo, + .sigtype = DAHDI_SIG_HDLCNET, + .deflaw = DAHDI_LAW_ALAW, + .master = 0, + .idlebits = 0, + }; + strncpy(dcc.netdev_name, netdev_name, sizeof(dcc.netdev_name)); + dcc.netdev_name[sizeof(dcc.netdev_name)-1] = '\0'; + + return ioctl(fd, DAHDI_CHANCONFIG, &dcc); +} + +static int chanconfig_hdlc_slave(int fd, int channo, int master) +{ + struct dahdi_chanconfig dcc = { + .chan = channo, + .sigtype = DAHDI_SIG_SLAVE, + .deflaw = DAHDI_LAW_ALAW, + .master = master, + .idlebits = 0, + }; + + return ioctl(fd, DAHDI_CHANCONFIG, &dcc); +} + +/* high-level wrapper to configure an E1 span + all its channels */ +static int config(int spanno, const char *hdlc_netdev) +{ + struct dahdi_spaninfo dsi = { + .spanno = spanno, + }; + int fd, rc; + + fd = open("/dev/dahdi/ctl", O_RDWR); + if (fd < 0) { + fprintf(stderr, "Unable to open /dev/dahd/ctl: %s\n", strerror(errno)); + return fd; + } + + rc = ioctl(fd, DAHDI_SPANSTAT, &dsi); + if (rc < 0) { + fprintf(stderr, "Error during spanstat: %s\n", strerror(errno)); + close(fd); + return rc; + } + printf("Span %u (%s: %s)\n", dsi.spanno, dsi.name, dsi.desc); + printf(" numchans=%u, totalchans=%u\n", dsi.numchans, dsi.totalchans); + + rc = spanconfig(fd, spanno); + if (rc < 0) { + fprintf(stderr, "Error during spanconfig: %s\n", strerror(errno)); + close(fd); + return rc; + } + + /* resolve basechan + num_chan via sysfs */ + int basechan = dahdi_span_get_basechan(spanno); + int num_chan = dahdi_span_get_channels(spanno); + if (basechan < 0 || num_chan < 0) { + fprintf(stderr, "Error getting basechan=%d or channels=%d for spanno=%d: %s\n", + basechan, num_chan, spanno, strerror(errno)); + close(fd); + return -1; + } + + for (unsigned int i = basechan; i < basechan+num_chan; i++) { + if (!hdlc_netdev) { + /* ISDN: we assume a standard ISDN configuration with TS16 == D-channel */ + rc = chanconfig(fd, i, i == basechan + 15); + } else { + /* HDLC: we assume TS 1-31 as superchannel */ + if (i == basechan) + rc = chanconfig_hdlc_master(fd, i, hdlc_netdev); + else + rc = chanconfig_hdlc_slave(fd, i, basechan); + } + if (rc < 0) { + fprintf(stderr, "Error during spanconfig: %s\n", strerror(errno)); + close(fd); + return rc; + } + } + close(fd); + return 0; +} + +static void print_help(void) +{ + printf("\n"); + printf( "dahdi_trunkdev create NAME\n" + " Create a new dahdi trunkdev named NAME\n" + "dahdi_trunkdev delete NAME\n" + " Delete an existing dahdi trunkdev named NAME\n" + "dahdi_trunkdev config NAME\n" + " Configure span + all channels of trunkdev named NAME for ISDN\n" + "dahdi_trunkdev config-hdlc NAME\n" + " Configure span + all channels of trunkdev named NAME for HDLC\n" + "dahdi_trunkdev read NAME\n" + " Continuously read + discard frames from trunkdev named NAME\n" + "dahdi_trunkdev rdwr NAME\n" + " Continuously read + loop back (write) frames of trunkdev named NAME\n"); + +} + +int main(int argc, char **argv) +{ + int rc; + + printf("DAHDI trunkdev tool (C) 2022 by Harald Welte <laforge(a)osmocom.org>\n\n"); + + if (argc < 2) { + fprintf(stderr, "First argument must specify the command\n"); + print_help(); + exit(2); + } + + if (!strcmp(argv[1], "help") || !strcmp(argv[1], "--help")) { + print_help(); + exit(0); + } + + g_fd = open("/dev/dahdi/trunkdev", O_RDWR); + if (g_fd < 0) { + fprintf(stderr, "Unable to open trunkdev: %s\n", strerror(errno)); + exit(1); + } + + if (!strcmp(argv[1], "create")) { + /* dahdi_trunkdev create foo */ + if (argc < 3) { + fprintf(stderr, "Second argument must specify the name\n"); + exit(2); + } + rc = trunkdev_create(g_fd, argv[2]); + if (rc < 0) { + fprintf(stderr, "Unable to create trunkdev: %s\n", strerror(errno)); + exit(1); + } + printf("DAHDI trunkdev %s created; span number %d\n", argv[2], rc); + } else if (!strcmp(argv[1], "delete")) { + /* dahdi_trunkdev create foo */ + if (argc < 3) { + fprintf(stderr, "Second argument must specify the name\n"); + exit(2); + } + rc = trunkdev_delete(g_fd, argv[2]); + if (rc < 0) { + fprintf(stderr, "Unable to create trunkdev: %s\n", strerror(errno)); + exit(1); + } + printf("DAHDI trunkdev %s deleted\n", argv[2]); + } else if (!strcmp(argv[1], "config")) { + /* dahdi_trunkdev config foo */ + if (argc < 3) { + fprintf(stderr, "Second argument must specify the name\n"); + exit(2); + } + rc = trunkdev_specify(g_fd, argv[2]); + if (rc < 0) { + fprintf(stderr, "Unable to specify trunkdev: %s\n", strerror(errno)); + exit(2); + } + rc = config(rc, NULL); + if (rc < 0) + exit(2); + printf("DAHDI trunkdev %s configured\n", argv[2]); + } else if (!strcmp(argv[1], "config-hdlc")) { + /* dahdi_trunkdev config-hdlc foo hdlc-foo */ + if (argc < 3) { + fprintf(stderr, "Second argument must specify the name\n"); + exit(2); + } + if (argc < 4) { + fprintf(stderr, "Third argument must specify the net-device name\n"); + exit(2); + } + rc = trunkdev_specify(g_fd, argv[2]); + if (rc < 0) { + fprintf(stderr, "Unable to specify trunkdev: %s\n", strerror(errno)); + exit(2); + } + rc = config(rc, argv[3]); + if (rc < 0) + exit(2); + printf("DAHDI trunkdev %s configured as netdev %s\n", argv[2], argv[3]); + } else if (!strcmp(argv[1], "read") || !strcmp(argv[1], "rdwr")) { + /* dahdi_trunkdev (read|rdwr) foo */ + if (argc < 3) { + fprintf(stderr, "Second argument must specify the name\n"); + exit(2); + } + rc = trunkdev_specify(g_fd, argv[2]); + if (rc < 0) { + fprintf(stderr, "Unable to specify trunkdev: %s\n", strerror(errno)); + exit(1); + } + if (!strcmp(argv[1], "read")) + printf("Reading + Disccarding from DAHDI trunkdev %s\n", argv[2]); + else + printf("Reading + Writing (looping back) DAHDI trunkdev %s\n", argv[2]); + while (1) { + uint8_t buf[32*8]; + rc = read(g_fd, buf, sizeof(buf)); + if (rc <= 0) { + fprintf(stderr, "Error %d reading: %s\n", rc, strerror(errno)); + exit(1); + } + fputc('.', stdout); + if (!strcmp(argv[1], "rdwr")) { + rc = write(g_fd, buf, rc); + if (rc <= 0) { + fprintf(stderr, "Error %d writing: %s\n", rc, strerror(errno)); + exit(1); + } + } + } + } else + exit(23); + + exit(0); +} -- To view, visit https://gerrit.osmocom.org/c/dahdi-tools/+/34013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-tools Gerrit-Branch: master Gerrit-Change-Id: Ie05100c80fd978e7ac6f5a028e0ef6c828e0bcc3 Gerrit-Change-Number: 34013 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in dahdi-linux[master]: Introduce virtual DAHDI trunk device

by laforge

Attention is currently required from: manawyrm, roox, laforge, tnt. Hello Jenkins Builder, manawyrm, roox, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 to look at the new patch set (#2). Change subject: Introduce virtual DAHDI trunk device ...................................................................... Introduce virtual DAHDI trunk device This virtual trunk device is a new character device. Contrary to the per-channel devices, this is a per-span device for virtual E1 spans. Userspace reads and writes 32-byte E1 frames on it. ioctl's are added to create and delete such virtual trunk devices at runtime. Each virtual trunk device is limited to one span. Opening trunkdev is similar to opening channels via /dev/dahd/chanw works: All users open the same generic device node but then issue an ioctl to specify which (named) trundev they actually want to open. This avoids having to dynamically register minor device ids, creating device nodes, etc. The trunkdev is in RED + LOS alarm after creation. Only once a userspace process opens the E1 frame side, those alarms cease. Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 --- M drivers/dahdi/Kbuild M drivers/dahdi/Kconfig M drivers/dahdi/dahdi-base.c A drivers/dahdi/trunkdev/Kbuild A drivers/dahdi/trunkdev/frame_fifo.c A drivers/dahdi/trunkdev/frame_fifo.h A drivers/dahdi/trunkdev/trunkdev.c M include/dahdi/kernel.h M include/dahdi/user.h 9 files changed, 939 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/10/34010/2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 Gerrit-Change-Number: 34010 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in dahdi-linux[master]: xpp_usb: Fix for 32bit architectures: use div_s64()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34009 ) Change subject: xpp_usb: Fix for 32bit architectures: use div_s64() ...................................................................... xpp_usb: Fix for 32bit architectures: use div_s64() Change-Id: Ib5cef80c018f800cc0a0cd08a51d6cb7afd584c6 --- M drivers/dahdi/xpp/xpp_usb.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 65f646a..0660de3 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -886,7 +886,7 @@ usec = 0; /* System clock jumped */ if (usec > xusb->max_tx_delay) xusb->max_tx_delay = usec; - i = usec / USEC_BUCKET; + i = div_s64(usec, USEC_BUCKET); if (i >= NUM_BUCKETS) i = NUM_BUCKETS - 1; xusb->usb_tx_delay[i]++; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib5cef80c018f800cc0a0cd08a51d6cb7afd584c6 Gerrit-Change-Number: 34009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in dahdi-linux[master]: xpp_usb: Fix for 32bit architectures: use div_s64()

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34009 ) Change subject: xpp_usb: Fix for 32bit architectures: use div_s64() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib5cef80c018f800cc0a0cd08a51d6cb7afd584c6 Gerrit-Change-Number: 34009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 29 Jul 2023 15:42:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in dahdi-linux[master]: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34012 ) Change subject: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP ...................................................................... trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP Using those maintenance modes we can test the local (DAHDI channel) and remote (trunkdev) sides indepdendent from each other. Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd --- M drivers/dahdi/trunkdev/trunkdev.c 1 file changed, 64 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/12/34012/1 diff --git a/drivers/dahdi/trunkdev/trunkdev.c b/drivers/dahdi/trunkdev/trunkdev.c index 339b9d0..f185c53 100644 --- a/drivers/dahdi/trunkdev/trunkdev.c +++ b/drivers/dahdi/trunkdev/trunkdev.c @@ -161,6 +161,35 @@ return 0; } +static const char *maint2str(int cmd) +{ + switch (cmd) { + case DAHDI_MAINT_NONE: return "NONE"; + case DAHDI_MAINT_LOCALLOOP: return "LOCALLOOP"; + case DAHDI_MAINT_NETWORKPAYLOADLOOP: return "NETWORKPAYLOADLOOP"; + default: return "UNKNOWN"; + } +} + +static int td_d_maint(struct dahdi_span *span, int cmd) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + + switch (cmd) { + case DAHDI_MAINT_NONE: + case DAHDI_MAINT_LOCALLOOP: + case DAHDI_MAINT_NETWORKPAYLOADLOOP: + /* we don't need to do anything, as span->maintstat is set by the core, + * just acknowledge those supported modes here */ + dev_info(&td->dahdi.dev->dev, "Setting maintenance mode to: %s\n", maint2str(cmd)); + break; + default: + return -ENOSYS; + } + return 0; +} + + /* called in hard_irq context with chan_lock held */ static void td_d_sync_tick(struct dahdi_span *span, int is_master) { @@ -178,14 +207,29 @@ uint8_t frame[32]; int rc; - /* Trunk -> DAHDI direction */ - rc = frame_fifo_out(&td->from_trunk, frame); - if (rc >= 0) - _span_demux_one_frame(td, frame); + switch (span->maintstat) { + case DAHDI_MAINT_NONE: + /* Trunk -> DAHDI direction */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + _span_demux_one_frame(td, frame); - /* Trunk <- DAHDI direction */ - _span_mux_one_frame(td, frame); - frame_fifo_in(&td->to_trunk, frame); + /* Trunk <- DAHDI direction */ + _span_mux_one_frame(td, frame); + frame_fifo_in(&td->to_trunk, frame); + break; + case DAHDI_MAINT_LOCALLOOP: + /* Loop frame from DAHDI back to itself */ + _span_mux_one_frame(td, frame); + _span_demux_one_frame(td, frame); + break; + case DAHDI_MAINT_NETWORKPAYLOADLOOP: + /* Loop frame from trunkdev back to itself */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + frame_fifo_in(&td->to_trunk, frame); + break; + } } /* wake up any processes doing blocking read or waiting in poll */ wake_up_interruptible(&td->waitq); @@ -197,7 +241,7 @@ .chanconfig = td_d_chanconfig, .startup = td_d_startup, .shutdown = td_d_shutdown, - //.maint = td_d_maint, + .maint = td_d_maint, .sync_tick = td_d_sync_tick, }; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd Gerrit-Change-Number: 34012 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in dahdi-linux[master]: Flush DAHDI->trunkdev FIFO at open time

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34011 ) Change subject: Flush DAHDI->trunkdev FIFO at open time ...................................................................... Flush DAHDI->trunkdev FIFO at open time If we don't do this, we always have a full FIFO at the time userspace opens the trunkdev, adding latency for no good reason. Change-Id: Ifbda3766309cc7d6be485073e36607bdd6742f3a --- M drivers/dahdi/trunkdev/frame_fifo.c M drivers/dahdi/trunkdev/frame_fifo.h M drivers/dahdi/trunkdev/trunkdev.c 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/11/34011/1 diff --git a/drivers/dahdi/trunkdev/frame_fifo.c b/drivers/dahdi/trunkdev/frame_fifo.c index 19b6dba..3b7732f 100644 --- a/drivers/dahdi/trunkdev/frame_fifo.c +++ b/drivers/dahdi/trunkdev/frame_fifo.c @@ -53,6 +53,15 @@ spin_lock_init(&fifo->lock); } +/*! Flush (drop) the entire content of the FIFO */ +void frame_fifo_flush(struct frame_fifo *fifo) +{ + unsigned long flags; + spin_lock_irqsave(&fifo->lock, flags); + fifo->next_out = fifo->next_in; + spin_unlock_irqrestore(&fifo->lock, flags); +} + #define FIFO_BUF_END(f) ((f)->buf + sizeof((f)->buf)) /*! put one received frames into the FIFO. diff --git a/drivers/dahdi/trunkdev/frame_fifo.h b/drivers/dahdi/trunkdev/frame_fifo.h index af02811..b07cddc 100644 --- a/drivers/dahdi/trunkdev/frame_fifo.h +++ b/drivers/dahdi/trunkdev/frame_fifo.h @@ -20,6 +20,8 @@ void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), void *priv); +void frame_fifo_flush(struct frame_fifo *fifo); + /* number of frames currently available in FIFO */ static inline unsigned int __frame_fifo_frames(struct frame_fifo *fifo) { diff --git a/drivers/dahdi/trunkdev/trunkdev.c b/drivers/dahdi/trunkdev/trunkdev.c index 8375c86..339b9d0 100644 --- a/drivers/dahdi/trunkdev/trunkdev.c +++ b/drivers/dahdi/trunkdev/trunkdev.c @@ -456,6 +456,9 @@ span->alarms &= ~(ALL_RY_ALARMS|DAHDI_ALARM_LOS); dahdi_alarm_notify(span); spin_unlock_irqrestore(&span->lock, flags); + /* FIFO should be full at this point, let's flush it as now we actually + * have a receiver */ + frame_fifo_flush(&td->to_trunk); open.spanno = span->spanno; if (copy_to_user((__user void *) data, &open, sizeof(open))) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ifbda3766309cc7d6be485073e36607bdd6742f3a Gerrit-Change-Number: 34011 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in dahdi-linux[master]: Introduce virtual DAHDI trunk device

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34010 ) Change subject: Introduce virtual DAHDI trunk device ...................................................................... Introduce virtual DAHDI trunk device This virtual trunk device is a new character device. Contrary to the per-channel devices, this is a per-span device for virtual E1 spans. Userspace reads and writes 32-byte E1 frames on it. ioctl's are added to create and delete such virtual trunk devices at runtime. Each virtual trunk device is limited to one span. Opening trunkdev is similar to opening channels via /dev/dahd/chanw works: All users open the same generic device node but then issue an ioctl to specify which (named) trundev they actually want to open. This avoids having to dynamically register minor device ids, creating device nodes, etc. The trunkdev is in RED + LOS alarm after creation. Only once a userspace process opens the E1 frame side, those alarms cease. Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 --- M drivers/dahdi/Kbuild M drivers/dahdi/Kconfig M drivers/dahdi/dahdi-base.c A drivers/dahdi/trunkdev/Kbuild A drivers/dahdi/trunkdev/frame_fifo.c A drivers/dahdi/trunkdev/frame_fifo.h A drivers/dahdi/trunkdev/trunkdev.c M include/dahdi/kernel.h M include/dahdi/user.h 9 files changed, 939 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/10/34010/1 diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 3332bf6..c3ec58e 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -6,6 +6,8 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETHMF) += dahdi_dynamic_ethmf.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRUNKDEV) += trunkdev/ + ifdef CONFIG_USB obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ICE1USB) += icE1usb/ endif diff --git a/drivers/dahdi/Kconfig b/drivers/dahdi/Kconfig index e8f33b0..14c49bd 100644 --- a/drivers/dahdi/Kconfig +++ b/drivers/dahdi/Kconfig @@ -262,6 +262,24 @@ If unsure, say Y. +config DAHDI_TRUNKDEV + tristate "Virtual trunk device support" + depends on DAHDI + default DAHDI + ---help--- + This driver provides support for spans via a virtual trunk device. + In this driver, DAHDI basically only acts as a compability layer to + multiplex and de-multiplex samples from the individual channels + (timeslots) to/from E1 frames, which are provided/consumed from a + new /dev/dahdi/trunkdev character device. Actual interfacing with + real or physical hardware is then performed by some userspace process. + + To compile this driver as a module, choose M here: the + module will be called dahdi-trunkdev. + + If unsure, say Y. + + source "drivers/dahdi/xpp/Kconfig" diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 7bcbda6..d8e6268 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -105,6 +105,7 @@ #define UNIT(file) MINOR(file->f_path.dentry->d_inode->i_rdev) EXPORT_SYMBOL(dahdi_transcode_fops); +EXPORT_SYMBOL(dahdi_trunkdev_fops); EXPORT_SYMBOL(dahdi_init_tone_state); EXPORT_SYMBOL(dahdi_mf_tone); EXPORT_SYMBOL(__dahdi_mulaw); @@ -181,6 +182,7 @@ static struct dahdi_span *master_span; struct file_operations *dahdi_transcode_fops = NULL; +struct file_operations *dahdi_trunkdev_fops = NULL; #ifdef CONFIG_DAHDI_CONFLINK @@ -524,6 +526,30 @@ return found; } +static struct dahdi_span *_find_span_by_name(const char *name) +{ + struct dahdi_span *s; + list_for_each_entry(s, &span_list, spans_node) { + if (!strcmp(s->name, name)) { + return s; + } + } + return NULL; +} + +struct dahdi_span *dahdi_span_find_by_name_and_get(const char *name) +{ + struct dahdi_span *found; + + mutex_lock(&registration_mutex); + found = _find_span_by_name(name); + if (found && !get_span(found)) + found = NULL; + mutex_unlock(&registration_mutex); + return found; +} +EXPORT_SYMBOL(dahdi_span_find_by_name_and_get); + static unsigned int span_count(void) { unsigned int count = 0; @@ -3328,6 +3354,24 @@ } return -ENXIO; } + if (unit == DAHDI_TRUNKDEV) { + if (!dahdi_trunkdev_fops) { + if (request_module("dahdi_trunkdev")) { + return -ENXIO; + } + } + if (!try_module_get(dahdi_trunkdev_fops->owner)) { + return -ENXIO; + } + if (dahdi_trunkdev_fops && dahdi_trunkdev_fops->open) { + return dahdi_trunkdev_fops->open(inode, file); + } else { + /* dahdi_trunkdev module should have exported a + * file_operations table. */ + WARN_ON(1); + } + return -ENXIO; + } if (unit == DAHDI_TIMER) { if (can_open_timer()) { return dahdi_timer_open(file); diff --git a/drivers/dahdi/trunkdev/Kbuild b/drivers/dahdi/trunkdev/Kbuild new file mode 100644 index 0000000..934153b --- /dev/null +++ b/drivers/dahdi/trunkdev/Kbuild @@ -0,0 +1,3 @@ +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRUNKDEV) += dahdi-trunkdev.o + +dahdi-trunkdev-objs := trunkdev.o frame_fifo.o diff --git a/drivers/dahdi/trunkdev/frame_fifo.c b/drivers/dahdi/trunkdev/frame_fifo.c new file mode 100644 index 0000000..19b6dba --- /dev/null +++ b/drivers/dahdi/trunkdev/frame_fifo.c @@ -0,0 +1,158 @@ +/* + * frame_fifo.c (copied from osmo-e1d) + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/types.h> +#include <linux/errno.h> +#include <linux/string.h> + +#include "frame_fifo.h" + + +/*********************************************************************** + * Frame FIFO + ***********************************************************************/ + +void fifo_dump(struct frame_fifo *fifo) +{ + printk(KERN_DEBUG "buf=%p, size=%zu, next_in=%lu, next_out=%lu\n", fifo->buf, sizeof(fifo->buf), + fifo->next_in - fifo->buf, fifo->next_out - fifo->buf); +} + +/*! Initialize a frame FIFO. + * \param fifo Caller-allocated memory for FIFO data structure + * \param threshold After how many available frames shall we call threshold_cb + * \param threshold_cb Optional call-back to call whenever FIFO contains more than 'threshold' frames + * \param priv Opaque pointer passed to threshold_cb */ +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv) +{ + memset(fifo->buf, 0xff, sizeof(fifo->buf)); + fifo->next_in = fifo->buf; + fifo->next_out = fifo->buf; + fifo->threshold = threshold; + fifo->threshold_cb = threshold_cb; + fifo->priv = priv; + spin_lock_init(&fifo->lock); +} + +#define FIFO_BUF_END(f) ((f)->buf + sizeof((f)->buf)) + +/*! put one received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns 0 on success; -1 on error (overflow */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame) +{ + unsigned long flags; + + spin_lock_irqsave(&fifo->lock, flags); +#if 0 + /* FIXME: detect overflow */ + if (fifo->next_in == fifo->next_out) { + spin_unlock_irqrestore(&fifo->lock, flags); + return -ENOSPC; + } +#endif + BUG_ON(fifo->next_in + BYTES_PER_FRAME > FIFO_BUF_END(fifo)); + memcpy(fifo->next_in, frame, BYTES_PER_FRAME); + fifo->next_in += BYTES_PER_FRAME; + if (fifo->next_in >= FIFO_BUF_END(fifo)) + fifo->next_in -= sizeof(fifo->buf); + spin_unlock_irqrestore(&fifo->lock, flags); + + if (fifo->threshold_cb) { + unsigned int frames_avail = frame_fifo_frames(fifo); + if (frames_avail >= fifo->threshold) + fifo->threshold_cb(fifo, frames_avail, fifo->priv); + } + + return 0; +} + +/*! put (append) multiple received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns Number of frames actually put to FIFO; can be less than 'count' */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count) +{ + const uint8_t *cur = frame; + unsigned int i; + int rc; + + for (i = 0; i < count; i++) { + rc = frame_fifo_in(fifo, cur); + /* abort on the first failing frame, there's no point in trying further */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} + +/*! pull one frames out of the FIFO. + * \param fifo The FIFO from which we want to pull frames + * \param out Caller-allocated output buffer + * \returns 0 on success; -1 on error (no frame available) */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out) +{ + unsigned long flags; + + spin_lock_irqsave(&fifo->lock, flags); + + if (__frame_fifo_frames(fifo) < 1) { + spin_unlock_irqrestore(&fifo->lock, flags); + return -1; + } + + memcpy(out, fifo->next_out, BYTES_PER_FRAME); + fifo->next_out += BYTES_PER_FRAME; + + if (fifo->next_out >= FIFO_BUF_END(fifo)) + fifo->next_out -= sizeof(fifo->buf); + + spin_unlock_irqrestore(&fifo->lock, flags); + + return 0; +} + +/*! pull multiple frames out of the FIFO. + * \param fifo The FIFO from which we want ot pull frames + * \param out Caller-allocated output buffer + * \param count Number of frames to pull + * \returns number of frames pulled; can be 0 or less than count */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count) +{ + uint8_t *cur = out; + unsigned int i; + int rc = 0; + + for (i = 0; i < count; i++) { + rc = frame_fifo_out(fifo, cur); + /* if there's no data in the FIFO, return number of frames + * pulled so far, could be 0. */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} diff --git a/drivers/dahdi/trunkdev/frame_fifo.h b/drivers/dahdi/trunkdev/frame_fifo.h new file mode 100644 index 0000000..af02811 --- /dev/null +++ b/drivers/dahdi/trunkdev/frame_fifo.h @@ -0,0 +1,56 @@ +#pragma once + +#include <linux/spinlock.h> + +#define BYTES_PER_FRAME 32 +#define FRAMES_PER_FIFO 800 /* 100ms @ 8000 frames per second */ + +struct frame_fifo { + spinlock_t lock; + uint8_t *next_in; /* where to write next input into FIFO */ + uint8_t *next_out; /* where to read next output from FIFO */ + uint8_t threshold; /* number of frames that should trigger */ + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv); + void *priv; + + uint8_t buf[BYTES_PER_FRAME * FRAMES_PER_FIFO]; +}; + +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv); + +/* number of frames currently available in FIFO */ +static inline unsigned int __frame_fifo_frames(struct frame_fifo *fifo) +{ + return ((fifo->next_in + sizeof(fifo->buf) - fifo->next_out) % sizeof(fifo->buf)) / BYTES_PER_FRAME; +} +static inline unsigned int frame_fifo_frames(struct frame_fifo *fifo) +{ + unsigned long flags; + unsigned int ret; + + spin_lock_irqsave(&fifo->lock, flags); + ret = __frame_fifo_frames(fifo); + spin_unlock_irqrestore(&fifo->lock, flags); + + return ret; +} + +/* for how many frames do we have space in the FIFO? */ +static inline unsigned int frame_fifo_space(struct frame_fifo *fifo) +{ + return FRAMES_PER_FIFO - frame_fifo_frames(fifo); +} + +/* put a received frame into the FIFO */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame); + +/* put multiple received frames into the FIFO */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count); + +/* pull one frame out of the FIFO */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out); + +/* pull multiple frames out of the FIFO */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count); diff --git a/drivers/dahdi/trunkdev/trunkdev.c b/drivers/dahdi/trunkdev/trunkdev.c new file mode 100644 index 0000000..8375c86 --- /dev/null +++ b/drivers/dahdi/trunkdev/trunkdev.c @@ -0,0 +1,607 @@ +/* DAHDI Virtual Trunk device driver. + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * for Osmocom retronetworking project + * + */ + +/* This virtual trunk device is a new character device. Contrary to + the per-channel devices, this is a per-span device for virtual E1 + spans. Userspace reads and writes 32-byte E1 frames on it. + + ioctl's are added to create and delete such virtual trunk devices + at runtime. Each virtual trunk device is limited to one span. + + Opening trunkdev is similar to opening channels via /dev/dahd/chanw + works: All users open the same generic device node but then issue + an ioctl to specify which (named) trundev they actually want to open. + + This avoids having to dynamically register minor device ids, creating + device nodes, etc. + + The trunkdev is in RED + LOS alarm after creation. Only once a userspace + process opens the E1 frame side, those alarms cease. +*/ + + +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kmod.h> +#include <linux/wait.h> +#include <linux/spinlock.h> + +#include <dahdi/kernel.h> + +#include "frame_fifo.h" +#include "../dahdi.h" + +#define TRUNKDEV_FMT "trunkdev/%s/0" + +#define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | \ + DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA) + +struct dahdi_trunkdev { + /* pointer to 'file' _if_ somebody has opened us via DAHDI_TRUNKDEV_OPEM */ + struct file *file; + + /* the two E1 frame FIFOs between trunk-device and DAHDI code */ + struct frame_fifo from_trunk; + struct frame_fifo to_trunk; + + /* wait-queue for blocking read on trunk device */ + wait_queue_head_t waitq; + + struct { + struct dahdi_device *dev; + struct dahdi_span span; + struct dahdi_chan *chans[31]; + /* [next rx byte] offset into chan[i]->readchunk */ + unsigned int readchunk_idx; + /* [next tx byte] offset into chan[i]->writechunk */ + unsigned int writechunk_idx; + } dahdi; +}; + +/* process one incoming E1 frame (32 bytes; one for each TS) */ +static void _span_demux_one_frame(struct dahdi_trunkdev *td, const uint8_t *data) +{ + struct dahdi_span *dspan = &td->dahdi.span; + unsigned int i; + + /* TODO: TS0 handling */ + + /* de-multiplex one byte to each channel */ + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan = td->dahdi.chans[i]; + chan->readchunk[td->dahdi.readchunk_idx] = data[1+i]; + } + td->dahdi.readchunk_idx++; + + /* DAHDI_CHUNKSIZE is 8, meaning every channel (timeslot) wants data for 8 + * bytes (PCM samples) every time _dahdi_receive() is called */ + if (td->dahdi.readchunk_idx == DAHDI_CHUNKSIZE) { + dahdi_receive(dspan); + td->dahdi.readchunk_idx = 0; + } +} + +/* multiplex one E1 frame (32 bytes) and write it to 'out' */ +static void _span_mux_one_frame(struct dahdi_trunkdev *td, uint8_t *out) +{ + struct dahdi_span *dspan = &td->dahdi.span; + unsigned int i; + + out[0] = 0; /* TODO: TS0 handling */ + + /* multiplex one byte of each channel into a frame */ + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan = td->dahdi.chans[i]; + out[1+i] = chan->writechunk[td->dahdi.writechunk_idx]; + } + td->dahdi.writechunk_idx++; + + /* DAHDI_CHUNKSIZE is 8, meaning every channel (timeslot) has data for 8 + * bytes (PCM samples) every time _dahdi_transmit() is called */ + if (td->dahdi.writechunk_idx == DAHDI_CHUNKSIZE) { + dahdi_transmit(dspan); + td->dahdi.writechunk_idx = 0; + } +} + + + + +/************************************************************************* + * DAHDI driver integration + *************************************************************************/ + +/* configuration of the span itself */ +static int td_d_spanconfig(struct file *file, struct dahdi_span *span, + struct dahdi_lineconfig *lc) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + unsigned int i; + + if (lc->sync < 0) + lc->sync = 0; + if (lc->sync > 1) { + // TODO: log + lc->sync = 0; + } + + /* (re-)set some sane defaults */ + for (i = 0; i < span->channels; i++) { + struct dahdi_chan *const chan = td->dahdi.chans[i]; + chan->sigcap = DAHDI_SIG_CLEAR | DAHDI_SIG_MTP2 | DAHDI_SIG_SF; + } + + return 0; +} + +/* configuration of a single channel within the span */ +static int td_d_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) +{ + return 0; +} + +/* start the span */ +static int td_d_startup(struct file *file, struct dahdi_span *span) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + /* TODO: set alarms if trunkdev not open? */ + return 0; +} + +/* shut down / stop the span */ +static int td_d_shutdown(struct dahdi_span *span) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + /* TODO: should trunkdev continue to read/write even if the dahdi side is shutdown */ + return 0; +} + +/* called in hard_irq context with chan_lock held */ +static void td_d_sync_tick(struct dahdi_span *span, int is_master) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + unsigned int i; + + /* we must have some other clock source than this span, due to the way + * how DAHDI works internally: This very sync_tick function is called when the + * master device receives data via _dahdi_receive(). As we are calling + * _dahdi_receive() via _span_demux_one_frame(), this would lead to re-entrancy */ + BUG_ON(is_master); + + /* trigger transmission + reception of E1 frames */ + for (i = 0; i < DAHDI_CHUNKSIZE; i++) { + uint8_t frame[32]; + int rc; + + /* Trunk -> DAHDI direction */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + _span_demux_one_frame(td, frame); + + /* Trunk <- DAHDI direction */ + _span_mux_one_frame(td, frame); + frame_fifo_in(&td->to_trunk, frame); + } + /* wake up any processes doing blocking read or waiting in poll */ + wake_up_interruptible(&td->waitq); +} + +static const struct dahdi_span_ops trunkdev_span_ops = { + .owner = THIS_MODULE, + .spanconfig = td_d_spanconfig, + .chanconfig = td_d_chanconfig, + .startup = td_d_startup, + .shutdown = td_d_shutdown, + //.maint = td_d_maint, + .sync_tick = td_d_sync_tick, +}; + + +static void trunkdev_free_channels(struct dahdi_trunkdev *td) +{ + unsigned int i; + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + kfree(td->dahdi.chans[i]); + td->dahdi.chans[i] = NULL; + } +} + +static int trunkdev_alloc_channels(struct dahdi_trunkdev *td) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan; + kfree(td->dahdi.chans[i]); + chan = td->dahdi.chans[i] = kzalloc(sizeof(*chan), GFP_KERNEL); + if (!chan) { + trunkdev_free_channels(td); + return -ENOMEM; + } + chan->pvt = td; + snprintf(chan->name, sizeof(chan->name)-1, "%s/%u", + td->dahdi.span.name, i+1); + chan->chanpos = i+1; + chan->sigcap = DAHDI_SIG_CLEAR | DAHDI_SIG_MTP2 | DAHDI_SIG_SF; + } + return 0; +} + +static int trunkdev_create(const char *name) +{ + struct dahdi_trunkdev *td; + struct dahdi_device *ddev; + struct dahdi_span *dspan; + int ret = -EINVAL; + int rc; + + td = kzalloc(sizeof(*td), GFP_KERNEL); + if (!td) + return -ENOMEM; + + frame_fifo_init(&td->from_trunk, 0, NULL, td); + frame_fifo_init(&td->to_trunk, 0, NULL, td); + init_waitqueue_head(&td->waitq); + + td->dahdi.dev = dahdi_create_device(); + if (!td->dahdi.dev) { + printk(KERN_ERR "Error in dahdi_create_device()\b"); + goto error; + } + ddev = td->dahdi.dev; + dev_set_name(&ddev->dev, "trunkdev_%s", name); + ddev->manufacturer = "Osmocom"; + ddev->devicetype = "Virtual Trunk"; + ddev->hardware_id = "none"; + //ddev->location = FIXME; + + dspan = &td->dahdi.span; + snprintf(dspan->name, sizeof(dspan->name), TRUNKDEV_FMT, name); + snprintf(dspan->desc, sizeof(dspan->desc), "Virtual trunk %s span 0", name); + dspan->channels = 31; + dspan->spantype = SPANTYPE_DIGITAL_E1; + dspan->deflaw = DAHDI_LAW_ALAW; + dspan->linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4; + dspan->alarms = DAHDI_ALARM_RED | DAHDI_ALARM_LOS; + dspan->chans = td->dahdi.chans; + dspan->flags = 0; + dspan->offset = 0; + dspan->ops = &trunkdev_span_ops; + dspan->cannot_provide_timing = 1; + + rc = trunkdev_alloc_channels(td); + if (rc) { + ret = -ENOMEM; + goto err_free_tdev; + } + + list_add_tail(&dspan->device_node, &ddev->spans); + + rc = dahdi_register_device(td->dahdi.dev, NULL); + if (rc) { + printk(KERN_ERR "Error in dahdi_register_device()\n"); + goto err_free_chans; + } + + return dspan->spanno; + +err_free_chans: + trunkdev_free_channels(td); +err_free_tdev: + dahdi_free_device(td->dahdi.dev); +error: + kfree(td); + return ret; +} + +static void trunkdev_free(struct dahdi_trunkdev *td) +{ + if (td->file) + td->file->private_data = NULL; + + /* will in turn call td_d_shutdown() */ + dahdi_unregister_device(td->dahdi.dev); + trunkdev_free_channels(td); + kfree(td); +} + + +/************************************************************************* + * /dev/dahdi/trunkdev character device handling for a full trunk + *************************************************************************/ + +/* user has opened a trunkdev device */ +static int dahdi_trunkdev_open(struct inode *inode, struct file *file) +{ + const struct file_operations *original_fops; + + printk(KERN_DEBUG "%s\n", __func__); + + /* use our own file operations for this file, not the generic dahdi ones */ + original_fops = file->f_op; + file->f_op = dahdi_trunkdev_fops; + file->private_data = NULL; + /* Under normal operation, this releases the reference on the DAHDI + * module that was created when the file was opened. dahdi_open is + * responsible for taking a reference out on this module before + * calling this function. */ + module_put(original_fops->owner); + + /* nothing else to do here, we wait for ioctls() to create new trunkdev + * or to associate the file handle with existing ones */ + return 0; +} + +/* user has closed the trunkdev device */ +static int dahdi_trunkdev_release(struct inode *inode, struct file *file) +{ + struct dahdi_trunkdev *td = file->private_data; + struct dahdi_span *dspan; + unsigned long flags; + + printk(KERN_DEBUG "%s\n", __func__); + + if (unlikely(!td)) + return -ENXIO; + + dspan = &td->dahdi.span; + /* signal RED alarm once the trunkdev user is gone */ + spin_lock_irqsave(&dspan->lock, flags); + dspan->alarms &= ~ALL_RY_ALARMS; + dspan->alarms |= DAHDI_ALARM_RED | DAHDI_ALARM_LOS; + dahdi_alarm_notify(dspan); + spin_unlock_irqrestore(&dspan->lock, flags); + + /* drop the reference taken during DAHDI_TRUNKDEV_OPEN */ + put_span(dspan); + + td->file = NULL; + file->private_data = NULL; + + return 0; +} + +static long dahdi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data) +{ + struct dahdi_trunkdev_create create; + struct dahdi_trunkdev_delete delete; + struct dahdi_trunkdev_open open; + char name[40]; + struct dahdi_trunkdev *td; + struct dahdi_span *span; + unsigned long flags; + int res; + + printk(KERN_DEBUG "%s(cmd=%u)\n", __func__, cmd); + + switch (cmd) { + case DAHDI_TRUNKDEV_CREATE: /* create an new trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_CREATE)\n", __func__); + if (copy_from_user(&create, (__user const void *) data, sizeof(create))) + return -EFAULT; + res = trunkdev_create(create.name); + if (res < 0) + return res; + create.spanno = res; + if (copy_to_user((__user void *) data, &create, sizeof(create))) { + trunkdev_free(td); + return -EFAULT; + } + /* increase module reference count to avoid module unload until all + * trunkdev have been deleted again */ + if (!try_module_get(THIS_MODULE)) { + trunkdev_free(td); + return -ENXIO; + } + return 0; + + case DAHDI_TRUNKDEV_DELETE: /* destroy an existing trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_DELETE)\n", __func__); + if (copy_from_user(&delete, (__user const void *) data, sizeof(delete))) + return -EFAULT; + snprintf(name, sizeof(name), TRUNKDEV_FMT, delete.name); + span = dahdi_span_find_by_name_and_get(name); + if (!span) + return -ENODEV; + if (span->ops != &trunkdev_span_ops) { + /* the span with this name is not a trunkdev span */ + put_span(span); + return -EINVAL; + } + td = container_of(span, struct dahdi_trunkdev, dahdi.span); + if (td->file) { + /* some other file already opened this span */ + put_span(span); + return -EBUSY; + } + /* FIXME: some kind of mutex required? */ + /* release the reference we obtained above before free'ing underlying memory */ + put_span(span); + trunkdev_free(td); + /* drop the reference we hold from TRUNKDEV_CREATE time */ + module_put(THIS_MODULE); + return 0; + + case DAHDI_TRUNKDEV_OPEN: /* open a trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_OPEN)\n", __func__); + if (unlikely(file->private_data)) + return -EBUSY; + if (copy_from_user(&open, (__user const void *) data, sizeof(open))) + return -EFAULT; + snprintf(name, sizeof(name), TRUNKDEV_FMT, open.name); + span = dahdi_span_find_by_name_and_get(name); + if (!span) + return -ENODEV; + if (span->ops != &trunkdev_span_ops) { + /* the span with this name is not a trunkdev span */ + put_span(span); + return -EINVAL; + } + td = container_of(span, struct dahdi_trunkdev, dahdi.span); + if (td->file) { + /* some other file already opened this span */ + put_span(span); + return -EBUSY; + } + /* FIXME: some kind of mutex required? */ + file->private_data = td; + td->file = file; + /* remove all alarms */ + spin_lock_irqsave(&span->lock, flags); + span->alarms &= ~(ALL_RY_ALARMS|DAHDI_ALARM_LOS); + dahdi_alarm_notify(span); + spin_unlock_irqrestore(&span->lock, flags); + + open.spanno = span->spanno; + if (copy_to_user((__user void *) data, &open, sizeof(open))) + return -EFAULT; + return 0; + default: + printk(KERN_ERR "%s(invalid cmd=0x%x)\n", __func__, cmd); + return -EINVAL; + } +} + +static ssize_t dahdi_trunkdev_read(struct file *file, char __user *usrbuf, + size_t count, loff_t *ppos) +{ + struct dahdi_trunkdev *td = file->private_data; + size_t copied = 0; + + if (unlikely(!td)) + return -ENODEV; + + if (unlikely(count < 1)) + return -EINVAL; + + if (unlikely(count % BYTES_PER_FRAME)) + return -EINVAL; + + while (copied < count) { + uint8_t frame[BYTES_PER_FRAME]; + int rc; + + rc = frame_fifo_out(&td->to_trunk, frame); + if (rc < 0) { + /* insufficient data available */ + if (file->f_flags & O_NONBLOCK) { + if (copied == 0) + return -EAGAIN; + else + return copied; + } + /* blocking wait for frames in FIFO or for device disappearing */ + rc = wait_event_interruptible(td->waitq, + (frame_fifo_frames(&td->to_trunk) || !file->private_data)); + if (rc) + return rc; + /* device has disappeared */ + if (!file->private_data) + return -ENODEV; + } + if (copy_to_user(usrbuf + copied, frame, sizeof(frame))) + return -EFAULT; + copied += sizeof(frame); + } + + return copied; +} + +static ssize_t dahdi_trunkdev_write(struct file *file, const char __user *usrbuf, size_t count, loff_t *ppos) +{ + struct dahdi_trunkdev *td = file->private_data; + size_t copied = 0; + + if (unlikely(!td)) + return -ENODEV; + + if (unlikely(count < 1)) + return -EINVAL; + + if (unlikely(count % BYTES_PER_FRAME)) + return -EINVAL; + + while (copied < count) { + uint8_t frame[BYTES_PER_FRAME]; + + if (copy_from_user(frame, usrbuf + copied, sizeof(frame))) + return -EFAULT; + + frame_fifo_in(&td->from_trunk, frame); + copied += sizeof(frame); + /* TODO: we could detect overflow and start blocking? */ + } + + return copied; +} + +static unsigned int dahdi_trunkdev_poll(struct file *file, struct poll_table_struct *wait_table) +{ + struct dahdi_trunkdev *td = file->private_data; + unsigned int ret = 0; + + if (unlikely(!td)) + return POLLERR | POLLHUP | POLLRDHUP | POLLNVAL | POLLPRI; + + poll_wait(file, &td->waitq, wait_table); + + if (frame_fifo_frames(&td->to_trunk)) + ret |= POLLIN | POLLRDNORM; + + /* we currently always allow write to the fifo, as we don't detect overflows yet */ + ret |= POLLOUT | POLLWRNORM; + + return ret; +} + +static const struct file_operations __dahdi_trunkdev_fops = { + .owner = THIS_MODULE, + .open = dahdi_trunkdev_open, + .release = dahdi_trunkdev_release, + .unlocked_ioctl = dahdi_unlocked_ioctl, + .read = dahdi_trunkdev_read, + .write = dahdi_trunkdev_write, + .poll = dahdi_trunkdev_poll, +}; + +static struct dahdi_chardev trunkdev_chardev = { + .name = "trunkdev", + .minor = DAHDI_TRUNKDEV, +}; + +static int __init dahdi_trunkdev_init(void) +{ + int res; + + if (dahdi_trunkdev_fops) { + printk(KERN_WARNING "dahdi_trunkdev_fops already set.\n"); + return -EBUSY; + } + + if ((res = dahdi_register_chardev(&trunkdev_chardev))) + return res; + + dahdi_trunkdev_fops = (struct file_operations *) &__dahdi_trunkdev_fops; + + printk(KERN_INFO "%s: Loaded.\n", THIS_MODULE->name); + return 0; +} + +static void __exit dahdi_trunkdev_cleanup(void) +{ + dahdi_unregister_chardev(&trunkdev_chardev); + dahdi_trunkdev_fops = NULL; + printk(KERN_INFO "%s: Unloaded.\n", THIS_MODULE->name); +} + +MODULE_DESCRIPTION("DAHDI virtual trunk device"); +MODULE_AUTHOR("Harald Welte <laforge(a)osmocom.org>"); +MODULE_LICENSE("GPL"); + +module_init(dahdi_trunkdev_init); +module_exit(dahdi_trunkdev_cleanup); diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 0df4f5e..0a25854 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1216,6 +1216,9 @@ void dahdi_free_device(struct dahdi_device *ddev); void dahdi_init_span(struct dahdi_span *span); +/*! Find a span by its name and get a reference */ +struct dahdi_span *dahdi_span_find_by_name_and_get(const char *name); + /*! Allocate / free memory for a transcoder */ struct dahdi_transcoder *dahdi_transcoder_alloc(int numchans); void dahdi_transcoder_free(struct dahdi_transcoder *ztc); @@ -1295,6 +1298,7 @@ } extern struct file_operations *dahdi_transcode_fops; +extern struct file_operations *dahdi_trunkdev_fops; int dahdi_get_auto_assign_spans(void); @@ -1592,6 +1596,7 @@ #define DAHDI_CTL 0 #define DAHDI_TRANSCODE 250 +#define DAHDI_TRUNKDEV 252 #define DAHDI_TIMER 253 #define DAHDI_CHANNEL 254 #define DAHDI_PSEUDO 255 diff --git a/include/dahdi/user.h b/include/dahdi/user.h index d69dc91..17e7a0e 100644 --- a/include/dahdi/user.h +++ b/include/dahdi/user.h @@ -1225,4 +1225,24 @@ *dst = '\0'; } +struct dahdi_trunkdev_create { + char name[40]; /* name of the to-be-created span */ + //int numchans; + int spanno; /* Span number (filled in by DAHDI) */ +}; +#define DAHDI_TRUNKDEV_CREATE _IOWR(DAHDI_CODE, 255, struct dahdi_trunkdev_create) + +struct dahdi_trunkdev_delete { + char name[40]; /* name of the to-be-opened span */ +}; +#define DAHDI_TRUNKDEV_DELETE _IOWR(DAHDI_CODE, 254, struct dahdi_trunkdev_delete) + +struct dahdi_trunkdev_open { + char name[40]; /* name of the to-be-opened span */ + int spanno; /* Span number (filled in by DAHDI) */ +}; +#define DAHDI_TRUNKDEV_OPEN _IOWR(DAHDI_CODE, 253, struct dahdi_trunkdev_open) + + + #endif /* _DAHDI_USER_H */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 Gerrit-Change-Number: 34010 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in dahdi-linux[master]: xpp_usb: Fix for 32bit architectures: use div_s64()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34009 ) Change subject: xpp_usb: Fix for 32bit architectures: use div_s64() ...................................................................... xpp_usb: Fix for 32bit architectures: use div_s64() Change-Id: Ib5cef80c018f800cc0a0cd08a51d6cb7afd584c6 --- M drivers/dahdi/xpp/xpp_usb.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/09/34009/1 diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 65f646a..0660de3 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -886,7 +886,7 @@ usec = 0; /* System clock jumped */ if (usec > xusb->max_tx_delay) xusb->max_tx_delay = usec; - i = usec / USEC_BUCKET; + i = div_s64(usec, USEC_BUCKET); if (i >= NUM_BUCKETS) i = NUM_BUCKETS - 1; xusb->usb_tx_delay[i]++; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib5cef80c018f800cc0a0cd08a51d6cb7afd584c6 Gerrit-Change-Number: 34009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements

by wbokslag

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: (1 comment) File src/tetra-rx.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/6bac42b9_f522ca10 PS2, Line 96: talloc > again, just FYI: talloc is hieararchical. […] Sorry, I was unfamiliar with that structure, I'll change it in a next patch then. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 29 Jul 2023 15:03:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33945 ) Change subject: ms/va: add test tool and data ...................................................................... Patch Set 12: Code-Review-1 (4 comments) File utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/7e68a9c5_9fa1e24d PS12, Line 9: osmo_prbs_tool_CPPFLAGS = $(LIBOSMOCODING_CFLAGS) : osmo_prbs_tool_CFLAGS = -Wall Things are still messed up here: * `CPPFLAGS` is for the preprocessor flags, like `-I PATH` and `-DHAVE_FOO_BAR`; * `CFLAGS` is for the compiler flags, like `$(LIBOSMOCODING_CFLAGS)` in this case. So can we just keep the `AM_CFLAGS = -Wall` line above unchanged, and put `$(LIBOSMOCODING_CFLAGS)` into the proper place (`osmo_prbs_tool_CFLAGS`)? https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/cf09bad8_830121f7 PS12, Line 18: ../Transceiver52M `${top_srcdir}/Transceiver52M/libtransceiver_common.la` https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/746963f3_c2118e29 PS12, Line 26: UHD_CFLAGS `UHD_CFLAGS` should be in `osmo_burst_gen_CXXFLAGS` (C++ compiler flags). https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/55581a69_764d766f PS12, Line 26: $(UHD_CFLAGS) "No newline at end of right file." -- please do not remove NLs, they're added on purpose. A programming friendly editor should add them automatically, and git is known to complain about missing NLs. https://stackoverflow.com/questions/5813311/whats-the-significance-of-the-n… https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a… -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 13:49:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33944 ) Change subject: ms: restructure the va code to add rach support ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 13:36:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support

by fixeria

Attention is currently required from: Hoernchen, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33944 ) Change subject: ms: restructure the va code to add rach support ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 13:36:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

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

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33927 ) Change subject: ms: update osmocom-bb ...................................................................... Patch Set 6: (1 comment) File Transceiver52M/ms/logging.c: https://gerrit.osmocom.org/c/osmo-trx/+/33927/comment/4a850512_ac7fda1b PS6, Line 46: DTRXC Neither `DTRXC` nor `DTRXD` is really needed here, since osmo-trx-ms does not speak TRXC/TRXD. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af Gerrit-Change-Number: 33927 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jul 2023 13:34:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added functions that prepare for decryption

by wbokslag

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34001 ) Change subject: Added functions that prepare for decryption ...................................................................... Patch Set 5: (3 comments) Patchset: PS5: Updated as requested File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34001/comment/73bf6935_5014110e PS2, Line 207: case KSG_TEA1: : tea1_stub(iv, eck, num_bytes, ks_bytes); : break; : case KSG_TEA2: : tea2_stub(iv, eck, num_bytes, ks_bytes); : break; : case KSG_TEA3: : tea3_stub(iv, eck, num_bytes, ks_bytes); : break; > I think it's a bit weird to add the stub functions that don't do anything in a commit here. […] Done https://gerrit.osmocom.org/c/osmo-tetra/+/34001/comment/73ff2637_1bea21c5 PS2, Line 305: / > we typically prefer /* */ comments. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 5 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 29 Jul 2023 11:13:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added functions that prepare for decryption

by wbokslag

Attention is currently required from: wbokslag. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 to look at the new patch set (#5). Change subject: Added functions that prepare for decryption ...................................................................... Added functions that prepare for decryption Added functions that will eventually allow for mac resource decryption, voice/traffic decryption and identity decryption. Calls to the true TEA keystream generator functions and TA61 identity decryption function will need to be added in a later patch. Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h 2 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/01/34001/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 5 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added functions that prepare for decryption functionality

by wbokslag

Attention is currently required from: wbokslag. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 to look at the new patch set (#4). Change subject: Added functions that prepare for decryption functionality ...................................................................... Added functions that prepare for decryption functionality Added functions that will eventually allow for mac resource decryption, voice/traffic decryption and identity decryption. Calls to the true TEA keystream generator functions and TA61 identity decryption function will need to be added in a later patch. Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h 2 files changed, 131 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/01/34001/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 4 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by wbokslag

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 to look at the new patch set (#3). Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Fixups and clarifying comments for msgb tail modifications Added fixups for msgb len field whenever the tail is modified Also, added some clarifying comments Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db --- M src/lower_mac/tetra_lower_mac.c M src/tetra_llc.c M src/tetra_upper_mac.c 3 files changed, 30 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/00/34000/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log July 2023