Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/42095?usp=email )
Change subject: scripts/kernel/linux-shallow-clone: new script
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File scripts/kernel/linux-shallow-clone.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/42095/comment/9c5a9e48_8daecfb9?usp=… :
PS1, Line 78: mv "$DEST_OLD" "$DEST"-old
we may have problems with this if somebody is fetching at the same moment afaict.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42095?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id3aadb46813047ecac3b80868192809b272dba0e
Gerrit-Change-Number: 42095
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 10 Feb 2026 12:49:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42102?usp=email )
Change subject: xua: Improve logging around unexpected snm messages
......................................................................
xua: Improve logging around unexpected snm messages
Log rx of unexpected message type according to configured role.
Decrease verbosity of DAUD logging to match the new logging.
For SUA we can use M3UA's m3ua_snm_msgt_names because the value/strings
are the same and they are actually used through m3ua_msg_class_snm in
xua_dialect_sua.
Change-Id: I697e52dfd733cb9ee260bba133204a7462c4e8ee
---
M src/m3ua.c
M src/sua.c
M src/xua_internal.h
3 files changed, 22 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/02/42102/1
diff --git a/src/m3ua.c b/src/m3ua.c
index a2da98e..93659c7 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -181,7 +181,7 @@
static const uint16_t drst_mand_ies[] = {
M3UA_IEI_AFFECTED_PC, 0
};
-static const struct value_string m3ua_snm_msgt_names[] = {
+const struct value_string m3ua_snm_msgt_names[] = {
{ M3UA_SNM_DUNA, "DUNA" },
{ M3UA_SNM_DAVA, "DAVA" },
{ M3UA_SNM_DAUD, "DAUD" },
@@ -1060,15 +1060,17 @@
/* RFC states only permitted in ASP->SG direction, not reverse. But some
* equipment still sends it to us as ASP ?!? */
if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
- LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ LOGPASP(asp, DLM3UA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD "
"despite being in ASP role\n");
xua_snm_rx_daud(asp, xua);
} else {
- LOGPASP(asp, DLM3UA, LOGL_ERROR, "DAUD not permitted in ASP role\n");
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "DAUD not permitted in ASP role\n");
rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
break;
default:
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in ASP role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
@@ -1101,6 +1103,8 @@
xua_snm_rx_daud(asp, xua);
break;
default:
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in SG role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
return M3UA_ERR_UNSUPP_MSG_TYPE;
}
@@ -1131,16 +1135,18 @@
/* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some
* equipment still sends it to us as IPSP ?!? */
if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
- LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ LOGPASP(asp, DLM3UA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD "
"despite being in IPSP role\n");
xua_snm_rx_daud(asp, xua);
} else {
- LOGPASP(asp, DLM3UA, LOGL_ERROR, "DAUD not permitted in IPSP role\n");
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "DAUD not permitted in IPSP role\n");
rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
break;
default:
/* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Rx %s not permitted in IPSP role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
diff --git a/src/sua.c b/src/sua.c
index f836a9a..9ebe4c6 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -1026,15 +1026,17 @@
/* RFC states only permitted in ASP->SG direction, not reverse. But some
* equipment still sends it to us as ASP ?!? */
if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
- LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ LOGPASP(asp, DLSUA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD "
"despite being in ASP role\n");
xua_snm_rx_daud(asp, xua);
} else {
- LOGPASP(asp, DLSUA, LOGL_ERROR, "DAUD not permitted in ASP role\n");
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "DAUD not permitted in ASP role\n");
return SUA_ERR_UNSUPP_MSG_TYPE;
}
break;
default:
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in ASP role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
return SUA_ERR_UNSUPP_MSG_TYPE;
}
@@ -1062,6 +1064,8 @@
xua_snm_rx_daud(asp, xua);
break;
default:
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in SG role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
return SUA_ERR_UNSUPP_MSG_TYPE;
}
@@ -1089,15 +1093,17 @@
/* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some
* equipment still sends it to us as IPSP ?!? */
if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
- LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ LOGPASP(asp, DLSUA, LOGL_INFO, "quirk daud_in_asp active: Accepting DAUD "
"despite being in IPSP role\n");
xua_snm_rx_daud(asp, xua);
} else {
- LOGPASP(asp, DLSUA, LOGL_ERROR, "DAUD not permitted in IPSP role\n");
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "DAUD not permitted in IPSP role\n");
rc = SUA_ERR_UNSUPP_MSG_TYPE;
}
break;
default:
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "Rx %s not permitted in IPSP role\n",
+ get_value_string(m3ua_snm_msgt_names, xua->hdr.msg_type));
rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
diff --git a/src/xua_internal.h b/src/xua_internal.h
index ebd1442..81c8a1b 100644
--- a/src/xua_internal.h
+++ b/src/xua_internal.h
@@ -91,6 +91,7 @@
extern const struct xua_msg_class m3ua_msg_class_aspsm;
extern const struct xua_msg_class m3ua_msg_class_asptm;
+extern const struct value_string m3ua_snm_msgt_names[];
extern const struct value_string m3ua_err_names[];
extern const struct value_string m3ua_ntfy_type_names[];
extern const struct value_string m3ua_ntfy_stchg_names[];
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42102?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I697e52dfd733cb9ee260bba133204a7462c4e8ee
Gerrit-Change-Number: 42102
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/42101?usp=email )
Change subject: esim/http_json_api: add alternative API interface (follow up)
......................................................................
esim/http_json_api: add alternative API interface (follow up)
This is a follow up patch to change:
I2a5d4b59b12e08d5eae7a1215814d3a69c8921f6
- do not ignore length of kwargs
- fix role parameter (roles other than 'legacy_client' can be used now)
- use startswith instead of match
Related: SYS#7866
Change-Id: Ifae13e82d671ff09bddf771f063a388d2ab283eb
---
M pySim/esim/http_json_api.py
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/42101/1
diff --git a/pySim/esim/http_json_api.py b/pySim/esim/http_json_api.py
index 94e60cb..cd95e0d 100644
--- a/pySim/esim/http_json_api.py
+++ b/pySim/esim/http_json_api.py
@@ -19,7 +19,6 @@
import requests
import logging
import json
-from re import match
from typing import Optional
import base64
from twisted.web.server import Request
@@ -211,7 +210,7 @@
# additional custom HTTP headers (server responses)
extra_http_res_headers = {}
- def __new__(cls, *args, role = None, **kwargs):
+ def __new__(cls, *args, role = 'legacy_client', **kwargs):
"""
Args:
args: (see JsonHttpApiClient and JsonHttpApiServer)
@@ -221,14 +220,13 @@
# Create a dictionary with the class attributes of this class (the properties listed above and the encode_
# decode_ methods below). The dictionary will not include any dunder/magic methods
- cls_attr = { attr_name: getattr(cls, attr_name) for attr_name in dir(cls) if not match("__.*__", attr_name) }
+ cls_attr = {attr_name: getattr(cls, attr_name) for attr_name in dir(cls) if not attr_name.startswith('__')}
# Normal instantiation as JsonHttpApiFunction:
- if len(args) == 0:
+ if len(args) == 0 and len(kwargs) == 0:
return type(cls.__name__, (abc.ABC,), cls_attr)()
# Instantiation as as JsonHttpApiFunction with a JsonHttpApiClient or JsonHttpApiServer base
- role = kwargs.get('role', 'legacy_client')
if role == 'legacy_client':
# Deprecated: With the advent of the server role (JsonHttpApiServer) the API had to be changed. To maintain
# compatibility with existing code (out-of-tree) the original behaviour and API interface and behaviour had
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42101?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ifae13e82d671ff09bddf771f063a388d2ab283eb
Gerrit-Change-Number: 42101
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42100?usp=email )
Change subject: xua: Allow rx DAUD in IPSP with quirk daud_in_asp
......................................................................
xua: Allow rx DAUD in IPSP with quirk daud_in_asp
That quirk was added back in time most probably when interacting with
some peer who claimed to be in SG mode but actually was in IPSP mode.
Hence, to be on the safe side, be relaxed and allow accepting DAUD also
if the quirk is added, otherwise it may be impossible to continue
communication with that faulty peer.
In theory according to spec DAUD should only be sent ASP->SG.
Change-Id: I8ad0889f4584446f8b01f1255498f57e0cd34012
---
M src/m3ua.c
M src/sua.c
2 files changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/00/42100/1
diff --git a/src/m3ua.c b/src/m3ua.c
index abf951f..a2da98e 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -1127,9 +1127,21 @@
return rc;
xua_snm_rx_scon(asp, as, xua);
break;
+ case M3UA_SNM_DAUD:
+ /* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some
+ * equipment still sends it to us as IPSP ?!? */
+ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
+ LOGPASP(asp, DLM3UA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ "despite being in IPSP role\n");
+ xua_snm_rx_daud(asp, xua);
+ } else {
+ LOGPASP(asp, DLM3UA, LOGL_ERROR, "DAUD not permitted in IPSP role\n");
+ rc = M3UA_ERR_UNSUPP_MSG_TYPE;
+ }
+ break;
default:
/* RFC 4666 Section 1.5.2: there is no MTP3 network management status information */
- return M3UA_ERR_UNSUPP_MSG_TYPE;
+ rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
return rc;
diff --git a/src/sua.c b/src/sua.c
index 2eb93e3..f836a9a 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -1085,8 +1085,20 @@
return rc;
xua_snm_rx_scon(asp, as, xua);
break;
+ case SUA_SNM_DAUD:
+ /* RFC states only permitted in ASP->SG direction, not reverse nor IPSP. But some
+ * equipment still sends it to us as IPSP ?!? */
+ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP) {
+ LOGPASP(asp, DLSUA, LOGL_NOTICE, "quirk daud_in_asp active: Accepting DAUD "
+ "despite being in IPSP role\n");
+ xua_snm_rx_daud(asp, xua);
+ } else {
+ LOGPASP(asp, DLSUA, LOGL_ERROR, "DAUD not permitted in IPSP role\n");
+ rc = SUA_ERR_UNSUPP_MSG_TYPE;
+ }
+ break;
default:
- return M3UA_ERR_UNSUPP_MSG_TYPE;
+ rc = M3UA_ERR_UNSUPP_MSG_TYPE;
}
return rc;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42100?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I8ad0889f4584446f8b01f1255498f57e0cd34012
Gerrit-Change-Number: 42100
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42095?usp=email )
Change subject: scripts/kernel/linux-shallow-clone: new script
......................................................................
scripts/kernel/linux-shallow-clone: new script
Add a script that maintains a linux repository in one place on jenkins
nodes, so we need less git clones from git.kernel.org and less disk
space. All jobs that need a kernel tree can now clone the relevant
branch directly from the jenkins node.
Follow up patches will add a jenkins job that runs the script daily and
adjust the existing jobs to make use of this instead of doing their own
clones.
Currently this script produces a 396M bare git repository.
Related: OS#6938
Change-Id: Id3aadb46813047ecac3b80868192809b272dba0e
---
A scripts/kernel/linux-shallow-clone.sh
1 file changed, 97 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/95/42095/1
diff --git a/scripts/kernel/linux-shallow-clone.sh b/scripts/kernel/linux-shallow-clone.sh
new file mode 100755
index 0000000..3aa9267
--- /dev/null
+++ b/scripts/kernel/linux-shallow-clone.sh
@@ -0,0 +1,97 @@
+#!/bin/sh -ex
+# Create a bare git repository and add/update shallow clones of linux.git
+# branches that are relevant for our CI jobs. Jobs can then quickly clone a
+# branch from this git repository and discard it afterwards. This saves disk
+# space on our jenkins nodes, and keeps the traffic to git.kernel.org minimal.
+
+set_dest() {
+ if [ -n "$1" ]; then
+ DEST="$1"
+ else
+ DEST=/tmp/linux-shallow
+ fi
+
+ # Check if an existing repository is from last month, and if that is
+ # the case then start with a new repository. This is done because the
+ # repository size increases with each fetch: we start with a shallow
+ # clone but can't truncate the history after follow-up fetches.
+ if [ -e "$DEST/.month" ] && [ "$(cat "$DEST/.month")" != "$(date +%m)" ]; then
+ DEST_OLD="$DEST"
+ DEST="$DEST-new"
+ fi
+}
+
+init() {
+ if [ -d "$DEST" ]; then
+ return
+ fi
+
+ mkdir -p "$DEST"
+ cd "$DEST"
+ git init . --bare
+
+ # Garbage collect in foreground
+ git config gc.autoDetach false
+
+ git remote add torvalds "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+ git remote add stable "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
+ git remote add net-next "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git"
+
+ echo "$(date +%m)" > "$DEST/.month"
+}
+
+fetch_branch() {
+ local remote="$1"
+ local branch="$2"
+ local head
+
+ git fetch --no-tags --depth=1 "$remote" "$branch"
+ head="$(git log -n1 --pretty=format:"%H" "$remote"/"$branch")"
+ git branch --force "$remote-$branch" "$head"
+
+ # Pretty print the current commit for the log
+ git -c color.ui=always log -1 --oneline "$remote-$branch"
+}
+
+fetch_branches() {
+ fetch_branch torvalds "master"
+
+ fetch_branch stable "linux-rolling-stable"
+ fetch_branch stable "linux-4.19.y"
+ fetch_branch stable "linux-5.10.y"
+ fetch_branch stable "linux-6.1.y"
+ fetch_branch stable "linux-6.12.y"
+
+ fetch_branch net-next "main"
+}
+
+collect_garbage() {
+ git gc --no-cruft --prune=now
+}
+
+# Replace last month's repository if needed, see the comment in set_dest
+replace_old() {
+ if [ -z "$DEST_OLD" ]; then
+ return
+ fi
+
+ mv "$DEST_OLD" "$DEST"-old
+ mv "$DEST" "$DEST_OLD"
+ rm -rf "$DEST"-old
+
+ DEST="$DEST_OLD"
+ DEST_OLD=""
+ cd "$DEST"
+}
+
+show_size() {
+ du -h -s "$DEST"
+}
+
+set_dest "$@"
+init
+cd "$DEST"
+fetch_branches
+collect_garbage
+replace_old
+show_size
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42095?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id3aadb46813047ecac3b80868192809b272dba0e
Gerrit-Change-Number: 42095
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42094?usp=email )
Change subject: (do not merge) a patch for testing CI
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42094?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: abandon
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: I93682eadb6790f5238af2c92c3126b6eea24dbb9
Gerrit-Change-Number: 42094
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder