[S] Change in libosmocore[master]: gsm0808: add knowledge of TW-TS-003 BSSMAP IE
Attention is currently required from: falconia, fixeria, laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36669?usp=email ) Change subject: gsm0808: add knowledge of TW-TS-003 BSSMAP IE .. Patch Set 3: (1 comment) Patchset: PS3: I'm in two minds here; this seems to be a single person effort. On the one hand, an open community wants to allow open use, but on the other hand there are bounds to what amount of API we can hope to maintain. I find this curious description of apparently a single person, I suspect the author of this patch =) "under the authority of the Presiding Sisterhood (government) of the Women's Republic of Themyscira as part of Themyscira Wireless technical initiative." in https://www.freecalypso.org/specs/tw-ts-001-v010100.txt This stuff puts me off -- I want to quickly understand what things are about, and adding noise around the core idea, like mimicking the kludgy phrases often found in 3GPP TS, adding glossaries and whimsical prose doesn't help in that regard... In general I'm critical to "RTP extension". RTP is maximally flexible by allowing *any* payload types to be used, even if they are pure fantasy. Adding custom IEs to RSL is done in osmcom, and its use is managed by the BTS features, seems this patch set is using that properly indeed. Adding custom IEs to BSSMAP is not done in osmocom yet, and we have no way of indicating the BSS' custom capabilities to osmo-msc. How do you solve that? BTW, if we have custom BSSMAP IEs, then I might want to add an IE to use an array of octets to describe all permitted AMR bitrates in a sane way (re: the AMR talk at osmodevcon '24: BSSMAP is a bottleneck in AMR rates negotiation). But there are ample reasons to not deviate from 3GPP if at all possible. Every time we add custom stuff, we need to support, test and maintain both the 3GPP compliant as well as the custom stuff for all eternity... Me personally, I'm a bit reluctant here, because I'm not familiar with the extensions. I would need a good TL;DR to start comprehending. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36669?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: Idd6f1838bdc0cd71a2f6357e9b6d8b8fa4f7c46c Gerrit-Change-Number: 36669 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 23 May 2024 03:04:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 5: (1 comment) File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/0930460c_579800f2 PS4, Line 245: /* source: http://www.cse.yorku.ca/~oz/hash.html */ > That's one of the reasons I end up using rb trees. […] the next patch following this one switches to the new osmo_jhash(). i left the patch separate so it's easy to manage the new libosmocore dependency. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 23 May 2024 02:24:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[L] Change in libosmocore[master]: add jhash.h, copied from linux/jhash.h
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/36913?usp=email )
Change subject: add jhash.h, copied from linux/jhash.h
..
Patch Set 1:
(2 comments)
File tests/jhash/jhash_test.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16267):
https://gerrit.osmocom.org/c/libosmocore/+/36913/comment/83386e5c_e36d6080
PS1, Line 40: hash_for_each(haystack, i, item, node)
space required before the open parenthesis '('
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16267):
https://gerrit.osmocom.org/c/libosmocore/+/36913/comment/84cb7273_a7ab3947
PS1, Line 49: hash_for_each_possible(haystack, item, node, hash)
space required before the open parenthesis '('
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36913?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: I0c9652bbc9e2a18b1200e7d63bb6f64ded7d75fa
Gerrit-Change-Number: 36913
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Thu, 23 May 2024 02:20:01 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[L] Change in libosmocore[master]: add jhash.h, copied from linux/jhash.h
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/36913?usp=email )
Change subject: add jhash.h, copied from linux/jhash.h
..
add jhash.h, copied from linux/jhash.h
Allow using arbitrary length data as hashtable key:
Copy jhash.h implementation from the linux kernel.
Apply osmo_ prefix to all global symbols.
Add jhash_test to ensure the code import works as intended.
First application will be a hashtable keyed by umts_cell_id in
osmo-hnbgw.git.
Related: SYS#6773
Change-Id: I0c9652bbc9e2a18b1200e7d63bb6f64ded7d75fa
---
M include/osmocom/core/Makefile.am
A include/osmocom/core/jhash.h
M tests/Makefile.am
A tests/jhash/jhash_test.c
A tests/jhash/jhash_test.ok
M tests/testsuite.at
6 files changed, 304 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/36913/1
diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am
index 7c29ca1..980f813 100644
--- a/include/osmocom/core/Makefile.am
+++ b/include/osmocom/core/Makefile.am
@@ -27,6 +27,7 @@
hashtable.h \
isdnhdlc.h \
it_q.h \
+ jhash.h \
linuxlist.h \
linuxrbtree.h \
log2.h \
diff --git a/include/osmocom/core/jhash.h b/include/osmocom/core/jhash.h
new file mode 100644
index 000..a63e930
--- /dev/null
+++ b/include/osmocom/core/jhash.h
@@ -0,0 +1,191 @@
+#pragma once
+#include
+
+/* Below is a partial copy of
+ *
https://raw.githubusercontent.com/torvalds/linux/master/tools/include/linux/bitops.h
+ * with an osmo_ prefix applied to avoid any collisions.
+ */
+/* SPDX-License-Identifier: GPL-2.0 */
+/**
+ * rol32 - rotate a 32-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline uint32_t osmo_rol32(uint32_t word, unsigned int shift)
+{
+ return (word << shift) | (word >> ((-shift) & 31));
+}
+
+/* Below is a copy of
+ *
https://raw.githubusercontent.com/torvalds/linux/79e3ea5aab48c83de9410e43b52895406847eca7/tools/include/linux/jhash.h
+ * with an osmo_ prefix applied to avoid any collisions.
+ * Using osmo_load32le() instead of __get_unaligned_cpu32().
+ */
+/* jhash.h: Jenkins hash support.
+ *
+ * Copyright (C) 2006. Bob Jenkins (bob_jenk...@burtleburtle.net)
+ *
+ * https://burtleburtle.net/bob/hash/
+ *
+ * These are the credits from Bob's sources:
+ *
+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+ *
+ * These are functions for producing 32-bit hashes for hash table lookup.
+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+ * are externally useful functions. Routines to test the hash are included
+ * if SELF_TEST is defined. You can use this free for any purpose. It's in
+ * the public domain. It has no warranty.
+ *
+ * Copyright (C) 2009-2010 Jozsef Kadlecsik (kad...@blackhole.kfki.hu)
+ *
+ * I've modified Bob's hash to be useful in the Linux kernel, and
+ * any bugs present are my fault.
+ * Jozsef
+ */
+
+/* Best hash sizes are of power of two */
+#define osmo_jhash_size(n) ((uint32_t)1<<(n))
+/* Mask the hash value, i.e (value & osmo_jhash_mask(n)) instead of (value %
n) */
+#define osmo_jhash_mask(n) (osmo_jhash_size(n)-1)
+
+/* __osmo_jhash_mix -- mix 3 32-bit values reversibly. */
+#define __osmo_jhash_mix(a, b, c) \
+{ \
+ a -= c; a ^= osmo_rol32(c, 4); c += b;\
+ b -= a; b ^= osmo_rol32(a, 6); a += c;\
+ c -= b; c ^= osmo_rol32(b, 8); b += a;\
+ a -= c; a ^= osmo_rol32(c, 16); c += b;\
+ b -= a; b ^= osmo_rol32(a, 19); a += c;\
+ c -= b; c ^= osmo_rol32(b, 4); b += a;\
+}
+
+/* __osmo_jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
+#define __osmo_jhash_final(a, b, c)\
+{ \
+ c ^= b; c -= osmo_rol32(b, 14); \
+ a ^= c; a -= osmo_rol32(c, 11); \
+ b ^= a; b -= osmo_rol32(a, 25); \
+ c ^= b; c -= osmo_rol32(b, 16); \
+ a ^= c; a -= osmo_rol32(c, 4); \
+ b ^= a; b -= osmo_rol32(a, 14); \
+ c ^= b; c -= osmo_rol32(b, 24); \
+}
+
+/* An arbitrary initial parameter */
+#define JHASH_INITVAL 0xdeadbeef
+
+/* osmo_jhash - hash an arbitrary key
+ * @k: sequence of bytes as key
+ * @length: the length of the key
+ * @initval: the previous hash, or an arbitray value
+ *
+ * The generic version, hashes an arbitrary sequence of bytes.
+ * No alignment or length assumptions are made about the input key.
+ *
+ * Returns the hash value of the key. The result depends on endianness.
+ */
+static inline uint32_t osmo_jhash(const void *key, uint32_t length, uint32_t
initval)
+{
+ uint32_t a, b, c;
+ const uint8_t *k = key;
+
+ /* Set up the internal state */
+ a = b =
[S] Change in osmo-hnbgw[master]: use osmo_jhash for the hnb_persistent hashtable
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36912?usp=email )
Change subject: use osmo_jhash for the hnb_persistent hashtable
..
use osmo_jhash for the hnb_persistent hashtable
Use hashing like the linux kernel.
Related: SYS#6773
Depends: I0c9652bbc9e2a18b1200e7d63bb6f64ded7d75fa
Change-Id: I5441db4293dc6b57a1c606ef830656fa9fa01943
---
M TODO-RELEASE
M src/osmo-hnbgw/hnbgw.c
M src/osmo-hnbgw/hnbgw_hnbap.c
3 files changed, 27 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/12/36912/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index b0ad6a0..a1206c1 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -12,3 +12,4 @@
MGWMGCP CRCX osmo-hnbgw used to CRCX in loopback mode, to trigger a
legacy IuUP hack. CRCX is no
longer in loopback mode now, so older osmo-mgw may fail
to respond to IuUP Initialization.
osmo-iuh >1.5.1decoding of more RANAP procedures in ranap_common
required for DTAP rate_counters
+libosmocore >1.9.0 require osmo_jhash from osmocom/core/jhash.h added in
I0c9652bbc9e2a18b1200e7d63bb6f64ded7d75fa
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index e6073de..86ad1c0 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
@@ -242,36 +243,22 @@
ucid->sac, ucid->cid);
}
-/* source: http://www.cse.yorku.ca/~oz/hash.html */
-static inline void mkhash_init(uint32_t *hash)
-{
- *hash = 5381;
-}
-static inline void mkhash_add(uint32_t *hash, int32_t val)
-{
- uint32_t h = *hash;
- h = ((h << 5) + h) ^ val; /* (h * 33) ^ val */
- *hash = h;
-}
-
/* Useful to index a hash table by struct umts_cell_id. */
uint32_t umts_cell_id_hash(const struct umts_cell_id *ucid)
{
- uint32_t hash;
- mkhash_init();
- mkhash_add(, ucid->mcc);
- mkhash_add(, ucid->mnc);
- mkhash_add(, ucid->lac);
- mkhash_add(, ucid->rac);
- mkhash_add(, ucid->sac);
- mkhash_add(, ucid->cid);
- return hash;
+ return osmo_jhash(ucid, sizeof(*ucid), 0x423423);
}
/* parse a string representation of an umts_cell_id into its decoded
representation */
int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr)
{
- int rc = sscanf(instr, "%hu-%hu-L%hu-R%hu-S%hu-C%u", >mcc,
>mnc, >lac, >rac, >sac, >cid);
+ int rc;
+
+ /* We want to use struct umts_cell_id as hashtable key. If it ever
happens to contain any padding bytes, make
+* sure everything is deterministically zero. */
+ memset(ucid, 0, sizeof(*ucid));
+
+ rc = sscanf(instr, "%hu-%hu-L%hu-R%hu-S%hu-C%u", >mcc,
>mnc, >lac, >rac, >sac, >cid);
if (rc < 0)
return -errno;
diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c
index e663196..8b823a4 100644
--- a/src/osmo-hnbgw/hnbgw_hnbap.c
+++ b/src/osmo-hnbgw/hnbgw_hnbap.c
@@ -492,6 +492,10 @@
/* copy all identity parameters from the message to ctx */
OSMO_STRLCPY_ARRAY(ctx->identity_info, identity_str);
+
+ /* We want to use struct umts_cell_id as hashtable key. If it ever
happens to contain any padding bytes, make
+* sure everything is deterministically zero. */
+ memset(>id, 0, sizeof(ctx->id));
ctx->id.lac = asn1str_to_u16();
ctx->id.sac = asn1str_to_u16();
ctx->id.rac = asn1str_to_u8();
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36912?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I5441db4293dc6b57a1c606ef830656fa9fa01943
Gerrit-Change-Number: 36912
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[S] Change in osmo-hnbgw[master]: fix rate_ctr leak in hnb_persistent_free()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36911?usp=email )
Change subject: fix rate_ctr leak in hnb_persistent_free()
..
fix rate_ctr leak in hnb_persistent_free()
Change-Id: I14e050bfb91b993f194e3800eacdc0d10f2b1a4e
---
M src/osmo-hnbgw/hnbgw.c
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/11/36911/1
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index 24d11a5..e8f7de1 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -541,6 +541,7 @@
void hnb_persistent_free(struct hnb_persistent *hnbp)
{
/* FIXME: check if in use? */
+ rate_ctr_group_free(hnbp->ctrs);
llist_del(>list);
talloc_free(hnbp);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36911?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I14e050bfb91b993f194e3800eacdc0d10f2b1a4e
Gerrit-Change-Number: 36911
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,380 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 12 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn()
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36910?usp=email ) Change subject: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn() .. trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn() If msg is NULL, we're inducing a BFI condition at the BTS side receiver by sending a TCH/A[FH]S block with invalid CRC6. In this case we need to skip the rest of the function and jump to send_burst immediately. Change-Id: I159b2ed455377c77d8764f9320efd15333129afb Fixes: 7c00190b "trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks" Fixes: CID#368538 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index d11b314..7cc1856 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -321,6 +321,8 @@ lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); + if (msg == NULL) + goto send_burst; break; } /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 0d3de00..6c88d19 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -528,6 +528,8 @@ lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); + if (msg == NULL) + goto send_burst; break; } /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36910?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: I159b2ed455377c77d8764f9320efd15333129afb Gerrit-Change-Number: 36910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36910?usp=email ) Change subject: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36910?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: I159b2ed455377c77d8764f9320efd15333129afb Gerrit-Change-Number: 36910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 23 May 2024 02:15:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36910?usp=email ) Change subject: trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn() .. trxcon/l1sched: fix NULL pointer dereference in tx_tch[fh]_fn() If msg is NULL, we're inducing a BFI condition at the BTS side receiver by sending a TCH/A[FH]S block with invalid CRC6. In this case we need to skip the rest of the function and jump to send_burst immediately. Change-Id: I159b2ed455377c77d8764f9320efd15333129afb Fixes: 7c00190b "trxcon/l1sched: fix sending dummy TCH/A[FH]S blocks" Fixes: CID#368538 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/36910/1 diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index d11b314..7cc1856 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -321,6 +321,8 @@ lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); + if (msg == NULL) + goto send_burst; break; } /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 0d3de00..6c88d19 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -528,6 +528,8 @@ lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); + if (msg == NULL) + goto send_burst; break; } /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36910?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: I159b2ed455377c77d8764f9320efd15333129afb Gerrit-Change-Number: 36910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: fix update_exp: s/soft_uart.ok/soft_uart_test.ok
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36909?usp=email ) Change subject: fix update_exp: s/soft_uart.ok/soft_uart_test.ok .. fix update_exp: s/soft_uart.ok/soft_uart_test.ok Change-Id: I2fb70b684978fa8a591d1d9e3cace919d590d1ef --- M tests/Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/36909/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 3b4325e..58900d3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -727,7 +727,7 @@ >$(srcdir)/osmo_io/osmo_io_test.ok \ 2>$(srcdir)/osmo_io/osmo_io_test.err soft_uart/soft_uart_test \ - >$(srcdir)/soft_uart/soft_uart.ok + >$(srcdir)/soft_uart/soft_uart_test.ok rlp/rlp_test \ >$(srcdir)/rlp/rlp_test.ok \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36909?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: I2fb70b684978fa8a591d1d9e3cace919d590d1ef Gerrit-Change-Number: 36909 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 10:
(8 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a936ea4a_eeddd3d8
PS6, Line 402: struct {
> Oh I didn't mean joining the dl and ul. […]
yes i mean that too.
i wouldn't do it here because nothing points to it, but my opinion is not
strong.
to keep it as is, resolve. to change it, say "change it please".
File src/osmo-hnbgw/hnbgw_hnbap.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/056856c9_7e254a03
PS6, Line 571: hnb_persistent_connected(ctx->persistent);
> Can actually an HNB be registered without being connected? I don't think so.
> […]
yes, but a hnb can be connected without being registered. (that is for a
different redmine ticket)
so do you prefer 'active' and 'inactive', or is 'connect' and 'disconnect' good
enough.
File src/osmo-hnbgw/hnbgw_vty.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/040c3b3d_0b639b97
PS9, Line 894: vty_out(vty, "%% WARNING: nft configuration changes
need a restart of osmo-hnbw%s", VTY_NEWLINE);
> still a typo in here. osmo-hnbw.
hey! i fixed that!
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/47a5b1fd_bb91d2cc
PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL;
> Ok, I'm not really a fan of having this sort of generic thread which may or
> may not do stuff, makes […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9fea60c5_2b46deb8
PS6, Line 193: static const char * const nft_thread_req_type_name[] = {
> no. […]
i want to avoid iteration ala value_string, because all callers are entirely
constants within this .c file
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/a84eb397_87f47076
PS6, Line 415: static int update_ctr(struct rate_ctr_group *cg, int cgidx,
uint64_t *last_val, uint64_t new_val)
> Yes, after looking at the surrounding code. […]
kk
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/db2f120f_9e4ea83d
PS9, Line 626: /* From here on, until we receive the next
NFT_THREAD_GET_COUNTERS in this thread, the
> Possible future improvement here is to use a double-buffer to fill next batch
> while the main thread […]
if ever the time it takes to retrieve counters does overlap the wait time
configured in timer X34, then we would simply add another nft_counters2 thread,
submitting GET_COUNTERS requests round robin between them. repeat to taste.
(but i don't expect that to be necessary.)
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/fc2fbb4d_735d293d
PS9, Line 994: nft_kpi_get_counters_schedule();
> So you call nft_kpi_get_counters_schedule() once you receive + process the
> counters, which will then […]
i believe this was the result of our discussion: to wait X34 time *between*
getting counters.
This is nice because it is simple and avoids all such races you describe.
What I don't like about it is that the metric from the user perspective should
be "get timers every N seconds" -- when we wait in-between, we will "drift",
elongating the period by the time it takes to retrieve counters.
This is not very long really, but i'd prefer scheduling to start counters every
N seconds, not wait N seconds in-between.
Doing so means that we need to ensure avoiding races, making the code more
complex.
So how ambitious are we? I think I am fine with waiting X34 seconds *between*
getting counters. it is good enough as i see it.
Other opinions?
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca
Gerrit-Change-Number: 36539
Gerrit-PatchSet: 10
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 22 May 2024 22:21:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: per-HNB GTP-U traffic counters via nft .. per-HNB GTP-U traffic counters via nft Add optional feature: retrieve GTP-U traffic counters per hNodeB (not per individual subscriber!) using nftables, to provide new rate_ctr stats. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. When an hNodeB registers, set up nftables rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. >From the per-hNodeB packet and byte counters from nftables, also derive a "UE bytes" counter, which is counting only the GTP-U payload. Assume IP header of 20 bytes; UDP and GTP-U headers are 8 bytes each: ue_bytes = total_bytes - packets * (20 + 8 + 8) Query these periodically, as configurable by new timer X34. Default is one second of wait time between querying counters (excluding the time it takes to retrieve and update the counters). Add compile-time switch --enable-nftables, to build with/without external dependency libnftables. Default is without, as before. Add jenkins axis NFTABLES to switch --enable-nftables. Add cfg file option 'hnbgw' / 'nft-kpi' to enable use of nftables. This requires osmo-hnbgw to be run with cap_net_admin. The VTY config commands are always visible -- simplifies VTY testing. Refuse to start osmo-hnbgw when the user is requesting nft-kpi in the config but when built without --enable-nftables. Do nft commands in 2 separate threads. Run the same request queue implementation twice, with two thread workers to handle them: - one thread receives all requests to init the nft table, add and remove hNodeB counters, and start and stop counting for a specific hNodeB. - Another thread handles all retrieval and parsing of counters from nft. The main() thread hence never blocks for nftables commands, and services the responses from nft when they are ready, via an osmo_it_q registered in the main() select loop. Persistently keep an nftables named counter for each seen hNodeB cell id in the nftables ruleset, for the lifetime of a hnb_persistent instance that holds the target rate_ctrs. Add the rules to feed into these persistent counters to the ruleset when the particular cell attaches and detaches via HNBAP HNB (De-)Register. On hnb_persistent_free(), remove all items relating to this cell id from nftables, including the persistent named counters. Loosely related: upcoming patches will implement - a hashtable for faster cell id lookup (important for updating counters) Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 - proper MNC-3-digit support in cell ids (better have a 100% correct primary key). Id9a91c80cd2745424a916aef4736993bb7cd8ba0 - idle timeout for disconnected hnbp, so we are sure stale state does not build up for eternity. Ic819d7cbc03fb39e98c204b70d016c5170dc6307 Related: SYS#6773 Related: OS#6425 Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca --- M configure.ac M contrib/jenkins.sh M debian/control M debian/rules M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/osmo_hnbgw_main.c M src/osmo-hnbgw/tdefs.c M tests/osmo-hnbgw.vty 15 files changed, 1,380 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/36539/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 11 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[master]: rsl: parse RSL_IE_OSMO_OSMUX_CID correctly
falconia has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/36908?usp=email ) Change subject: rsl: parse RSL_IE_OSMO_OSMUX_CID correctly .. rsl: parse RSL_IE_OSMO_OSMUX_CID correctly This IE has TLV format, even though the only valid form is a single value octet. To guard against pathological input with L=0 in this IE, we have to check the length explicitly with TLVP_PRES_LEN before accepting TLVP_VAL as if it was TV. Change-Id: I15fa75b6c30d7fa0bf50424d25fc47a088dada0a --- M src/common/rsl.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/36908/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36908?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I15fa75b6c30d7fa0bf50424d25fc47a088dada0a Gerrit-Change-Number: 36908 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[master]: rsl: parse OSMO_IE_OSMO_OSMUX_CID correctly
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36908?usp=email ) Change subject: rsl: parse OSMO_IE_OSMO_OSMUX_CID correctly .. rsl: parse OSMO_IE_OSMO_OSMUX_CID correctly This IE has TLV format, even though the only valid form is a single value octet. To guard against pathological input with L=0 in this IE, we have to check the length explicitly with TLVP_PRES_LEN before accepting TLVP_VAL as if it was TV. Change-Id: I15fa75b6c30d7fa0bf50424d25fc47a088dada0a --- M src/common/rsl.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/36908/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index fa5f495..40690f0 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2978,7 +2978,8 @@ struct tlv_parsed tp; struct gsm_lchan *lchan = msg->lchan; struct gsm_bts *bts = lchan->ts->trx->bts; - const uint8_t *payload_type, *speech_mode, *payload_type2, *osmux_cid, *csd_fmt; + const uint8_t *payload_type, *speech_mode, *payload_type2, *csd_fmt; + const uint8_t *osmux_cid = NULL; uint32_t connect_ip = 0; uint16_t connect_port = 0; int rc, inc_ip_port = 0; @@ -3029,7 +3030,9 @@ if (payload_type2) LOGPC(DRSL, LOGL_DEBUG, "payload_type2=%u ", *payload_type2); - osmux_cid = TLVP_VAL(, RSL_IE_OSMO_OSMUX_CID); + /* this IE has TLV format when TV would have been good enough */ + if (TLVP_PRES_LEN(, RSL_IE_OSMO_OSMUX_CID, 1)) + osmux_cid = TLVP_VAL(, RSL_IE_OSMO_OSMUX_CID); if (osmux_cid) LOGPC(DRSL, LOGL_DEBUG, "osmux_cid=%u ", *osmux_cid); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36908?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I15fa75b6c30d7fa0bf50424d25fc47a088dada0a Gerrit-Change-Number: 36908 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: asterisk: AMI: Implement AuthReq procedure
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36871?usp=email ) Change subject: asterisk: AMI: Implement AuthReq procedure .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36871?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: I77aeeb79cbddfc515e1626385f1b176da7319ba0 Gerrit-Change-Number: 36871 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 22 May 2024 16:33:03 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Send P-Associated-URI in IMS Register Response
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36907?usp=email )
Change subject: asterisk: Send P-Associated-URI in IMS Register Response
..
asterisk: Send P-Associated-URI in IMS Register Response
Change-Id: I4c163f34c052d0463baba799c44fecaaa15be394
---
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
2 files changed, 62 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/07/36907/1
diff --git a/asterisk/IMS_ConnectionHandler.ttcn
b/asterisk/IMS_ConnectionHandler.ttcn
index 091f5da..a55935a 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++ b/asterisk/IMS_ConnectionHandler.ttcn
@@ -66,6 +66,7 @@
charstring user,
charstring display_name,
charstring password,
+ charstring msisdn,
/* Expected User-Location-Info in P-Access-Network-Info */
charstring uli_str,
octetstring rand,
@@ -150,6 +151,7 @@
user := user,
display_name := f_sip_str_quote(display_name),
password := password,
+ msisdn := "90828",
uli_str := "238010001101",
/* The Nonce field is the Base64 encoded version of the RAND value and
concatenated with the AUTN: */
rand := '14987631f65f8e3788a0798b6ebcd08e'O,
@@ -404,6 +406,7 @@
var template (value) SipAddr to_addr;
var template (value) CommaParam_List digestCln ;
var template (value) WwwAuthenticate wwwAuthenticate;
+ var template (value) P_Associated_Uri p_associated_uri :=
ts_P_Associated_Uri({});
var template (value) Security_server security_server;
var template (value) Server server_name :=
ts_Server({c_sip_server_name});
var template (value) Require require :=
ts_Require({"sec-agree"});
@@ -487,6 +490,7 @@
wwwAuthenticate,
sip_seq_nr,
"REGISTER",
+ p_associated_uri := p_associated_uri,
security_server := security_server,
server := server_name,
supported := supported,
@@ -537,6 +541,16 @@
/* Validate P-Access-Network-Info: */
f_ims_validate_register_P_Access_Network_info(g_rx_sip_req,
exp_present := true);
+ p_associated_uri := ts_P_Associated_Uri({
+
ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.realm),
+
ts_UserInfo(g_pars.msisdn),
+
scheme := "sip"))),
+
ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.msisdn),
+ omit,
+
scheme := "tel"))),
+
ts_P_Assoc_uri_spec(g_rx_sip_req.msgHeader.toField.addressField.nameAddr)
+ });
+
/* Tx 200 OK */
to_addr.params := f_sip_param_set(to_addr.params, "tag",
f_sip_rand_tag());
tx_resp := ts_SIP_Response(sip_call_id,
@@ -546,6 +560,7 @@
sip_seq_nr,
"OK",
via,
+ p_associated_uri := p_associated_uri,
require := require,
server := server_name,
supported := supported,
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 56404da..72a4426 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -37,16 +37,18 @@
}
template (value) SipUrl ts_SipUrl(template (value) HostPort host_port,
- template (omit) UserInfo user_info := omit)
:= {
- scheme := "sip",
+ template (omit) UserInfo user_info := omit,
+ template (value) charstring scheme := "sip")
:= {
+ scheme := scheme,
userInfo := user_info,
hostPort := host_port,
urlParameters := omit,
headers := omit
}
template (present) SipUrl tr_SipUrl(template (present) HostPort host_port := ?,
- template UserInfo user_info := *) := {
- scheme := "sip",
+ template UserInfo user_info := *,
+ template (present) charstring scheme :=
"sip") := {
+ scheme := scheme,
userInfo := user_info,
hostPort := host_port,
urlParameters := *,
@@ -54,8
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?usp=email )
Change subject: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present
..
SIP_Templates: f_sip_SipUrl_to_str(): Print username if present
Since now user is printed, adapt existing user in Asterisk_Tests to use the
proper field.
Change-Id: Ifb1470768222ddee1b1d96ecb9153412ed10fd42
---
M asterisk/IMS_ConnectionHandler.ttcn
M library/SIP_Templates.ttcn
2 files changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/05/36905/1
diff --git a/asterisk/IMS_ConnectionHandler.ttcn
b/asterisk/IMS_ConnectionHandler.ttcn
index 0d11922..091f5da 100644
--- a/asterisk/IMS_ConnectionHandler.ttcn
+++ b/asterisk/IMS_ConnectionHandler.ttcn
@@ -503,7 +503,7 @@
*/
authorization :=
f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate),
g_pars.user & "@"
& g_pars.realm,
-
f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec));
+
f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri));
/* TODO: match Authorization from above: */
exp_req :=
tr_SIP_REGISTER(g_pars.registrar_sip_req_uri,
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index 7da56bc..56404da 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -1426,7 +1426,11 @@
}
function f_sip_SipUrl_to_str(SipUrl uri) return charstring {
- var charstring str := uri.scheme & ":" &
f_sip_HostPort_to_str(uri.hostPort);
+ var charstring str := uri.scheme & ":";
+ if (ispresent(uri.userInfo)) {
+ str := str & uri.userInfo.userOrTelephoneSubscriber & "@";
+ }
+ str := str & f_sip_HostPort_to_str(uri.hostPort);
return str;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?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: Ifb1470768222ddee1b1d96ecb9153412ed10fd42
Gerrit-Change-Number: 36905
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: asterisk: AMI: Wait for Event Registry after IMS REGISTER
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36906?usp=email ) Change subject: asterisk: AMI: Wait for Event Registry after IMS REGISTER .. asterisk: AMI: Wait for Event Registry after IMS REGISTER Change-Id: I735a4298ec0d13009d8971880fe870810608d7e0 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 52 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/36906/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index be1be70..a82af97 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -27,11 +27,14 @@ const charstring AMI_FIELD_ACTION := "Action"; const charstring AMI_FIELD_ACTION_ID := "ActionID"; +const charstring AMI_FIELD_CHAN_TYPE := "ChannelType"; +const charstring AMI_FIELD_DOMAIN := "Domain"; const charstring AMI_FIELD_EVENT := "Event"; const charstring AMI_FIELD_INFO := "Info"; -const charstring AMI_FIELD_USERNAME := "Username"; -const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; +const charstring AMI_FIELD_SECRET := "Secret"; +const charstring AMI_FIELD_STATUS := "Status"; +const charstring AMI_FIELD_USERNAME := "Username"; /* Extensions: */ const charstring AMI_FIELD_ALGORITHM := "Algorithm"; @@ -85,13 +88,19 @@ template (value) AMI_Field ts_AMI_Field_ActionId(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION_ID, val); template (value) AMI_Field +ts_AMI_Field_ChannelType(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_CHAN_TYPE, val); +template (value) AMI_Field +ts_AMI_Field_Domain(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_DOMAIN, val); +template (value) AMI_Field ts_AMI_Field_Event(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_EVENT, val); template (value) AMI_Field ts_AMI_Field_Info(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_INFO, val); template (value) AMI_Field -ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); -template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); +template (value) AMI_Field +ts_AMI_Field_Status(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_STATUS, val); +template (value) AMI_Field +ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); /* Extensions: */ template (value) AMI_Field ts_AMI_Field_Algorithm(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ALGORITHM, val); @@ -115,15 +124,21 @@ template (present) AMI_Field tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION_ID, val); template (present) AMI_Field +tr_AMI_Field_ChannelType(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_CHAN_TYPE, val); +template (present) AMI_Field +tr_AMI_Field_Domain(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_DOMAIN, val); +template (present) AMI_Field tr_AMI_Field_Event(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val); template (present) AMI_Field tr_AMI_Field_Info(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val); template (present) AMI_Field -tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val); template (present) AMI_Field -tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); +tr_AMI_Field_Status(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_STATUS, val); +template (present) AMI_Field +tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); /* Extensions: */ template (present) AMI_Field tr_AMI_Field_Algorithm(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ALGORITHM, val); @@ -304,6 +319,25 @@ tr_AMI_Field_AUTN(autn) ); +/* Event: Registry + * Privilege: system,all + * ChannelType: PJSIP + * Username: sip:23801090828@172.18.155.103 + * Domain: sip:172.18.155.103 + * Status: Registered + */ +template (present) AMI_Msg +tr_AMI_Event_Registry(template (present) charstring username := ?, + template (present) charstring domain := ?, + template (present) charstring status := ?, +
[M] Change in pysim[master]: pySim/cat: Fix contruct for Address class/IE
Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36839?usp=email ) Change subject: pySim/cat: Fix contruct for Address class/IE .. Patch Set 2: (1 comment) File smpp_ota_apdu2.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16251): https://gerrit.osmocom.org/c/pysim/+/36839/comment/da9be05c_a5613ab5 PS2, Line 97: trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36839?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: Idf8326298cab7ebc68b09c7e829bfc2061222f51 Gerrit-Change-Number: 36839 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 16:17:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: commands.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36899?usp=email )
Change subject: commands.py: Resolve possible variable use before assignment
..
commands.py: Resolve possible variable use before assignment
pySim/commands.py:223:18: E0606: Possibly using variable 'skip' before
assignment (possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: Id1a892c3446e472699e77f076c2414277e92c98d
---
M pySim/commands.py
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/36899/1
diff --git a/pySim/commands.py b/pySim/commands.py
index 9a49124..08537bd 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -211,6 +211,7 @@
# checking if the length of the remaining TLV string matches
# what we get in the length field.
# See also ETSI TS 102 221, chapter 11.1.1.3.0 Base coding.
+# TODO: this likely just is normal BER-TLV ("All data objects are
BER-TLV except if otherwise # defined.")
exp_tlv_len = int(fcp[2:4], 16)
if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 4
@@ -218,6 +219,7 @@
exp_tlv_len = int(fcp[2:6], 16)
if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 6
+raise ValueError('Cannot determine length of TLV-length')
# Skip FCP tag and length
tlv = fcp[skip:]
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36899?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: Id1a892c3446e472699e77f076c2414277e92c98d
Gerrit-Change-Number: 36899
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-prog.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36903?usp=email ) Change subject: pySim-prog.py: Resolve possible variable use before assignment .. pySim-prog.py: Resolve possible variable use before assignment pySim-prog.py:741:7: E0606: Possibly using variable 'cp' before assignment (possibly-used-before-assignment) Change-Id: I6ab307db378d2ca76dfeae53dc3befa7c103974d --- M pySim-prog.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/03/36903/1 diff --git a/pySim-prog.py b/pySim-prog.py index 3f506de..db9c327 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -723,6 +723,7 @@ card.erase() card.reset() +cp = None # Generate parameters if opts.source == 'cmdline': cp = gen_parameters(opts) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36903?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: I6ab307db378d2ca76dfeae53dc3befa7c103974d Gerrit-Change-Number: 36903 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in pysim[master]: osmo-smdpp.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36902?usp=email )
Change subject: osmo-smdpp.py: Resolve possible variable use before assignment
..
osmo-smdpp.py: Resolve possible variable use before assignment
osmo-smdpp.py:374:72: E0601: Using variable 'iccid_str' before assignment
(used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: I01b308226e12f91699b1b5c6bb06f853be47e185
---
M osmo-smdpp.py
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/36902/1
diff --git a/osmo-smdpp.py b/osmo-smdpp.py
index 1f4311d..3dc6131 100755
--- a/osmo-smdpp.py
+++ b/osmo-smdpp.py
@@ -368,6 +368,9 @@
pes = saip.ProfileElementSequence.from_der(f.read())
iccid_str =
b2h(pes.get_pe_for_type('header').decoded['iccid'])
+# make pylint happy: E0601: Using variable 'iccid_str' before
assignment (used-before-assignment)
+assert iccid_str
+
# FIXME: we actually want to perform the profile binding herr, and
read the profile metadat from the profile
# Put together profileMetadata + _bin
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36902?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: I01b308226e12f91699b1b5c6bb06f853be47e185
Gerrit-Change-Number: 36902
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-trace.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36904?usp=email )
Change subject: pySim-trace.py: Resolve possible variable use before assignment
..
pySim-trace.py: Resolve possible variable use before assignment
pySim-trace.py:198:27: E0606: Possibly using variable 's' before assignment
(possibly-used-before-assignment)
Change-Id: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935
---
M pySim-trace.py
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/36904/1
diff --git a/pySim-trace.py b/pySim-trace.py
index be1d40b..165e338 100755
--- a/pySim-trace.py
+++ b/pySim-trace.py
@@ -194,6 +194,8 @@
s = PysharkRsproLive(opts.interface)
elif opts.source == 'gsmtap-pyshark-pcap':
s = PysharkGsmtapPcap(opts.pcap_file)
+else:
+raise ValueError("unsupported source %s", opts.source)
tracer = Tracer(source=s, suppress_status=opts.suppress_status,
suppress_select=opts.suppress_select,
show_raw_apdu=opts.show_raw_apdu)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36904?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: I28c137a20143b2cd6ea9a0d5461ab61fcd6fe935
Gerrit-Change-Number: 36904
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: euicc.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36901?usp=email )
Change subject: euicc.py: Resolve possible variable use before assignment
..
euicc.py: Resolve possible variable use before assignment
pySim/euicc.py:436:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
pySim/euicc.py:455:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
pySim/euicc.py:473:31: E0606: Possibly using variable 'p_id' before assignment
(possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a
---
M pySim/euicc.py
1 file changed, 27 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/36901/1
diff --git a/pySim/euicc.py b/pySim/euicc.py
index c27c91f..7f4cdda 100644
--- a/pySim/euicc.py
+++ b/pySim/euicc.py
@@ -429,8 +429,11 @@
"""Perform an ES10c EnableProfile function."""
if opts.isdp_aid:
p_id =
ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)])
-if opts.iccid:
+elif opts.iccid:
p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)])
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
ep_cmd_contents = [p_id,
RefreshFlag(decoded=opts.refresh_required)]
ep_cmd = EnableProfileReq(children=ep_cmd_contents)
ep = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
ep_cmd, EnableProfileResp)
@@ -448,8 +451,11 @@
"""Perform an ES10c DisableProfile function."""
if opts.isdp_aid:
p_id =
ProfileIdentifier(children=[IsdpAid(decoded=opts.isdp_aid)])
-if opts.iccid:
+elif opts.iccid:
p_id = ProfileIdentifier(children=[Iccid(decoded=opts.iccid)])
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
dp_cmd_contents = [p_id,
RefreshFlag(decoded=opts.refresh_required)]
dp_cmd = DisableProfileReq(children=dp_cmd_contents)
dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
dp_cmd, DisableProfileResp)
@@ -466,8 +472,11 @@
"""Perform an ES10c DeleteProfile function."""
if opts.isdp_aid:
p_id = IsdpAid(decoded=opts.isdp_aid)
-if opts.iccid:
+elif opts.iccid:
p_id = Iccid(decoded=opts.iccid)
+else:
+# this is guaranteed by argparse; but we need this to make
pylint happy
+raise ValueError('Either ISD-P AID or ICCID must be given')
dp_cmd_contents = [p_id]
dp_cmd = DeleteProfileReq(children=dp_cmd_contents)
dp = CardApplicationISDR.store_data_tlv(self._cmd.lchan.scc,
dp_cmd, DeleteProfileResp)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36901?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: Ifdf4651e503bae6ea3e91c89c2121b416a12fb1a
Gerrit-Change-Number: 36901
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in pysim[master]: commands.py: Resolve possible variable use before assignment
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/36900?usp=email )
Change subject: commands.py: Resolve possible variable use before assignment
..
commands.py: Resolve possible variable use before assignment
pySim/commands.py:608:39: E0606: Possibly using variable 'p2' before assignment
(possibly-used-before-assignment)
Let's raise an exception in the erroneous case.
Change-Id: I23adf2e89aa8a13246cc20ef022c84f0113eb2cd
---
M pySim/commands.py
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/36900/1
diff --git a/pySim/commands.py b/pySim/commands.py
index 08537bd..7b21faf 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -606,6 +606,8 @@
p2 = '81'
elif context == 'gsm':
p2 = '80'
+else:
+raise ValueError("Unsupported context '%s'" % context)
(data, sw) = self.send_apdu_constr_checksw(
self.cla_byte, '88', '00', p2, AuthCmd3G, cmd_data, AuthResp3G)
if 'auts' in data:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/36900?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: I23adf2e89aa8a13246cc20ef022c84f0113eb2cd
Gerrit-Change-Number: 36900
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:39:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck
Attention is currently required from: daniel, fixeria, neels, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck .. Patch Set 1: (1 comment) Patchset: PS1: > Thanks for having a look. I wonder what other reviewers think. I'm also not happy with having some kind of tests that *only* get executed by the jenkins.sh script. In general the assumption is that tests can be execuetd from make check or make distcheck... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 May 2024 15:39:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_rau_invalid_old_rai
Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?usp=email ) Change subject: sgsn: add TC_attach_rau_invalid_old_rai .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?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: I006adabdad26c0c48e1ebe99421bcab7295dc147 Gerrit-Change-Number: 36625 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:36:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections .. Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: I also think @nhofm...@sysmocom.de should have a look -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:36:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X5) on MO/MT SMS
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email ) Change subject: libmsc: reset the LU delay timer (X5) on MO/MT SMS .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 May 2024 15:35:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email )
Change subject: SGP32Definitions_Templates: add templates for missing PSMOs
..
SGP32Definitions_Templates: add templates for missing PSMOs
We do not have templates for all PSMOs (EuiccPackage) and their
results (EuiccPackageResult) yet. This packages makes the set
complete.
Related: SYS#6824
Change-Id: I354ca5f45a6157e1e40596547388147daf60b95f
---
M library/euicc/SGP32Definitions_Templates.ttcn
1 file changed, 211 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn
b/library/euicc/SGP32Definitions_Templates.ttcn
index e1ca093..d18fee4 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -344,6 +344,70 @@
}
}
}
+template (present) EuiccPackage
+tr_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := *,
+ tagList := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_listProfileInfo := {
+ psmoList := {
+ {
+ listProfileInfo := {
+ searchCriteria := {
+ iccid := '123456789ABCDEFF'O
+ },
+ tagList := '92'O /* profileName */
+ }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_getRAT := {
+ psmoList := {
+ {
+ getRAT := { }
+ }
+ }
+}
+template (present) EuiccPackage
+tr_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := *,
+ smdpOid := *,
+ smdpAddress := *
+ }
+ }
+ }
+}
+template (value) EuiccPackage
+ts_euiccPackage_configureAutoEnable := {
+ psmoList := {
+ {
+ configureAutoEnable := {
+ autoEnableFlag := NULL,
+ smdpOid := objid {1 2 3},
+ smdpAddress := "smdp.example.com"
+ }
+ }
+ }
+}
/* GSMA SGP.32, section 6.3.2.6 */
template (present) EsipaMessageFromEimToIpa
@@ -654,6 +718,139 @@
euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
}
}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := ?,
+ counterValue := ?,
+ transactionId := *,
+ seqNumber := ?,
+ euiccResult := {
+ {
+ listProfileInfoResult := ?
+ }
+ }
+ },
+ euiccSignEPR := ?
+ }
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_listProfileInfo := {
+ euiccPackageResultSigned := {
+ euiccPackageResultDataSigned := {
+ eimId := "myEIM",
+ counterValue := 1,
+ transactionId := omit,
+ seqNumber := 123,
+ euiccResult := {
+ {
+ listProfileInfoResult := {
+ profileInfoListOk := {
+ {
+ iccid := omit,
+ isdpAid := omit,
+ profileState :=
omit,
+ profileNickname
:= omit,
+
serviceProviderName := omit,
+ profileName :=
"testme",
+ iconType :=
omit,
+
[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add templates for missing PSMOs
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?usp=email ) Change subject: SGP32Definitions_Templates: add templates for missing PSMOs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36881?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: I354ca5f45a6157e1e40596547388147daf60b95f Gerrit-Change-Number: 36881 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 22 May 2024 15:35:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email ) Change subject: debian/osmo-gtphub.init: delete .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb Gerrit-Change-Number: 36898 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 15:34:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email )
Change subject: debian/osmo-gtphub.init: delete
..
debian/osmo-gtphub.init: delete
Remove SysV init scripts. These are not really maintained anymore and
this makes it consistent with other Osmocom projects.
Avoids synchronizing with SysV scripts on debian:
# systemctl enable osmo-gtphub
Synchronizing state of osmo-gtphub.service with SysV service script with
/usr/lib/systemd/systemd-sysv-install.
Executing: /usr/lib/systemd/systemd-sysv-install enable osmo-gtphub
Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb
---
D debian/osmo-gtphub.init
1 file changed, 17 insertions(+), 150 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/debian/osmo-gtphub.init b/debian/osmo-gtphub.init
deleted file mode 100755
index 160d55b..000
--- a/debian/osmo-gtphub.init
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: osmo-gtphub
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Osmocom GTP hub
-# Description: Osmocom GTP hub
-### END INIT INFO
-
-# Author: Neels Hofmeyr
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=osmo-gtphub # Introduce the short server's name
here
-DESC="Osmocom GTP hub" # Introduce a short description here
-DAEMON=/usr/bin/osmo-gtphub # Introduce the server's location here
-SCRIPTNAME=/etc/init.d/osmo-gtphub
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/osmo-gtphub ] && . /etc/default/osmo-gtphub
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE"
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec
$DAEMON
- [ "$?" = 2 ] && return 2
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
- return 0
-}
-
-case "$1" in
- start)
-[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
-do_start
-case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo
Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email ) Change subject: asterisk: Use Action PJSIPAccessNetworkInfo .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?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: I2759d12caeaca81a9224997a29541c325d65fe30 Gerrit-Change-Number: 36886 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 15:34:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 4: (1 comment) File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/b1e2d324_fa1e0da3 PS4, Line 245: /* source: http://www.cse.yorku.ca/~oz/hash.html */ > I would by default always use the jenkins hash functions, see jhash.[ch] of > the Linux kernel. That's one of the reasons I end up using rb trees. I don't need to care about hash functions :D -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 15:00:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:56:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email )
Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
..
ipa: Use pseudo-random number for SLS in IPA->M3UA direction
[back-port of Ia4e66d660b6057338f66a47fffc8a0d32759f733]
In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced
code that would make the LSB of the file descriptor be used as SLS
when passing packets from IPA in M3UA direction.
This did however not achieve sufficient entropy in real-world use cases.
In this change, we change over to allocating a pseudo-random SLS to each
IPA connection at the time it is established; We then assign that SLS
to each packet received on that IPA connection.
Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Related: SYS#6543
Closes: SYS#6802
---
M src/osmo_ss7_asp.c
M stp/stp_main.c
2 files changed, 34 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index e1c197c..b017510 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -906,7 +906,9 @@
}
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
- return ipa_rx_msg(asp, msg, ofd->fd & 0xf);
+ /* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
+* connect */
+ return ipa_rx_msg(asp, msg, asp->asp_id & 0xf);
}
/* netif code tells us we can read something from the socket */
@@ -996,6 +998,12 @@
if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
rc = ss7_asp_apply_peer_primary_address(asp);
rc = ss7_asp_apply_primary_address(asp);
+ } else {
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) {
+ /* we use the lower 4 bits of the asp_id feld as SLS;
let's initialize it here from a
+* pseudo-random value */
+ asp->asp_id = rand() & 0xf;
+ }
}
if (asp->lm && asp->lm->prim_cb) {
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 01d1865..d630032 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -213,6 +213,8 @@
{
int rc;
+ srand(time(NULL));
+
tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp");
msgb_talloc_ctx_init(tall_stp_ctx, 0);
osmo_init_logging2(tall_stp_ctx, _info);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: for-1.8
Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7
Gerrit-Change-Number: 36884
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[for-1.8]: Bump version: 1.8.1-dirty → 1.8.2
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email ) Change subject: Bump version: 1.8.1-dirty → 1.8.2 .. Bump version: 1.8.1-dirty → 1.8.2 Let's tag a 1.8.2 just containing the change of more random SLS allocation in IPA / SCCPlite links. Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c --- M debian/changelog M src/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index cd1c181..b3bf213 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (1.8.2) unstable; urgency=medium + + * ipa: Use pseudo-random number for SLS in IPA->M3UA direction + + -- Harald Welte Tue, 21 May 2024 14:28:44 +0200 + libosmo-sccp (1.8.1) unstable; urgency=medium * Fix counting received IPA packets in server mode diff --git a/src/Makefile.am b/src/Makefile.am index c87848d..5fba62a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=9:1:0 +LIBVERSION=9:2:0 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I63c39cfd7af0b8deb7f7c9ff0ec519f2bc05117c Gerrit-Change-Number: 36885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmo-sccp[for-1.8]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: for-1.8 Gerrit-Change-Id: I97f43bd3bdd89a6bf21a84284a060305fcbb86e7 Gerrit-Change-Number: 36884 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:56:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 4: (1 comment) File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/a9d5cf95_9a0c957e PS4, Line 245: /* source: http://www.cse.yorku.ca/~oz/hash.html */ > I am not very sure about whether this here is the right way. […] I would by default always use the jenkins hash functions, see jhash.[ch] of the Linux kernel. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:50:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 4: (2 comments) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/1a6c8607_3dafe643 PS3, Line 463: DECLARE_HASHTABLE(hnb_persistent_by_id, 5); > is this 5 related to the one in mkhash_add()? if so, it may make sense to use > a define, or some hash […] no, this is just how many bits to use for the hash table. That mkhash stuff is to get to something that this here can handle (up to 64 bit input) File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/135863b6_01741fea PS4, Line 245: /* source: http://www.cse.yorku.ca/~oz/hash.html */ I am not very sure about whether this here is the right way. Maybe we need a generic arbitrary-buffer-to-hash function, or maybe there already is one that I don't know about? Or maybe we can just feed the last 64 bit of the umts_cell_id to the hashtable's hash function? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 22 May 2024 14:40:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 14:35:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 3: (1 comment) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889/comment/d3798ded_d8ef4011 PS3, Line 463: DECLARE_HASHTABLE(hnb_persistent_by_id, 5); is this 5 related to the one in mkhash_add()? if so, it may make sense to use a define, or some hashtable object field if it exists instead in there. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 22 May 2024 14:35:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. add hnb_persistent hashtable: optimize lookup by cell id Mainly the new nft counters do a lot of hnb_persistent lookups by cell id. Add a hashtable to optimize looking up hnb_persistent instances. So far we iterate the linear list of hnb_persistent for each and every counter returned from nft_kpi.c. Also improves lookups for HNBAP HNB* operations (rare). Related: SYS#6773 Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c 2 files changed, 59 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/89/36889/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-hnbgw[master]: add hnb_persistent hashtable: optimize lookup by cell id
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email ) Change subject: add hnb_persistent hashtable: optimize lookup by cell id .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iecb81eba28263ecf90a09c108995f6fb6f5f81f2 Gerrit-Change-Number: 36889 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 22 May 2024 14:31:26 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: jobs/ttcn3: update ttcn3-ggsn-test-kernel
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email ) Change subject: jobs/ttcn3: update ttcn3-ggsn-test-kernel .. jobs/ttcn3: update ttcn3-ggsn-test-kernel Remove ttcn3-ggsn-test-kernel-pablo-gtp, as the IPv6 GTP patches have been merged. Add ttcn3-ggsn-test-kernel-net-next and ttcn3-ggsn-test-kernel-torvalds instead, which run the master/nightly version of osmo-ggsn against HEAD of the kernel trees in netdev/net-next and torvalds/linux. Change-Id: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 --- M jobs/ttcn3-testsuites.yml 1 file changed, 41 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 6780f74..d7646f5 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -32,16 +32,24 @@ timer: H 04 * * * description: | Test osmo-ggsn master with the Debian kernel. - - ttcn3-ggsn-test-kernel-pablo-gtp: + - ttcn3-ggsn-test-kernel-net-next: timer: H 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false + node: ttcn3-ggsn-test-kernel-git description: | -Test osmo-ggsn master with the Linux kernel built from main of -https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/;>pablo/gtp.git. - -This is a temporary job, to be removed once the IPv6 related GTP -patches are upstreamed (OS#1952). +Test osmo-ggsn master with the Linux kernel built from master of +https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/;> + net-next.git. + - ttcn3-ggsn-test-kernel-torvalds: + timer: H 04 * * * + # Cache the linux source tree in the workspace of one node + wipe_workspace: false + node: ttcn3-ggsn-test-kernel-git + description: | +Test osmo-ggsn master with the Linux kernel built from master of +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/;> + torvalds/linux.git. - ttcn3-ggsn-test-kernel-latest: timer: H 04 * * * description: | @@ -266,15 +274,24 @@ # Run against debian's kernel export KERNEL_TEST=1 ;; - ttcn3-ggsn-test-kernel-pablo-gtp) + ttcn3-ggsn-test-kernel-net-next) DIR="ttcn3-ggsn-test" export IMAGE_SUFFIX="master" export KERNEL_TEST=1 export KERNEL_BUILD=1 - export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git; - export KERNEL_REMOTE_NAME="pablo-gtp" + export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git; + export KERNEL_REMOTE_NAME="net-next" export KERNEL_BRANCH="main" ;; + ttcn3-ggsn-test-kernel-torvalds) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="master" + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; + export KERNEL_REMOTE_NAME="torvalds" + export KERNEL_BRANCH="master" + ;; ttcn3-ggsn-test-kernel-latest) DIR="ttcn3-ggsn-test" export IMAGE_SUFFIX="latest" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36882?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: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 Gerrit-Change-Number: 36882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-ci[master]: jobs/ttcn3: update ttcn3-ggsn-test-kernel
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36882?usp=email ) Change subject: jobs/ttcn3: update ttcn3-ggsn-test-kernel .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36882?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: I3d2f26ca87f79365f4a407376b5c3c0145f729a6 Gerrit-Change-Number: 36882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 13:54:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email ) Change subject: debian/osmo-gtphub.init: delete .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb Gerrit-Change-Number: 36898 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 11:50:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsm48_encode_bearer_cap(): omit octet 3a if only GSM-FR/GSM-HR v1 is ...
Attention is currently required from: neels, nt2mku. Hello Jenkins Builder, fixeria, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36784?usp=email to look at the new patch set (#3). Change subject: gsm48_encode_bearer_cap(): omit octet 3a if only GSM-FR/GSM-HR v1 is supported .. gsm48_encode_bearer_cap(): omit octet 3a if only GSM-FR/GSM-HR v1 is supported Some early phase 1 GSM phones (like the Siemens P1 Porty) do not accept a mobile-terminating call setup if octet 3a is present. If speech version is GSM-FR or GSM-HR (v1) only and CTM text telephony is not supported, omit octet 3a. Ref: 3GPP TS 24.008, section 10.5.4.5.1. Change-Id: Ia09abb32a8458384151a6ae28744835ea440fc5b --- M src/gsm/gsm48_ie.c 1 file changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/36784/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36784?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: Ia09abb32a8458384151a6ae28744835ea440fc5b Gerrit-Change-Number: 36784 Gerrit-PatchSet: 3 Gerrit-Owner: nt2mku Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: nt2mku Gerrit-MessageType: newpatchset
[M] Change in osmo-sgsn[master]: debian/osmo-gtphub.init: delete
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/36898?usp=email )
Change subject: debian/osmo-gtphub.init: delete
..
debian/osmo-gtphub.init: delete
Remove SysV init scripts. These are not really maintained anymore and
this makes it consistent with other Osmocom projects.
Avoids synchronizing with SysV scripts on debian:
# systemctl enable osmo-gtphub
Synchronizing state of osmo-gtphub.service with SysV service script with
/usr/lib/systemd/systemd-sysv-install.
Executing: /usr/lib/systemd/systemd-sysv-install enable osmo-gtphub
Change-Id: I9008944369314a4cbb345bfbf01bdb57aa7590fb
---
D debian/osmo-gtphub.init
1 file changed, 17 insertions(+), 150 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/98/36898/1
diff --git a/debian/osmo-gtphub.init b/debian/osmo-gtphub.init
deleted file mode 100755
index 160d55b..000
--- a/debian/osmo-gtphub.init
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: osmo-gtphub
-# Required-Start:$network $local_fs
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Osmocom GTP hub
-# Description: Osmocom GTP hub
-### END INIT INFO
-
-# Author: Neels Hofmeyr
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=osmo-gtphub # Introduce the short server's name
here
-DESC="Osmocom GTP hub" # Introduce a short description here
-DAEMON=/usr/bin/osmo-gtphub # Introduce the server's location here
-SCRIPTNAME=/etc/init.d/osmo-gtphub
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/osmo-gtphub ] && . /etc/default/osmo-gtphub
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE"
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- # If the above conditions are not satisfied then add some other code
- # that waits for the process to drop all resources that could be
- # needed by services started subsequently. A last resort is to
- # sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec
$DAEMON
- [ "$?" = 2 ] && return 2
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
- return 0
-}
-
-case "$1" in
- start)
-[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
-do_start
-case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
-
[S] Change in osmo-sgsn[master]: tests: don't run osmotestconfig.py in distcheck
Attention is currently required from: daniel, fixeria, laforge, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email ) Change subject: tests: don't run osmotestconfig.py in distcheck .. Patch Set 1: (1 comment) Patchset: PS1: > As of now I think it's fine having it run twice when you run make check and > make distcheck. […] Thanks for having a look. I wonder what other reviewers think. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 Gerrit-Change-Number: 36864 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 May 2024 10:59:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 9: (3 comments) File src/osmo-hnbgw/nft_kpi.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/ecacc0aa_de499b1f PS9, Line 626: /* From here on, until we receive the next NFT_THREAD_GET_COUNTERS in this thread, the Possible future improvement here is to use a double-buffer to fill next batch while the main thread is processing the previous one. Not needed for this first version though imo. https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/fc710e64_d1eae1e4 PS9, Line 700: osmo_timer_setup(_hnbgw->nft_kpi.get_counters_timer, nft_kpi_get_counters_cb, NULL); possible idea for the future: keep interval tracking at the worker, use osmo_timerfd_*() here, this way we could easily track for instance how often the thread cannot cope with the expected counter update frequency. https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/e549fb40_09414bc5 PS9, Line 994: nft_kpi_get_counters_schedule(); So you call nft_kpi_get_counters_schedule() once you receive + process the counters, which will then schedule a new counter update every X34 uS. However, you are not account for the (long) time it took for the counters to be retrieved. Hence, in nft_kpi_get_counters_schedule(), you should store a last_ts = now() value, and subtract the processing time since last time you called it. Otherwise, if you have X34 to let's say 1 second, but the counting takes 0.3 seconds, you are actually requesting counters every 1.3s (and actually getting them updated every 1.3+0.3s). -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 10:00:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft .. Patch Set 9: (1 comment) File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/83940bb8_272470fb PS9, Line 894: vty_out(vty, "%% WARNING: nft configuration changes need a restart of osmo-hnbw%s", VTY_NEWLINE); still a typo in here. osmo-hnbw. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib2f0a9252715ea4b2fe9c367aa65f771357768ca Gerrit-Change-Number: 36539 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 09:36:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft
Attention is currently required from: laforge, neels.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539?usp=email )
Change subject: per-HNB GTP-U traffic counters via nft
..
Patch Set 9:
(16 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/84344d4d_b07e3a98
PS6, Line 384: /* When rules to count traffic to and from this hNodeB are
present, this reflects the state in nftables
> Done
ACK.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/ac15f67a_9120ed54
PS6, Line 394: struct osmo_sockaddr_str addr_remote;
> libnftables interfacing is string based, as the patch should show in other
> places
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f00243b2_56949943
PS6, Line 402: struct {
> (in an earlier patch set i actually had the two combined in one struct.) […]
Oh I didn't mean joining the dl and ul. My proposal was to simply make the
struct named so it can be declared one, used twice. That also makes it possible
to pass a pointer to it.
File include/osmocom/hnbgw/nft_kpi.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/2d63fa0a_4f91520d
PS6, Line 21: int nft_kpi_hnb_start(struct hnb_persistent *hnbp, const struct
osmo_sockaddr_str *gtpu_remote);
> nftables uses strings (also all logging), so it makes sense to use strings
> here. […]
Done
File src/osmo-hnbgw/hnbgw.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/09ce5455_93fb3768
PS6, Line 346: hnb_persistent_disconnected(ctx->persistent);
> (or "active" and "inactive", s.a. […]
Yeah, whatever, just give it a second though :)
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/d495300f_44ccb1b7
PS6, Line 607: {
> exactly what i mean above. But this patch is not about fixing the HNBAP / HNB
> activity tracking. […]
Ack
File src/osmo-hnbgw/hnbgw_hnbap.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/2b5a2a59_fccd98c0
PS6, Line 571: hnb_persistent_connected(ctx->persistent);
> yes, but how osmo-hnbgw handles HNBAP is weird. […]
Can actually an HNB be registered without being connected? I don't think so.
My understanding is that a HNBAP link disconnect makes the HNB implicitly
become "unregistered".
File src/osmo-hnbgw/hnbgw_vty.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/f3192d20_704f761c
PS6, Line 884: DEFUN(cfg_hnbgw_nft_kpi, cfg_hnbgw_nft_kpi_cmd,
> I wanted to, but it does not exist AFAICT: […]
Ah then it's probably the default. DONE.
File src/osmo-hnbgw/nft_kpi.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/7fd077cd_6b1f1569
PS6, Line 86: static __thread struct nft_thread *g_nft_thread = NULL;
> the nft_thread could be launched any number of times. […]
Ok, I'm not really a fan of having this sort of generic thread which may or may
not do stuff, makes the architecture more open for no good reason, but fine.
I'd prefer having 2 (actually 3 counting the main thread) distinct threads
doing specific stuff with specific context, but if you like it the other way we
can keep it.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/16d564ff_9dfe2e27
PS6, Line 120: LOGP(DNFT, LOGL_ERROR, "error running nft cmd %s#%u:
rc=%d cmd=%s\n",
> yes we have the rc that is carried back to the main thread in the queued
> response. […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/9c8b547a_5f808d31
PS6, Line 182: enum nft_thread_req_type {
> can, but this is the part of the file that defines the thread request queue,
> so i'd like this to be […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/68d34dcd_2c071dcd
PS6, Line 207: struct {
> hence the naming yes
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/7ade3ea8_0eef8f10
PS6, Line 251: OSMO_ASSERT(g_nft_thread);
> Why allocate it using talloc? […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/6601dced_9cada900
PS6, Line 297: static void nft_t2m_enqueue(struct nft_thread *t, struct
nft_thread_req *req)
> The terms I use so far are "main()" and "(nft-)thread", because main() isn't
> started by pthread_crea […]
Done
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/0e333f77_964f8f30
PS6, Line 415: static int update_ctr(struct rate_ctr_group *cg, int cgidx,
uint64_t *last_val, uint64_t new_val)
> but the second thought made you realize that there is a cg counter group
> involved, right =)
Yes, after looking at the surrounding code. Just sharing that we use "ctrg" in
lots of places already, so it's easier for osmocom users to understand right
away.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/36539/comment/27662d54_da2b328d
PS6, Line 452: size_t want = g_nft_thread->counters_len + 64;
> I used \*2 in an array list for a diff algorithm implementation in the
> https://gameoftrees. […]
Done
--
To view, visit
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. contrib/jenkins: set --enable-werror Fixes: OS#6460 Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dfbbbfe..1c4fa2b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,7 +59,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 May 2024 07:08:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: contrib/jenkins: set --enable-werror
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email ) Change subject: contrib/jenkins: set --enable-werror .. contrib/jenkins: set --enable-werror Fixes: OS#6460 Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 --- M contrib/jenkins.sh 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/97/36897/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index dfbbbfe..1c4fa2b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -59,7 +59,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6d85b077f57a86b0bad29cb868f1f4f848506f46 Gerrit-Change-Number: 36897 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/55b76f78_9cc2b0c1 PS5, Line 217: struct hnbgw_context_map *map = fi->priv; > looks like jenkins tested patchset 4, not the rebase in patchset 5 that was > submitted -> https://osmocom.org/issues/6460 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 06:39:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters .. Patch Set 5: (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788/comment/68a96698_8b64eb1d PS5, Line 217: struct hnbgw_context_map *map = fi->priv; > This is now an unused variable -- why did jenkins not complain about this? […] looks like jenkins tested patchset 4, not the rebase in patchset 5 that was submitted -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 May 2024 06:35:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
