[S] Change in libosmo-netif[master]: stream_cli: Fix opening sctp client socket if no local address set
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email ) Change subject: stream_cli: Fix opening sctp client socket if no local address set .. Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-netif/+/35235/comment/370ee6f7_ae51f702 PS2, Line 17: Depends: libosmocore.git Change-Id I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd add dep on newer libosmocore in TODO-RELEASE? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I0d9d0e48690c915f7b51ad09f452e551e01368b5 Gerrit-Change-Number: 35235 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 07:43:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOC...
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email ) Change subject: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOCK_F_BIND flag set .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia32510e8db1de0cc0dc36cebf8a94f09e44fda70 Gerrit-Change-Number: 35233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 07:36:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: socket: Reimplement osmo_sock_init2_multiaddr()
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email )
Change subject: socket: Reimplement osmo_sock_init2_multiaddr()
..
Patch Set 2:
(1 comment)
File src/core/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/35232/comment/97f6d9df_6d77f3dc
PS2, Line 945: (loc_has_v4addr != rem_has_v4addr || loc_has_v6addr !=
rem_has_v6addr)) {
> the if condition looks right, but is IMHO a bit hard to read, maybe move it /
> or the whole block her […]
with multiple return paths I mean, to potentially make it more readable
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd
Gerrit-Change-Number: 35232
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 06 Dec 2023 07:32:05 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[M] Change in libosmocore[master]: socket: Reimplement osmo_sock_init2_multiaddr()
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email )
Change subject: socket: Reimplement osmo_sock_init2_multiaddr()
..
Patch Set 2: Code-Review+1
(4 comments)
Patchset:
PS2:
logic looks fine, just some cosmetics
File src/core/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/35232/comment/707ab214_70e3d9a9
PS2, Line 922: IPv4 or IPv6
IPv4-only or IPv6-only
https://gerrit.osmocom.org/c/libosmocore/+/35232/comment/c4fb0cd8_50b0b67d
PS2, Line 933: * Both are checked here through "or" here to account for "bind
flag set,
what do you mean with 'checked through "or" here', did you mean to write it
like this?
```
if (loc_has_v6addr || rem_has_v6addr)
family = AF_INET6;
else
family = AF_INET;
```
https://gerrit.osmocom.org/c/libosmocore/+/35232/comment/1f5f1437_11cdfece
PS2, Line 945: (loc_has_v4addr != rem_has_v4addr || loc_has_v6addr !=
rem_has_v6addr)) {
the if condition looks right, but is IMHO a bit hard to read, maybe move it /
or the whole block here to a separate function?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd
Gerrit-Change-Number: 35232
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 06 Dec 2023 07:26:48 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 06:29:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: laforge, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email ) Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 06 Dec 2023 06:23:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: OBS: add jenkins job to check for new distros
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email )
Change subject: OBS: add jenkins job to check for new distros
..
OBS: add jenkins job to check for new distros
Add a new jenkins job to notify us about new versions of Debian,
Raspbian and Ubuntu becoming available in the openSUSE OBS. This allows
us to consistently follow along and make the repositories available in
the Osmocom OBS. I've decided to check the openSUSE OBS instead of
checking somewhere upstream, because it takes time between a new
release of a distribution and the version becoming available in
openSUSE OBS, and we have another job that syncs the configuration with
that OBS instance.
Related: OS#6163
Change-Id: I0abc49a95197da55f7d83ed4fd1c4ebb6bd14b1e
---
M jobs/README.adoc
A jobs/osmocom-obs-check-new-distros.yml
A scripts/obs/check_new_distros.py
M scripts/obs/lib/config.py
4 files changed, 181 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/jobs/README.adoc b/jobs/README.adoc
index 86fc485..c37b3bb 100644
--- a/jobs/README.adoc
+++ b/jobs/README.adoc
@@ -123,6 +123,7 @@
18:00 - 21:00 OBS related
18:XX osmocom-obs-sync (sync Debian:12 etc. with openSUSE OBS)
+ 19:XX osmocom-obs-check-new-distros
19:XX osmocom-obs-wireshark
20:XX osmocom-obs (new binary packages start building on OBS!)
diff --git a/jobs/osmocom-obs-check-new-distros.yml
b/jobs/osmocom-obs-check-new-distros.yml
new file mode 100644
index 000..760479a
--- /dev/null
+++ b/jobs/osmocom-obs-check-new-distros.yml
@@ -0,0 +1,39 @@
+---
+- job:
+name: 'Osmocom_OBS_check_new_distros'
+project-type: freestyle
+concurrent: false
+defaults: global
+description: |
+ Check whether new distributions (Debian, Raspyberry Pi OS, Ubuntu) are
+ available in openSUSE's OBS that we need to add to the Osmocom OBS.
+properties:
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 30
+node: obs
+parameters:
+ - string:
+ name: CI_BRANCH
+ description: osmo-ci.git branch
+ default: 'master'
+scm:
+ - git:
+ branches:
+- '$CI_BRANCH'
+ url: https://gerrit.osmocom.org/osmo-ci
+ git-config-name: 'Jenkins Builder'
+ git-config-email: 'jenk...@osmocom.org'
+builders:
+ - shell: |
+ export PYTHONUNBUFFERED=1
+ ./scripts/obs/check_new_distros.py --docker
+triggers:
+ - timed: "H 19 * * *"
+wrappers:
+- ansicolor:
+colormap: xterm
+publishers:
+ - email:
+ notify-every-unstable-build: true
+ recipients: 'jenkins-notificati...@lists.osmocom.org'
diff --git a/scripts/obs/check_new_distros.py b/scripts/obs/check_new_distros.py
new file mode 100755
index 000..962d547
--- /dev/null
+++ b/scripts/obs/check_new_distros.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright 2023 sysmocom - s.f.m.c. GmbH
+import argparse
+import lib.docker
+import lib.osc
+import sys
+
+projects_opensuse = None
+projects_osmocom = None
+
+
+def parse_args():
+parser = argparse.ArgumentParser(description="Check for new distribution"
+" projects on the openSUSE OBS, that we want to configure in the"
+" Osmocom OBS as soon as they are available")
+parser.add_argument("-d", "--docker",
+help="run in docker to avoid installing required pkgs",
+action="store_true")
+parser.add_argument("-v", "--verbose", action="store_true",
+help="always print shell commands and their output,"
+ " instead of only printing them on error")
+
+advanced = parser.add_argument_group("advanced options")
+advanced.add_argument("-A", "--apiurl", help="source OBS API URL"
+ " (default: https://api.opensuse.org)",
+ default="https://api.opensuse.org;)
+advanced.add_argument("-p", "--prefix", default="openSUSE.org-mirror",
+ help="destination OBS prefix"
+ " (default: openSUSE.org-mirror)")
+advanced.add_argument("-t", "--to-apiurl", help="destination OBS API URL"
+ " (default: https://obs.osmocom.org)",
+ default="https://obs.osmocom.org;)
+
+args = parser.parse_args()
+lib.set_args(args)
+
+lib.osc.check_oscrc()
+
+if args.docker:
+lib.docker.run_in_docker_and_exit("check_new_distros.py",
add_oscrc=True)
+
+
+def find_highest_distro_project(distro):
+highest = None
+for project in projects_opensuse:
+if not project.startswith(f"{distro}:"):
+continue
+
+num =
[S] Change in osmo-ci[master]: OBS: lib.osc.get_projects: print apiurl
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email )
Change subject: OBS: lib.osc.get_projects: print apiurl
..
OBS: lib.osc.get_projects: print apiurl
Print the apiurl, to make more obvious what is going on when running the
function twice in a row with two different apiurls (as done in the next
patch).
Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06
---
M scripts/obs/lib/osc.py
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py
index 20a63b5..ef2fc4b 100644
--- a/scripts/obs/lib/osc.py
+++ b/scripts/obs/lib/osc.py
@@ -178,5 +178,5 @@
proj])
def get_projects():
-print(f"OBS: getting list of projects")
+print(f"OBS: getting list of projects ({apiurl})")
return lib.osc.run_osc(["ls"]).output.rstrip().split("\n")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06
Gerrit-Change-Number: 35222
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: osmith, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 4: (2 comments) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35097/comment/4899a31c_83a5bb8e PS3, Line 3231: bts->imm_ass_time = IMM_ASS_TIME_POST_CHAN_ACK; > same Done File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35097/comment/8881326a_ef45b916 PS4, Line 3245: : ts->fi->id rationale: the choice is: a) use fi->id directly. b) osmo_fsm_inst_name() includes the FSM instance pointer address, which makes the vty output untestable. VTY tests are run against the osmo-bsc binary, so where to call osmo_fsm_log_addr(false)? add a new DEFUN to logging_vty.c, wait for it to merge to libosmocore, then call that here in the vty test? Then find out that calling from vty is too late, because osmo_fsm_inst->name for the timeslots was composed before the test could run the vty command? modify the doc/examples/osmo-bsc/osmo-bsc-minimal.cfg to include that new vty cmd early enough, hopefully; but is the file then still "minimal"? so instead add another .cfg file copy specifically for the vty tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 03:39:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: neels, osmith, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by neels, Verified+1 by Jenkins Builder Change subject: vty: disallow combination of early-IA and frequency hopping .. vty: disallow combination of early-IA and frequency hopping Related: osmo-bts Id9a930e5c67122812b229dc27ea2bfe246b67611 Related: SYS#6655 Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 --- M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c A tests/early_ia.vty 3 files changed, 67 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: osmith, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 3: Code-Review-1 (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35097/comment/c20841af_fa4f6f29 PS3, Line 3231: bts->imm_ass_time = IMM_ASS_TIME_POST_CHAN_ACK; same -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 03:18:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: osmith, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: vty: disallow combination of early-IA and frequency hopping .. vty: disallow combination of early-IA and frequency hopping Related: osmo-bts Id9a930e5c67122812b229dc27ea2bfe246b67611 Related: SYS#6655 Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 --- M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c A tests/early_ia.vty 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: osmith, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 2: (1 comment) File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35097/comment/0bf5b2f4_cf50eca5 PS2, Line 352: ts->hopping.enabled = enabled; > Ack no. hm. well. yes. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 03:05:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in libosmocore[master]: logging: fix nul octets in log output / use osmo_strbuf
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35208?usp=email ) Change subject: logging: fix nul octets in log output / use osmo_strbuf .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib577a5e0d7450ce93ff21f37ba3262704cbf4752 Gerrit-Change-Number: 35208 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 06 Dec 2023 02:41:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: laforge, osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email ) Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. Patch Set 2: (1 comment) File src/core/utils.c: https://gerrit.osmocom.org/c/libosmocore/+/35207/comment/b10c5b87_a8033688 PS2, Line 1249: /* when a strbuf is full, sb->pos may point after the final nul, so nul terminate only when pos is valid. */ (actually i'd like to fix that, but am resisting modifying things too much) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 06 Dec 2023 02:41:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: laforge, osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email ) Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. Patch Set 1: (1 comment) File include/osmocom/core/utils.h: https://gerrit.osmocom.org/c/libosmocore/+/35207/comment/72c04f8d_08e8abc0 PS1, Line 329: } while (0) > (not related to here, macros are cool to get the actual source line/file > indicated in logging, and f […] I added real functions for the implementation, making them much more readable as a side effect, but i also kept the macros so the OSMO_STRBUF(sb, ...) pattern remains consistent in osmo_strbuf usage. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 06 Dec 2023 02:38:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in libosmocore[master]: util: add OSMO_STRBUF_REMAIN()
Attention is currently required from: neels. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35206?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: util: add OSMO_STRBUF_REMAIN() .. util: add OSMO_STRBUF_REMAIN() This code already exists twice, and upcoming patch will need this as well in logging.c. Add a macro to remove the code dup. Related: OS#6284 Related: Ib577a5e0d7450ce93ff21f37ba3262704cbf4752 Change-Id: I6f2991125882bff948708bbb4ae218f9f3d1e50c --- M include/osmocom/core/utils.h 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/35206/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f2991125882bff948708bbb4ae218f9f3d1e50c Gerrit-Change-Number: 35206 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: laforge, osmith. Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. util: add osmo_strbuf macros to manipulate the strbuf tail Upcoming patch adopts osmo_strbuf in logging.c, which sometimes needs to steal and re-add trailing newline characters, and also needs to let ctime_r() write to the buffer before updating the osmo_strbuf state. Related: OS#6284 Related: Ib577a5e0d7450ce93ff21f37ba3262704cbf4752 Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 --- M include/osmocom/core/utils.h M src/core/libosmocore.map M src/core/utils.c M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 171 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/35207/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: laforge, osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email ) Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. Patch Set 1: (1 comment) File include/osmocom/core/utils.h: https://gerrit.osmocom.org/c/libosmocore/+/35207/comment/228b9ff9_ecb83591 PS1, Line 329: } while (0) > inline functions have various advantages, starting from better syntax > highlighting in the editor/IDE […] (not related to here, macros are cool to get the actual source line/file indicated in logging, and for avoiding va_args handling. For *this* patch i full ack your feedback) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 06 Dec 2023 02:09:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: IuUP: allow Initialization from any address if not yet set
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email ) Change subject: IuUP: allow Initialization from any address if not yet set .. Patch Set 3: (1 comment) Patchset: PS3: This is an invitation to others to add a +1, and not be scared off by the long discussions. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6c365559a7bd197349f0ea99f7a13b56a4bb580b Gerrit-Change-Number: 35205 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 02:06:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: IuUP: Allow Initialization with set rem IP address and unset rem port
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35176?usp=email ) Change subject: IuUP: Allow Initialization with set rem IP address and unset rem port .. Patch Set 5: Code-Review+1 (1 comment) Patchset: PS5: This is an invitation to others to add a +1, and not be scared off by the long discussions. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35176?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idd833997abce46886e9664505b2776fa5dadc8db Gerrit-Change-Number: 35176 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 06 Dec 2023 02:06:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: IuUP: allow Initialization from any address if not yet set
Attention is currently required from: laforge, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email )
Change subject: IuUP: allow Initialization from any address if not yet set
..
Patch Set 3: Code-Review+1
(3 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-mgw/+/35205/comment/1192328b_6d1965a0
PS1, Line 28: Decided for now that it's not worth the extra effort to make this
more
: restrictive
> "we do allow any source address to send MGCP to the MGW and actually". […]
ack
(So for early IuUP Initialization ACK, we use the sender's address somehow, for
ip probing?)
This modified patch and the following ones do make the code more restrictive as
requested, so resolving this
File src/libosmo-mgcp/mgcp_network.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/35205/comment/d3d00eb9_a8b469c1
PS1, Line 838: if (mgcp_conn_rtp_is_iuup(conn) && !conn->iuup.configured) {
> I updated https://gerrit.osmocom. […]
Re the linked patch, I see only address and port related code in that patch,
nothing about codecs nor IUFP? wrong link / am i not seeing it?
i'm a bit confused with these aspects:
1) whether the conn is indicated to be IUFP from the first CRCX
2) whether SDP is sent in the first CRCX
3) whether the remote RTP IP address is known from the first CRCX
For 1), I'm pretty sure that we are always telling the MGW about IUFP codec
right from the first CRCX. In the MGCP header's "L:" line if no SDP is present,
and in the SDP if SDP is present. And not only since yesterday.
(May need to qualify this statement for {msc,hnbgw}x{nightly,latest})
So if you add SDP even if port=0, it does not add the IUFP information;
IUFP codec was already indicated before, only now it is in the SDP instead of
MGCP head.
For 2), we can send IUFP codec even when there is no SDP.
SDP is needed only for address and port.
For 3), I'm pretty sure we DO NOT send the remote RTP IP address right from the
start, nor can we always do that, AFAICT?
>From your patch I gather that it is sometimes possible to know the remote
>address right in the first CRCX, and would like to understand it...
hnbgw knows msc's address right from the start; but cannot know RNC's address?
osmo-msc MO cannot know MT's address right from the start.
AFAICT there will always be cases where we cannot include a remote IP address
in the first CRCX, because we don't know the remote address yet, right? I am
asking because, if we can teach all clients to always include a remote address,
then this patch is not needed (besides maybe for backwards compat).
We do still need/want to have that check_rtp() skipping for IuUP Init, right?
File src/libosmo-mgcp/mgcp_network.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/35205/comment/60546d0c_82fe0ab5
PS2, Line 837: != 0)
> It's not a bool, it's a tristate 1, 0, -1. It's a bool + error. […]
(...which is exactly the same as handling the return val as bool)
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6c365559a7bd197349f0ea99f7a13b56a4bb580b
Gerrit-Change-Number: 35205
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 06 Dec 2023 02:05:10 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_network: Improve err logging when rtp pkt from unexpected origin...
Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35175?usp=email ) Change subject: mgcp_network: Improve err logging when rtp pkt from unexpected origin comes in .. Patch Set 2: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/35175/comment/141a180a_58c713f8 PS1, Line 8: > I think it is clear by just looking at the diff. […] i was asking because i think it is not clear, and i see this as an important part of submitting patches in general. but have your way, ts. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35175?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id9b60395df667ae9898c23cbc2afe56ac7e8b0e5 Gerrit-Change-Number: 35175 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Dec 2023 01:29:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp-client: Transmit remote IP addr in CRCX if known and port=0
Attention is currently required from: dexter, laforge, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email )
Change subject: mgcp-client: Transmit remote IP addr in CRCX if known and port=0
..
Patch Set 6: Code-Review+1
(3 comments)
File src/libosmo-mgcp-client/mgcp_client.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/35152/comment/b0323a8d_2b31bbce
PS3, Line 1323: urn -
> I'm not following you here. […]
I mean: not return -EINVAL, instead skip the PRINTF("c=IN").
>From below comment about your preference, i gather that you don't agree with
>this point. I think you're wrong, but i'm fine to live with your choice so one
>day i can say "i told you so" =)
anyway, here are my reasons, if you'd like to know.
there are different causes for not having a valid address.
this patch handles the causes differently:
- when the flag is not set, omit the addr and send the rest.
- when the flag is set, but the addr is empty, fail the entire message, do not
send anything.
i think it would be less complexity and more stable to just always omit and
send the rest, no matter what the cause is for not having a valid IP address.
that way we don't obscurely fail sending a message at all if some flag
combination is set weirdly. Why do those flags even exist, if the value itself
can indicate presence or not...
https://gerrit.osmocom.org/c/osmo-mgw/+/35152/comment/b1c0ef6e_008b4619
PS3, Line 1339: et
> I prefer the way it is now. […]
Done
https://gerrit.osmocom.org/c/osmo-mgw/+/35152/comment/dd85524f_d2d4fc6c
PS3, Line 1353: codecs
> Whichever gets first into master makes the other one rebase it, I don't
> really care and it's fine ea […]
ok, the other patch isn't ready yet until it has backwards compat, so go ahead.
would be good if a C test covers this, to make sure it stays intact.
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d
Gerrit-Change-Number: 35152
Gerrit-PatchSet: 6
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Wed, 06 Dec 2023 01:26:37 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in pysim[master]: ara_m: Fix encoding of DeviceInterfaceVersionDO
neels has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/35230?usp=email )
Change subject: ara_m: Fix encoding of DeviceInterfaceVersionDO
..
ara_m: Fix encoding of DeviceInterfaceVersionDO
Ever since commit 30de9fd8abc9d7c2c541fea7fa4b97c4ca1a54eb in July
we are (properly) using snake_case names in the from_dict (to become
bijective with to_dict). This code was not updated by accident,
creating an exception when using the `aram_get_config`
Change-Id: If216b56b38ab17d13896074aa726278b9ba16923
Related: OS#6119
---
M pySim/ara_m.py
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
neels: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/pySim/ara_m.py b/pySim/ara_m.py
index b4ac747..68244d1 100644
--- a/pySim/ara_m.py
+++ b/pySim/ara_m.py
@@ -295,7 +295,7 @@
@staticmethod
def get_config(tp, v_major=0, v_minor=0, v_patch=1):
cmd_do = DeviceConfigDO()
-cmd_do.from_dict([{'DeviceInterfaceVersionDO': {
+cmd_do.from_dict([{'device_interface_version_do': {
'major': v_major, 'minor': v_minor, 'patch':
v_patch}}])
return ADF_ARAM.xceive_apdu_tlv(tp, '80cadf21', cmd_do,
ResponseAramConfigDO)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35230?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: If216b56b38ab17d13896074aa726278b9ba16923
Gerrit-Change-Number: 35230
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
[S] Change in pysim[master]: ara_m: Fix encoding of DeviceInterfaceVersionDO
Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35230?usp=email ) Change subject: ara_m: Fix encoding of DeviceInterfaceVersionDO .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If216b56b38ab17d13896074aa726278b9ba16923 Gerrit-Change-Number: 35230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 06 Dec 2023 01:07:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: ara_m: Fix encoding of DeviceInterfaceVersionDO
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35230?usp=email ) Change subject: ara_m: Fix encoding of DeviceInterfaceVersionDO .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If216b56b38ab17d13896074aa726278b9ba16923 Gerrit-Change-Number: 35230 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 05 Dec 2023 22:05:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: add TLV Serving Network
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email ) Change subject: epdg_gtpc_s2b: add TLV Serving Network .. Patch Set 3: Code-Review+1 (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218/comment/c4f07f50_c436114e PS1, Line 338: plmn_id = gtp_utils:plmn_to_bin(?MCC, ?MNC, ?MNC_SIZE) > Isn't this defined by the osmo-ePDG? […] so this means we'll need to move this to a config file at some point. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 Gerrit-Change-Number: 35218 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 21:56:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[S] Change in libosmocore[master]: tests/socket: Avoid keeping unneeded sockets open during next test cases
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email )
Change subject: tests/socket: Avoid keeping unneeded sockets open during next
test cases
..
tests/socket: Avoid keeping unneeded sockets open during next test cases
Change-Id: I59cde0843545428e2bc490cc9470b76cbd7f8393
---
M tests/socket/socket_sctp_test.c
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c
index e099be9..5948abc 100644
--- a/tests/socket/socket_sctp_test.c
+++ b/tests/socket/socket_sctp_test.c
@@ -107,6 +107,7 @@
addrv4_rem, addrv4_size, listen_port_v4,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
printf("Checking osmo_sock_init2_multiaddr(AF_UNSPEC) must fail on
mixed IPv4 & IPv6\n");
fd = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, IPPROTO_SCTP,
@@ -128,6 +129,7 @@
addrv4_rem, addrv4_size, listen_port_v4,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
printf("Checking osmo_sock_init2_multiaddr(AF_UNSPEC) BIND + CONNECT on
IPv6\n");
fd = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, IPPROTO_SCTP,
@@ -135,6 +137,7 @@
addrv6_rem, addrv6_size, listen_port_v6,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
close(listen_fd_v4);
close(listen_fd_v6);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I59cde0843545428e2bc490cc9470b76cbd7f8393
Gerrit-Change-Number: 35231
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: gsup: fix error log message
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email ) Change subject: gsup: fix error log message .. gsup: fix error log message The error happened in auth info and not in PDP info Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 --- M src/gsm/gsup.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 4e09ac8..4e18ddb 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -266,7 +266,7 @@ parse_error: LOGP(DLGSUP, LOGL_ERROR, -"GSUP IE type %d, length %zu invalid in PDP info\n", iei, value_len); +"GSUP IE type %d, length %zu invalid in auth info\n", iei, value_len); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 Gerrit-Change-Number: 35236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in libosmocore[master]: gsup: fix error log message
Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email ) Change subject: gsup: fix error log message .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 Gerrit-Change-Number: 35236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 20:26:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_cli: Fix opening sctp client socket if no local address set
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email ) Change subject: stream_cli: Fix opening sctp client socket if no local address set .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I0d9d0e48690c915f7b51ad09f452e551e01368b5 Gerrit-Change-Number: 35235 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 20:25:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: add TLV Serving Network
Attention is currently required from: lynxis lazus, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: epdg_gtpc_s2b: add TLV Serving Network .. epdg_gtpc_s2b: add TLV Serving Network The open5gs requires Serving Network TLV. Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 --- M src/epdg_gtpc_s2b.erl A src/gtp_utils.erl 2 files changed, 63 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/18/35218/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 Gerrit-Change-Number: 35218 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: fix encoding of the IP address
Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: epdg_gtpc_s2b: fix encoding of the IP address .. epdg_gtpc_s2b: fix encoding of the IP address Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c --- M src/epdg_gtpc_s2b.erl M src/gtp_utils.erl 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/19/35219/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c Gerrit-Change-Number: 35219 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOC...
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email ) Change subject: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOCK_F_BIND flag set .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: might benefit from a slightly longer commit log message -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia32510e8db1de0cc0dc36cebf8a94f09e44fda70 Gerrit-Change-Number: 35233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 20:25:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: socket: Reimplement osmo_sock_init2_multiaddr()
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email ) Change subject: socket: Reimplement osmo_sock_init2_multiaddr() .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: lgtm, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd Gerrit-Change-Number: 35232 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 20:24:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: tests/socket: Avoid keeping unneeded sockets open during next test cases
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email ) Change subject: tests/socket: Avoid keeping unneeded sockets open during next test cases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59cde0843545428e2bc490cc9470b76cbd7f8393 Gerrit-Change-Number: 35231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 20:21:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsup: fix error log message
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email ) Change subject: gsup: fix error log message .. gsup: fix error log message The error happened in auth info and not in PDP info Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 --- M src/gsm/gsup.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/35236/1 diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 4e09ac8..4e18ddb 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -266,7 +266,7 @@ parse_error: LOGP(DLGSUP, LOGL_ERROR, -"GSUP IE type %d, length %zu invalid in PDP info\n", iei, value_len); +"GSUP IE type %d, length %zu invalid in auth info\n", iei, value_len); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 Gerrit-Change-Number: 35236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: gsup: add support for IPV4/IPV6 in PDP info
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35237?usp=email )
Change subject: gsup: add support for IPV4/IPV6 in PDP info
..
gsup: add support for IPV4/IPV6 in PDP info
The IPV4/IPV6 in the PDP will be used by the
ePDG to send back the allocated IP from the PGW.
Further it could be used at a later point to
assign static IPs, saved in the HLR/HSS.
Change-Id: I17ccbe8b78e92e2f03c18e4e42e8b62f0a7bcbd1
---
M include/osmocom/gsm/gsup.h
M src/gsm/gsup.c
2 files changed, 56 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/35237/1
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 6e7fcf0..3edbdd0 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#define OSMO_GSUP_PORT 4222
@@ -77,6 +78,8 @@
OSMO_GSUP_ACCESS_POINT_NAME_IE = 0x12,
OSMO_GSUP_PDP_QOS_IE= 0x13,
OSMO_GSUP_CHARG_CHAR_IE = 0x14,
+ OSMO_GSUP_IPV4_IE = 0x15,
+ OSMO_GSUP_IPV6_IE = 0x16,
OSMO_GSUP_RAND_IE = 0x20,
OSMO_GSUP_SRES_IE = 0x21,
OSMO_GSUP_KC_IE = 0x22,
@@ -277,6 +280,14 @@
const uint8_t *pdp_charg_enc;
/*! length (in octets) of pdp_charg_enc */
size_t pdp_charg_enc_len;
+ /*! True if pdp_ipv4 is set */
+ boolpdp_ipv4_set;
+ /*! IPv4 address of the PDP context */
+ struct in_addr pdp_ipv4;
+ /*! True if pdp_ipv6 is set */
+ boolpdp_ipv6_set;
+ /*! IPv6 address of the PDP context */
+ struct in6_addr pdp_ipv6;
};
enum osmo_gsup_message_class {
diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c
index 4e18ddb..9bdd1f5 100644
--- a/src/gsm/gsup.c
+++ b/src/gsm/gsup.c
@@ -133,11 +133,10 @@
uint8_t tag;
uint8_t *value;
size_t value_len;
+ enum osmo_gsup_iei iei;
/* specific parts */
while (data_len > 0) {
- enum osmo_gsup_iei iei;
-
rc = osmo_shift_tlv(, _len, , , _len);
if (rc < 0)
return -GMM_CAUSE_PROTO_ERR_UNSPEC;
@@ -169,6 +168,20 @@
pdp_info->pdp_charg_enc_len = value_len;
break;
+ case OSMO_GSUP_IPV4_IE:
+ if (value_len != sizeof(pdp_info->pdp_ipv4))
+ goto parse_error;
+ memcpy(_info->pdp_ipv4, value, value_len);
+ pdp_info->pdp_ipv4_set = 1;
+ break;
+
+ case OSMO_GSUP_IPV6_IE:
+ if (value_len != sizeof(pdp_info->pdp_ipv6))
+ goto parse_error;
+ memcpy(_info->pdp_ipv6, value, value_len);
+ pdp_info->pdp_ipv6_set = 1;
+ break;
+
default:
LOGP(DLGSUP, LOGL_ERROR,
"GSUP IE type %d not expected in PDP info\n", iei);
@@ -177,6 +190,12 @@
}
return 0;
+
+parse_error:
+ LOGP(DLGSUP, LOGL_ERROR,
+"GSUP IE type %d, length %zu invalid in PDP info\n", iei,
value_len);
+
+ return -1;
}
static int decode_auth_info(uint8_t *data, size_t data_len,
@@ -623,6 +642,16 @@
pdp_info->pdp_charg_enc_len,
pdp_info->pdp_charg_enc);
}
+ if (pdp_info->pdp_ipv4_set) {
+ msgb_tlv_put(msg, OSMO_GSUP_IPV4_IE,
+ sizeof(pdp_info->pdp_ipv4),
_info->pdp_ipv4);
+ }
+
+ if (pdp_info->pdp_ipv6_set) {
+ msgb_tlv_put(msg, OSMO_GSUP_IPV6_IE,
+ sizeof(pdp_info->pdp_ipv6),
_info->pdp_ipv6);
+ }
+
/* Update length field */
*len_field = msgb_length(msg) - old_len;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35237?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I17ccbe8b78e92e2f03c18e4e42e8b62f0a7bcbd1
Gerrit-Change-Number: 35237
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA
Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c Gerrit-Change-Number: 35216 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 19:05:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: examples/stream-* try to support SCTP when called with "-s" argument
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email )
Change subject: examples/stream-* try to support SCTP when called with "-s"
argument
..
examples/stream-* try to support SCTP when called with "-s" argument
Change-Id: I4137cdf1e21cb669b632fe5c126ec27475d98400
---
M examples/stream-client.c
M examples/stream-server.c
2 files changed, 44 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/34/35234/1
diff --git a/examples/stream-client.c b/examples/stream-client.c
index 6781c72..e42748f 100644
--- a/examples/stream-client.c
+++ b/examples/stream-client.c
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include
#include
@@ -89,10 +90,21 @@
return 0;
}
-int main(void)
+int main(int argc, char **argv)
{
struct osmo_fd *kbd_ofd;
- int rc;
+ bool use_sctp = false;
+ int opt, rc;
+
+ while ((opt = getopt(argc, argv, "s")) != -1) {
+ switch (opt) {
+ case 's':
+ use_sctp = true;
+ break;
+ default:
+ break;
+ }
+ }
tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test");
msgb_talloc_ctx_init(tall_test, 0);
@@ -111,12 +123,16 @@
osmo_stream_cli_set_name(conn, "stream_client");
osmo_stream_cli_set_addr(conn, "127.0.0.1");
osmo_stream_cli_set_port(conn, 1);
+ if (use_sctp)
+ osmo_stream_cli_set_proto(conn, IPPROTO_SCTP);
+
osmo_stream_cli_set_connect_cb(conn, connect_cb);
osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb);
osmo_stream_cli_set_read_cb2(conn, read_cb);
- if (osmo_stream_cli_open(conn) < 0) {
- fprintf(stderr, "cannot open cli\n");
+ rc = osmo_stream_cli_open(conn);
+ if (rc < 0) {
+ fprintf(stderr, "cannot open cli: %d\n", rc);
exit(EXIT_FAILURE);
}
diff --git a/examples/stream-server.c b/examples/stream-server.c
index 8aa8b9b..9faf307 100644
--- a/examples/stream-server.c
+++ b/examples/stream-server.c
@@ -117,9 +117,21 @@
return 0;
}
-int main(void)
+int main(int argc, char **argv)
{
struct osmo_fd *kbd_ofd;
+ bool use_sctp = false;
+ int opt;
+
+ while ((opt = getopt(argc, argv, "s")) != -1) {
+ switch (opt) {
+ case 's':
+ use_sctp = true;
+ break;
+ default:
+ break;
+ }
+ }
tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test");
msgb_talloc_ctx_init(tall_test, 0);
@@ -137,6 +149,8 @@
}
osmo_stream_srv_link_set_addr(srv, "127.0.0.1");
osmo_stream_srv_link_set_port(srv, 1);
+ if (use_sctp)
+ osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP);
osmo_stream_srv_link_set_accept_cb(srv, accept_cb);
if (osmo_stream_srv_link_open(srv) < 0) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I4137cdf1e21cb669b632fe5c126ec27475d98400
Gerrit-Change-Number: 35234
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-CC: laforge
Gerrit-MessageType: newchange
[S] Change in libosmo-netif[master]: stream_cli: Fix opening sctp client socket if no local address set
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email )
Change subject: stream_cli: Fix opening sctp client socket if no local address
set
..
stream_cli: Fix opening sctp client socket if no local address set
Properly call osmo_sock_init2_multiaddr2() to use default binding
address if user of osmo_stream_cli didn't set one on the object
through the API.
osmo_sock_init2_multiaddr2() was also borken under that scenario until
recently (see Depends below). Until now, users of osmo_stream for SCTP
(mainly libosmo-sccp) relied on always setting a proper local address to
overcome this limitation.
Depends: libosmocore.git Change-Id I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd
Related: OS#6279
Change-Id: I0d9d0e48690c915f7b51ad09f452e551e01368b5
---
M src/stream_cli.c
1 file changed, 32 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/35/35235/1
diff --git a/src/stream_cli.c b/src/stream_cli.c
index 1e7ebeb..4f2963d 100644
--- a/src/stream_cli.c
+++ b/src/stream_cli.c
@@ -838,7 +838,9 @@
* \return negative on error, 0 on success */
int osmo_stream_cli_open(struct osmo_stream_cli *cli)
{
- int ret, fd = -1;
+ int ret, flags;
+ int fd = -1;
+ unsigned int local_addrcnt;
/* we are reconfiguring this socket, close existing first. */
if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) &&
osmo_stream_cli_get_fd(cli) >= 0)
@@ -856,11 +858,18 @@
switch (cli->proto) {
#ifdef HAVE_LIBSCTP
case IPPROTO_SCTP:
+ local_addrcnt = cli->local_addrcnt;
+ flags = OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK;
+ if (cli->local_addrcnt > 0 || cli->local_port > 0) { /*
explicit bind required? */
+ flags |= OSMO_SOCK_F_BIND;
+ /* If no local addr configured, use
local_addr[0]=NULL by default when creating the socket. */
+ if (cli->local_addrcnt == 0)
+ local_addrcnt = 1;
+ }
ret = osmo_sock_init2_multiaddr2(cli->sk_domain,
cli->sk_type, cli->proto,
- (const char
**)cli->local_addr, cli->local_addrcnt, cli->local_port,
+ (const char
**)cli->local_addr, local_addrcnt, cli->local_port,
(const char
**)cli->addr, cli->addrcnt, cli->port,
-
OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK,
- >ma_pars);
+ flags, >ma_pars);
break;
#endif
default:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I0d9d0e48690c915f7b51ad09f452e551e01368b5
Gerrit-Change-Number: 35235
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOC...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email )
Change subject: socket: osmo_sock_init2_multiaddr2(): Apply params too if no
OSMO_SOCK_F_BIND flag set
..
socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOCK_F_BIND
flag set
Change-Id: Ia32510e8db1de0cc0dc36cebf8a94f09e44fda70
---
M src/core/socket.c
1 file changed, 30 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/35233/1
diff --git a/src/core/socket.c b/src/core/socket.c
index 7873e45..22488cf 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -959,23 +959,8 @@
goto ret_freeaddrinfo;
}
- if (flags & OSMO_SOCK_F_BIND) {
- /* Since so far we only allow IPPROTO_SCTP in this function,
- no need to check below for "proto != IPPROTO_UDP || flags &
OSMO_SOCK_F_UDP_REUSEADDR" */
- rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,
- , sizeof(on));
- if (rc < 0) {
- int err = errno;
- multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts,
local_hosts_cnt);
- LOGP(DLGLOBAL, LOGL_ERROR,
-"cannot setsockopt socket:"
-" %s:%u: %s\n",
-strbuf, local_port,
-strerror(err));
- goto ret_close;
- }
-
- if (pars && pars->sctp.sockopt_auth_supported.set) {
+ if (pars) {
+ if (pars->sctp.sockopt_auth_supported.set) {
/* RFC 5061 4.2.7: ASCONF also requires AUTH feature. */
rc = setsockopt_sctp_auth_supported(sfd,
pars->sctp.sockopt_auth_supported.value);
if (rc < 0) {
@@ -991,7 +976,7 @@
}
}
- if (pars && pars->sctp.sockopt_asconf_supported.set) {
+ if (pars->sctp.sockopt_asconf_supported.set) {
rc = setsockopt_sctp_asconf_supported(sfd,
pars->sctp.sockopt_asconf_supported.value);
if (rc < 0) {
int err = errno;
@@ -1006,7 +991,7 @@
}
}
- if (pars && pars->sctp.sockopt_initmsg.set) {
+ if (pars->sctp.sockopt_initmsg.set) {
rc = setsockopt_sctp_initmsg(sfd, pars);
if (rc < 0) {
int err = errno;
@@ -1019,6 +1004,23 @@
/* do not fail, some parameters will be left as
the global default */
}
}
+ }
+
+ if (flags & OSMO_SOCK_F_BIND) {
+ /* Since so far we only allow IPPROTO_SCTP in this function,
+ no need to check below for "proto != IPPROTO_UDP || flags &
OSMO_SOCK_F_UDP_REUSEADDR" */
+ rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,
+ , sizeof(on));
+ if (rc < 0) {
+ int err = errno;
+ multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts,
local_hosts_cnt);
+ LOGP(DLGLOBAL, LOGL_ERROR,
+"cannot setsockopt socket:"
+" %s:%u: %s\n",
+strbuf, local_port,
+strerror(err));
+ goto ret_close;
+ }
/* Build array of addresses taking first entry for each host.
TODO: Ideally we should use backtracking storing last used
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia32510e8db1de0cc0dc36cebf8a94f09e44fda70
Gerrit-Change-Number: 35233
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: socket: Reimplement osmo_sock_init2_multiaddr()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email to look at the new patch set (#2). Change subject: socket: Reimplement osmo_sock_init2_multiaddr() .. socket: Reimplement osmo_sock_init2_multiaddr() This is an attempt to fix several downsides of current osmo_sock_init2_multiaddr() API, mainly the requirement to pass an explicit local address (!NULL). It also now works fine if OSMO_SOCK_F_BIND flag is not used. This reimplementation is based on the follwing logic: - If caller passed family=AF_INET or family=AF_INET6, that same family is used and kernel will fail if something is wrong. - If caller passes family=AF_UNSPEC, the function will try to find the required family to create the socket. The decision is taken on the assumption that an AF_INET6 socket can handle both AF_INET6 and AF_INET addresses (through v4v6 mapping). Hence, if any of the addresses in the local or remote set of addresses resolves through getaddrinfo() to an IPv6 address, then AF_INET6 is used; AF_INET is used otherwise. Related: OS#6279 Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd --- M src/core/socket.c 1 file changed, 128 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/35232/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd Gerrit-Change-Number: 35232 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: Reimplement osmo_sock_init2_multiaddr()
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email )
Change subject: Reimplement osmo_sock_init2_multiaddr()
..
Reimplement osmo_sock_init2_multiaddr()
This is an attempt to fix several downsides of current
osmo_sock_init2_multiaddr() API, mainly the requirement to pass an explicit
local address (!NULL). It also now works fine if OSMO_SOCK_F_BIND flag
is not used.
This reimplementation is based on the follwing logic:
- If caller passed family=AF_INET or family=AF_INET6, that same family
is used and kernel will fail if something is wrong.
- If caller passes family=AF_UNSPEC, the function will try to find the
required family to create the socket. The decision is taken on the
assumption that an AF_INET6 socket can handle both AF_INET6 and AF_INET
addresses (through v4v6 mapping). Hence, if any of the addresses in the
local or remote set of addresses resolves through getaddrinfo() to an
IPv6 address, then AF_INET6 is used; AF_INET is used otherwise.
Related: OS#6279
Change-Id: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd
---
M src/core/socket.c
1 file changed, 128 insertions(+), 44 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/35232/1
diff --git a/src/core/socket.c b/src/core/socket.c
index 1dc8e46..7873e45 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -616,18 +616,45 @@
#ifdef HAVE_LIBSCTP
-/* Check whether there's an IPv6 Addr as first option of any addrinfo item in
the addrinfo set */
+/* Check whether there's an addrinfo item in the addrinfo set with an IPv4 or
IPv6 option */
static void addrinfo_has_v4v6addr(const struct addrinfo **result, size_t
result_count, bool *has_v4, bool *has_v6)
{
size_t host_idx;
+ const struct addrinfo *rp;
*has_v4 = false;
*has_v6 = false;
for (host_idx = 0; host_idx < result_count; host_idx++) {
- if (result[host_idx]->ai_family == AF_INET)
- *has_v4 = true;
- else if (result[host_idx]->ai_family == AF_INET6)
- *has_v6 = true;
+ for (rp = result[host_idx]; rp != NULL; rp = rp->ai_next) {
+ if (result[host_idx]->ai_family == AF_INET)
+ *has_v4 = true;
+ else if (result[host_idx]->ai_family == AF_INET6)
+ *has_v6 = true;
+ }
+ }
+}
+
+/* Check whether there's an addrinfo item in the addrinfo set with only an
IPv4 or IPv6 option */
+static void addrinfo_has_v4v6only_addr(const struct addrinfo **result, size_t
result_count, bool *has_v4only, bool *has_v6only)
+{
+ size_t host_idx;
+ const struct addrinfo *rp;
+ *has_v4only = false;
+ *has_v6only = false;
+
+ for (host_idx = 0; host_idx < result_count; host_idx++) {
+ bool has_v4 = false;
+ bool has_v6 = false;
+ for (rp = result[host_idx]; rp != NULL; rp = rp->ai_next) {
+ if (rp->ai_family == AF_INET6)
+ has_v6 = true;
+ else
+ has_v4 = true;
+ }
+ if (has_v4 && !has_v6)
+ *has_v4only = true;
+ else if (has_v6 && !has_v4)
+ *has_v6only = true;
}
}
@@ -636,13 +663,16 @@
{
size_t host_idx;
struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+ const struct addrinfo *rp;
for (host_idx = 0; host_idx < result_count; host_idx++) {
- if (result[host_idx]->ai_family != AF_INET6)
- continue;
- if (memcmp(&((struct sockaddr_in6
*)result[host_idx]->ai_addr)->sin6_addr,
- _any, sizeof(in6addr_any)) == 0)
- return true;
+ for (rp = result[host_idx]; rp != NULL; rp = rp->ai_next) {
+ if (rp->ai_family != AF_INET6)
+ continue;
+ if (memcmp(&((struct sockaddr_in6
*)rp->ai_addr)->sin6_addr,
+ _any, sizeof(in6addr_any)) == 0)
+ return true;
+ }
}
return false;
}
@@ -676,22 +706,28 @@
for (host_idx = 0; host_idx < host_cont; host_idx++) {
/* Addresses are ordered based on RFC 3484, see man getaddrinfo
*/
for (rp = result[host_idx]; rp != NULL; rp = rp->ai_next) {
- if (family != AF_UNSPEC && rp->ai_family != family)
- continue;
- if (offset + rp->ai_addrlen > addrs_buf_len) {
- LOGP(DLGLOBAL, LOGL_ERROR, "Output buffer to
small: %zu\n",
-addrs_buf_len);
-
[S] Change in libosmocore[master]: tests/socket: Avoid keeping unneeded sockets open during next test cases
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email )
Change subject: tests/socket: Avoid keeping unneeded sockets open during next
test cases
..
tests/socket: Avoid keeping unneeded sockets open during next test cases
Change-Id: I59cde0843545428e2bc490cc9470b76cbd7f8393
---
M tests/socket/socket_sctp_test.c
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/35231/1
diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c
index e099be9..5948abc 100644
--- a/tests/socket/socket_sctp_test.c
+++ b/tests/socket/socket_sctp_test.c
@@ -107,6 +107,7 @@
addrv4_rem, addrv4_size, listen_port_v4,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
printf("Checking osmo_sock_init2_multiaddr(AF_UNSPEC) must fail on
mixed IPv4 & IPv6\n");
fd = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, IPPROTO_SCTP,
@@ -128,6 +129,7 @@
addrv4_rem, addrv4_size, listen_port_v4,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
printf("Checking osmo_sock_init2_multiaddr(AF_UNSPEC) BIND + CONNECT on
IPv6\n");
fd = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, IPPROTO_SCTP,
@@ -135,6 +137,7 @@
addrv6_rem, addrv6_size, listen_port_v6,
OSMO_SOCK_F_BIND|OSMO_SOCK_F_CONNECT);
OSMO_ASSERT(fd >= 0);
+ close(fd);
close(listen_fd_v4);
close(listen_fd_v6);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I59cde0843545428e2bc490cc9470b76cbd7f8393
Gerrit-Change-Number: 35231
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in pysim[master]: filesystem: add flag to tell whether an ADF supports an FS or not
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34902?usp=email ) Change subject: filesystem: add flag to tell whether an ADF supports an FS or not .. filesystem: add flag to tell whether an ADF supports an FS or not An ADF may or may not support a file system. For example ADF.ARA-M does not have any filesystem support, which means the SELECT we may use from this ADF is limited and an can only select a different application. To know about this in advance let's add a flag that we set when we instantiate an ADF. Change-Id: Ifd0f7c34164685ea18d8a746394e55416fa0aa66 Related: OS#5418 --- M pySim/filesystem.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_31_104.py 4 files changed, 24 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 800f2cc..d39162c 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -504,11 +504,12 @@ class CardADF(CardDF): """ADF (Application Dedicated File) in the smart card filesystem""" -def __init__(self, aid: str, **kwargs): +def __init__(self, aid: str, has_fs: bool=False, **kwargs): super().__init__(**kwargs) # reference to CardApplication may be set from CardApplication constructor self.application = None # type: Optional[CardApplication] self.aid = aid # Application Identifier +self.has_fs = has_fs # Flag to tell whether the ADF supports a filesystem or not mf = self.get_mf() if mf: mf.add_application_df(self) diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 0fcf883..28781e1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1369,9 +1369,9 @@ class ADF_USIM(CardADF): -def __init__(self, aid='a000871002', name='ADF.USIM', fid=None, sfid=None, +def __init__(self, aid='a000871002', has_fs=True, name='ADF.USIM', fid=None, sfid=None, desc='USIM Application'): -super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) +super().__init__(aid=aid, has_fs=has_fs, fid=fid, sfid=sfid, name=name, desc=desc) # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 4327a1a..5268c70 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -258,9 +258,9 @@ class ADF_ISIM(CardADF): -def __init__(self, aid='a000871004', name='ADF.ISIM', fid=None, sfid=None, +def __init__(self, aid='a000871004', has_fs=True, name='ADF.ISIM', fid=None, sfid=None, desc='ISIM Application'): -super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) +super().__init__(aid=aid, has_fs=has_fs, fid=fid, sfid=sfid, name=name, desc=desc) files = [ EF_IMPI(), diff --git a/pySim/ts_31_104.py b/pySim/ts_31_104.py index 0adafba..239acbf 100644 --- a/pySim/ts_31_104.py +++ b/pySim/ts_31_104.py @@ -30,9 +30,9 @@ class ADF_HPSIM(CardADF): -def __init__(self, aid='a00087100A', name='ADF.HPSIM', fid=None, sfid=None, +def __init__(self, aid='a00087100A', has_fs=True, name='ADF.HPSIM', fid=None, sfid=None, desc='HPSIM Application'): -super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) +super().__init__(aid=aid, has_fs=has_fs, fid=fid, sfid=sfid, name=name, desc=desc) files = [ EF_ARR(fid='6f06', sfid=0x06), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34902?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifd0f7c34164685ea18d8a746394e55416fa0aa66 Gerrit-Change-Number: 34902 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: Correctly assemble measurement result into MEASUREMENT REPORT
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35214?usp=email ) Change subject: Correctly assemble measurement result into MEASUREMENT REPORT .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaeeaf978da31611c47a20af41790bfa6640dcffd Gerrit-Change-Number: 35214 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 05 Dec 2023 17:37:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Correctly assemble measurement result into MEASUREMENT REPORT
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/35214?usp=email )
Change subject: Correctly assemble measurement result into MEASUREMENT REPORT
..
Correctly assemble measurement result into MEASUREMENT REPORT
After adding the strongest cell to the measurement report, the variables
'strongest' and 'strongest_i' are used to prevent that already added
cells are added again.
Please note that there are no neighbor cell measurements available,
because current layer 1 does not report BSIC of neighbor cells. This
means that there is no neighbor cell reported.
Related: OS#6280
Change-Id: Iaeeaf978da31611c47a20af41790bfa6640dcffd
---
M src/host/layer23/src/mobile/gsm48_rr.c
1 file changed, 28 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index 52c6a73..fb79c9b 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -3707,7 +3707,7 @@
if (rep_valid) {
int8_t strongest, current;
uint8_t ncc;
- int i, index;
+ int i, index, strongest_i;
#if 0
/* FIXME: multi-band reporting, if not: 0 = normal reporting */
@@ -3721,13 +3721,20 @@
current = -128; /* -infinite */
index = 0;
for (i = 0; i < rrmeas->nc_num; i++) {
+ /* Skip stronger cells that have been added to
measurement report so far. */
+ if (rrmeas->nc_rxlev_dbm[i] > strongest)
+ continue;
+ /* Skip cells with equal strength that have
been added so far. */
+ if (rrmeas->nc_rxlev_dbm[i] == strongest && i
<= strongest_i)
+ continue;
/* only check if NCC is permitted */
ncc = rrmeas->nc_bsic[i] >> 3;
if ((s->nb_ncc_permitted_si6 & (1 << ncc))
-&& rrmeas->nc_rxlev_dbm[i] > current
-&& rrmeas->nc_rxlev_dbm[i] < strongest) {
+&& rrmeas->nc_rxlev_dbm[i] > current) {
current = rrmeas->nc_rxlev_dbm[i];
+ strongest = current;
index = i;
+ strongest_i = i;
}
}
if (current == -128) /* no more found */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35214?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Iaeeaf978da31611c47a20af41790bfa6640dcffd
Gerrit-Change-Number: 35214
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: util: add osmo_strbuf macros to manipulate the strbuf tail
Attention is currently required from: neels, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email ) Change subject: util: add osmo_strbuf macros to manipulate the strbuf tail .. Patch Set 1: (1 comment) File include/osmocom/core/utils.h: https://gerrit.osmocom.org/c/libosmocore/+/35207/comment/69a340eb_7ca1d74b PS1, Line 329: } while (0) > yeah, it's becoming a habit. it is a form of inlining code but .. […] inline functions have various advantages, starting from better syntax highlighting in the editor/IDE, higher chances that automatic tools might understand what's going on, and last but not least you also have your own scope for variables, ability to use recursive calls, ... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I997707c328eab3ffa00a78fdb9a0a2cbe18404b4 Gerrit-Change-Number: 35207 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 05 Dec 2023 17:36:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: OBS: add jenkins job to check for new distros
Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email ) Change subject: OBS: add jenkins job to check for new distros .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0abc49a95197da55f7d83ed4fd1c4ebb6bd14b1e Gerrit-Change-Number: 35223 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 17:33:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: OBS: lib.osc.get_projects: print apiurl
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email ) Change subject: OBS: lib.osc.get_projects: print apiurl .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06 Gerrit-Change-Number: 35222 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 05 Dec 2023 17:33:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: ara_m: Fix encoding of DeviceInterfaceVersionDO
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/35230?usp=email )
Change subject: ara_m: Fix encoding of DeviceInterfaceVersionDO
..
ara_m: Fix encoding of DeviceInterfaceVersionDO
Ever since commit 30de9fd8abc9d7c2c541fea7fa4b97c4ca1a54eb in July
we are (properly) using snake_case names in the from_dict (to become
bijective with to_dict). This code was not updated by accident,
creating an exception when using the `aram_get_config`
Change-Id: If216b56b38ab17d13896074aa726278b9ba16923
Related: OS#6119
---
M pySim/ara_m.py
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/35230/1
diff --git a/pySim/ara_m.py b/pySim/ara_m.py
index b4ac747..68244d1 100644
--- a/pySim/ara_m.py
+++ b/pySim/ara_m.py
@@ -295,7 +295,7 @@
@staticmethod
def get_config(tp, v_major=0, v_minor=0, v_patch=1):
cmd_do = DeviceConfigDO()
-cmd_do.from_dict([{'DeviceInterfaceVersionDO': {
+cmd_do.from_dict([{'device_interface_version_do': {
'major': v_major, 'minor': v_minor, 'patch':
v_patch}}])
return ADF_ARAM.xceive_apdu_tlv(tp, '80cadf21', cmd_do,
ResponseAramConfigDO)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35230?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: If216b56b38ab17d13896074aa726278b9ba16923
Gerrit-Change-Number: 35230
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/gerrit: osmo-upf: don't for build debian 10
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email )
Change subject: jobs/gerrit: osmo-upf: don't for build debian 10
..
jobs/gerrit: osmo-upf: don't for build debian 10
osmo-upf currently can't build against debian 10, as the required
libnftables-dev version there is too low and we don't provide a backport
for it. As discussed, disable it for debian 10.
Adjust CI to build against debian 11 instead (in addition to the usual
almalinux 8, debian 12).
Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356
---
M jobs/gerrit-verifications.yml
1 file changed, 18 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 90c5fb5..2efac00 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -393,7 +393,8 @@
-e WITH_MANUALS="$WITH_MANUALS" \
{docker_img} {timeout_cmd} /build/contrib/jenkins.sh
- - osmo-upf
+ - osmo-upf:
+ pipeline_binpkgs: "almalinux:8 debian:11 debian:12"
- pysim:
concurrent: false
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356
Gerrit-Change-Number: 35229
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: jobs/gerrit: osmo-upf: don't for build debian 10
Attention is currently required from: jolly, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email ) Change subject: jobs/gerrit: osmo-upf: don't for build debian 10 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356 Gerrit-Change-Number: 35229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 05 Dec 2023 17:09:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-upf[master]: Use uniform log format for default config files
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email ) Change subject: Use uniform log format for default config files .. Use uniform log format for default config files Related: OS#6272 Change-Id: I5f364aa88a020dd8a0de501b3547ad077457c616 --- M contrib/osmo-pfcp-tool-scripts/osmo-pfcp-tool.cfg M contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg M contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg M doc/examples/osmo-upf/osmo-upf-create-dev.cfg M doc/examples/osmo-upf/osmo-upf-mockup.cfg M doc/examples/osmo-upf/osmo-upf.cfg 6 files changed, 31 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/contrib/osmo-pfcp-tool-scripts/osmo-pfcp-tool.cfg b/contrib/osmo-pfcp-tool-scripts/osmo-pfcp-tool.cfg index a6d4635..ab4c4d4 100644 --- a/contrib/osmo-pfcp-tool-scripts/osmo-pfcp-tool.cfg +++ b/contrib/osmo-pfcp-tool-scripts/osmo-pfcp-tool.cfg @@ -1,4 +1,10 @@ log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 logging level set-all info local-addr 127.0.0.2 diff --git a/contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg b/contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg index d619f54..6655223 100644 --- a/contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg +++ b/contrib/osmo-pfcp-tool-scripts/osmo-upf-11.cfg @@ -1,11 +1,11 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging print category-hex 0 + logging print category 1 + logging timestamp 0 logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all notice logging level set-all info logging level session debug diff --git a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg index 8b77417..b639e96 100644 --- a/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg +++ b/contrib/osmo-pfcp-tool-scripts/osmo-upf-12.cfg @@ -1,11 +1,11 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging print category-hex 0 + logging print category 1 + logging timestamp 0 logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all notice logging level set-all info logging level session debug diff --git a/doc/examples/osmo-upf/osmo-upf-create-dev.cfg b/doc/examples/osmo-upf/osmo-upf-create-dev.cfg index e69f49c..a4195b9 100644 --- a/doc/examples/osmo-upf/osmo-upf-create-dev.cfg +++ b/doc/examples/osmo-upf/osmo-upf-create-dev.cfg @@ -1,11 +1,11 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging print category-hex 0 + logging print category 1 + logging timestamp 0 logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all notice timer pfcp x24 5000 diff --git a/doc/examples/osmo-upf/osmo-upf-mockup.cfg b/doc/examples/osmo-upf/osmo-upf-mockup.cfg index 1150c34..b5d5c5b 100644 --- a/doc/examples/osmo-upf/osmo-upf-mockup.cfg +++ b/doc/examples/osmo-upf/osmo-upf-mockup.cfg @@ -1,11 +1,11 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging print category-hex 0 + logging print category 1 + logging timestamp 0 logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all notice timer pfcp x24 5000 diff --git a/doc/examples/osmo-upf/osmo-upf.cfg b/doc/examples/osmo-upf/osmo-upf.cfg index 77b6871..3477daa 100644 --- a/doc/examples/osmo-upf/osmo-upf.cfg +++ b/doc/examples/osmo-upf/osmo-upf.cfg @@ -1,11 +1,11 @@ log stderr logging filter all 1 logging color 1 - logging print level 1 - logging print category 1 logging print category-hex 0 + logging print category 1 + logging timestamp 0 logging print file basename last - logging print extended-timestamp 1 + logging print level 1 logging level set-all notice timer pfcp x24 5000 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I5f364aa88a020dd8a0de501b3547ad077457c616 Gerrit-Change-Number: 35200 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged
[S] Change in osmo-upf[master]: Use uniform log format for default config files
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email ) Change subject: Use uniform log format for default config files .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I5f364aa88a020dd8a0de501b3547ad077457c616 Gerrit-Change-Number: 35200 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 05 Dec 2023 17:09:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Allow receiving MTU ICMPv6 Option in RouterAdv
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35227?usp=email ) Change subject: ggsn: Allow receiving MTU ICMPv6 Option in RouterAdv .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35227?usp=email 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: Icf3e10dc599d41fb65051670fc3aec5ff0c67510 Gerrit-Change-Number: 35227 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 17:09:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Fix restriction type on several template definitions
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35226?usp=email ) Change subject: ggsn: Fix restriction type on several template definitions .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35226?usp=email 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: I47a0c3fbf1b4078c2d8157b148330f7750cc3266 Gerrit-Change-Number: 35226 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 17:08:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Early exit test if f_wait_icmp6() fails
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35225?usp=email ) Change subject: ggsn: Early exit test if f_wait_icmp6() fails .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35225?usp=email 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: Ida6be6194f98de44dca804759c85016031cae61c Gerrit-Change-Number: 35225 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 17:08:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: perform multiple GET RESPONSE cycles if more data is available
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35215?usp=email ) Change subject: perform multiple GET RESPONSE cycles if more data is available .. perform multiple GET RESPONSE cycles if more data is available So far we implemented only one round of "Send the APDU, get SW=61xx, call GET RESPONSE". This permitted us to receive only data up to 256 bytes. Let's extend that to doing multiple rounds, concatenating the result. This allows us to obtain arbitrary-length data from the card. See Annex C.1 of ETSI TS 102 221 for examples showing multiple 61xx iterations. Change-Id: Ib17da655aa0b0eb203c29dc92690c81bd1300778 Closes: OS#6287 --- M pySim/transport/__init__.py 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index e90ced6..2ffb9c3 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -137,11 +137,12 @@ # xx is the number of response bytes available. # See also: if (sw is not None): -if ((sw[0:2] == '9f') or (sw[0:2] == '61')): +while ((sw[0:2] == '9f') or (sw[0:2] == '61')): # SW1=9F: 3GPP TS 51.011 9.4.1, Responses to commands which are correctly executed # SW1=61: ISO/IEC 7816-4, Table 5 — General meaning of the interindustry values of SW1-SW2 pdu_gr = pdu[0:2] + 'c0' + sw[2:4] -data, sw = self.send_apdu_raw(pdu_gr) +d, sw = self.send_apdu_raw(pdu_gr) +data += d if sw[0:2] == '6c': # SW1=6C: ETSI TS 102 221 Table 7.1: Procedure byte coding pdu_gr = pdu[0:8] + sw[2:4] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib17da655aa0b0eb203c29dc92690c81bd1300778 Gerrit-Change-Number: 35215 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in pysim[master]: perform multiple GET RESPONSE cycles if more data is available
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35215?usp=email ) Change subject: perform multiple GET RESPONSE cycles if more data is available .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: rather trivial change, going ahead and merging it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35215?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib17da655aa0b0eb203c29dc92690c81bd1300778 Gerrit-Change-Number: 35215 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 05 Dec 2023 17:07:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email )
Change subject: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
..
bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
The struct member gen_idle_blocks controls whether the the PCU has to
generate dummy blocks to fill idle periods or if this task is left to
the BTS hardware.
Since idle dummy blocks only have to be transmitted on the C0 carrier,
we should rename the gen_idle_blocks struct member to
gen_idle_blocks_C0.
Related: OS#6198
Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465
---
M src/bts.h
M src/gprs_rlcmac_sched.cpp
M src/pcu_l1_if.cpp
3 files changed, 22 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/bts.h b/src/bts.h
index 86c161b..380c47c 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -282,7 +282,7 @@
/* When the PDCH is idle, the timeslot is expected to transmit dummy
blocks. Some BTS models will generate
* those dummy blocks automatically when no data is transmitted. In
contrast, other BTS models may require a
* continuous stream of PDCH blocks that already has the gaps filled
with dummy blocks. */
- bool gen_idle_blocks;
+ bool gen_idle_blocks_C0;
};
struct paging_req_cs {
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 12b9e50..ac58121 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -488,7 +488,7 @@
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
- if (bts->gen_idle_blocks)
+ if (bts->gen_idle_blocks_C0)
skip_idle = skip_idle && trx != 0;
if (!skip_idle && (msg = sched_dummy())) {
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 07082d3..fb44bd8 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -552,7 +552,7 @@
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
- if (bts->gen_idle_blocks)
+ if (bts->gen_idle_blocks_C0)
skip_idle = skip_idle && trx != 0;
if (skip_idle) {
@@ -966,7 +966,7 @@
LOGP(DL1IF, LOGL_INFO, "BTS model: %s\n",
get_value_string(gsm_pcuif_bts_model_names, info_ind->bts_model));
bts->bts_model = info_ind->bts_model;
- bts->gen_idle_blocks = decide_gen_idle_blocks(bts);
+ bts->gen_idle_blocks_C0 = decide_gen_idle_blocks(bts);
bts->active = true;
return rc;
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465
Gerrit-Change-Number: 35224
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email ) Change subject: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465 Gerrit-Change-Number: 35224 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 05 Dec 2023 17:02:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: fix encoding of the IP address
Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email ) Change subject: epdg_gtpc_s2b: fix encoding of the IP address .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c Gerrit-Change-Number: 35219 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 17:02:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: add TLV Serving Network
Attention is currently required from: lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email ) Change subject: epdg_gtpc_s2b: add TLV Serving Network .. Patch Set 2: (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218/comment/6fadb5c7_f6bbfcf0 PS2, Line 64: -define(MNC_SIZE, 42). I don't really understand the MNC_SIZE. Is that some kind of length? and why would that be 42 bytes? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 Gerrit-Change-Number: 35218 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 17:02:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing include of rfc4004
Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35217?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing include of rfc4004 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35217?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I986154f057f84e131845f6aff79e3ec81aea6a81 Gerrit-Change-Number: 35217 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 17:00:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA
Attention is currently required from: lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c Gerrit-Change-Number: 35216 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Dec 2023 17:00:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA
Attention is currently required from: pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA .. Patch Set 2: (1 comment) Patchset: PS1: > This is wrong. Youy are mentioning AAR in commit description, but modifying > AAA. Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c Gerrit-Change-Number: 35216 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 16:01:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: add TLV Serving Network
Attention is currently required from: pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email ) Change subject: epdg_gtpc_s2b: add TLV Serving Network .. Patch Set 2: (1 comment) File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218/comment/a2c62ecc_e4988641 PS1, Line 338: plmn_id = gtp_utils:plmn_to_bin(?MCC, ?MNC, ?MNC_SIZE) > this will need to come from CEAI interface at some point? from strongswan I > mean. […] Isn't this defined by the osmo-ePDG? Aren't we the serving network? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 Gerrit-Change-Number: 35218 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 16:01:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA
Attention is currently required from: lynxis lazus, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin Change subject: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA .. dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA AAA allows to have unknown AVPs. Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c --- M dia/diameter_3gpp_ts29_273_s6b.dia 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/16/35216/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c Gerrit-Change-Number: 35216 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email )
Change subject: gbproy/ns: Make components alive
..
gbproy/ns: Make components alive
Might help with random test failures on shutdown, see OS#6273 for
details.
Change-Id: I59578934c6406bea5eb8d55d3641737e555a2d85
Related: OS#6273
---
M gbproxy/GBProxy_Tests.ttcn
M library/NS_Emulation.ttcnpp
M library/NS_Provider_FR.ttcn
M library/RAW_NS.ttcnpp
4 files changed, 20 insertions(+), 7 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
daniel: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index e5bec7d..7a6572a 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -702,7 +702,7 @@
pars.p_tmsi := omit;
}
- vc_conn := BSSGP_ConnHdlr.create(id);
+ vc_conn := BSSGP_ConnHdlr.create(id) alive;
log("Starting ", id, " for SGSN[", sgsn_idx, "], NRI=", nri, ",
P-TMSI=", pars.p_tmsi,
", TLLI=", pars.tlli, ", IMSI=", pars.imsi, " on component=",
vc_conn);
diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index b5fc807..d1700f8 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -319,7 +319,7 @@
/* Create ipep and add it to the list */
log("Creating NSIP provider for ", ipep.local_ip, ":",
ipep.local_udp_port);
- ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP");
+ ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP") alive;
connect(self:NSPIP_PROC, ipep.provider_ct:PROC);
ipep.provider_ct.start(NS_Provider_IPL4.main(nsvc_cfg,
g_config, nsvc_id));
g_ip_endpoints := g_ip_endpoints & { ipep };
@@ -343,7 +343,7 @@
/* Start the actual NSVC component */
te.cfg := nsvc_cfg;
- te.vc_conn := NSVC_CT.create(nsvc_id);
+ te.vc_conn := NSVC_CT.create(nsvc_id) alive;
te.state := NSVC_S_DEAD_BLOCKED;
connect(self:NSVC, te.vc_conn:NS_SP);
@@ -721,7 +721,7 @@
vc_NSP_IP := nsp_ip
#ifdef NS_EMULATION_FR
} else if (ischosen(g_nsvc_config.provider.fr)) {
- vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP, vc_NSP_FR:NSE);
vc_NSP_FR.start(NS_Provider_FR.main(g_nsvc_config,
g_config, id));
#endif
diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn
index eb2fb24..b664b5e 100644
--- a/library/NS_Provider_FR.ttcn
+++ b/library/NS_Provider_FR.ttcn
@@ -30,7 +30,7 @@
function main(NSVCConfiguration config, NSConfiguration nsconfig, charstring
id) runs on NS_Provider_FR_CT system af_packet {
/* start Frame Relay Emulation */
- vc_FREMU := FR_Emulation_CT.create(id & "-FRemu");
+ vc_FREMU := FR_Emulation_CT.create(id & "-FRemu") alive;
var Q933em_Config q933_cfg := valueof(ts_Q933em_Config(ats_is_user :=
not nsconfig.role_sgsn, bidirectional := false));
q933_cfg.T391 := 1.0;
map(vc_FREMU:FR, system:AF_PACKET) param (config.provider.fr.netdev);
diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index 6930a72..da1a0cc 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -103,7 +103,7 @@
}
ip_prov[prov_idx].local_ip :=
ns_config.nsvc[idx].provider.ip.local_ip;
ip_prov[prov_idx].local_udp_port :=
ns_config.nsvc[idx].provider.ip.local_udp_port;
- ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx));
+ ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx)) alive;
connect(self:NSPIP_PROC,
ip_prov[prov_idx].vc_NSP_IP:PROC);
ip_prov[prov_idx].vc_NSP_IP.start(NS_Provider_IPL4.main(ns_config.nsvc[idx],
ns_config, id));
}
@@ -112,7 +112,7 @@
/* the NS_PROV_LINK_STATUS_UP is not sent by the
NS_Provider_IPL4 because we connect the port manual */
#ifdef NS_EMULATION_FR
} else if (ischosen(ns_config.nsvc[idx].provider.fr)) {
- vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP[idx], vc_NSP_FR[idx]:NSE);
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
Attention is currently required from: fixeria, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email ) Change subject: gbproy/ns: Make components alive .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > to be more sure that it works as expected, it would also be possible to copy > the ttcn3 job, change t […] I don't think it will hurt since we already use alive components in a lot of places and my manual testing showed that this doesn't fail in a consistent way. We can always revert if there are issues. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email 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: I59578934c6406bea5eb8d55d3641737e555a2d85 Gerrit-Change-Number: 35228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Dec 2023 15:23:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
Attention is currently required from: daniel, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email ) Change subject: gbproy/ns: Make components alive .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: to be more sure that it works as expected, it would also be possible to copy the ttcn3 job, change the parameters to run it from your branch, and run it a couple of times -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email 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: I59578934c6406bea5eb8d55d3641737e555a2d85 Gerrit-Change-Number: 35228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Dec 2023 15:14:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/gerrit: osmo-upf: don't for build debian 10
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email ) Change subject: jobs/gerrit: osmo-upf: don't for build debian 10 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356 Gerrit-Change-Number: 35229 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 05 Dec 2023 15:12:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email ) Change subject: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465 Gerrit-Change-Number: 35224 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 05 Dec 2023 15:12:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
Attention is currently required from: daniel, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email ) Change subject: gbproy/ns: Make components alive .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email 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: I59578934c6406bea5eb8d55d3641737e555a2d85 Gerrit-Change-Number: 35228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Dec 2023 15:11:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/gerrit: osmo-upf: don't for build debian 10
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email )
Change subject: jobs/gerrit: osmo-upf: don't for build debian 10
..
jobs/gerrit: osmo-upf: don't for build debian 10
osmo-upf currently can't build against debian 10, as the required
libnftables-dev version there is too low and we don't provide a backport
for it. As discussed, disable it for debian 10.
Adjust CI to build against debian 11 instead (in addition to the usual
almalinux 8, debian 12).
Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356
---
M jobs/gerrit-verifications.yml
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/35229/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 90c5fb5..2efac00 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -393,7 +393,8 @@
-e WITH_MANUALS="$WITH_MANUALS" \
{docker_img} {timeout_cmd} /build/contrib/jenkins.sh
- - osmo-upf
+ - osmo-upf:
+ pipeline_binpkgs: "almalinux:8 debian:11 debian:12"
- pysim:
concurrent: false
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35229?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I63798d451b66bf728b58b02414c1a44f6156b356
Gerrit-Change-Number: 35229
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-upf[master]: Use uniform log format for default config files
Attention is currently required from: jolly. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email ) Change subject: Use uniform log format for default config files .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I5f364aa88a020dd8a0de501b3547ad077457c616 Gerrit-Change-Number: 35200 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 05 Dec 2023 15:05:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-upf[master]: Use uniform log format for default config files
Attention is currently required from: jolly. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email ) Change subject: Use uniform log format for default config files .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: very nice to have this consistent now! -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/35200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I5f364aa88a020dd8a0de501b3547ad077457c616 Gerrit-Change-Number: 35200 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 05 Dec 2023 15:05:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
Attention is currently required from: dexter, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email ) Change subject: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465 Gerrit-Change-Number: 35224 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 05 Dec 2023 14:55:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email ) Change subject: gbproy/ns: Make components alive .. Patch Set 1: Verified+1 (1 comment) Patchset: PS1: I'm making a note here - all tests succeeded. Time will tell if we can consider it a huge success -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email 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: I59578934c6406bea5eb8d55d3641737e555a2d85 Gerrit-Change-Number: 35228 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 05 Dec 2023 14:54:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: gbproy/ns: Make components alive
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email )
Change subject: gbproy/ns: Make components alive
..
gbproy/ns: Make components alive
Might help with random test failures on shutdown, see OS#6273 for
details.
Change-Id: I59578934c6406bea5eb8d55d3641737e555a2d85
Related: OS#6273
---
M gbproxy/GBProxy_Tests.ttcn
M library/NS_Emulation.ttcnpp
M library/NS_Provider_FR.ttcn
M library/RAW_NS.ttcnpp
4 files changed, 20 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/28/35228/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index e5bec7d..7a6572a 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -702,7 +702,7 @@
pars.p_tmsi := omit;
}
- vc_conn := BSSGP_ConnHdlr.create(id);
+ vc_conn := BSSGP_ConnHdlr.create(id) alive;
log("Starting ", id, " for SGSN[", sgsn_idx, "], NRI=", nri, ",
P-TMSI=", pars.p_tmsi,
", TLLI=", pars.tlli, ", IMSI=", pars.imsi, " on component=",
vc_conn);
diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index b5fc807..d1700f8 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -319,7 +319,7 @@
/* Create ipep and add it to the list */
log("Creating NSIP provider for ", ipep.local_ip, ":",
ipep.local_udp_port);
- ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP");
+ ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP") alive;
connect(self:NSPIP_PROC, ipep.provider_ct:PROC);
ipep.provider_ct.start(NS_Provider_IPL4.main(nsvc_cfg,
g_config, nsvc_id));
g_ip_endpoints := g_ip_endpoints & { ipep };
@@ -343,7 +343,7 @@
/* Start the actual NSVC component */
te.cfg := nsvc_cfg;
- te.vc_conn := NSVC_CT.create(nsvc_id);
+ te.vc_conn := NSVC_CT.create(nsvc_id) alive;
te.state := NSVC_S_DEAD_BLOCKED;
connect(self:NSVC, te.vc_conn:NS_SP);
@@ -721,7 +721,7 @@
vc_NSP_IP := nsp_ip
#ifdef NS_EMULATION_FR
} else if (ischosen(g_nsvc_config.provider.fr)) {
- vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP, vc_NSP_FR:NSE);
vc_NSP_FR.start(NS_Provider_FR.main(g_nsvc_config,
g_config, id));
#endif
diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn
index eb2fb24..b664b5e 100644
--- a/library/NS_Provider_FR.ttcn
+++ b/library/NS_Provider_FR.ttcn
@@ -30,7 +30,7 @@
function main(NSVCConfiguration config, NSConfiguration nsconfig, charstring
id) runs on NS_Provider_FR_CT system af_packet {
/* start Frame Relay Emulation */
- vc_FREMU := FR_Emulation_CT.create(id & "-FRemu");
+ vc_FREMU := FR_Emulation_CT.create(id & "-FRemu") alive;
var Q933em_Config q933_cfg := valueof(ts_Q933em_Config(ats_is_user :=
not nsconfig.role_sgsn, bidirectional := false));
q933_cfg.T391 := 1.0;
map(vc_FREMU:FR, system:AF_PACKET) param (config.provider.fr.netdev);
diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index 6930a72..da1a0cc 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -103,7 +103,7 @@
}
ip_prov[prov_idx].local_ip :=
ns_config.nsvc[idx].provider.ip.local_ip;
ip_prov[prov_idx].local_udp_port :=
ns_config.nsvc[idx].provider.ip.local_udp_port;
- ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx));
+ ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx)) alive;
connect(self:NSPIP_PROC,
ip_prov[prov_idx].vc_NSP_IP:PROC);
ip_prov[prov_idx].vc_NSP_IP.start(NS_Provider_IPL4.main(ns_config.nsvc[idx],
ns_config, id));
}
@@ -112,7 +112,7 @@
/* the NS_PROV_LINK_STATUS_UP is not sent by the
NS_Provider_IPL4 because we connect the port manual */
#ifdef NS_EMULATION_FR
} else if (ischosen(ns_config.nsvc[idx].provider.fr)) {
- vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP[idx], vc_NSP_FR[idx]:NSE);
vc_NSP_FR[idx].start(NS_Provider_FR.main(ns_config.nsvc[idx],
ns_config, id));
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Fix restriction type on several template definitions
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35226?usp=email )
Change subject: ggsn: Fix restriction type on several template definitions
..
ggsn: Fix restriction type on several template definitions
Change-Id: I47a0c3fbf1b4078c2d8157b148330f7750cc3266
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 26 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/26/35226/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 48cf725..118f1d5 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -819,7 +819,7 @@
const octetstring c_neigh_solicit:=
'60203afffe82ff020001ff0287009f96fe8201010288b51f2559'O;
/* template for sending an ICMPv4 echo request */
- template PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := {
+ template (value) PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := {
echo := {
type_field := 8,
code := 0,
@@ -831,7 +831,7 @@
}
/* template for receiving/matching an ICMPv4 echo request */
- template PDU_ICMP tr_ICMPv4_ERQ := {
+ template (present) PDU_ICMP tr_ICMPv4_ERQ := {
echo := {
type_field := 8,
code := 0,
@@ -843,7 +843,7 @@
}
/* template for receiving/matching an ICMPv4 echo reply */
- template PDU_ICMP tr_ICMPv4_ERP(template octetstring data := *) := {
+ template (present) PDU_ICMP tr_ICMPv4_ERP(template octetstring data :=
*) := {
echo_reply := {
type_field := 0,
code := 0,
@@ -855,7 +855,7 @@
}
/* template for receiving/matching an ICMPv6 Destination Unreachable */
- template PDU_ICMP tr_ICMPv4_DU := {
+ template (present) PDU_ICMP tr_ICMPv4_DU := {
destination_unreachable := {
type_field := 1,
code := ?,
@@ -866,7 +866,7 @@
}
/* template to construct IPv4_packet from input arguments, ready for
use in f_IPv4_enc() */
- template IPv4_packet ts_IP4(OCT4 srcaddr, OCT4 dstaddr, LIN1 proto,
LIN2_BO_LAST tlen, octetstring payload) := {
+ template (value) IPv4_packet ts_IP4(OCT4 srcaddr, OCT4 dstaddr, LIN1
proto, LIN2_BO_LAST tlen, octetstring payload) := {
header := {
ver := 4,
hlen := 5,
@@ -888,7 +888,7 @@
}
/* template to generate a 'Prefix Information' ICMPv6 option */
- template OptionField ts_ICMP6_OptPrefix(OCT16 prefix, INT1 prefix_len)
:= {
+ template (value) OptionField ts_ICMP6_OptPrefix(OCT16 prefix, INT1
prefix_len) := {
prefixInformation := {
typeField := 3,
lengthIndicator := 8,
@@ -904,7 +904,7 @@
}
/* template for sending an ICMPv6 echo request */
- template PDU_ICMPv6 ts_ICMPv6_ERQ := {
+ template (value) PDU_ICMPv6 ts_ICMPv6_ERQ := {
echoRequest := {
typeField := 128,
code := 0,
@@ -916,7 +916,7 @@
}
/* template for sending an ICMPv6 router solicitation */
- template PDU_ICMPv6 ts_ICMPv6_RS := {
+ template (value) PDU_ICMPv6 ts_ICMPv6_RS := {
routerSolicitation := {
typeField := 133,
code := 0,
@@ -928,12 +928,12 @@
}
/* template for sending an ICMPv6 router advertisement */
- template PDU_ICMPv6 ts_ICMPv6_RA(OCT16 prefix, INT1 prefix_len) := {
+ template (value) PDU_ICMPv6 ts_ICMPv6_RA(OCT16 prefix, INT1 prefix_len)
:= {
routerAdvertisement := {
typeField := 134,
code := 0,
checksum := ''O,
- curHopLimit := ?,
+ curHopLimit := 0,
reserved := '00'B,
o_Bit := '0'B,
m_Bit := '0'B,
@@ -947,7 +947,7 @@
}
/* template for sending an ICMPv6 neighbor solicitation */
- template PDU_ICMPv6 ts_ICMPv6_NS(OCT16 target_addr) := {
+ template (value) PDU_ICMPv6 ts_ICMPv6_NS(OCT16 target_addr) := {
neighborSolicitation := {
typeField := 135,
code := 0,
@@ -961,7 +961,7 @@
/* derive ICMPv6 link-local address from lower 64bit of link_id */
/* template for receiving/matching an ICMPv6 'Prefix Information'
option */
- template OptionField tr_ICMP6_OptPrefix(template OCT16 prefix, template
INT1
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Allow receiving MTU ICMPv6 Option in RouterAdv
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35227?usp=email )
Change subject: ggsn: Allow receiving MTU ICMPv6 Option in RouterAdv
..
ggsn: Allow receiving MTU ICMPv6 Option in RouterAdv
This Option is not mandatory, but open5gs-smfd started transmitting it
recently (ab64ff9514d8da121500be7b92c9d793ef20b894). Allow it.
Change-Id: Icf3e10dc599d41fb65051670fc3aec5ff0c67510
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 25 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/27/35227/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 118f1d5..435f71d 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -976,6 +976,16 @@
}
}
+ /* template for receiving/matching an ICMPv6 'MTU' option, rfc4861
4.6.4 */
+ template (present) OptionField tr_ICMP6_OptMTU(template (present)
integer mtu := ?) := {
+ mTU := {
+ typeField := 5,
+ lengthIndicator := 1,
+ reserved := ?,
+ mTU_Value := mtu
+ }
+ }
+
/* template for receiving/matching an ICMPv6 router advertisement */
template (present) PDU_ICMPv6 tr_ICMPv6_RA(template (present) OCT16
prefix, template (present) INT1 prefix_len) := {
routerAdvertisement := {
@@ -989,9 +999,9 @@
routerLifetime := ?,
reachableTime := ?,
retransTimer := ?,
- options := {
- tr_ICMP6_OptPrefix(prefix, prefix_len)
- }
+ options := ({ tr_ICMP6_OptPrefix(prefix, prefix_len) },
+ { tr_ICMP6_OptPrefix(prefix, prefix_len),
tr_ICMP6_OptMTU }
+ )
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35227?usp=email
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: Icf3e10dc599d41fb65051670fc3aec5ff0c67510
Gerrit-Change-Number: 35227
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ci[master]: OBS: add jenkins job to check for new distros
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email ) Change subject: OBS: add jenkins job to check for new distros .. Patch Set 1: (1 comment) Patchset: PS1: > I wonder whether we really want to be checking this everyday, given that some > of them happen every 6 […] the check itself takes about 5 seconds, I think it is fine :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0abc49a95197da55f7d83ed4fd1c4ebb6bd14b1e Gerrit-Change-Number: 35223 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Dec 2023 13:33:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: ggsn: Early exit test if f_wait_icmp6() fails
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35225?usp=email )
Change subject: ggsn: Early exit test if f_wait_icmp6() fails
..
ggsn: Early exit test if f_wait_icmp6() fails
Change-Id: Ida6be6194f98de44dca804759c85016031cae61c
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 19 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/25/35225/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index d6a0403..48cf725 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -1184,8 +1184,8 @@
alt {
[] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value ud {
if (f_verify_gtpu_txseq(ud.gtpu,
use_gtpu_txseq) == false) {
- setverdict(fail);
- stop;
+ Misc_Helpers.f_shutdown(__BFILE__,
__LINE__, fail,
+
log2str("Received GTPU with wrong txseq while waiting for ICMPv6: ", expected));
}
var octetstring gpdu :=
ud.gtpu.gtpu_IEs.g_PDU_IEs.data;
var IPv6_packet ip6 := f_IPv6_dec(gpdu);
@@ -1203,8 +1203,14 @@
}
}
[] GTPU.receive(tr_GTPU_GPDU(?, ?)) { repeat; }
- [] GTPU.receive { setverdict(fail); }
- [] T_default.timeout { setverdict(fail); }
+ [] GTPU.receive {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__,
fail,
+ log2str("Received
unexpected GTPU while waiting for ICMPv6: ", expected));
+ }
+ [] T_default.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__,
fail,
+ log2str("Timeout
waiting for ICMPv6: ", expected));
+ }
}
T_default.stop;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35225?usp=email
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: Ida6be6194f98de44dca804759c85016031cae61c
Gerrit-Change-Number: 35225
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email ) Change subject: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian .. jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian Related: OS#6163 Change-Id: I459bd48b50d80fcd07837377e19e89df21d6c328 --- M jobs/osmocom-obs-sync.yml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index fef1e83..53ae0b3 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -36,9 +36,11 @@ Debian:Testing Raspbian:10 Raspbian:11 +Raspbian:12 Ubuntu:20.04 Ubuntu:22.04 Ubuntu:23.04 +Ubuntu:23.10 " ./scripts/obs/sync_obs_projects.py \ --docker \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I459bd48b50d80fcd07837377e19e89df21d6c328 Gerrit-Change-Number: 35221 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email )
Change subject: bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
..
bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0
The struct member gen_idle_blocks controls whether the the PCU has to
generate dummy blocks to fill idle periods or if this task is left to
the BTS hardware.
Since idle dummy blocks only have to be transmitted on the C0 carrier,
we should rename the gen_idle_blocks struct member to
gen_idle_blocks_C0.
Related: OS#6198
Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465
---
M src/bts.h
M src/gprs_rlcmac_sched.cpp
M src/pcu_l1_if.cpp
3 files changed, 22 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/24/35224/1
diff --git a/src/bts.h b/src/bts.h
index 86c161b..380c47c 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -282,7 +282,7 @@
/* When the PDCH is idle, the timeslot is expected to transmit dummy
blocks. Some BTS models will generate
* those dummy blocks automatically when no data is transmitted. In
contrast, other BTS models may require a
* continuous stream of PDCH blocks that already has the gaps filled
with dummy blocks. */
- bool gen_idle_blocks;
+ bool gen_idle_blocks_C0;
};
struct paging_req_cs {
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 12b9e50..ac58121 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -488,7 +488,7 @@
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
- if (bts->gen_idle_blocks)
+ if (bts->gen_idle_blocks_C0)
skip_idle = skip_idle && trx != 0;
if (!skip_idle && (msg = sched_dummy())) {
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 07082d3..fb44bd8 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -552,7 +552,7 @@
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
- if (bts->gen_idle_blocks)
+ if (bts->gen_idle_blocks_C0)
skip_idle = skip_idle && trx != 0;
if (skip_idle) {
@@ -966,7 +966,7 @@
LOGP(DL1IF, LOGL_INFO, "BTS model: %s\n",
get_value_string(gsm_pcuif_bts_model_names, info_ind->bts_model));
bts->bts_model = info_ind->bts_model;
- bts->gen_idle_blocks = decide_gen_idle_blocks(bts);
+ bts->gen_idle_blocks_C0 = decide_gen_idle_blocks(bts);
bts->active = true;
return rc;
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35224?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: If9511ed911f9c5d6d463881a387a9e7d11a15465
Gerrit-Change-Number: 35224
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[M] Change in osmo-ci[master]: OBS: add jenkins job to check for new distros
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email ) Change subject: OBS: add jenkins job to check for new distros .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I wonder whether we really want to be checking this everyday, given that some of them happen every 6 months or so. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0abc49a95197da55f7d83ed4fd1c4ebb6bd14b1e Gerrit-Change-Number: 35223 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 05 Dec 2023 13:08:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: OBS: lib.osc.get_projects: print apiurl
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email ) Change subject: OBS: lib.osc.get_projects: print apiurl .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06 Gerrit-Change-Number: 35222 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 05 Dec 2023 13:06:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email ) Change subject: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I459bd48b50d80fcd07837377e19e89df21d6c328 Gerrit-Change-Number: 35221 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 05 Dec 2023 13:04:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: OBS: add jenkins job to check for new distros
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/35223?usp=email )
Change subject: OBS: add jenkins job to check for new distros
..
OBS: add jenkins job to check for new distros
Add a new jenkins job to notify us about new versions of Debian,
Raspbian and Ubuntu becoming available in the openSUSE OBS. This allows
us to consistently follow along and make the repositories available in
the Osmocom OBS. I've decided to check the openSUSE OBS instead of
checking somewhere upstream, because it takes time between a new
release of a distribution and the version becoming available in
openSUSE OBS, and we have another job that syncs the configuration with
that OBS instance.
Related: OS#6163
Change-Id: I0abc49a95197da55f7d83ed4fd1c4ebb6bd14b1e
---
M jobs/README.adoc
A jobs/osmocom-obs-check-new-distros.yml
A scripts/obs/check_new_distros.py
M scripts/obs/lib/config.py
4 files changed, 181 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/23/35223/1
diff --git a/jobs/README.adoc b/jobs/README.adoc
index 86fc485..c37b3bb 100644
--- a/jobs/README.adoc
+++ b/jobs/README.adoc
@@ -123,6 +123,7 @@
18:00 - 21:00 OBS related
18:XX osmocom-obs-sync (sync Debian:12 etc. with openSUSE OBS)
+ 19:XX osmocom-obs-check-new-distros
19:XX osmocom-obs-wireshark
20:XX osmocom-obs (new binary packages start building on OBS!)
diff --git a/jobs/osmocom-obs-check-new-distros.yml
b/jobs/osmocom-obs-check-new-distros.yml
new file mode 100644
index 000..760479a
--- /dev/null
+++ b/jobs/osmocom-obs-check-new-distros.yml
@@ -0,0 +1,39 @@
+---
+- job:
+name: 'Osmocom_OBS_check_new_distros'
+project-type: freestyle
+concurrent: false
+defaults: global
+description: |
+ Check whether new distributions (Debian, Raspyberry Pi OS, Ubuntu) are
+ available in openSUSE's OBS that we need to add to the Osmocom OBS.
+properties:
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 30
+node: obs
+parameters:
+ - string:
+ name: CI_BRANCH
+ description: osmo-ci.git branch
+ default: 'master'
+scm:
+ - git:
+ branches:
+- '$CI_BRANCH'
+ url: https://gerrit.osmocom.org/osmo-ci
+ git-config-name: 'Jenkins Builder'
+ git-config-email: 'jenk...@osmocom.org'
+builders:
+ - shell: |
+ export PYTHONUNBUFFERED=1
+ ./scripts/obs/check_new_distros.py --docker
+triggers:
+ - timed: "H 19 * * *"
+wrappers:
+- ansicolor:
+colormap: xterm
+publishers:
+ - email:
+ notify-every-unstable-build: true
+ recipients: 'jenkins-notificati...@lists.osmocom.org'
diff --git a/scripts/obs/check_new_distros.py b/scripts/obs/check_new_distros.py
new file mode 100755
index 000..962d547
--- /dev/null
+++ b/scripts/obs/check_new_distros.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright 2023 sysmocom - s.f.m.c. GmbH
+import argparse
+import lib.docker
+import lib.osc
+import sys
+
+projects_opensuse = None
+projects_osmocom = None
+
+
+def parse_args():
+parser = argparse.ArgumentParser(description="Check for new distribution"
+" projects on the openSUSE OBS, that we want to configure in the"
+" Osmocom OBS as soon as they are available")
+parser.add_argument("-d", "--docker",
+help="run in docker to avoid installing required pkgs",
+action="store_true")
+parser.add_argument("-v", "--verbose", action="store_true",
+help="always print shell commands and their output,"
+ " instead of only printing them on error")
+
+advanced = parser.add_argument_group("advanced options")
+advanced.add_argument("-A", "--apiurl", help="source OBS API URL"
+ " (default: https://api.opensuse.org)",
+ default="https://api.opensuse.org;)
+advanced.add_argument("-p", "--prefix", default="openSUSE.org-mirror",
+ help="destination OBS prefix"
+ " (default: openSUSE.org-mirror)")
+advanced.add_argument("-t", "--to-apiurl", help="destination OBS API URL"
+ " (default: https://obs.osmocom.org)",
+ default="https://obs.osmocom.org;)
+
+args = parser.parse_args()
+lib.set_args(args)
+
+lib.osc.check_oscrc()
+
+if args.docker:
+lib.docker.run_in_docker_and_exit("check_new_distros.py",
add_oscrc=True)
+
+
+def find_highest_distro_project(distro):
+highest = None
+for project in projects_opensuse:
+if not project.startswith(f"{distro}:"):
+continue
+
+num = project[len(distro) + 1:]
+if not
[S] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email ) Change subject: jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian .. jobs/osmocom-obs-sync: add newest Ubuntu, Raspbian Related: OS#6163 Change-Id: I459bd48b50d80fcd07837377e19e89df21d6c328 --- M jobs/osmocom-obs-sync.yml 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/35221/1 diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index fef1e83..53ae0b3 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -36,9 +36,11 @@ Debian:Testing Raspbian:10 Raspbian:11 +Raspbian:12 Ubuntu:20.04 Ubuntu:22.04 Ubuntu:23.04 +Ubuntu:23.10 " ./scripts/obs/sync_obs_projects.py \ --docker \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35221?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I459bd48b50d80fcd07837377e19e89df21d6c328 Gerrit-Change-Number: 35221 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ci[master]: OBS: lib.osc.get_projects: print apiurl
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email )
Change subject: OBS: lib.osc.get_projects: print apiurl
..
OBS: lib.osc.get_projects: print apiurl
Print the apiurl, to make more obvious what is going on when running the
function twice in a row with two different apiurls (as done in the next
patch).
Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06
---
M scripts/obs/lib/osc.py
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/35222/1
diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py
index 20a63b5..ef2fc4b 100644
--- a/scripts/obs/lib/osc.py
+++ b/scripts/obs/lib/osc.py
@@ -178,5 +178,5 @@
proj])
def get_projects():
-print(f"OBS: getting list of projects")
+print(f"OBS: getting list of projects ({apiurl})")
return lib.osc.run_osc(["ls"]).output.rstrip().split("\n")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35222?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I789d12ce59ff14f526ab0334e78a6b22a063ec06
Gerrit-Change-Number: 35222
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-mgw[master]: check_rtp_origin: drop special case for legacy IuUP hack
Attention is currently required from: laforge, pespin. pespin has uploaded a new patch set (#4) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35181?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: check_rtp_origin: drop special case for legacy IuUP hack .. check_rtp_origin: drop special case for legacy IuUP hack We have proper IuUP support and everything about this legacy hack should be purged. The purpose of this function is to validate that RTP is coming from the expected address and port. To allow that legacy IuUP hack, which is no longer needed, we punched a hole into this validation, by adding this special case for loopback mode (suddenly we don't care who or what sends RTP and bounce it back to anyone). So let's get rid of this hole that was only needed for very early 3G voice hacking. Instead, we permit RTP for IuUP Initialization regardless of the RTP loopback/send/recv mode since I6c365559a7bd197349f0ea99f7a13b56a4bb580b Related: SYS#6657 Change-Id: I158dd046fdfcb10392cde3de8cc88dd095a05b40 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 30 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/81/35181/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35181?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I158dd046fdfcb10392cde3de8cc88dd095a05b40 Gerrit-Change-Number: 35181 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: IuUP: allow Initialization from any address if not yet set
Attention is currently required from: laforge, neels. pespin has uploaded a new patch set (#3) to the change originally created by neels. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by neels, Verified+1 by Jenkins Builder Change subject: IuUP: allow Initialization from any address if not yet set .. IuUP: allow Initialization from any address if not yet set Do not refuse IuUP Initialization messages coming in on an RTP port if the remote IP address is not yet known. If an IUFP conn is not yet configured (pre-Initialization), allow rx from any remote address if the remote IP address is not yet known. If we refuse the IuUP Initialization, a 3G RNC may fail to set up a RAB. We will know the remote address only *after* assigning a RAB succeeded. So the IuUP Initialization must be allowed before knowing all addresses. At the time of writing, CRCX for IUFP are sent to osmo-mgw in either LOOPBACK or in RECVONLY mode: - current osmo-msc: recvonly - osmo-msc <= v1.10.0: loopback - osmo-hnbgw: loopback IuUP Initialization should work regardless of that. See also next patch I158dd046fdfcb10392cde3de8cc88dd095a05b40 IuUP is one layer below the loopback/send/recv decision for RTP; IuUP is always terminated at the MGW, while the AMR payload carries through. Related: alternative patch Idd833997abce46886e9664505b2776fa5dadc8db Related: SYS#6657 Change-Id: I6c365559a7bd197349f0ea99f7a13b56a4bb580b --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/35205/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6c365559a7bd197349f0ea99f7a13b56a4bb580b Gerrit-Change-Number: 35205 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: IuUP: Allow Initialization with set rem IP address and unset rem port
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35176?usp=email ) Change subject: IuUP: Allow Initialization with set rem IP address and unset rem port .. Patch Set 4: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/35176/comment/890ed34b_b58b214d PS4, Line 7: rem > (i'd rather write out "remote" and abbreviate "Init" and "addr") Done Patchset: PS4: > Ok, I see, and agree with this. […] I/we already invested time into separating them. No need to spend more time now joining them, let's leave it as is (I agree it would be arguable whether 1 or 2 is better). File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/35176/comment/fcdb22ec_e5acf916 PS4, Line 842: ASs > Ack Done https://gerrit.osmocom.org/c/osmo-mgw/+/35176/comment/4141065f_d4203f9e PS4, Line 843: MDCX > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35176?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idd833997abce46886e9664505b2776fa5dadc8db Gerrit-Change-Number: 35176 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 05 Dec 2023 12:50:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: IuUP: allow Initialization from any address if not yet set
Attention is currently required from: laforge, neels.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email )
Change subject: IuUP: allow Initialization from any address if not yet set
..
Patch Set 2:
(1 comment)
File src/libosmo-mgcp/mgcp_network.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/35205/comment/de56d40a_437eaf7b
PS1, Line 838: if (mgcp_conn_rtp_is_iuup(conn) && !conn->iuup.configured) {
> With current master (at least from yesterday) yes, you are right. However, […]
I updated https://gerrit.osmocom.org/c/osmo-mgw/+/35152 to submit the codec
(IUFP) even if port is not set, so that MGW knows that it has to create an IuUP
conn.
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35205?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6c365559a7bd197349f0ea99f7a13b56a4bb580b
Gerrit-Change-Number: 35205
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Comment-Date: Tue, 05 Dec 2023 12:41:56 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp-client: Transmit remote IP addr in CRCX if known and port=0
Attention is currently required from: dexter, laforge, neels. Hello Jenkins Builder, dexter, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: mgcp-client: Transmit remote IP addr in CRCX if known and port=0 .. mgcp-client: Transmit remote IP addr in CRCX if known and port=0 A client may know the IP address during CRCX but not yet the port, or it may simply want to hint an initial IP address so that the MGW can better guess when allocating a local IP address. Related: SYS#6657 Change-Id: I30165dbac5e484011d0acf46af36f105954a501d --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 2 files changed, 56 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/35152/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
