fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33165 )
Change subject: fake_trx.py: remove SETSLOT based burst filtering
......................................................................
fake_trx.py: remove SETSLOT based burst filtering
For the sake of simplicity and due to some performance limitations,
fake_trx.py does not generate TRXD NOPE indications for osmo-bts-trx
on its own. It's actually trxcon sending NOPE.req (empty Tx PDUs)
when it has nothing to send, and fake_trx.py simply converting them.
In a follow-up change [1] we remove trxcon's internal clock module,
making the Uplink burst scheduling being driven by Downlink bursts
with the respective TDMA Fn/Tn values. Given that fake_trx.py is
currently dropping bursts received for inactive timeslots, we would
get NOPE.req only for a single timeslot, the one being currently
active. This would break several testcases in ttcn3-bts-test.
Remove SETSLOT based burst filtering, so that trxcon would still be
able to generate NOPE.req for all, active and inactive timeslots.
Downlink bursts for inactive timeslots are discarded anyway.
Change-Id: Ia42550d5c2d8b49efbdf8ef0ce46b26afd1c464e
Related: [1] Ic8a5b6277c6b16392026e0557376257d71c9d230
Related: OS#5500
---
M src/target/trx_toolkit/burst_fwd.py
M src/target/trx_toolkit/ctrl_if_trx.py
M src/target/trx_toolkit/transceiver.py
3 files changed, 27 insertions(+), 48 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/33165/1
diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py
index f5a6d78..6924531 100644
--- a/src/target/trx_toolkit/burst_fwd.py
+++ b/src/target/trx_toolkit/burst_fwd.py
@@ -58,8 +58,6 @@
# Check transceiver state
if not trx.running:
continue
- if rx_msg.tn not in trx.ts_list:
- continue
# Match Tx/Rx frequencies of the both transceivers
if trx.get_rx_freq(rx_msg.fn) != tx_freq:
diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py
index 2871f37..e6fdaf1 100644
--- a/src/target/trx_toolkit/ctrl_if_trx.py
+++ b/src/target/trx_toolkit/ctrl_if_trx.py
@@ -134,32 +134,6 @@
self.trx._tx_freq = int(request[1]) * 1000
return 0
- elif self.verify_cmd(request, "SETSLOT", 2):
- log.debug("(%s) Recv SETSLOT cmd" % self.trx)
-
- # Obtain TS index
- ts = int(request[1])
- if ts not in range(0, 8):
- log.error("(%s) TS index should be in "
- "range: 0..7" % self.trx)
- return -1
-
- # Parse TS type
- ts_type = int(request[2])
-
- # TS activation / deactivation
- # We don't care about ts_type
- if ts_type == 0:
- # Deactivate TS (remove from the list of active timeslots)
- if ts in self.trx.ts_list:
- self.trx.ts_list.remove(ts)
- else:
- # Activate TS (add to the list of active timeslots)
- if ts not in self.trx.ts_list:
- self.trx.ts_list.append(ts)
-
- return 0
-
# Power measurement
if self.verify_cmd(request, "MEASURE", 1):
log.debug("(%s) Recv MEASURE cmd" % self.trx)
diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py
index 385c38d..ffd18ab 100644
--- a/src/target/trx_toolkit/transceiver.py
+++ b/src/target/trx_toolkit/transceiver.py
@@ -43,16 +43,6 @@
NOTE: CLCK is not required for some L1 implementations, so it is optional.
- == Timeslot configuration
-
- Transceiver has a list of active (i.e. configured) TDMA timeslots.
- The L1 should configure a timeslot before sending or expecting any
- data on it. This is done by SETSLOT control command, which also
- indicates an associated channel combination (see GSM TS 05.02).
-
- NOTE: we don't store the associated channel combinations,
- as they are only useful for burst detection and demodulation.
-
== Child transceivers
A BTS can (optionally) have more than one transceiver. In this case
@@ -168,9 +158,6 @@
# Frequency hopping parameters (set by CTRL)
self.fh = None
- # List of active (configured) timeslots
- self.ts_list = []
-
# List of child transceivers
self.child_trx_list = TRXList()
@@ -264,13 +251,6 @@
"is not running => dropping..." % (self, msg.desc_hdr()))
return None
- # Make sure that indicated timeslot is configured
- # Pass PDUs without burst bits, they will be sent as NOPE.ind
- if msg.tn not in self.ts_list and msg.burst:
- log.warning("(%s) RX TRXD message (%s), but timeslot is not "
- "configured => dropping..." % (self, msg.desc_hdr()))
- return None
-
return msg
def handle_data_msg(self, msg):
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33165
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia42550d5c2d8b49efbdf8ef0ce46b26afd1c464e
Gerrit-Change-Number: 33165
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33166 )
Change subject: trxcon: do not advance Uplink TDMA Fn by default
......................................................................
trxcon: do not advance Uplink TDMA Fn by default
The idea behind advancing Uplink TDMA Fn is to give the transceiver,
which is usually a separate process, some additional time to receive
and prepare Uplink bursts for transmission. This comes at a price
of having an additional delay between Uplink and Downlink.
Given that trxcon, as a standalone application, is primarily used in
conjunction with fake_trx.py for running ttcn3-bts-test against
osmo-bts-trx, there is no reason to advance the Uplink TDMA Fn.
Change-Id: I838b1ebc54e4c5d116f8af2155d97215a6133ba4
Related: OS#5500
---
M src/host/trxcon/src/trxcon_main.c
1 file changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/33166/1
diff --git a/src/host/trxcon/src/trxcon_main.c b/src/host/trxcon/src/trxcon_main.c
index 7298f5a..3901e33 100644
--- a/src/host/trxcon/src/trxcon_main.c
+++ b/src/host/trxcon/src/trxcon_main.c
@@ -79,7 +79,7 @@
.trx_remote_ip = "127.0.0.1",
.trx_bind_ip = "0.0.0.0",
.trx_base_port = 6700,
- .trx_fn_advance = 3,
+ .trx_fn_advance = 0,
.phyq_fbsb_extend_fns = 0,
};
@@ -184,7 +184,7 @@
printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n");
printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n");
printf(" -p --trx-port Base port of TRX instance (default 6700)\n");
- printf(" -f --trx-advance Uplink burst scheduling advance (default 3)\n");
+ printf(" -f --trx-advance Uplink burst scheduling advance (default 0)\n");
printf(" -F --fbsb-extend FBSB timeout extension (in TDMA FNs, default 0)\n");
printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n");
printf(" -g --gsmtap-ip The destination IP used for GSMTAP (disabled by default)\n");
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33166
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I838b1ebc54e4c5d116f8af2155d97215a6133ba4
Gerrit-Change-Number: 33166
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33099 )
Change subject: Add VTY support for TUAK algorithm
......................................................................
Patch Set 5: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33099
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: If2611658f7cb990b484d7429ab2f944f56fd2eb6
Gerrit-Change-Number: 33099
Gerrit-PatchSet: 5
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Sun, 04 Jun 2023 20:16:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33098 )
Change subject: db: extend database schema to support 256bit K and/or OP[c] values
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33098
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: Ibbde68484c904507a15c35cbfdf88cd47d0c7039
Gerrit-Change-Number: 33098
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Sun, 04 Jun 2023 20:14:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33097 )
Change subject: Port to new libosmogsm 'struct osmo_sub_auth_data2'
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33097
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I3207c7bfb73e9ff5471e5c26b66639549e4d48a2
Gerrit-Change-Number: 33097
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Sun, 04 Jun 2023 20:10:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33164 )
Change subject: struct osmo_sub_auth_data: remove OSMO_DEPRECATED_OUTSIDE
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I am sorry, adding this attribute was not a good idea :/
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia5d365206207872d5d3fdd4ae40273eab909fb33
Gerrit-Change-Number: 33164
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Sun, 04 Jun 2023 18:52:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment