fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37670?usp=email )
Change subject: OBS: add release tag pattern for gapk
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37670?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: Ibe67831149e402aa75c8451da713d852ea62fafc
Gerrit-Change-Number: 37670
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 31 Jul 2024 16:39:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/37674?usp=email )
Change subject: osmo_bsc_sigtran: Don't try to decode ipaccess_head a second time
......................................................................
osmo_bsc_sigtran: Don't try to decode ipaccess_head a second time
osmo_io segmentation will already parse the ipaccess_header and set
msg->data to the payload of the control command.
Depends: Id91cddf9948ca49abf092850fae3a8f17e445b45 (libosmo-netif.git)
Related: OS#6422
Change-Id: I300bbab3c0215d52bc5f6232ace5c37a6613feb7
---
M src/osmo-bsc/osmo_bsc_sigtran.c
1 file changed, 16 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/37674/1
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 224e2c6..cdc5785 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -38,6 +38,7 @@
#include <osmocom/bsc/paging.h>
#include <osmocom/bsc/bssmap_reset.h>
#include <osmocom/mgcp_client/mgcp_common.h>
+#include <osmocom/netif/ipa.h>
/* A pointer to a list with all involved MSCs
* (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */
@@ -733,9 +734,6 @@
* libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP */
static int asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg)
{
- struct ipaccess_head *iph;
- struct ipaccess_head_ext *iph_ext;
-
if (osmo_ss7_asp_get_proto(asp) != OSMO_SS7_ASP_PROT_IPA) {
msgb_free(msg);
return 0;
@@ -743,15 +741,7 @@
switch (ppid_mux) {
case IPAC_PROTO_OSMO:
- if (msg->len < sizeof(*iph) + sizeof(*iph_ext)) {
- LOGP(DMSC, LOGL_ERROR, "The message is too short.\n");
- msgb_free(msg);
- return -EINVAL;
- }
- iph = (struct ipaccess_head *) msg->data;
- iph_ext = (struct ipaccess_head_ext *) iph->data;
- msg->l2h = iph_ext->data;
- switch (iph_ext->proto) {
+ switch (osmo_ipa_msgb_cb_proto_ext(msg)) {
case IPAC_PROTO_EXT_CTRL:
return bsc_sccplite_rx_ctrl(asp, msg);
case IPAC_PROTO_EXT_MGCP:
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/37674?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: rel-1.12.1
Gerrit-Change-Id: I300bbab3c0215d52bc5f6232ace5c37a6613feb7
Gerrit-Change-Number: 37674
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newchange
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