pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38965?usp=email )
Change subject: e1_input: Fix e1i_ts pointing to old line after line_clone
......................................................................
e1_input: Fix e1i_ts pointing to old line after line_clone
Change-Id: I8f8e1fd67a63b46d59f433ad01bb2ab880cdf910
---
M src/e1_input.c
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/65/38965/1
diff --git a/src/e1_input.c b/src/e1_input.c
index 145fccf..76adbd9 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -675,6 +675,10 @@
OSMO_ASSERT(clone->sock_path);
}
+ /* Update TS to point to the cloned line: */
+ for (unsigned int i = 0; i < line->num_ts; i++)
+ clone->ts[i].line = clone;
+
/*
* Rate counters and driver data are shared between clones. These are pointers
* to dynamic memory so we use reference counting to avoid a double-free (see OS#3137).
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38965?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I8f8e1fd67a63b46d59f433ad01bb2ab880cdf910
Gerrit-Change-Number: 38965
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: dexter.
pespin has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38964?usp=email )
Change subject: PCUIF: fix usage of bts number in PCUIF_TXT_IND
......................................................................
Patch Set 1:
(1 comment)
File bts/BTS_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38964/comment/64d211fb_63f5… :
PS1, Line 5449: /* At this point, a real PCU would not have any BTS context yet. This means that the receiving process is
I'm failing to see the relation between "PCU not having any BTS contenxt yet" and the fact that we send a "0" in the field because we need to send whatever anywyay...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38964?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I93de261fc77806b2f817e0d30cb1b0d377ed0dbb
Gerrit-Change-Number: 38964
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 Nov 2024 17:28:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38964?usp=email )
Change subject: PCUIF: fix usage of bts number in PCUIF_TXT_IND
......................................................................
PCUIF: fix usage of bts number in PCUIF_TXT_IND
When we receive the PCU_VERSION using tr_PCUIF_TXT_IND we must ignore the
included BTS number because the PCU_VERSION is not addressed to a specific
BTS. When we send a PCU_VERSION using ts_PCUIF_TXT_IND, we should always
use the bts number 0 to be consistent (the BSC/BTS will ignore this number
anyway).
Let's fix the usage of tr_PCUIF_TXT_IND and put comments, to make clear why
the above applies.
Change-Id: I93de261fc77806b2f817e0d30cb1b0d377ed0dbb
related: OS#6507
---
M bts/BTS_Tests.ttcn
M bts/BTS_Tests_OML.ttcn
M pcu/PCUIF_Components.ttcn
M pcu/PCU_Tests_NS.ttcn
4 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/38964/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 1ba8d53..186d273 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -5446,6 +5446,8 @@
f_init();
map(self:PCU, system:PCU);
f_init_pcu(PCU, testcasename(), g_pcu_conn_id, g_pcu_last_info);
+ /* At this point, a real PCU would not have any BTS context yet. This means that the receiving process is
+ * expected to ignore the BTS number (0) we use when sending the PCU_VERSION. */
PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION, testcasename())));
}
diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn
index 980643a..e34a5f7 100644
--- a/bts/BTS_Tests_OML.ttcn
+++ b/bts/BTS_Tests_OML.ttcn
@@ -150,6 +150,8 @@
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU INFO_IND");
}
}
+ /* At this point, a real PCU would not have any BTS context yet. This means that the receiving process is
+ * expected to ignore the BTS number (0) we use when sending the PCU_VERSION. */
pt.send(t_SD_PCUIF(pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION, testcasename())));
}
diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn
index 6e956ba..db181b9 100644
--- a/pcu/PCUIF_Components.ttcn
+++ b/pcu/PCUIF_Components.ttcn
@@ -503,8 +503,9 @@
PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT));
alt {
- /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */
- [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg {
+ /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13). Since the PCU does not have any BTS context
+ * at this point, we will ignore the BTS number in this TXT indication. */
+ [] PCUIF.receive(tr_PCUIF_TXT_IND(?, PCU_VERSION, ?)) -> value pcu_msg {
log("Rx TXT.ind from the PCU, version is ", pcu_msg.u.txt_ind.text);
/* Send System Information 13 to the PCU */
diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn
index eea8d3f..fad9047 100644
--- a/pcu/PCU_Tests_NS.ttcn
+++ b/pcu/PCU_Tests_NS.ttcn
@@ -55,8 +55,9 @@
g_pcu_conn_id := f_pcuif_listen(PCU, mp_pcu_sock_path);
PCU.receive(UD_connected:?);
- /* Wait for PCU_VERSION and return INFO_IND */
- PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(0, PCU_VERSION, ?)));
+ /* Wait for PCU_VERSION and return INFO_IND. Since the PCU does not have any BTS context at this point, we will
+ * ignore the BTS number in this TXT indication. */
+ PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TXT_IND(?, PCU_VERSION, ?)));
/* FIXME: make sure to use parameters from mp_gb_cfg.bvc[0].cell_id in the PCU INFO IND */
var template PCUIF_Message info_ind_msg := ts_PCUIF_INFO_IND(0, info_ind);
PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind_msg));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38964?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I93de261fc77806b2f817e0d30cb1b0d377ed0dbb
Gerrit-Change-Number: 38964
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38963?usp=email )
Change subject: bsc: osmo-bsc.cfg: Listen IPA Abis and CTRL interfaces on 127.0.0.1
......................................................................
bsc: osmo-bsc.cfg: Listen IPA Abis and CTRL interfaces on 127.0.0.1
CTRL seems to bind to 127.0.0.1 by default, but IPA Abis listents to
0.0.0.0 by default, which is not needed and may create problems with
concurrent instances.
Change-Id: I56c8c6af16502e8f98b28902a251e190da0c0490
---
M bsc/osmo-bsc.cfg
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/38963/1
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index 958db6a..a03aeaf 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -45,11 +45,14 @@
line vty
no login
bind 127.0.0.1
+ctrl
+ bind 127.0.0.1
!
e1_input
e1_line 0 driver ipa
e1_line 0 port 0
no e1_line 0 keepalive
+ ipa bind 127.0.0.1
cs7 instance 0
asp asp-clnt-msc-0 2905 1905 m3ua
remote-ip 127.0.0.1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38963?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I56c8c6af16502e8f98b28902a251e190da0c0490
Gerrit-Change-Number: 38963
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email )
Change subject: pySim-shell: change Prompt character to "#" after "verify_adm"
......................................................................
Patch Set 3:
(1 comment)
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/38884/comment/32ee3710_eaa75e5c?usp=em… :
PS1, Line 301:
> Your gut feeling is correct. There is/was indeed a problem with equip. I have fixed this now. […]
(My browser setup died, the last paragraph should be something entirely different)
I wanted to say that I have moved the adm_verified state into the rs object. Since we normally call the reset method of this object, the state can be reset by that method much safer. Also we get a new rs object when we call init_card.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f
Gerrit-Change-Number: 38884
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 Nov 2024 14:00:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder, fixeria, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38884?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Verified+1 by Jenkins Builder
Change subject: pySim-shell: change Prompt character to "#" after "verify_adm"
......................................................................
pySim-shell: change Prompt character to "#" after "verify_adm"
Let's change the prompt from ">" to "#" when the user gains admin
privilegs using verify_adm.
Related: OS#6640
Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f
---
M pySim-shell.py
M pySim/runtime.py
2 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/38884/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f
Gerrit-Change-Number: 38884
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(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: fixeria <vyanitskiy(a)sysmocom.de>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38962?usp=email )
Change subject: pySim-shell: reset card in method equip
......................................................................
pySim-shell: reset card in method equip
When the equip method is running, all kinds of states in pySim-shell are reset.
To be sure that the card state is also reset (normally this is the case because
usually init_card is called before equip), we should send an explicit reset to
the card as well.
Related: OS#6640
Change-Id: I622a2df2c9184841f72abd18483bfbfd00b2f464
---
M pySim-shell.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/38962/1
diff --git a/pySim-shell.py b/pySim-shell.py
index 08f00f9..f2b3ad2 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -155,6 +155,7 @@
# When a card object and a runtime state is present, (re)equip pySim-shell with everything that is
# needed to operate on cards.
if self.card and self.rs:
+ self.rs.reset()
self.lchan = self.rs.lchan[0]
self._onchange_conserve_write(
'conserve_write', False, self.conserve_write)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38962?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I622a2df2c9184841f72abd18483bfbfd00b2f464
Gerrit-Change-Number: 38962
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email )
Change subject: pySim-shell: change Prompt character to "#" after "verify_adm"
......................................................................
Patch Set 2:
(1 comment)
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/38884/comment/431c6180_8f8e0803?usp=em… :
PS1, Line 301:
> are we sure all instances of 'reset' or 'detecting a new card' (equip, ... […]
Your gut feeling is correct. There is/was indeed a problem with equip. I have fixed this now. Also I noticed that equip by itself does not reset the card, even though it resets all kinds of states in pySim-shell and even selects the MF. I have corrected this in a separate patch.
So, we do reset the adm_verifed state on reset, we reset it in the equip method, which is called from do_equip and also from the code that does the bulk script execution.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f
Gerrit-Change-Number: 38884
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 27 Nov 2024 12:05:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38913?usp=email )
Change subject: msc: fix a race condition in f_mt_call_establish()
......................................................................
msc: fix a race condition in f_mt_call_establish()
It can happen that the MSC sends a paging request quicker than
function f_ran_register_imsi() returns (e.g. when a node executing
the testsuite is under significant load). In this case the
BSSMAP PAGING message is dropped by the RAN_Emulation CT:
CommonBssmapUnitdataCallback: IMSI/TMSI not found in table
This can be avoided by calling f_ran_register_imsi() *before*
sending the MNCC SETUP.req, which is triggering paging.
This patch fixes sporadic failures of:
* TC_lu_and_mt_call
* TC_lu_and_mt_call_ipv6
* TC_lu_and_mt_call_no_dlcx_resp
Change-Id: Ie8b69c3b59ea61e01adb24c71c1376335a5ddde6
---
M msc/BSC_ConnectionHandler.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index b7d1b94..4444f37 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1420,12 +1420,12 @@
function f_mt_call_establish(inout CallParameters cpars)
runs on BSC_ConnHdlr {
+ f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
/* Initiate the call via MNCC */
f_mt_call_initiate(cpars);
/* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */
- f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
f_expect_paging()
/* Complete the call via BSSAP */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38913?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie8b69c3b59ea61e01adb24c71c1376335a5ddde6
Gerrit-Change-Number: 38913
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>