- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: pgw: Don't expect Gx messages during delete of unknwon session
by pespin 12 Apr '22

12 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27733 ) Change subject: pgw: Don't expect Gx messages during delete of unknwon session ...................................................................... pgw: Don't expect Gx messages during delete of unknwon session Same approach as implemented for GGSN_Tests in 10ec96e24b7d7fc8dd4fe6e023cc06514f53c66e. Change-Id: I7ad1fcae612a562d6643f9f01db3a4e7941f3666 --- M pgw/PGW_Tests.ttcn 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 2b74418..775b904 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -378,7 +378,8 @@ /* delete the session from the PGW */ private function f_delete_session(template (omit) OCT1 tx_cause := omit, template (present) OCT4 exp_teid, - template (present) OCT1 exp_cause) runs on PGW_Session_CT { + template (present) OCT1 exp_cause, + boolean expect_diameter := true) runs on PGW_Session_CT { var template (value) FullyQualifiedTEID fteid_c_ie fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_teic, 0, f_inet_addr(mp_local_hostname_c), omit); @@ -388,7 +389,7 @@ teid_list := {}, bearer_id := 1); GTP2.send(g2c); - if (DIAMETER_PROC.checkstate("Connected")) { + if (DIAMETER_PROC.checkstate("Connected") and expect_diameter) { as_DIA_CCR(TERMINATION_REQUEST); } alt { @@ -564,7 +565,7 @@ private function f_TC_deleteSession_unknown() runs on PGW_Session_CT { g_teic := f_gtp2_allocate_teid(); g_teic_remote := f_rnd_octstring(4); - f_delete_session(omit, '00000000'O, '40'O /* Context Unknown */); + f_delete_session(omit, '00000000'O, '40'O /* Context Unknown */, false); setverdict(pass); } testcase TC_deleteSession_unknown() runs on PGW_Test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27733 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: I7ad1fcae612a562d6643f9f01db3a4e7941f3666 Gerrit-Change-Number: 27733 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: pgw: Wait for component to get out of SUT's Diameter SUSPECt list
by pespin 12 Apr '22

12 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27732 ) Change subject: pgw: Wait for component to get out of SUT's Diameter SUSPECt list ...................................................................... pgw: Wait for component to get out of SUT's Diameter SUSPECt list Similar fix was applied to GGSN_Tests when adding Diameter support in commit 0bcfd9de8ff359673ddb71e013dbad44bf9510cc. Change-Id: I95ddf6c1048f0bfd6590bae574aea15c4fc2710b --- M pgw/PGW_Tests.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 9846dab..2b74418 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -146,6 +146,12 @@ vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); f_diameter_wait_capability(DIAMETER_UNIT); + /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): + * RFC6733 sec 5.1 + * RFC3539 sec 3.4.1 [5] + * https://github.com/freeDiameter/freeDiameter/blob/master/libfdcore/p_psm.c#… + */ + f_sleep(1.0); } private function f_init(float guard_timeout := 60.0) runs on PGW_Test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27732 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: I95ddf6c1048f0bfd6590bae574aea15c4fc2710b Gerrit-Change-Number: 27732 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: pgw: Wait for component to get out of SUT's Diameter SUSPECt list
by fixeria 12 Apr '22

12 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27732 ) Change subject: pgw: Wait for component to get out of SUT's Diameter SUSPECt list ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27732 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: I95ddf6c1048f0bfd6590bae574aea15c4fc2710b Gerrit-Change-Number: 27732 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 16:17:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: pgw: Don't expect Gx messages during delete of unknwon session
by fixeria 12 Apr '22

12 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27733 ) Change subject: pgw: Don't expect Gx messages during delete of unknwon session ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27733 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: I7ad1fcae612a562d6643f9f01db3a4e7941f3666 Gerrit-Change-Number: 27733 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 16:16:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-uecups[master]: main: Remove duplicate call to child_terminated()
by fixeria 12 Apr '22

12 Apr '22

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27737 ) Change subject: main: Remove duplicate call to child_terminated() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Good catch! -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I348b91097fe9bf78b2c7e33d4f3eaf316618068e Gerrit-Change-Number: 27737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 14:38:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-uecups[master]: main.c: Fix typo in comment
by fixeria 12 Apr '22

12 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27736 ) Change subject: main.c: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I6fb65b0468ebab8c35bb918f1d04d62b641edf69 Gerrit-Change-Number: 27736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 14:37:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-uecups[master]: main.c: Fix typo in comment
by pespin 11 Apr '22

11 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27736 ) Change subject: main.c: Fix typo in comment ...................................................................... main.c: Fix typo in comment Change-Id: I6fb65b0468ebab8c35bb918f1d04d62b641edf69 --- M daemon/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/36/27736/1 diff --git a/daemon/main.c b/daemon/main.c index 788ed70..39d60e6 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -370,7 +370,7 @@ child_terminated(d, fdsi->ssi_pid, fdsi->ssi_status); /* it is known that classic signals coalesce: If you get multiple signals of the - * same type before a process is scheduled, the subsequent signaals are dropped. This + * same type before a process is scheduled, the subsequent signals are dropped. This * makes sense for SIGINT or something like this, but for SIGCHLD carrying the PID of * the terminated process, it doesn't really. Linux had the chance to fix this when * introducing signalfd() - but the developers decided not to fix it. So the signalfd_siginfo -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I6fb65b0468ebab8c35bb918f1d04d62b641edf69 Gerrit-Change-Number: 27736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-uecups[master]: main: Remove duplicate call to child_terminated()
by pespin 11 Apr '22

11 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27737 ) Change subject: main: Remove duplicate call to child_terminated() ...................................................................... main: Remove duplicate call to child_terminated() The same pid will be handled below tyhrough waitpid. This can be seen when running PGW_Tests: """ 20220411134309656 DUECUPS main.c:343 SIGCHLD receive from pid 24; status=0 20220411134309656 DUECUPS main.c:95 r=172.18.18.202:9999<->l=172.18.18.20:4268: JSON Tx '{"program_term_ind": {"exit_code": 0, "pid": 24}}' 20220411134309656 DUECUPS main.c:343 SIGCHLD receive from pid 24; status=0 """ Change-Id: I348b91097fe9bf78b2c7e33d4f3eaf316618068e --- M daemon/main.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/37/27737/1 diff --git a/daemon/main.c b/daemon/main.c index 39d60e6..328d074 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -367,8 +367,6 @@ OSMO_ASSERT(fdsi->ssi_signo == SIGCHLD); - child_terminated(d, fdsi->ssi_pid, fdsi->ssi_status); - /* it is known that classic signals coalesce: If you get multiple signals of the * same type before a process is scheduled, the subsequent signals are dropped. This * makes sense for SIGINT or something like this, but for SIGCHLD carrying the PID of -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I348b91097fe9bf78b2c7e33d4f3eaf316618068e Gerrit-Change-Number: 27737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check
by fixeria 11 Apr '22

11 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27723 ) Change subject: osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check ...................................................................... osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check This check is redundant because it's guaranteed in rts_tchh_fn() that FACCH/H is always scheduled at the correct frame offset. Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Related: SYS#5916, OS#5518 --- M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-virtual/scheduler_virtbts.c 2 files changed, 0 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 05e8e7e..c9811da 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -374,14 +374,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Cannot transmit FACCH starting on even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* BURST BYPASS */ /* allocate burst memory, if not already, diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 9d2adfc..8557638 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -449,14 +449,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot transmit FACCH starting on " - "even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* no message at all */ if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "has not been served !! No prim\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Gerrit-Change-Number: 27723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bts[master]: scheduler: rts_tchh_fn(): use a lookup table for FACCH/H
by fixeria 11 Apr '22

11 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27721 ) Change subject: scheduler: rts_tchh_fn(): use a lookup table for FACCH/H ...................................................................... scheduler: rts_tchh_fn(): use a lookup table for FACCH/H Unlike TCH/F, TCH/H imposes some additional requirements on the FACCH transmission, so that a signalling block can be transmitted only at specific TDMA frame numbers defined in 3GPP TS 45.002, table 1. This is why in rts_tchh_fn() we need to check the given TDMA frame number and tell rts_tch_common() whether FACCH/H is permitted or not. The check is based on a magic formula, which I find a bit hard to read and understand. Let's better use a lookup table. Change-Id: I3dba243e5a1b7c8008ef0178ea18ed885256c50d Related: SYS#5916, OS#5518 --- M src/common/scheduler.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 99ab597..96189ef 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -996,12 +996,21 @@ return rts_tch_common(l1ts, br, true); } +/* FACCH/H channel mapping for Downlink (see 3GPP TS 45.002, table 1). + * This mapping is valid for both FACCH/H(0) and FACCH/H(1). */ +static const uint8_t sched_tchh_dl_facch_map[26] = { + [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ + [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ + [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ + [14] = 1, /* FACCH/H(1): B1(14,16,18,20,22,24) */ + [21] = 1, /* FACCH/H(0): B2(21,23,0,2,4,6) */ + [22] = 1, /* FACCH/H(1): B2(22,24,1,3,5,7) */ +}; /* RTS for half rate traffic frame */ static int rts_tchh_fn(const struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br) { - /* the FN 4/5, 13/14, 21/22 defines that FACCH may be included. */ - return rts_tch_common(l1ts, br, ((br->fn % 26) >> 2) & 1); + return rts_tch_common(l1ts, br, sched_tchh_dl_facch_map[br->fn % 26]); } /* set multiframe scheduler to given pchan */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3dba243e5a1b7c8008ef0178ea18ed885256c50d Gerrit-Change-Number: 27721 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log