daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/37673?usp=email )
Change subject: ipa: Ensure osmo_ipa_segmentation_cb sets msg->l2h to the payload data
......................................................................
ipa: Ensure osmo_ipa_segmentation_cb sets msg->l2h to the payload data
Previously if ih->proto was IPAC_PROTO_OSMO msg->l2h would still point
to the extension header byte which breaks assumptions in e.g. osmo-bsc.
Change-Id: Id91cddf9948ca49abf092850fae3a8f17e445b45
Related: OS#6422
---
M src/ipa.c
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/73/37673/1
diff --git a/src/ipa.c b/src/ipa.c
index 8720427..d43df00 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -375,7 +375,8 @@
#define MSG_CB_IPA_INFO_OFFSET 0
/* Check and remove headers (in case of p == IPAC_PROTO_OSMO, also the IPA extension header).
- * Returns a negative number on error, otherwise the number of octets removed */
+ * Returns a negative number on error, otherwise the number of octets removed.
+ * Both msg->data and msg->l2h point to the user data after the (extended) IPA header if this function is successful. */
static inline int ipa_check_pull_headers(struct msgb *msg)
{
int ret;
@@ -397,6 +398,7 @@
osmo_ipa_msgb_cb_proto_ext(msg) = msg->data[0];
msgb_pull(msg, sizeof(struct ipa_head_ext));
octets_removed += sizeof(struct ipa_head_ext);
+ msg->l2h = msg->data;
return octets_removed;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/37673?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: rel-1.5.1
Gerrit-Change-Id: Id91cddf9948ca49abf092850fae3a8f17e445b45
Gerrit-Change-Number: 37673
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37671?usp=email )
Change subject: OBS: latest: set pattern for gapk releases
......................................................................
Patch Set 1:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ci/+/37671/comment/fdd84bab_f6a38c23
PS1, Line 9: may only have two numbers
> this is not the case with `v1.1. […]
I confirmed (using https://regex101.com/) that this regexp also works for `v1.1.1`. The reason for that is this part `[0-9.]*`, which is allowing zero or more repetitions of a dot or a digit. This regexp would also match versions like `v1.1.` or even `v1........1`. Not critical, I think.
Patchset:
PS1:
I was a bit quicker with https://gerrit.osmocom.org/c/osmo-ci/+/37670 ;)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37671?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: If7328a31c6c64b91d0727dbe16bb8d6915fed260
Gerrit-Change-Number: 37671
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 31 Jul 2024 15:31:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ggsn/+/37597?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: gtp: Allow setting callback to receive update_context_ind
......................................................................
gtp: Allow setting callback to receive update_context_ind
This will be used by:
* SGSN: Get to know that RNC has gonne down according to GGSN (re-attempt
Direct Tunnel or go back to tun SGSN<->GGSN).
* GGSN: Maybe find out that Direct Flags are used (should be handled
internally directly in the rx path probably)
Related: OS#6512
Change-Id: Ic80a9a928c55b6ff85be96014920bb42793cb943
---
M TODO-RELEASE
M gtp/gsn.c
M gtp/gtp.c
M include/osmocom/gtp/gsn.h
M include/osmocom/gtp/gtp.h
5 files changed, 91 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/97/37597/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37597?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ic80a9a928c55b6ff85be96014920bb42793cb943
Gerrit-Change-Number: 37597
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: daniel, laforge, osmith.
Hello Jenkins Builder, daniel, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp}
......................................................................
gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp}
In Update PDP Ctx Response, only SGSN is expected to transmit Direct
Tunnel Flags in the message.
Related: SYS#5435
Change-Id: I36d93619e2fe9cafd3092515df18b82d29099d2d
---
M TODO-RELEASE
M gtp/gtp.c
M include/osmocom/gtp/pdp.h
3 files changed, 31 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/94/37594/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I36d93619e2fe9cafd3092515df18b82d29099d2d
Gerrit-Change-Number: 37594
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37671?usp=email )
Change subject: OBS: latest: set pattern for gapk releases
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ci/+/37671/comment/457fb075_a7960c85
PS1, Line 9: may only have two numbers
this is not the case with `v1.1.1`, right?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37671?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: If7328a31c6c64b91d0727dbe16bb8d6915fed260
Gerrit-Change-Number: 37671
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 31 Jul 2024 15:19:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: daniel, laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email )
Change subject: gtp: Allow tx Direct Tunnel Flags in UpdatePDPCtx{Req,Resp}
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> doesn't this need a TODO-RELEASE for the ABI breakage?
hmm I thought I had added them, but maybe only in osmo-sgsn patches and forgot the osmo-ggsn ones.
Will update them now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37594?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I36d93619e2fe9cafd3092515df18b82d29099d2d
Gerrit-Change-Number: 37594
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 Jul 2024 15:15:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37668?usp=email )
Change subject: OBS: latest: handle "version is None"
......................................................................
OBS: latest: handle "version is None"
Fix the Osmocom_OBS_latest job, which currently fails on git
repositories where no tagged release can be found with:
File "/obs/lib/debian.py", line 96, in transform_version
if "osmo-epdg-" in version:
^^^^^^^^^^^^^^^^^^^^^^^
TypeError: argument of type 'NoneType' is not iterable
Fixes: 9b36d2a8 ("OBS: fix up-to-date check for strongswan-epdg")
Change-Id: I69cb884d499d1f6a8cae4b4585d31b5bc095fd6e
---
M scripts/obs/lib/debian.py
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py
index 68459c8..85fcc5f 100644
--- a/scripts/obs/lib/debian.py
+++ b/scripts/obs/lib/debian.py
@@ -93,6 +93,9 @@
def transform_version(version):
+ if version is None:
+ return None
+
if "osmo-epdg-" in version:
version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37668?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: I69cb884d499d1f6a8cae4b4585d31b5bc095fd6e
Gerrit-Change-Number: 37668
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37671?usp=email )
Change subject: OBS: latest: set pattern for gapk releases
......................................................................
OBS: latest: set pattern for gapk releases
The gapk release tags start with a v and may only have two numbers.
Related: OS#6521
Change-Id: If7328a31c6c64b91d0727dbe16bb8d6915fed260
---
M scripts/obs/lib/config.py
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/37671/1
diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py
index 1ad0106..3bfbd4e 100644
--- a/scripts/obs/lib/config.py
+++ b/scripts/obs/lib/config.py
@@ -116,6 +116,7 @@
git_latest_tag_pattern_default = "^[0-9]*\\.[0-9]*\\.[0-9]*$"
git_latest_tag_pattern_other = {
+ "gapk": "^v[0-9]*\\.[0-9.]*$",
"limesuite": "^v[0-9]*\\.[0-9]*\\.[0-9]*$",
"open5gs": "^v[0-9]*\\.[0-9]*\\.[0-9]*$",
"osmo-fl2k": "^v[0-9]*\\.[0-9]*\\.[0-9]*$",
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37671?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: If7328a31c6c64b91d0727dbe16bb8d6915fed260
Gerrit-Change-Number: 37671
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange