fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/29227 )
Change subject: Bump minimum required construct version to v2.9.51
......................................................................
Bump minimum required construct version to v2.9.51
With this version I can get all unittests passing:
python -m unittest discover tests/
We're passing argument 'path' to stream_read_entire(), which was
added in [1] and become available since v2.9.51.
Change-Id: I4223c83570d333ad8d79bc2aa2d8bcc580156cff
Related: [1] bfe71315b027e18e62f00ec4de75043992fd2316 construct.git
Related: OS#5666
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/29227/1
diff --git a/setup.py b/setup.py
index ec1a76a..b9ad1bf 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
"pytlv",
"cmd2 >= 1.3.0, < 2.0.0",
"jsonpath-ng",
- "construct >= 2.9",
+ "construct >= 2.9.51",
"bidict",
"gsm0338",
"termcolor",
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/29227
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4223c83570d333ad8d79bc2aa2d8bcc580156cff
Gerrit-Change-Number: 29227
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/29226 )
Change subject: construct: use Python's API for int<->bytes conversion
......................................................................
construct: use Python's API for int<->bytes conversion
Argument 'signed' was added in [1] and become available since v2.10.63.
Therefore using bytes2integer() and integer2bytes() from construct.core
bumps the minimum required version of construct to v2.10.63. For
instance, debian:bullseye currently ships v2.10.58.
There is no strict requirement to use construct's API, so let's use
Python's API instead. This allows using older construct versions
from the v2.9.xx family.
Change-Id: I613dbfebe993f9c19003635371941710fc1b1236
Related: [1] 660ddbe2d9a351731ad7976351adbf413809a715 construct.git
Related: OS#5666
---
M pySim/construct.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/26/29226/1
diff --git a/pySim/construct.py b/pySim/construct.py
index 4910a7f..97af235 100644
--- a/pySim/construct.py
+++ b/pySim/construct.py
@@ -2,7 +2,7 @@
from construct.core import EnumIntegerString
import typing
from construct import *
-from construct.core import evaluate, bytes2integer, integer2bytes, BitwisableString
+from construct.core import evaluate, BitwisableString
from construct.lib import integertypes
from pySim.utils import b2h, h2b, swap_nibbles
import gsm0338
@@ -219,7 +219,7 @@
if evaluate(self.swapped, context):
data = swapbytes(data)
try:
- return bytes2integer(data, self.signed)
+ return int.from_bytes(data, byteorder='big', signed=self.signed)
except ValueError as e:
raise IntegerError(str(e), path=path)
@@ -248,7 +248,7 @@
raise IntegerError(f"value {obj} is not an integer", path=path)
length = self.__bytes_required(obj, self.minlen)
try:
- data = integer2bytes(obj, length, self.signed)
+ data = obj.to_bytes(length, byteorder='big', signed=self.signed)
except ValueError as e:
raise IntegerError(str(e), path=path)
if evaluate(self.swapped, context):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/29226
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I613dbfebe993f9c19003635371941710fc1b1236
Gerrit-Change-Number: 29226
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: msuraev.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29224 )
Change subject: Ignore .deb build byproducts
......................................................................
Patch Set 2:
(1 comment)
File .gitignore:
https://gerrit.osmocom.org/c/osmo-ggsn/+/29224/comment/46016d64_0dea5044
PS2, Line 27: # debian
I suggest to move your new entries here, so that we have all debian stuff in one place.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29224
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Iec63ef5ea0acfc5e6621054926be15ae4754d65d
Gerrit-Change-Number: 29224
Gerrit-PatchSet: 2
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 29 Aug 2022 12:53:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29225 )
Change subject: Set working directory in systemd service file
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29225
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I40b5d50470cb55ca94af5e17f21658181a02d4c2
Gerrit-Change-Number: 29225
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Mon, 29 Aug 2022 12:48:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ggsn/+/29223
to look at the new patch set (#2).
Change subject: Set working directory in systemd service file
......................................................................
Set working directory in systemd service file
By default systemd will execute service with root directory (or home directory for user instance) which might result in
attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system
instance) instead.
Related: OS#4821
Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a
---
M contrib/systemd/osmo-ggsn.service
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/23/29223/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29223
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a
Gerrit-Change-Number: 29223
Gerrit-PatchSet: 2
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29223 )
Change subject: Set working directory in systemd service file
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29223
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Idffc115c21cac77f6f43356333de538ba549fc6a
Gerrit-Change-Number: 29223
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Mon, 29 Aug 2022 12:01:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/29224 )
Change subject: Ignore .deb build byproducts
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/29224
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Iec63ef5ea0acfc5e6621054926be15ae4754d65d
Gerrit-Change-Number: 29224
Gerrit-PatchSet: 1
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Mon, 29 Aug 2022 12:00:54 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels, laforge, fixeria.
Hello Jenkins Builder, neels, laforge, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sccp/+/29084
to look at the new patch set (#15).
Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
......................................................................
SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
The length limit of optional Data parameter is 130 bytes according to ITU-T Rec Q.713 §4.2..§4.5. If we receive CR, CC or
RLSD message with bigger data - cache it if necessary and send via separate DT1 message after connection becomes active.
While at it, clarify the order of comments in the encoding routine to match the spec.
Fixes: OS#5579
Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a
---
M src/sccp_scoc.c
1 file changed, 132 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/84/29084/15
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a
Gerrit-Change-Number: 29084
Gerrit-PatchSet: 15
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, laforge, fixeria.
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 )
Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
......................................................................
Patch Set 14:
(4 comments)
This change is ready for review.
Patchset:
PS14:
I've added comment to the line which raised questions - hopefully this would clarify things.
File src/sccp_scoc.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/6ce89fd4_8d05fbff
PS8, Line 659: break
> drop the "break;"
Done
File src/sccp_scoc.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/48dbaa89_d31e82c7
PS14, Line 603: if (conn->opt_data_cache->cb[0] != exp_type)
> cosmetic: we use curly braces around multi-line blocks, even if it's only a single statement within […]
Done
https://gerrit.osmocom.org/c/libosmo-sccp/+/29084/comment/a86dafd8_0ce12659
PS14, Line 1110: xua_opt_data_send_cache(conn, SUA_CO_CORE, xua->hdr.msg_class);
> or maybe this? […]
I think I'm missing a point in here. Could you elaborate - what exactly you think should be changed in here and why?
That's both the intention behind this code and how the result looks like in wireshark:
A B
------> Conn Req (cache Optional Data)
<------ Conn Conf
------> DT1 with cached data
When the lib receieve CR with way too much data (but not big enough to not fit into DT1) we cache it, send CR without optional data and send DT1 after receiving CC. To make sure we do not interfere with regular user traffic the DT1 (with outstanding optional data from CR) is sent here from conn_pend_out state before we notify lib user that CC was received.
You can reproduce this yourself by following readme for examples/ code which is already merged to master.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a
Gerrit-Change-Number: 29084
Gerrit-PatchSet: 14
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 29 Aug 2022 10:25:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29222 )
Change subject: contrib/jenkins.sh: do not override parallel make for libsmpp34
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29222
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I13d2d6f3b5ffae390cf429e41bf9035b8c551f66
Gerrit-Change-Number: 29222
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 29 Aug 2022 08:57:34 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/29219 )
Change subject: contrib/jenkins.sh: actually build with $PARALLEL_MAKE
......................................................................
contrib/jenkins.sh: actually build with $PARALLEL_MAKE
Executing $MAKE without $PARALLEL_MAKE builds the project with -j1.
Executing $MAKE with $PARALLEL_MAKE after that makes no sense,
because everything is already compiled and there is nothing to do.
Change-Id: Iff7e7acfac0b827ce3b1086cea376a438b5af334
---
M contrib/jenkins.sh
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/19/29219/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 3b4e639..7a75e25 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -7,7 +7,6 @@
autoreconf --install --force
./configure --enable-sanitize --enable-werror
-$MAKE
$MAKE $PARALLEL_MAKE
$MAKE distcheck || cat-testlogs.sh
$MAKE maintainer-clean
--
To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29219
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-Change-Id: Iff7e7acfac0b827ce3b1086cea376a438b5af334
Gerrit-Change-Number: 29219
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29002 )
Change subject: debian,RPM: package with PFCP support
......................................................................
Patch Set 10:
(1 comment)
Patchset:
PS10:
libosmo-pfcp shows as succeeded in obs for nightly and latest;
it is disabled on CentOS7, but so is osmo-hnbgw.
my "home" build on obs worked, so this should succeed now...
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29002
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I54dfe600d45541fecbb4c05bf75f147934c230f0
Gerrit-Change-Number: 29002
Gerrit-PatchSet: 10
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Sat, 27 Aug 2022 16:02:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29217 )
Change subject: osmo-bts-trx: fix handling of ciphering params in PRIM_INFO_MODIFY
......................................................................
osmo-bts-trx: fix handling of ciphering params in PRIM_INFO_MODIFY
The PRIM_INFO_MODIFY is sent on receipt of the RSL MODE MODIFY message,
which may optionally contain new ciphering parameters. Before this
patch, osmo-bts-trx would ignore the new parameters and continue using
the old ciphering key/algorithm.
* Modify l1if_set_ciphering() to allow updating ciphering params.
* Call l1if_set_ciphering() when handling PRIM_INFO_MODIFY.
This problem was uncovered by BTS_Tests.TC_rsl_modify_encr, which has
been failing ever since it was introduced [1]. This patch makes it pass.
Change-Id: I2278703b487374c0de4cfc42b22e70aaf6548589
Related: [1] I4cbea499bb6a331d314e6573548a4540945208b5 osmo-ttcn3-hacks.git
Related: OS#3750
---
M src/osmo-bts-trx/l1_if.c
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/29217/1
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 92180b5..8c364c3 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -326,8 +326,8 @@
/* enable ciphering */
static int l1if_set_ciphering(struct gsm_lchan *lchan, uint8_t chan_nr, int downlink)
{
- /* ciphering already enabled in both directions */
- if (lchan->ciph_state == LCHAN_CIPH_RXTX_CONF)
+ /* ignore the request when the channel is not active */
+ if (lchan->state != LCHAN_S_ACTIVE)
return -EINVAL;
if (!downlink) {
@@ -463,6 +463,13 @@
lchan->tch.amr_mr.mode[3].mode,
amr_get_initial_mode(lchan),
0);
+ /* update ciphering params */
+ l1if_set_ciphering(lchan, chan_nr, 0);
+ l1if_set_ciphering(lchan, chan_nr, 1);
+ if (lchan->encr.alg_id)
+ lchan->ciph_state = LCHAN_CIPH_RXTX_CONF;
+ else
+ lchan->ciph_state = LCHAN_CIPH_NONE;
break;
}
/* here, type == PRIM_INFO_DEACTIVATE */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29217
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I2278703b487374c0de4cfc42b22e70aaf6548589
Gerrit-Change-Number: 29217
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164 )
Change subject: packate the new osmo-hnbgw-pfcp.cfg example config file
......................................................................
packate the new osmo-hnbgw-pfcp.cfg example config file
In I62c4935bcc7f684bfe850f88f1b80e8970e0e098 we added a new example
config file, but didn't actually package it in dpkg or rpm packages
yet. This also lead to package build failures like:
[ 39s] RPM build errors:
[ 39s] Installed (but unpackaged) file(s) found:
[ 39s] /usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg
Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
---
M debian/osmo-hnbgw.install
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install
index ac1f931..daf1f1a 100644
--- a/debian/osmo-hnbgw.install
+++ b/debian/osmo-hnbgw.install
@@ -2,3 +2,4 @@
lib/systemd/system/osmo-hnbgw.service
usr/bin/osmo-hnbgw
usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw.cfg usr/share/doc/osmo-hnbgw/examples
+usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg usr/share/doc/osmo-hnbgw/examples
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
Gerrit-Change-Number: 29164
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164 )
Change subject: packate the new osmo-hnbgw-pfcp.cfg example config file
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
Gerrit-Change-Number: 29164
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 26 Aug 2022 11:53:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29214 )
Change subject: repo-install-test: fix nftables errors on centos8
......................................................................
repo-install-test: fix nftables errors on centos8
Don't attempt to install nftables-devel or python3-nftables in centos8
in the repo-install-test. What happens is, that dnf tries to install the
versions from the centos repositories, which conflict with the ones from
the OBS repositories. This fixes the failing
Osmocom-repo-install-centos8 jenkins job.
Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
---
M scripts/repo-install-test/blacklist_centos8.txt
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt
index 83d2cbd..3e5381d 100644
--- a/scripts/repo-install-test/blacklist_centos8.txt
+++ b/scripts/repo-install-test/blacklist_centos8.txt
@@ -9,3 +9,7 @@
# the dependency problem means that we can't simply install the package in
# centos. In OBS we work around this in the project config.
ulfius-devel
+
+# Also linked to opensuse versions
+nftables-devel
+python3-nftables
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29214
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
Gerrit-Change-Number: 29214
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29213 )
Change subject: osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
......................................................................
osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
Fix for building on opensuse 15.4 with GCC 7.5.0+r278197:
osmo_pfcp_tool_main.c:219:15: error: initializer element is not constant
.copyright = osmo_pfcp_tool_copyright,
The variable is only used once, so move its contents directly into the
struct vty_app_info, like it is done in osmo_upf_main.c.
Fixes: OS#5655
Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
---
M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
index 43c3b45..e950f7f 100644
--- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
+++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
@@ -206,17 +206,16 @@
}
}
-static const char * const osmo_pfcp_tool_copyright =
- "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
- "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
- "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
- "This is free software: you are free to change and redistribute it.\r\n"
- "There is NO WARRANTY, to the extent permitted by law.\r\n";
static struct vty_app_info pfcp_tool_vty_app_info = {
.name = "osmo-pfcp-tool",
.version = PACKAGE_VERSION,
- .copyright = osmo_pfcp_tool_copyright,
+ .copyright =
+ "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
+ "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
+ "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
+ "This is free software: you are free to change and redistribute it.\r\n"
+ "There is NO WARRANTY, to the extent permitted by law.\r\n",
};
static const struct log_info_cat pfcp_tool_default_categories[] = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29213
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
Gerrit-Change-Number: 29213
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29214 )
Change subject: repo-install-test: fix nftables errors on centos8
......................................................................
repo-install-test: fix nftables errors on centos8
Don't attempt to install nftables-devel or python3-nftables in centos8
in the repo-install-test. What happens is, that dnf tries to install the
versions from the centos repositories, which conflict with the ones from
the OBS repositories. This fixes the failing
Osmocom-repo-install-centos8 jenkins job.
Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
---
M scripts/repo-install-test/blacklist_centos8.txt
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/14/29214/1
diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt
index 83d2cbd..3e5381d 100644
--- a/scripts/repo-install-test/blacklist_centos8.txt
+++ b/scripts/repo-install-test/blacklist_centos8.txt
@@ -9,3 +9,7 @@
# the dependency problem means that we can't simply install the package in
# centos. In OBS we work around this in the project config.
ulfius-devel
+
+# Also linked to opensuse versions
+nftables-devel
+python3-nftables
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29214
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
Gerrit-Change-Number: 29214
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: msuraev.
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28993 )
Change subject: Use osmo_sockaddr_strs_to_str() for multiaddr helper
......................................................................
Removed Code-Review+1 by laforge <laforge(a)osmocom.org>
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28993
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Icef53fe4b6e51563d97a1bc48001d67679b3b6e9
Gerrit-Change-Number: 28993
Gerrit-PatchSet: 8
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: deleteVote
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/29213 )
Change subject: osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
......................................................................
osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
Fix for building on opensuse 15.4 with GCC 7.5.0+r278197:
osmo_pfcp_tool_main.c:219:15: error: initializer element is not constant
.copyright = osmo_pfcp_tool_copyright,
The variable is only used once, so move its contents directly into the
struct vty_app_info, like it is done in osmo_upf_main.c.
Fixes: OS#5655
Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
---
M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/13/29213/1
diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
index 43c3b45..e950f7f 100644
--- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
+++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
@@ -206,17 +206,16 @@
}
}
-static const char * const osmo_pfcp_tool_copyright =
- "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
- "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
- "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
- "This is free software: you are free to change and redistribute it.\r\n"
- "There is NO WARRANTY, to the extent permitted by law.\r\n";
static struct vty_app_info pfcp_tool_vty_app_info = {
.name = "osmo-pfcp-tool",
.version = PACKAGE_VERSION,
- .copyright = osmo_pfcp_tool_copyright,
+ .copyright =
+ "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
+ "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
+ "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
+ "This is free software: you are free to change and redistribute it.\r\n"
+ "There is NO WARRANTY, to the extent permitted by law.\r\n",
};
static const struct log_info_cat pfcp_tool_default_categories[] = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29213
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
Gerrit-Change-Number: 29213
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29210 )
Change subject: Allow running without a GTP dev
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29210
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Ibb79b3ce1906136f77a895ff6f691d72a92c9fb9
Gerrit-Change-Number: 29210
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Aug 2022 05:38:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29211 )
Change subject: drop charts/, duplicated from libosmo-pfcp.git
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29211
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I95f11e1525b3bc6b782e5f8aecddea672a104c99
Gerrit-Change-Number: 29211
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 26 Aug 2022 05:38:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment