pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27094 )
Change subject: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working
......................................................................
Patch Set 2: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475
Gerrit-Change-Number: 27094
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 17:08:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27095 )
Change subject: ttcn3-ggsn-tests-ogs: use correct DNS addresses
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27095
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia1045d86d6f07d41054f14be0b6efdf9c7169af2
Gerrit-Change-Number: 27095
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: abandon
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/27094 )
Change subject: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working
......................................................................
ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working
The DNS address provided is used by the test to ping. In osmo-ggsn, we
configured the DNS to be the shared address between GTPC and GTPU. In
open5gs, the addresses are different. Hence, let's pass the GTPU address
instead of the GTPC address to make the setup easier (no need to have
proper routing working between UPFD and SMFD containers).
Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475
---
M ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
M ttcn3-ggsn-test/ogs/smfd.yaml
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/27094/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475
Gerrit-Change-Number: 27094
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27094 )
Change subject: ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working
......................................................................
ttcn3-ggsn-tests-ogs: Set correct DNS address to get ping working
The DNS address provided is used by the test to ping. In osmo-ggsn, we
configured the DNS to be the shared address between GTPC and GTPU. In
open5gs, the addresses are different. Hence, let's pass the GTPU address
instead of the GTPC address to make the setup easier (no need to have
proper routing working between UPFD and SMFD containers).
Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475
---
M ttcn3-ggsn-test/ogs/smfd.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/27094/1
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml
index 1bdf03b..2e1fc08 100644
--- a/ttcn3-ggsn-test/ogs/smfd.yaml
+++ b/ttcn3-ggsn-test/ogs/smfd.yaml
@@ -349,7 +349,7 @@
dnn: inet46
dns:
- - 172.18.3.201
+ - 172.18.3.222
- 8.8.8.8
- fd02:db8:3::201
- 2001:4860:4860::8844
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2a452ad871612d1c88b94579dadbe62b718b1475
Gerrit-Change-Number: 27094
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27095 )
Change subject: ttcn3-ggsn-tests-ogs: use correct DNS addresses
......................................................................
ttcn3-ggsn-tests-ogs: use correct DNS addresses
The DNS addresses are used to ping them from the subscriber. Let's set
up the UPF container ones instead of the SMF container ones, in order to
simplify routing not related to the test.
Change-Id: Ia1045d86d6f07d41054f14be0b6efdf9c7169af2
---
M ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
M ttcn3-ggsn-test/ogs/smfd.yaml
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/27095/1
diff --git a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
index 6471dc9..f05ddaf 100644
--- a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
+++ b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
@@ -16,8 +16,8 @@
GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201"
GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.222"
# GGSN announced DNS address
-GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201"
-GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201"
+GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.222"
+GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::222"
GGSN_Tests.m_ggsn_impl := GGSN_IMPL_OPEN5GS
[EXECUTE]
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml
index 2e1fc08..a0be176 100644
--- a/ttcn3-ggsn-test/ogs/smfd.yaml
+++ b/ttcn3-ggsn-test/ogs/smfd.yaml
@@ -351,7 +351,7 @@
dns:
- 172.18.3.222
- 8.8.8.8
- - fd02:db8:3::201
+ - fd02:db8:3::222
- 2001:4860:4860::8844
mtu: 1400
freeDiameter: /data/freediameter.conf
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27095
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia1045d86d6f07d41054f14be0b6efdf9c7169af2
Gerrit-Change-Number: 27095
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: tnt.
Hello tnt,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/dahdi-linux/+/26967
to look at the new patch set (#2).
Change subject: icE1usb: update ice1usb_proto.h to firmware 0.2-8
......................................................................
icE1usb: update ice1usb_proto.h to firmware 0.2-8
git revision cac342af6bccc9820a8617f900afaf663ad608ed of
https://git.osmocom.org/osmo-e1-hardware
Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29
---
M drivers/dahdi/icE1usb/icE1usb.c
M drivers/dahdi/icE1usb/ice1usb_proto.h
2 files changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/67/26967/2
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29
Gerrit-Change-Number: 26967
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 )
Change subject: gsm_network_T_defs: add T4, so it becomes configurable
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
There was some confusion about this. There were two patches for that problem. The other one is already in master.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c
Gerrit-Change-Number: 27084
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 16:35:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27048 )
Change subject: core/msgb.h: make use of OSMO_LIKELY / OSMO_UNLIKELY
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27048
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iff666b5fa0b320ae47b6c8c5dfd39debd2d9b8b7
Gerrit-Change-Number: 27048
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 16:34:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27088 )
Change subject: core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0)
......................................................................
core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0)
Using do-while is a common practice for complex macros. This allows
invoking OSMO_ASSERT in simple if-else statements without braces.
Change-Id: I42d9c315c9c30bce828564a63c496ee62e5c1431
---
M include/osmocom/core/utils.h
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 7625da1..182da08 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -111,9 +111,11 @@
* the predicate evaluates to false (0).
*/
#define OSMO_ASSERT(exp) \
+do { \
if (!(exp)) { \
osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \
- }
+ } \
+} while (0); /* some code invokes OSMO_ASSERT() without the semicolon */
/*! duplicate a string using talloc and release its prior content (if any)
* \param[in] ctx Talloc context to use for allocation
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27088
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I42d9c315c9c30bce828564a63c496ee62e5c1431
Gerrit-Change-Number: 27088
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27092 )
Change subject: ggsn: Expect no linklocal-addr forwarding when testing open5gs
......................................................................
ggsn: Expect no linklocal-addr forwarding when testing open5gs
It's not really clear whether GTP should really be forwarding packets
with link-local address outside the tunnel. In theory the link-local
address should be used to communicate with the GGSN in order to get the
global link address, that's it. Running against open5gs it can be
observed that they are not forwarded, while osmo-ggsn forwards them
correctly.
Since it seems more like an implementation dependent detail, let's
accept any and adapt expectancies depending on what are we testing, this
way it ends up documented the current situation in case it ever changes
in the future.
Change-Id: Ieafd24c059b9341c702311c78caad3312db5f1f3
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 0d134f6..3b34c7f 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -995,7 +995,11 @@
/* Check if we can use valid link-local src addr. */
var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_ll, dns1_addr));
- f_wait_icmp6_echo_reply(ctx);
+ if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) {
+ f_wait_icmp6_echo_reply(ctx);
+ } else {
+ f_wait_gtpu_fail(ctx);
+ }
/* Check that attempting RA with another ll src addr won't work, packet dropped: */
var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27092
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: Ieafd24c059b9341c702311c78caad3312db5f1f3
Gerrit-Change-Number: 27092
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: iedemam, neels, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 )
Change subject: WIP: New stats for lchan life duration.
......................................................................
Patch Set 4:
(3 comments)
File src/osmo-bsc/bts_trx_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/a11f1499_4bd36483
PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE);
> Probably more interesting to print it in VTY as seconds? Doesn't look like we can glance millisecond […]
Ack
File src/osmo-bsc/gsm_data.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/46898db0_b4de1db2
PS4, Line 349: long long
wondering if a signed data type makes sense here, but this is not critical.
File src/osmo-bsc/lchan_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/ce2f4e08_3501ff19
PS4, Line 1816: rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms);
> Does it really makes sense to use this kind of value as a rate_ctr? Just asking. […]
my gut feeling also goes more towards a stat_item, but I didn't spend a lot of time contemplating it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347
Gerrit-Change-Number: 27081
Gerrit-PatchSet: 4
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 16:29:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27092 )
Change subject: ggsn: Expect no linklocal-addr forwarding when testing open5gs
......................................................................
ggsn: Expect no linklocal-addr forwarding when testing open5gs
It's not really clear whether GTP should really be forwarding packets
with link-local address outside the tunnel. In theory the link-local
address should be used to communicate with the GGSN in order to get the
global link address, that's it. Running against open5gs it can be
observed that they are not forwarded, while osmo-ggsn forwards them
correctly.
Since it seems more like an implementation dependent detail, let's
accept any and adapt expectancies depending on what are we testing, this
way it ends up documented the current situation in case it ever changes
in the future.
Change-Id: Ieafd24c059b9341c702311c78caad3312db5f1f3
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/27092/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 0d134f6..3b34c7f 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -995,7 +995,11 @@
/* Check if we can use valid link-local src addr. */
var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_ll, dns1_addr));
- f_wait_icmp6_echo_reply(ctx);
+ if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) {
+ f_wait_icmp6_echo_reply(ctx);
+ } else {
+ f_wait_gtpu_fail(ctx);
+ }
/* Check that attempting RA with another ll src addr won't work, packet dropped: */
var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27092
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: Ieafd24c059b9341c702311c78caad3312db5f1f3
Gerrit-Change-Number: 27092
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27090 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
bssmap_reset: make T4 user configurable
The timer (T4) that controls the re-sending of the BSSMAP RESET can not
be changed via the VTY, althrough it is defined via a tdef struct. Lets
add a description along with default values to make it configurable via
the VTY.
Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Related: SYS#5796
---
M src/osmo-bsc/bssmap_reset.c
M src/osmo-bsc/net_init.c
M tests/timer.vty
3 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index beb8968..4d24c01 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -47,7 +47,7 @@
osmo_tdef_fsm_inst_state_chg(FI, STATE, \
bssmap_reset_timeouts, \
(bsc_gsmnet)->T_defs, \
- 5)
+ -1)
struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg)
{
diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index ec2f881..adcffc7 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -27,6 +27,7 @@
#include <osmocom/bsc/neighbor_ident.h>
static struct osmo_tdef gsm_network_T_defs[] = {
+ { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" },
{ .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" },
{ .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" },
{ .T=10, .default_val=6, .desc="RR Assignment" },
diff --git a/tests/timer.vty b/tests/timer.vty
index 12c13ad..e832070 100644
--- a/tests/timer.vty
+++ b/tests/timer.vty
@@ -1,6 +1,7 @@
OsmoBSC> enable
OsmoBSC# show timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
@@ -53,6 +54,7 @@
OsmoBSC# configure terminal
OsmoBSC(config)# network
OsmoBSC(config-net)# timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27090
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27090 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Thank you all for reviewing this: I have pushed the same patch on 2121q4 as well, so that it can be backported.
https://gerrit.osmocom.org/c/osmo-bsc/+/27091
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27090
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:33:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: iedemam, neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 )
Change subject: WIP: New stats for lchan life duration.
......................................................................
Patch Set 4:
(5 comments)
File src/osmo-bsc/bts_trx_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/7ecf102a_5a8ad6b4
PS4, Line 575: vty_out(vty, " Activated %llu ms ago%s", duration_ms, VTY_NEWLINE);
Probably more interesting to print it in VTY as seconds? Doesn't look like we can glance millisecond updates in the VTY anyway.
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0fd3e91a_42ca9366
PS4, Line 3830: vty_out(vty, " Channel Activations : %"PRIu64" TCH", activations_tch);
I'd rather put it:
Channel Activations:
TCH (avg lifespan 3s)
SDCCH (avg lifespan 5s)
See the line formatting, and also use seconds instead of milliseconds. "Average" can probably be shortened to "avg".
File src/osmo-bsc/lchan_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/2f4a8537_0e73101b
PS4, Line 1812: long long duration_ms = gsm_lchan_active_duration_ms(lchan);
Shouldn't this be an unsigned long long everywhere? Maybe simply use time_t?
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/0722481b_de0b326b
PS4, Line 1814: if (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H) {
I'd go for a switch statement here, but not critical.
https://gerrit.osmocom.org/c/osmo-bsc/+/27081/comment/f9e99713_697ad89f
PS4, Line 1816: rate_ctr_add(rate_ctr_group_get_ctr(bts_ctrs, BTS_CTR_LCHAN_TCH_TOTAL_ACTIVE_MILLISECONDS), duration_ms);
Does it really makes sense to use this kind of value as a rate_ctr? Just asking. It's difficult to interpet it I think.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347
Gerrit-Change-Number: 27081
Gerrit-PatchSet: 4
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:23:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27091 )
Change subject: bssmap_reset: make T4 user configurable
......................................................................
bssmap_reset: make T4 user configurable
The timer (T4) that controls the re-sending of the BSSMAP RESET can not
be changed via the VTY, althrough it is defined via a tdef struct. Lets
add a description along with default values to make it configurable via
the VTY.
Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Related: SYS#5796
---
M src/osmo-bsc/bssmap_reset.c
M src/osmo-bsc/net_init.c
M tests/timer.vty
3 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/27091/1
diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index beb8968..4d24c01 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -47,7 +47,7 @@
osmo_tdef_fsm_inst_state_chg(FI, STATE, \
bssmap_reset_timeouts, \
(bsc_gsmnet)->T_defs, \
- 5)
+ -1)
struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg)
{
diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c
index ec2f881..adcffc7 100644
--- a/src/osmo-bsc/net_init.c
+++ b/src/osmo-bsc/net_init.c
@@ -27,6 +27,7 @@
#include <osmocom/bsc/neighbor_ident.h>
static struct osmo_tdef gsm_network_T_defs[] = {
+ { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" },
{ .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" },
{ .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" },
{ .T=10, .default_val=6, .desc="RR Assignment" },
diff --git a/tests/timer.vty b/tests/timer.vty
index 12c13ad..e832070 100644
--- a/tests/timer.vty
+++ b/tests/timer.vty
@@ -1,6 +1,7 @@
OsmoBSC> enable
OsmoBSC# show timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
@@ -53,6 +54,7 @@
OsmoBSC# configure terminal
OsmoBSC(config)# network
OsmoBSC(config-net)# timer
+net: T4 = 5 s Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC (default: 5 s)
net: T7 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
net: T8 = 10 s inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
net: T10 = 6 s RR Assignment (default: 6 s)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27091
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: 2021q4
Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7
Gerrit-Change-Number: 27091
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 )
Change subject: gsm_network_T_defs: add T4, so it becomes configurable
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
Patchset:
PS3:
To me this belongs to the same patch, but ok.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c
Gerrit-Change-Number: 27084
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 11:00:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27088 )
Change subject: core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0)
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File include/osmocom/core/utils.h:
https://gerrit.osmocom.org/c/libosmocore/+/27088/comment/d567ec77_4cb94df3
PS1, Line 118: } while (0); /* some code invokes OSMO_ASSERT() without the semicolon */
We should fix those.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27088
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I42d9c315c9c30bce828564a63c496ee62e5c1431
Gerrit-Change-Number: 27088
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 08 Feb 2022 10:58:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment