August 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.202...

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34029 to look at the new patch set (#2). Change subject: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 ...................................................................... ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 --- M src/osmo-bsc/vgcs_fsm.c 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/34029/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 Gerrit-Change-Number: 34029 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER: Origin-State-Id in DWR and DWA messages is optional

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 ) Change subject: DIAMETER: Origin-State-Id in DWR and DWA messages is optional ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 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: I02e6f97a308f1752711aafed39c1d7534a382c70 Gerrit-Change-Number: 34230 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: Tue, 29 Aug 2023 10:40:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_rim: do not check the origin of a RIM message

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 ) Change subject: sgsn_rim: do not check the origin of a RIM message ...................................................................... sgsn_rim: do not check the origin of a RIM message When we forward RIM messages from GTP to BSSGP, we do not have to check the origin of the message since it does not matter from which origin the message came when we are forwarding it. Related: OS#6095 Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be --- M src/sgsn/sgsn_rim.c 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sgsn/sgsn_rim.c b/src/sgsn/sgsn_rim.c index c4a4a78..c6f8dcd 100644 --- a/src/sgsn/sgsn_rim.c +++ b/src/sgsn/sgsn_rim.c @@ -93,13 +93,6 @@ /* Receive a RIM PDU from GTPv1C (EUTRAN) */ int sgsn_rim_rx_from_gtp(struct bssgp_ran_information_pdu *pdu) { - if (pdu->routing_info_src.discr != BSSGP_RIM_ROUTING_INFO_EUTRAN) { - LOGP(DRIM, LOGL_ERROR, "Rx GTP RAN Information Relay: Expected src %s, got %s\n", - bssgp_rim_routing_info_discr_str(BSSGP_RIM_ROUTING_INFO_EUTRAN), - bssgp_rim_routing_info_discr_str(pdu->routing_info_src.discr)); - return -EINVAL; - } - if (pdu->routing_info_dest.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DRIM, LOGL_ERROR, "Rx GTP RAN Information Relay: Expected dst %s, got %s\n", bssgp_rim_routing_info_discr_str(BSSGP_RIM_ROUTING_INFO_GERAN), -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be Gerrit-Change-Number: 34121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-sgsn[master]: sgsn_rim: do not check the origin of a RIM message

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 ) Change subject: sgsn_rim: do not check the origin of a RIM message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iea8176dcfe64c25d207bafc0ef61ca9d9ad415be Gerrit-Change-Number: 34121 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 3: (1 comment) File src/pcu_l1_if.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/e430df5f_37104483 PS2, Line 150: void pcu_l1if_tx_agch2(struct gprs_rlcmac_bts *bts, bitvec *block, int plen, bool conform, uint32_t msg_id); > typo: confirm Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:39:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 3: (3 comments) File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/0d7b0b0a_a76b790e PS2, Line 1037: pcu_l1if_tx_agch2(bts, bv, plen, tbf->tlli(), false); > if we don't need cofnirmation so far, we don't need to pass a msg_id based on TLLI which may be actu […] Done https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/3bf7f9bb_1064d4cd PS2, Line 1055: pcu_l1if_tx_agch2(bts, bv, plen, tbf->tlli(), false); > Same, TLLI_UNUSED Done File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/c4195060_053f4bc9 PS2, Line 278: /* OS#6097: if strlen(imsi) == 0: We assume the MS is in non-DRX > why did you drop this comment? This all still holds true afaict if v10 is being used. I thought I could remove it since we use pcu_l1if_tx_agch2() in case no IMSI is present. But yes, the problem is still there in v.10. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:39:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 to look at the new patch set (#3). Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 When an downlink IMMEDIATE ASSIGNMENT message is sent through the PCH, an IMSI is always required in order to be able to calculate the paging group. However, when the downlink IMMEDIATE ASSIGNMENT has to be sent before the MS has completed the GMM ATTACH REQUEST, the IMSI is still unknown. In this case we may assume that the MS is still in non-DRX mode, which means it listens on all CCCH blocks (PCH and AGCH). This means we may send the IMMEDIATE ASSIGNMENT through the AGCH in this situation. This will also have the advantage that the scheduling through the AGCH will have less latency than the paging queue. Unfortunately the SAPI PCU_IF_SAPI_AGCH only supports sending whole MAC blocks, so it won't be possible to attach a TLLI that can be used for confirmation. To fix this, let's add a new SAPI_PCUI_IF_AGCH_2, that works similar as SAPI PCU_IF_SAPI_PCH_2 and use it to send the IMMEDIATE ASSIGNMENT through the AGCH. CAUTION: This patch breaks compatibility with current master osmo-bts and osmo-bsc (see "Depends") Related: OS#5927 Depends: osmo-bts.git I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/pcu_l1_if.cpp M src/pcu_l1_if.h 4 files changed, 98 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/34058/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: sim-rest-server: fix REST method info

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34154 ) Change subject: sim-rest-server: fix REST method info ...................................................................... sim-rest-server: fix REST method info The REST megthd info uses deprecated methods to read the ICCID and the IMSI from the card. However, we can replace those methods by selecting the files we are interested in manually and then reading them. Related: RT#67094 Change-Id: Ib0178823abb18187404249cfed71cfb3123d1d74 --- M contrib/sim-rest-server.py 1 file changed, 24 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/sim-rest-server.py b/contrib/sim-rest-server.py index 9f31168..83fb377 100755 --- a/contrib/sim-rest-server.py +++ b/contrib/sim-rest-server.py @@ -27,6 +27,9 @@ from pySim.transport.pcsc import PcscSimLink from pySim.commands import SimCardCommands from pySim.cards import UiccCardBase +from pySim.utils import dec_iccid, dec_imsi +from pySim.ts_51_011 import EF_IMSI +from pySim.ts_102_221 import EF_ICCID from pySim.exceptions import * class ApduPrintTracer(ApduTracer): @@ -134,10 +137,14 @@ tp, scc, card = connect_to_card(slot) + ef_iccid = EF_ICCID() + (iccid, sw) = card._scc.read_binary(ef_iccid.fid) + card.select_adf_by_aid(adf='usim') - iccid, sw = card.read_iccid() - imsi, sw = card.read_imsi() - res = {"imsi": imsi, "iccid": iccid } + ef_imsi = EF_IMSI() + (imsi, sw) = card._scc.read_binary(ef_imsi.fid) + + res = {"imsi": dec_imsi(imsi), "iccid": dec_iccid(iccid) } tp.disconnect() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib0178823abb18187404249cfed71cfb3123d1d74 Gerrit-Change-Number: 34154 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: sim-rest-server: fix REST method info

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34154 ) Change subject: sim-rest-server: fix REST method info ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib0178823abb18187404249cfed71cfb3123d1d74 Gerrit-Change-Number: 34154 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:38:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 ...................................................................... ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 After fixing GCC and BCC transaction ID, the new head is: b6602eb357673f097ea1a1d22edd568ecd239da1 Related: OS#4854 Change-Id: I2833750a8cf1def74f92a5a50f0d271891cee05f --- M deps/Makefile 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index c9aa1cf..0c8688f 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -104,7 +104,7 @@ titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= 76a3557f69834b6171652aaeaeef220444c35ba7 +titan.ProtocolModules.MobileL3_v13.4.0_commit= b6602eb357673f097ea1a1d22edd568ecd239da1 titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 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: I2833750a8cf1def74f92a5a50f0d271891cee05f Gerrit-Change-Number: 34232 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 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: I2833750a8cf1def74f92a5a50f0d271891cee05f Gerrit-Change-Number: 34232 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:37:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 3: (1 comment) File msc/MSC_Tests_ASCI.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/74075dc9_c2b6… PS3, Line 667: testcase TC_no_callref() runs on asci_CT { f_TC_asci_call(COORD_TEST_NO_CALLREF); } > better use regular spacing/newlines in all these here. ok, jolly please do that final change and then we can get it submitted. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:37:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: sigtran: Document SCTP (peer) primary address configuration

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 ) Change subject: sigtran: Document SCTP (peer) primary address configuration ...................................................................... sigtran: Document SCTP (peer) primary address configuration Related: OS#6076 Related: SYS#6501 Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 --- M common/chapters/sigtran.adoc 1 file changed, 95 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc index 51ef65e..d1cc6f0 100644 --- a/common/chapters/sigtran.adoc +++ b/common/chapters/sigtran.adoc @@ -358,6 +358,90 @@ multiple `local-ip` VTY commands within one `asp` (SCTP client role) or within one `listen m3ua 2905` (SCTP server role). +==== SCTP Primary Address + +SCTP has the concept of "primary address" in an association. The primary address +is a remote address selected from those announced by the peer, and it is the +"active" one chosen to transmit user data. The other remote addresses, that are +not used, are kept as backups. They are in general only used to transmit user +data whenever the SCTP implementation decides to change the primary address, be +it due to user policy configuration change or due to the previous primary link +becoming unusable. Only confirmed remote addresses (through HEARTBEAT mechanism) +are electable to be used as primary address. + +By default, the Linux kernel SCTP stack implementation will probably take the +first remote address provided at connect() time in order to start the initial +handshake, and continue with next provided remote addresses if the first one +fails to confirm the handshake. The remote address which successfully confirmed +the handshake is then used as a primary address (since it's likely the only +confirmed so far), and will be kept until the link is considered down. + +Some deployment setups may have requirements on preferred links to be used when +transmitting data (eg. network setups with primary and secondary paths). This +can be accomplished by explicitly notifying the kernel to use one of the remote +addresses through the SCTP_PRIMARY_ADDR sockopt, plus monitoring the address +availability changes on the socket and re-enforcing the primary address when it +becomes available again. This is supported in the Osmocom SIGTRAN stack by using +the `primary` parameter in one of the `remote-ip` commands under the `asp` node: + +---- +cs7 instance 0 + asp my-asp 2905 0 m3ua + remote-ip 10.11.12.13 + remote-ip 16.17.18.19 primary <1> + ... +---- +<1> Use 16.17.18.19 as primary address for the SCTP association. User data will +be in general transmitted over this path. + +==== SCTP Peer Primary Address + +The SCTP extension ASCONF (RFC5061) allows, when negotiated and supported by +both peers, to dynamically announce to the peer the addition or deletion of IP +addresses to the association. It also allows one peer announcing to the other +peer the desired IP address it should be using as a primary address when sending +data to it. + +In the Linux kernel SCTP stack, this is accomplished by setting the sockopt +SCTP_SET_PEER_PRIMARY_ADDR, which will trigger an ASCONF SCTP message to the +peer with the provided local IP address. This is supported in the Osmocom +SIGTRAN stack by using the `primary` parameter in one of the `local-ip` commands +under the `asp` node: + +---- +cs7 instance 0 + asp my-asp 2905 0 m3ua + local-ip 10.11.12.13 + local-ip 16.17.18.19 primary <1> + ... +---- +<1> Announce 16.17.18.19 to the peer as the primary address to be used when +transmitting user data to us. + +In order to be able to use this feature, the SCTP association peer must support +the ASCONF extension. The extension support is negotiation during the INIT +handshake of the association. Furthermore, for ASCONF features to work properly, +the assoc also needs to announce/use the AUTH extension, as per RFC5061 section +4.2.7. Otherwise, the peer receiving an SCTP INIT with +`ExtensionFeatures=ASCONF,ASCONF_ACK`` but without AUTH, will reject the +association with an ABORT since it's not complying with specifications (this +behavior can be tweaked through sysctl "net.sctp.addip_noauth_enable"). + +As of the time of writing this documentation (linux 6.4.12) and since basically +ever, those extensions are runtime-disabled by default. They can be enabled per +socket using the kernel sockopts SCTP_ASCONF_SUPPORTED and SCTP_AUTH_SUPPORTED, +and that's what the Osmocom stack is currently doing for all SCTP sockets. +However, those sockopts are farily new (linux v5.4), which means user running +older kernels will see in the logs setting those sockopts fail, but connection +will keep ongoing, simply without those features available (so setting `primary` +in the configuration won't have any effect here). +On those older kernels, if this feature is still desired, it can be used +by means of enabling the SCTP extensions in all socket system-wide through sysctl: +---- +net.sctp.auth_enable=1 +net.sctp.addip_enable=1 +---- + ==== SCTP role The _SCTP role_ defines which of the two L4 protocol roles SCTP assumes: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 Gerrit-Change-Number: 34225 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: sigtran: Document SCTP (peer) primary address configuration

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 ) Change subject: sigtran: Document SCTP (peer) primary address configuration ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 Gerrit-Change-Number: 34225 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:35:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:28:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 4: (1 comment) File include/osmo-bts/bts.h: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/4eb5760a_a1dd89eb PS3, Line 448: bool confirm; > changing the field order would probably benefit from better alignment :) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:24:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 to look at the new patch set (#4). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. In both cases we send a confirmation back to the PCU. For details see coresponding patch in osmo-pcu.git (see Depends) CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Depends: osmo-ttcn3-hacks.git Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 --- M include/osmo-bts/bts.h M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/bts.c M src/common/paging.c M src/common/pcu_sock.c 6 files changed, 67 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/59/34059/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[XL] Change in osmo-tetra[master]: Added crypto support

by wbokslag

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34169 to look at the new patch set (#3). Change subject: Added crypto support ...................................................................... Added crypto support Added TETRA cryptographic primitives (TEA1-3, TAA1 minus TA61). If a keyfile is loaded (using -k flag), matching signalling frames will be decrypted. No support for traffic or identity encryption yet. Based on https://github.com/MidnightBlueLabs/TETRA_crypto Change-Id: I0c0227cf5b747bd5032602390175b898173f6ae6 --- M src/Makefile A src/crypto/hurdle.c A src/crypto/hurdle.h A src/crypto/taa1.c A src/crypto/taa1.h A src/crypto/tea1.c A src/crypto/tea1.h A src/crypto/tea2.c A src/crypto/tea2.h A src/crypto/tea3.c A src/crypto/tea3.h M src/crypto/tetra_crypto.c 12 files changed, 1,199 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/69/34169/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I0c0227cf5b747bd5032602390175b898173f6ae6 Gerrit-Change-Number: 34169 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[XL] Change in osmo-tetra[master]: Added crypto support

by wbokslag

Attention is currently required from: laforge. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34169 ) Change subject: Added crypto support ...................................................................... Patch Set 2: (1 comment) File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/34169/comment/7eea84e2_89994c3f PS2, Line 249: // key->addr, key->index, tcs->hn, tetra_tdma_time_dump(tdma_time), tmpdu_offset, ct_len); > why is this (and similar lines below) commented-out in this patch? I'd suspect it would work just as […] You are right, I have been making some general modifications to have the code conform more to what I believe to be the osmocom standard, I could/should probably have refrained from making such changes in this patch. I have removed it in an amended patch. Log levels seem like a good idea for the future. The particular print in this example is rarely of interest. These, and some other prints elsewhere in the code, may be useful when debugging/understanding network traffic, but not to the majority of users. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I0c0227cf5b747bd5032602390175b898173f6ae6 Gerrit-Change-Number: 34169 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:22:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File include/osmo-bts/bts.h: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/235ff057_4fc6370b PS3, Line 448: bool confirm; changing the field order would probably benefit from better alignment :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:04:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 to look at the new patch set (#3). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. In both cases we send a confirmation back to the PCU. For details see coresponding patch in osmo-pcu.git (see Depends) CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Depends: osmo-ttcn3-hacks.git Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 --- M include/osmo-bts/bts.h M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/bts.c M src/common/paging.c M src/common/pcu_sock.c 6 files changed, 67 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/59/34059/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by pespin

Attention is currently required from: osmith, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/b99acf52_ce71fc66 PS1, Line 552: if (pch->confirmed_imm_ass) > I don't think that it is required to mention this, we do changes to PCUIF all the time. […] I disagree with this. I'm now more or less understanding the different changes you are doing to the protocol, but even for myself it's starting to be confusing the amount of changes. Imagine for others, or ourselves in a few months time. It will be difficult to understand which changes are part of which versions of the protocol. So yeah, in general I'd love seeing a bit more thoughts and clear explanations on what these changes are part of (eg v10->v11 changes). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:59:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by pespin

Attention is currently required from: osmith, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: (2 comments) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/d1b91702_425d377d PS2, Line 559: if (!pch->confirm) I'm not really following. > The problem is that we can not really chose here if we want a confirmation or not. Who is "we" here? in which piece of software? > The Ericsson RBS BTS will send the IMM ASS send message whether we want it or not. And this will generate a confirmation. What do you mean here with "will send a IMM ASS whether we want it or not"? > As far as I understand, you would use the pch->confirm flag to decide if the message has to go through pcu_rx_rr_imm_ass_pch() or pcu_rx_rr_paging_pch() why do you want to do that? pch->confim is to know whether the PCUIF primitive has to be confirmed. You look the message type to know whether it's an ImmAss or a Paging. https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/068d3d07_a2fcde4f PS2, Line 566: if (pch->confirm) > In theory osmo-bts would be capable to confirm paging MAC blocks. […] Just send the confirmation when you transmit the related block over RSL. We can later on add some extra parameters in osmo-pcu to incresae the delay, get estimation delays from the other PCUIF side, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:57:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:56:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/13e623d3_978cef5d PS1, Line 552: if (pch->confirmed_imm_ass) > @osmith this should not be a problem since there's a PCUIF version bump 10->11. […] I don't think that it is required to mention this, we do changes to PCUIF all the time. We take care that we do not break compatibility (Depends) and expect that users always use the current master and do not mix different states from different days. If someone uses nightly, nothing should be broken. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:54:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER: Origin-State-Id in DWR and DWA messages is optional

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 ) Change subject: DIAMETER: Origin-State-Id in DWR and DWA messages is optional ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 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: I02e6f97a308f1752711aafed39c1d7534a382c70 Gerrit-Change-Number: 34230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:50:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34222 ) Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... add the gnuradio 3.10 demodulator and receiver from telive Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a --- A src/demod/simdemod3.grc A src/demod/simdemod3.py A src/demod/telive_1ch_simple_gr310_udp.grc A src/demod/telive_1ch_simple_gr310_udp.py A src/receiver1udp 5 files changed, 2,115 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/demod/simdemod3.grc b/src/demod/simdemod3.grc new file mode 100644 index 0000000..18bcce2 --- /dev/null +++ b/src/demod/simdemod3.grc @@ -0,0 +1,498 @@ +options: + parameters: + author: Jacek Lipkowski SQ5BPF + catch_exceptions: 'True' + category: '[GRC Hier Blocks]' + cmake_opt: '' + comment: '' + copyright: '' + description: cqpsk demodulator for tetra. based on pi4dqpsk_rx.grc (by 'Luca + Bortolotti' @optiluca) from https://gitlab.com/larryth/tetra-kit/ . It is meant + as a replacement for simdemod2.py, taked the data from stdin, and dumpd demodulated + data to STDOUT. Also sends via UDP the information how much the signal is mistuned + (this option is disabled for the version committed to osmo-tetra) + gen_cmake: 'On' + gen_linking: dynamic + generate_options: no_gui + hier_block_src_path: '.:' + id: simdemod3 + max_nouts: '0' + output_language: python + placement: (0,0) + qt_qss_theme: '' + realtime_scheduling: '' + run: 'True' + run_command: '{python} -u {filename}' + run_options: run + sizing_mode: fixed + thread_safe_setters: '' + title: DQPSK demodulator for Telive, with the AFC packet sending option disabled + window_size: (1000,1000) + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [8, 8] + rotation: 0 + state: enabled + +blocks: +- name: TETRA_HACK_IP + id: variable + parameters: + comment: '' + value: os.getenv('TETRA_HACK_IP') if os.getenv('TETRA_HACK_IP') else "127.0.0.1" + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [304, 92.0] + rotation: 0 + state: disabled +- name: TETRA_HACK_PORT + id: variable + parameters: + comment: '' + value: int(os.getenv('TETRA_HACK_PORT')) if os.getenv('TETRA_HACK_PORT') else + 7379 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [416, 92.0] + rotation: 0 + state: disabled +- name: TETRA_HACK_RXID + id: variable + parameters: + comment: '' + value: int(os.getenv('TETRA_HACK_RXID')) if os.getenv('TETRA_HACK_RXID') else + 0 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [176, 92.0] + rotation: 0 + state: disabled +- name: arity + id: variable + parameters: + comment: '' + value: '4' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [560, 12] + rotation: 0 + state: enabled +- name: channel_rate + id: variable + parameters: + comment: '' + value: '36000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [288, 12] + rotation: 0 + state: enabled +- name: constel + id: variable_constellation + parameters: + comment: '' + const_points: '[1-1j, 1+1j, -1-1j, 1-1j]' + dims: '1' + normalization: digital.constellation.AMPLITUDE_NORMALIZATION + precision: '8' + rot_sym: '4' + soft_dec_lut: '''auto''' + sym_map: '[0, 1, 3, 2]' + type: dqpsk + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [768, 452.0] + rotation: 0 + state: enabled +- name: decim + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [808, 12] + rotation: 0 + state: enabled +- name: nfilts + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [400, 12] + rotation: 0 + state: enabled +- name: rrc_taps + id: variable + parameters: + comment: '' + value: firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), 0.35, 11*sps*nfilts) + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [640, 12] + rotation: 0 + state: enabled +- name: samp_rate + id: variable + parameters: + comment: '' + value: '2000000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [184, 12] + rotation: 0 + state: enabled +- name: sps + id: variable + parameters: + comment: '' + value: '2' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [480, 12] + rotation: 0 + state: enabled +- name: variable_adaptive_algorithm_0 + id: variable_adaptive_algorithm + parameters: + comment: '' + cons: constel + delta: '10.0' + ffactor: '0.99' + modulus: '1' + step_size: 10e-3 + type: cma + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [904, 444.0] + rotation: 0 + state: true +- name: Author_note + id: note + parameters: + alias: '' + comment: '' + note: 'This is originally part of the telive software: https://github.com/sq5bpf/telive ' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [8, 156.0] + rotation: 0 + state: true +- name: analog_feedforward_agc_cc_0 + id: analog_feedforward_agc_cc + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_samples: '8' + reference: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [312, 220.0] + rotation: 0 + state: enabled +- name: blocks_file_descriptor_source_0 + id: blocks_file_descriptor_source + parameters: + affinity: '' + alias: '' + comment: '' + fd: '0' + maxoutbuf: '0' + minoutbuf: '0' + repeat: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [112, 220.0] + rotation: 0 + state: true +- name: blocks_null_sink_0 + id: blocks_null_sink + parameters: + affinity: '' + alias: '' + bus_structure_sink: '[[0,],]' + comment: '' + num_inputs: '3' + type: float + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [800, 224.0] + rotation: 0 + state: true +- name: blocks_unpack_k_bits_bb_0 + id: blocks_unpack_k_bits_bb + parameters: + affinity: '' + alias: '' + comment: '' + k: constel.bits_per_symbol() + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [752, 564.0] + rotation: 0 + state: enabled +- name: digital_constellation_decoder_cb_0 + id: digital_constellation_decoder_cb + parameters: + affinity: '' + alias: '' + comment: '' + constellation: constel + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [576, 452.0] + rotation: 0 + state: enabled +- name: digital_diff_phasor_cc_0 + id: digital_diff_phasor_cc + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [624, 356.0] + rotation: 0 + state: enabled +- name: digital_fll_band_edge_cc_0 + id: digital_fll_band_edge_cc + parameters: + affinity: '' + alias: '' + comment: '' + filter_size: '45' + maxoutbuf: '0' + minoutbuf: '0' + rolloff: '0.35' + samps_per_sym: sps + type: cc + w: cmath.pi/100.0 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [544, 192.0] + rotation: 0 + state: enabled +- name: digital_linear_equalizer_0 + id: digital_linear_equalizer + parameters: + adapt_after_training: 'True' + affinity: '' + alg: variable_adaptive_algorithm_0 + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_taps: '15' + sps: sps + training_sequence: '[ ]' + training_start_tag: corr_est + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [368, 360.0] + rotation: 0 + state: true +- name: digital_map_bb_0 + id: digital_map_bb + parameters: + affinity: '' + alias: '' + comment: '' + map: constel.pre_diff_code() + maxoutbuf: '0' + minoutbuf: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [576, 564.0] + rotation: 0 + state: enabled +- name: digital_pfb_clock_sync_xxx_0 + id: digital_pfb_clock_sync_xxx + parameters: + affinity: '' + alias: '' + comment: '' + filter_size: nfilts + init_phase: nfilts/2 + loop_bw: 2*cmath.pi/100.0 + max_dev: '1.5' + maxoutbuf: '0' + minoutbuf: '0' + osps: sps + sps: sps + taps: rrc_taps + type: ccf + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [128, 344.0] + rotation: 0 + state: enabled +- name: import_0 + id: import + parameters: + alias: '' + comment: '' + imports: import cmath + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [944, 12.0] + rotation: 0 + state: enabled +- name: import_1 + id: import + parameters: + alias: '' + comment: '' + imports: import os + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1040, 12.0] + rotation: 0 + state: true +- name: send_udp_to_telive + id: epy_block + parameters: + _source_code: "\"\"\"\nEmbedded Python Blocks:\n\nEach time this file is saved,\ + \ GRC will instantiate the first class it finds\nto get ports and parameters\ + \ of your block. The arguments to __init__ will\nbe the parameters. All of\ + \ them are required to have default values!\n\"\"\"\n\nimport numpy as np\n\ + from gnuradio import gr\nimport socket\n\nclass blk(gr.sync_block): # other\ + \ base classes are basic_block, decim_block, interp_block\n \"\"\"Embedded\ + \ Python Block - periodically send UDP packet to telive\"\"\"\n\n def __init__(self,\ + \ ntimes=10, rxid=0, port=7379, ip=\"127.0.0.1\",scaling=10): # only default\ + \ arguments here\n \"\"\"arguments to this function show up as parameters\ + \ in GRC\"\"\"\n gr.sync_block.__init__(\n self,\n \ + \ name='Send UDP messages to telive', # will show up in GRC\n \ + \ in_sig=[np.float32],\n out_sig=None\n )\n # if\ + \ an attribute with the same name as a parameter is found,\n # a callback\ + \ is registered (properties work, too).\n self.sock = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)\n\ + \ self.counter=0\n self.ntimes=ntimes\n self.tetra_hack_rxid=int(rxid)\n\ + \ self.tetra_hack_ip=str(ip)\n self.tetra_hack_port=int(port)\n\ + \ self.tetra_hack_scaling=scaling\n \n \n\n def work(self,\ + \ input_items, output_items):\n \"\"\"example: multiply with constant\"\ + \"\"\n self.counter=(self.counter+1)%self.ntimes\n if self.counter==0:\n\ + \ mmm=\"TETMON_begin FUNC:AFCVAL AFC:%i RX:%i TETMON_end\" % ( int\ + \ (input_items[0][0] * self.tetra_hack_scaling * - 1.0), self.tetra_hack_rxid)\n\ + \ message=bytes(mmm, \"utf-8\")\n self.sock.sendto(message,\ + \ (self.tetra_hack_ip, self.tetra_hack_port))\n return len(input_items\ + \ [0])\n" + affinity: '' + alias: '' + comment: '' + ip: TETRA_HACK_IP + maxoutbuf: '0' + minoutbuf: '0' + ntimes: '5' + port: TETRA_HACK_PORT + rxid: TETRA_HACK_RXID + scaling: '100' + states: + _io_cache: ('Send UDP messages to telive', 'blk', [('ntimes', '10'), ('rxid', + '0'), ('port', '7379'), ('ip', "'127.0.0.1'"), ('scaling', '10')], [('0', 'float', + 1)], [], 'Embedded Python Block - periodically send UDP packet to telive', ['ntimes']) + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [960, 140.0] + rotation: 0 + state: disabled +- name: stdout_sink + id: blocks_file_descriptor_sink + parameters: + affinity: '' + alias: '' + comment: '' + fd: '1' + type: byte + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [960, 564.0] + rotation: 0 + state: true + +connections: +- [analog_feedforward_agc_cc_0, '0', digital_fll_band_edge_cc_0, '0'] +- [blocks_file_descriptor_source_0, '0', analog_feedforward_agc_cc_0, '0'] +- [blocks_unpack_k_bits_bb_0, '0', stdout_sink, '0'] +- [digital_constellation_decoder_cb_0, '0', digital_map_bb_0, '0'] +- [digital_diff_phasor_cc_0, '0', digital_constellation_decoder_cb_0, '0'] +- [digital_fll_band_edge_cc_0, '0', digital_pfb_clock_sync_xxx_0, '0'] +- [digital_fll_band_edge_cc_0, '1', blocks_null_sink_0, '0'] +- [digital_fll_band_edge_cc_0, '1', send_udp_to_telive, '0'] +- [digital_fll_band_edge_cc_0, '2', blocks_null_sink_0, '1'] +- [digital_fll_band_edge_cc_0, '3', blocks_null_sink_0, '2'] +- [digital_linear_equalizer_0, '0', digital_diff_phasor_cc_0, '0'] +- [digital_map_bb_0, '0', blocks_unpack_k_bits_bb_0, '0'] +- [digital_pfb_clock_sync_xxx_0, '0', digital_linear_equalizer_0, '0'] + +metadata: + file_format: 1 + grc_version: 3.10.5.1 diff --git a/src/demod/simdemod3.py b/src/demod/simdemod3.py new file mode 100755 index 0000000..13f5997 --- /dev/null +++ b/src/demod/simdemod3.py @@ -0,0 +1,161 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# +# SPDX-License-Identifier: GPL-3.0 +# +# GNU Radio Python Flow Graph +# Title: DQPSK demodulator for Telive, with the AFC packet sending option disabled +# Author: Jacek Lipkowski SQ5BPF +# Description: cqpsk demodulator for tetra. based on pi4dqpsk_rx.grc (by 'Luca Bortolotti' @optiluca) from https://gitlab.com/larryth/tetra-kit/ . It is meant as a replacement for simdemod2.py, taked the data from stdin, and dumpd demodulated data to STDOUT. Also sends via UDP the information how much the signal is mistuned (this option is disabled for the version committed to osmo-tetra) +# GNU Radio version: 3.10.5.1 + +from gnuradio import analog +from gnuradio import blocks +from gnuradio import digital +from gnuradio import gr +from gnuradio.filter import firdes +from gnuradio.fft import window +import sys +import signal +from argparse import ArgumentParser +from gnuradio.eng_arg import eng_float, intx +from gnuradio import eng_notation +import cmath +import os + + + + +class simdemod3(gr.top_block): + + def __init__(self): + gr.top_block.__init__(self, "DQPSK demodulator for Telive, with the AFC packet sending option disabled", catch_exceptions=True) + + ################################################## + # Variables + ################################################## + self.sps = sps = 2 + self.nfilts = nfilts = 32 + self.constel = constel = digital.constellation_dqpsk().base() + self.constel.gen_soft_dec_lut(8) + self.variable_adaptive_algorithm_0 = variable_adaptive_algorithm_0 = digital.adaptive_algorithm_cma( constel, 10e-3, 1).base() + self.samp_rate = samp_rate = 2000000 + self.rrc_taps = rrc_taps = firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), 0.35, 11*sps*nfilts) + self.decim = decim = 32 + self.channel_rate = channel_rate = 36000 + self.arity = arity = 4 + + ################################################## + # Blocks + ################################################## + + self.stdout_sink = blocks.file_descriptor_sink(gr.sizeof_char*1, 1) + self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, (2*cmath.pi/100.0), rrc_taps, nfilts, (nfilts/2), 1.5, sps) + self.digital_map_bb_0 = digital.map_bb(constel.pre_diff_code()) + self.digital_linear_equalizer_0 = digital.linear_equalizer(15, sps, variable_adaptive_algorithm_0, True, [ ], 'corr_est') + self.digital_fll_band_edge_cc_0 = digital.fll_band_edge_cc(sps, 0.35, 45, (cmath.pi/100.0)) + self.digital_diff_phasor_cc_0 = digital.diff_phasor_cc() + self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(constel) + self.blocks_unpack_k_bits_bb_0 = blocks.unpack_k_bits_bb(constel.bits_per_symbol()) + self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_float*1) + self.blocks_file_descriptor_source_0 = blocks.file_descriptor_source(gr.sizeof_gr_complex*1, 0, False) + self.analog_feedforward_agc_cc_0 = analog.feedforward_agc_cc(8, 1) + + + ################################################## + # Connections + ################################################## + self.connect((self.analog_feedforward_agc_cc_0, 0), (self.digital_fll_band_edge_cc_0, 0)) + self.connect((self.blocks_file_descriptor_source_0, 0), (self.analog_feedforward_agc_cc_0, 0)) + self.connect((self.blocks_unpack_k_bits_bb_0, 0), (self.stdout_sink, 0)) + self.connect((self.digital_constellation_decoder_cb_0, 0), (self.digital_map_bb_0, 0)) + self.connect((self.digital_diff_phasor_cc_0, 0), (self.digital_constellation_decoder_cb_0, 0)) + self.connect((self.digital_fll_band_edge_cc_0, 2), (self.blocks_null_sink_0, 1)) + self.connect((self.digital_fll_band_edge_cc_0, 3), (self.blocks_null_sink_0, 2)) + self.connect((self.digital_fll_band_edge_cc_0, 1), (self.blocks_null_sink_0, 0)) + self.connect((self.digital_fll_band_edge_cc_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) + self.connect((self.digital_linear_equalizer_0, 0), (self.digital_diff_phasor_cc_0, 0)) + self.connect((self.digital_map_bb_0, 0), (self.blocks_unpack_k_bits_bb_0, 0)) + self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_linear_equalizer_0, 0)) + + + def get_sps(self): + return self.sps + + def set_sps(self, sps): + self.sps = sps + self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), 0.35, 11*self.sps*self.nfilts)) + + def get_nfilts(self): + return self.nfilts + + def set_nfilts(self, nfilts): + self.nfilts = nfilts + self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), 0.35, 11*self.sps*self.nfilts)) + + def get_constel(self): + return self.constel + + def set_constel(self, constel): + self.constel = constel + + def get_variable_adaptive_algorithm_0(self): + return self.variable_adaptive_algorithm_0 + + def set_variable_adaptive_algorithm_0(self, variable_adaptive_algorithm_0): + self.variable_adaptive_algorithm_0 = variable_adaptive_algorithm_0 + + def get_samp_rate(self): + return self.samp_rate + + def set_samp_rate(self, samp_rate): + self.samp_rate = samp_rate + + def get_rrc_taps(self): + return self.rrc_taps + + def set_rrc_taps(self, rrc_taps): + self.rrc_taps = rrc_taps + self.digital_pfb_clock_sync_xxx_0.update_taps(self.rrc_taps) + + def get_decim(self): + return self.decim + + def set_decim(self, decim): + self.decim = decim + + def get_channel_rate(self): + return self.channel_rate + + def set_channel_rate(self, channel_rate): + self.channel_rate = channel_rate + + def get_arity(self): + return self.arity + + def set_arity(self, arity): + self.arity = arity + + + + +def main(top_block_cls=simdemod3, options=None): + tb = top_block_cls() + + def sig_handler(sig=None, frame=None): + tb.stop() + tb.wait() + + sys.exit(0) + + signal.signal(signal.SIGINT, sig_handler) + signal.signal(signal.SIGTERM, sig_handler) + + tb.start() + + tb.wait() + + +if __name__ == '__main__': + main() diff --git a/src/demod/telive_1ch_simple_gr310_udp.grc b/src/demod/telive_1ch_simple_gr310_udp.grc new file mode 100644 index 0000000..00a1130 --- /dev/null +++ b/src/demod/telive_1ch_simple_gr310_udp.grc @@ -0,0 +1,936 @@ +options: + parameters: + author: Jacek Lipkowski SQ5BPF + catch_exceptions: 'True' + category: Custom + cmake_opt: '' + comment: '' + copyright: '' + description: This is a receiver flowgraph, uses a rtl-sdr dongle, and outputs + a downsampled stream to 127.0.0.1 42001/udp. This can be used with telive, or + just osmo-tetra + gen_cmake: 'On' + gen_linking: dynamic + generate_options: qt_gui + hier_block_src_path: '.:' + id: telive_1ch_simple_gr310_udp + max_nouts: '0' + output_language: python + placement: (0,0) + qt_qss_theme: '' + realtime_scheduling: '' + run: 'True' + run_command: '{python} -u {filename}' + run_options: prompt + sizing_mode: fixed + thread_safe_setters: '' + title: SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio + 3.10 version) xmlrpc + window_size: 2048, 2048 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [10, 10] + rotation: 0 + state: enabled + +blocks: +- name: first_decim + id: variable + parameters: + comment: '' + value: '32' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [547, 15] + rotation: 0 + state: enabled +- name: first_port + id: variable + parameters: + comment: '' + value: '42000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1080, 85] + rotation: 0 + state: enabled +- name: freq + id: variable_qtgui_entry + parameters: + comment: '' + gui_hint: 0,0,1,2 + label: Frequency + type: real + value: 438.0125e6 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [40, 404.0] + rotation: 0 + state: true +- name: if_samp_rate + id: variable + parameters: + comment: '' + value: samp_rate/first_decim + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [315, 18] + rotation: 0 + state: enabled +- name: options_low_pass + id: variable + parameters: + comment: '' + value: '12500' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [654, 18] + rotation: 0 + state: enabled +- name: out_sample_rate + id: variable + parameters: + comment: '' + value: '36000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [419, 18] + rotation: 0 + state: enabled +- name: ppm_corr + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,5,1,3 + label: ppm + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: float + start: '-100' + step: '0.5' + stop: '100' + value: '0' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [360, 420.0] + rotation: 0 + state: true +- name: samp_rate + id: variable + parameters: + comment: '' + value: '2000000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [223, 19] + rotation: 0 + state: enabled +- name: sdr_gain + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,8,1,2 + label: gain + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: int + start: '0' + step: '1' + stop: '50' + value: '30' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [448, 420.0] + rotation: 0 + state: true +- name: sdr_ifgain + id: variable + parameters: + comment: '' + value: '20' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [56, 628.0] + rotation: 0 + state: enabled +- name: telive_receiver_channels + id: variable + parameters: + comment: '' + value: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1160, 396.0] + rotation: 0 + state: enabled +- name: telive_receiver_name + id: variable + parameters: + comment: '' + value: '''SQ5BPF 1-channel rx for telive''' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1192, 332.0] + rotation: 0 + state: enabled +- name: udp_dest_addr + id: variable + parameters: + comment: '' + value: '"127.0.0.1"' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1056, 157] + rotation: 0 + state: enabled +- name: udp_packet_size + id: variable + parameters: + comment: '' + value: '1472' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1072, 229] + rotation: 0 + state: enabled +- name: variable_qtgui_label_0_0 + id: variable_qtgui_label + parameters: + comment: '' + formatter: 'lambda x: f''{x/1000000:.4f} MHz''' + gui_hint: '' + label: 'Receive frequency: ' + type: real + value: freq+xlate_offset_fine1 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [176, 636.0] + rotation: 0 + state: true +- name: xlate_offset1 + id: variable + parameters: + comment: '' + value: '500000' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [464, 652.0] + rotation: 0 + state: enabled +- name: xlate_offset_fine1 + id: variable_qtgui_range + parameters: + comment: '' + gui_hint: 0,2,1,3 + label: Fine tune1 + min_len: '200' + orient: QtCore.Qt.Horizontal + rangeType: float + start: -5e3 + step: '1' + stop: +5e3 + value: '0' + widget: counter_slider + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [168, 404.0] + rotation: 0 + state: true +- name: analog_agc3_xx_0 + id: analog_agc3_xx + parameters: + affinity: '' + alias: '' + attack_rate: 1e-3 + comment: '' + decay_rate: 1e-4 + gain: '1.0' + iir_update_decim: '1' + max_gain: '65536' + maxoutbuf: '0' + minoutbuf: '0' + reference: '1.0' + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [568, 392.0] + rotation: 0 + state: enabled +- name: freq_xlating_fir_filter_xxx_0 + id: freq_xlating_fir_filter_xxx + parameters: + affinity: '' + alias: '' + center_freq: xlate_offset1+xlate_offset_fine1 + comment: '' + decim: first_decim + maxoutbuf: '0' + minoutbuf: '0' + samp_rate: samp_rate + taps: firdes.low_pass(1, samp_rate, options_low_pass, options_low_pass*0.2) + type: ccc + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [520, 95] + rotation: 0 + state: enabled +- name: mmse_resampler_xx_0 + id: mmse_resampler_xx + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + phase_shift: '0' + resamp_ratio: float(float(if_samp_rate)/float(out_sample_rate)) + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [760, 440.0] + rotation: 0 + state: true +- name: network_udp_sink_0 + id: network_udp_sink + parameters: + addr: udp_dest_addr + affinity: '' + alias: '' + comment: '' + header: '0' + payloadsize: udp_packet_size + port: first_port+1 + send_eof: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [952, 428.0] + rotation: 0 + state: true +- name: note_0 + id: note + parameters: + alias: '' + comment: '' + note: 'The xmlrpc server is disabled, so that it doesn''t confuse anyone. You + can enable it when gnuradio bug #6766 is fixed' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [896, 20.0] + rotation: 0 + state: true +- name: osmosdr_source_0 + id: osmosdr_source + parameters: + affinity: '' + alias: '' + ant0: '' + ant1: '' + ant10: '' + ant11: '' + ant12: '' + ant13: '' + ant14: '' + ant15: '' + ant16: '' + ant17: '' + ant18: '' + ant19: '' + ant2: '' + ant20: '' + ant21: '' + ant22: '' + ant23: '' + ant24: '' + ant25: '' + ant26: '' + ant27: '' + ant28: '' + ant29: '' + ant3: '' + ant30: '' + ant31: '' + ant4: '' + ant5: '' + ant6: '' + ant7: '' + ant8: '' + ant9: '' + args: '' + bb_gain0: '20' + bb_gain1: '20' + bb_gain10: '20' + bb_gain11: '20' + bb_gain12: '20' + bb_gain13: '20' + bb_gain14: '20' + bb_gain15: '20' + bb_gain16: '20' + bb_gain17: '20' + bb_gain18: '20' + bb_gain19: '20' + bb_gain2: '20' + bb_gain20: '20' + bb_gain21: '20' + bb_gain22: '20' + bb_gain23: '20' + bb_gain24: '20' + bb_gain25: '20' + bb_gain26: '20' + bb_gain27: '20' + bb_gain28: '20' + bb_gain29: '20' + bb_gain3: '20' + bb_gain30: '20' + bb_gain31: '20' + bb_gain4: '20' + bb_gain5: '20' + bb_gain6: '20' + bb_gain7: '20' + bb_gain8: '20' + bb_gain9: '20' + bw0: '0' + bw1: '0' + bw10: '0' + bw11: '0' + bw12: '0' + bw13: '0' + bw14: '0' + bw15: '0' + bw16: '0' + bw17: '0' + bw18: '0' + bw19: '0' + bw2: '0' + bw20: '0' + bw21: '0' + bw22: '0' + bw23: '0' + bw24: '0' + bw25: '0' + bw26: '0' + bw27: '0' + bw28: '0' + bw29: '0' + bw3: '0' + bw30: '0' + bw31: '0' + bw4: '0' + bw5: '0' + bw6: '0' + bw7: '0' + bw8: '0' + bw9: '0' + clock_source0: '' + clock_source1: '' + clock_source2: '' + clock_source3: '' + clock_source4: '' + clock_source5: '' + clock_source6: '' + clock_source7: '' + comment: '' + corr0: ppm_corr + corr1: '0' + corr10: '0' + corr11: '0' + corr12: '0' + corr13: '0' + corr14: '0' + corr15: '0' + corr16: '0' + corr17: '0' + corr18: '0' + corr19: '0' + corr2: '0' + corr20: '0' + corr21: '0' + corr22: '0' + corr23: '0' + corr24: '0' + corr25: '0' + corr26: '0' + corr27: '0' + corr28: '0' + corr29: '0' + corr3: '0' + corr30: '0' + corr31: '0' + corr4: '0' + corr5: '0' + corr6: '0' + corr7: '0' + corr8: '0' + corr9: '0' + dc_offset_mode0: '0' + dc_offset_mode1: '0' + dc_offset_mode10: '0' + dc_offset_mode11: '0' + dc_offset_mode12: '0' + dc_offset_mode13: '0' + dc_offset_mode14: '0' + dc_offset_mode15: '0' + dc_offset_mode16: '0' + dc_offset_mode17: '0' + dc_offset_mode18: '0' + dc_offset_mode19: '0' + dc_offset_mode2: '0' + dc_offset_mode20: '0' + dc_offset_mode21: '0' + dc_offset_mode22: '0' + dc_offset_mode23: '0' + dc_offset_mode24: '0' + dc_offset_mode25: '0' + dc_offset_mode26: '0' + dc_offset_mode27: '0' + dc_offset_mode28: '0' + dc_offset_mode29: '0' + dc_offset_mode3: '0' + dc_offset_mode30: '0' + dc_offset_mode31: '0' + dc_offset_mode4: '0' + dc_offset_mode5: '0' + dc_offset_mode6: '0' + dc_offset_mode7: '0' + dc_offset_mode8: '0' + dc_offset_mode9: '0' + freq0: freq-xlate_offset1 + freq1: 100e6 + freq10: 100e6 + freq11: 100e6 + freq12: 100e6 + freq13: 100e6 + freq14: 100e6 + freq15: 100e6 + freq16: 100e6 + freq17: 100e6 + freq18: 100e6 + freq19: 100e6 + freq2: 100e6 + freq20: 100e6 + freq21: 100e6 + freq22: 100e6 + freq23: 100e6 + freq24: 100e6 + freq25: 100e6 + freq26: 100e6 + freq27: 100e6 + freq28: 100e6 + freq29: 100e6 + freq3: 100e6 + freq30: 100e6 + freq31: 100e6 + freq4: 100e6 + freq5: 100e6 + freq6: 100e6 + freq7: 100e6 + freq8: 100e6 + freq9: 100e6 + gain0: sdr_gain + gain1: '10' + gain10: '10' + gain11: '10' + gain12: '10' + gain13: '10' + gain14: '10' + gain15: '10' + gain16: '10' + gain17: '10' + gain18: '10' + gain19: '10' + gain2: '10' + gain20: '10' + gain21: '10' + gain22: '10' + gain23: '10' + gain24: '10' + gain25: '10' + gain26: '10' + gain27: '10' + gain28: '10' + gain29: '10' + gain3: '10' + gain30: '10' + gain31: '10' + gain4: '10' + gain5: '10' + gain6: '10' + gain7: '10' + gain8: '10' + gain9: '10' + gain_mode0: 'False' + gain_mode1: 'False' + gain_mode10: 'False' + gain_mode11: 'False' + gain_mode12: 'False' + gain_mode13: 'False' + gain_mode14: 'False' + gain_mode15: 'False' + gain_mode16: 'False' + gain_mode17: 'False' + gain_mode18: 'False' + gain_mode19: 'False' + gain_mode2: 'False' + gain_mode20: 'False' + gain_mode21: 'False' + gain_mode22: 'False' + gain_mode23: 'False' + gain_mode24: 'False' + gain_mode25: 'False' + gain_mode26: 'False' + gain_mode27: 'False' + gain_mode28: 'False' + gain_mode29: 'False' + gain_mode3: 'False' + gain_mode30: 'False' + gain_mode31: 'False' + gain_mode4: 'False' + gain_mode5: 'False' + gain_mode6: 'False' + gain_mode7: 'False' + gain_mode8: 'False' + gain_mode9: 'False' + if_gain0: sdr_ifgain + if_gain1: '20' + if_gain10: '20' + if_gain11: '20' + if_gain12: '20' + if_gain13: '20' + if_gain14: '20' + if_gain15: '20' + if_gain16: '20' + if_gain17: '20' + if_gain18: '20' + if_gain19: '20' + if_gain2: '20' + if_gain20: '20' + if_gain21: '20' + if_gain22: '20' + if_gain23: '20' + if_gain24: '20' + if_gain25: '20' + if_gain26: '20' + if_gain27: '20' + if_gain28: '20' + if_gain29: '20' + if_gain3: '20' + if_gain30: '20' + if_gain31: '20' + if_gain4: '20' + if_gain5: '20' + if_gain6: '20' + if_gain7: '20' + if_gain8: '20' + if_gain9: '20' + iq_balance_mode0: '0' + iq_balance_mode1: '0' + iq_balance_mode10: '0' + iq_balance_mode11: '0' + iq_balance_mode12: '0' + iq_balance_mode13: '0' + iq_balance_mode14: '0' + iq_balance_mode15: '0' + iq_balance_mode16: '0' + iq_balance_mode17: '0' + iq_balance_mode18: '0' + iq_balance_mode19: '0' + iq_balance_mode2: '0' + iq_balance_mode20: '0' + iq_balance_mode21: '0' + iq_balance_mode22: '0' + iq_balance_mode23: '0' + iq_balance_mode24: '0' + iq_balance_mode25: '0' + iq_balance_mode26: '0' + iq_balance_mode27: '0' + iq_balance_mode28: '0' + iq_balance_mode29: '0' + iq_balance_mode3: '0' + iq_balance_mode30: '0' + iq_balance_mode31: '0' + iq_balance_mode4: '0' + iq_balance_mode5: '0' + iq_balance_mode6: '0' + iq_balance_mode7: '0' + iq_balance_mode8: '0' + iq_balance_mode9: '0' + maxoutbuf: '0' + minoutbuf: '0' + nchan: '1' + num_mboards: '1' + sample_rate: samp_rate + sync: sync + time_source0: '' + time_source1: '' + time_source2: '' + time_source3: '' + time_source4: '' + time_source5: '' + time_source6: '' + time_source7: '' + type: fc32 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [32, 136.0] + rotation: 0 + state: enabled +- name: qtgui_freq_sink_x_0 + id: qtgui_freq_sink_x + parameters: + affinity: '' + alias: '' + alpha1: '1.0' + alpha10: '1.0' + alpha2: '1.0' + alpha3: '1.0' + alpha4: '1.0' + alpha5: '1.0' + alpha6: '1.0' + alpha7: '1.0' + alpha8: '1.0' + alpha9: '1.0' + autoscale: 'False' + average: '0.2' + axislabels: 'True' + bw: samp_rate + color1: '"blue"' + color10: '"dark blue"' + color2: '"red"' + color3: '"green"' + color4: '"black"' + color5: '"cyan"' + color6: '"magenta"' + color7: '"yellow"' + color8: '"dark red"' + color9: '"dark green"' + comment: '' + ctrlpanel: 'True' + fc: freq-xlate_offset1 + fftsize: '1024' + freqhalf: 'True' + grid: 'False' + gui_hint: 1,0,1,6 + label: Relative Gain + label1: '' + label10: '''''' + label2: '''''' + label3: '''''' + label4: '''''' + label5: '''''' + label6: '''''' + label7: '''''' + label8: '''''' + label9: '''''' + legend: 'True' + maxoutbuf: '0' + minoutbuf: '0' + name: '""' + nconnections: '1' + norm_window: 'False' + showports: 'False' + tr_chan: '0' + tr_level: '0.0' + tr_mode: qtgui.TRIG_MODE_FREE + tr_tag: '""' + type: complex + units: dB + update_time: '0.10' + width1: '1' + width10: '1' + width2: '1' + width3: '1' + width4: '1' + width5: '1' + width6: '1' + width7: '1' + width8: '1' + width9: '1' + wintype: window.WIN_BLACKMAN_hARRIS + ymax: '10' + ymin: '-140' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [280, 284.0] + rotation: 0 + state: true +- name: qtgui_freq_sink_x_0_0 + id: qtgui_freq_sink_x + parameters: + affinity: '' + alias: '' + alpha1: '1.0' + alpha10: '1.0' + alpha2: '1.0' + alpha3: '1.0' + alpha4: '1.0' + alpha5: '1.0' + alpha6: '1.0' + alpha7: '1.0' + alpha8: '1.0' + alpha9: '1.0' + autoscale: 'True' + average: '1.0' + axislabels: 'True' + bw: if_samp_rate + color1: '"blue"' + color10: '"dark blue"' + color2: '"red"' + color3: '"green"' + color4: '"black"' + color5: '"cyan"' + color6: '"magenta"' + color7: '"yellow"' + color8: '"dark red"' + color9: '"dark green"' + comment: '' + ctrlpanel: 'True' + fc: '0' + fftsize: '256' + freqhalf: 'True' + grid: 'True' + gui_hint: 1,6,1,6 + label: Relative Gain + label1: '' + label10: '''''' + label2: '''''' + label3: '''''' + label4: '''''' + label5: '''''' + label6: '''''' + label7: '''''' + label8: '''''' + label9: '''''' + legend: 'True' + maxoutbuf: '0' + minoutbuf: '0' + name: '"IF"' + nconnections: '1' + norm_window: 'False' + showports: 'True' + tr_chan: '0' + tr_level: '0.0' + tr_mode: qtgui.TRIG_MODE_FREE + tr_tag: '""' + type: complex + units: dB + update_time: '0.01' + width1: '1' + width10: '1' + width2: '1' + width3: '1' + width4: '1' + width5: '1' + width6: '1' + width7: '1' + width8: '1' + width9: '1' + wintype: window.WIN_BLACKMAN_hARRIS + ymax: '-30' + ymin: '-180' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [832, 156.0] + rotation: 0 + state: true +- name: xlate_offset_fine1 + id: variable_slider + parameters: + alias: '' + comment: '' + converver: float_converter + grid_pos: 3,1,1,4 + label: Fine Tune + max: '10000' + min: '-10000' + notebook: '' + num_steps: '200' + style: wx.SL_HORIZONTAL + value: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [144, 770] + rotation: 0 + state: enabled +- name: xmlrpc_server_0 + id: xmlrpc_server + parameters: + addr: 0.0.0.0 + alias: '' + comment: '' + port: first_port + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [800, 20.0] + rotation: 0 + state: disabled + +connections: +- [analog_agc3_xx_0, '0', mmse_resampler_xx_0, '0'] +- [freq_xlating_fir_filter_xxx_0, '0', analog_agc3_xx_0, '0'] +- [freq_xlating_fir_filter_xxx_0, '0', qtgui_freq_sink_x_0_0, '0'] +- [mmse_resampler_xx_0, '0', network_udp_sink_0, '0'] +- [osmosdr_source_0, '0', freq_xlating_fir_filter_xxx_0, '0'] +- [osmosdr_source_0, '0', qtgui_freq_sink_x_0, '0'] + +metadata: + file_format: 1 + grc_version: 3.10.5.1 diff --git a/src/demod/telive_1ch_simple_gr310_udp.py b/src/demod/telive_1ch_simple_gr310_udp.py new file mode 100755 index 0000000..22990c0 --- /dev/null +++ b/src/demod/telive_1ch_simple_gr310_udp.py @@ -0,0 +1,438 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# +# SPDX-License-Identifier: GPL-3.0 +# +# GNU Radio Python Flow Graph +# Title: SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc +# Author: Jacek Lipkowski SQ5BPF +# Description: This is a receiver flowgraph, uses a rtl-sdr dongle, and outputs a downsampled stream to 127.0.0.1 42001/udp. This can be used with telive, or just osmo-tetra +# GNU Radio version: 3.10.5.1 + +from packaging.version import Version as StrictVersion + +if __name__ == '__main__': + import ctypes + import sys + if sys.platform.startswith('linux'): + try: + x11 = ctypes.cdll.LoadLibrary('libX11.so') + x11.XInitThreads() + except: + print("Warning: failed to XInitThreads()") + +from PyQt5 import Qt +from gnuradio import eng_notation +from gnuradio import qtgui +from gnuradio.filter import firdes +import sip +from gnuradio import analog +from gnuradio import filter +from gnuradio import gr +from gnuradio.fft import window +import sys +import signal +from argparse import ArgumentParser +from gnuradio.eng_arg import eng_float, intx +from gnuradio import network +from gnuradio.qtgui import Range, RangeWidget +from PyQt5 import QtCore +import osmosdr +import time + + + +from gnuradio import qtgui + +class telive_1ch_simple_gr310_udp(gr.top_block, Qt.QWidget): + + def __init__(self): + gr.top_block.__init__(self, "SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc", catch_exceptions=True) + Qt.QWidget.__init__(self) + self.setWindowTitle("SQ5BPF Tetra live receiver 1ch simple UDP demo with fixed offset (gnuradio 3.10 version) xmlrpc") + qtgui.util.check_set_qss() + try: + self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc')) + except: + pass + self.top_scroll_layout = Qt.QVBoxLayout() + self.setLayout(self.top_scroll_layout) + self.top_scroll = Qt.QScrollArea() + self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame) + self.top_scroll_layout.addWidget(self.top_scroll) + self.top_scroll.setWidgetResizable(True) + self.top_widget = Qt.QWidget() + self.top_scroll.setWidget(self.top_widget) + self.top_layout = Qt.QVBoxLayout(self.top_widget) + self.top_grid_layout = Qt.QGridLayout() + self.top_layout.addLayout(self.top_grid_layout) + + self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + + try: + if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + self.restoreGeometry(self.settings.value("geometry").toByteArray()) + else: + self.restoreGeometry(self.settings.value("geometry")) + except: + pass + + ################################################## + # Variables + ################################################## + self.xlate_offset_fine1 = xlate_offset_fine1 = 0 + self.samp_rate = samp_rate = 2000000 + self.freq = freq = 438.0125e6 + self.first_decim = first_decim = 32 + self.xlate_offset1 = xlate_offset1 = 500000 + self.variable_qtgui_label_0_0 = variable_qtgui_label_0_0 = (freq+xlate_offset_fine1) + self.udp_packet_size = udp_packet_size = 1472 + self.udp_dest_addr = udp_dest_addr = "127.0.0.1" + self.telive_receiver_name = telive_receiver_name = 'SQ5BPF 1-channel rx for telive' + self.telive_receiver_channels = telive_receiver_channels = 1 + self.sdr_ifgain = sdr_ifgain = 20 + self.sdr_gain = sdr_gain = 30 + self.ppm_corr = ppm_corr = 0 + self.out_sample_rate = out_sample_rate = 36000 + self.options_low_pass = options_low_pass = 12500 + self.if_samp_rate = if_samp_rate = samp_rate/first_decim + self.first_port = first_port = 42000 + + ################################################## + # Blocks + ################################################## + + self._xlate_offset_fine1_range = Range(-5e3, +5e3, 1, 0, 200) + self._xlate_offset_fine1_win = RangeWidget(self._xlate_offset_fine1_range, self.set_xlate_offset_fine1, "Fine tune1", "counter_slider", float, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._xlate_offset_fine1_win, 0, 2, 1, 3) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(2, 5): + self.top_grid_layout.setColumnStretch(c, 1) + self._sdr_gain_range = Range(0, 50, 1, 30, 200) + self._sdr_gain_win = RangeWidget(self._sdr_gain_range, self.set_sdr_gain, "gain", "counter_slider", int, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._sdr_gain_win, 0, 8, 1, 2) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(8, 10): + self.top_grid_layout.setColumnStretch(c, 1) + self._ppm_corr_range = Range(-100, 100, 0.5, 0, 200) + self._ppm_corr_win = RangeWidget(self._ppm_corr_range, self.set_ppm_corr, "ppm", "counter_slider", float, QtCore.Qt.Horizontal) + self.top_grid_layout.addWidget(self._ppm_corr_win, 0, 5, 1, 3) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(5, 8): + self.top_grid_layout.setColumnStretch(c, 1) + self._freq_tool_bar = Qt.QToolBar(self) + self._freq_tool_bar.addWidget(Qt.QLabel("Frequency" + ": ")) + self._freq_line_edit = Qt.QLineEdit(str(self.freq)) + self._freq_tool_bar.addWidget(self._freq_line_edit) + self._freq_line_edit.returnPressed.connect( + lambda: self.set_freq(eng_notation.str_to_num(str(self._freq_line_edit.text())))) + self.top_grid_layout.addWidget(self._freq_tool_bar, 0, 0, 1, 2) + for r in range(0, 1): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(0, 2): + self.top_grid_layout.setColumnStretch(c, 1) + self._variable_qtgui_label_0_0_tool_bar = Qt.QToolBar(self) + + if lambda x: f'{x/1000000:.4f} MHz': + self._variable_qtgui_label_0_0_formatter = lambda x: f'{x/1000000:.4f} MHz' + else: + self._variable_qtgui_label_0_0_formatter = lambda x: eng_notation.num_to_str(x) + + self._variable_qtgui_label_0_0_tool_bar.addWidget(Qt.QLabel("Receive frequency: ")) + self._variable_qtgui_label_0_0_label = Qt.QLabel(str(self._variable_qtgui_label_0_0_formatter(self.variable_qtgui_label_0_0))) + self._variable_qtgui_label_0_0_tool_bar.addWidget(self._variable_qtgui_label_0_0_label) + self.top_layout.addWidget(self._variable_qtgui_label_0_0_tool_bar) + self.qtgui_freq_sink_x_0_0 = qtgui.freq_sink_c( + 256, #size + window.WIN_BLACKMAN_hARRIS, #wintype + 0, #fc + if_samp_rate, #bw + "IF", #name + 1, + None # parent + ) + self.qtgui_freq_sink_x_0_0.set_update_time(0.01) + self.qtgui_freq_sink_x_0_0.set_y_axis((-180), (-30)) + self.qtgui_freq_sink_x_0_0.set_y_label('Relative Gain', 'dB') + self.qtgui_freq_sink_x_0_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "") + self.qtgui_freq_sink_x_0_0.enable_autoscale(True) + self.qtgui_freq_sink_x_0_0.enable_grid(True) + self.qtgui_freq_sink_x_0_0.set_fft_average(1.0) + self.qtgui_freq_sink_x_0_0.enable_axis_labels(True) + self.qtgui_freq_sink_x_0_0.enable_control_panel(True) + self.qtgui_freq_sink_x_0_0.set_fft_window_normalized(False) + + + + labels = ['', '', '', '', '', + '', '', '', '', ''] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ["blue", "red", "green", "black", "cyan", + "magenta", "yellow", "dark red", "dark green", "dark blue"] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + + for i in range(1): + if len(labels[i]) == 0: + self.qtgui_freq_sink_x_0_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_freq_sink_x_0_0.set_line_label(i, labels[i]) + self.qtgui_freq_sink_x_0_0.set_line_width(i, widths[i]) + self.qtgui_freq_sink_x_0_0.set_line_color(i, colors[i]) + self.qtgui_freq_sink_x_0_0.set_line_alpha(i, alphas[i]) + + self._qtgui_freq_sink_x_0_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0_0.qwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_0_win, 1, 6, 1, 6) + for r in range(1, 2): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(6, 12): + self.top_grid_layout.setColumnStretch(c, 1) + self.qtgui_freq_sink_x_0 = qtgui.freq_sink_c( + 1024, #size + window.WIN_BLACKMAN_hARRIS, #wintype + (freq-xlate_offset1), #fc + samp_rate, #bw + "", #name + 1, + None # parent + ) + self.qtgui_freq_sink_x_0.set_update_time(0.10) + self.qtgui_freq_sink_x_0.set_y_axis((-140), 10) + self.qtgui_freq_sink_x_0.set_y_label('Relative Gain', 'dB') + self.qtgui_freq_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "") + self.qtgui_freq_sink_x_0.enable_autoscale(False) + self.qtgui_freq_sink_x_0.enable_grid(False) + self.qtgui_freq_sink_x_0.set_fft_average(0.2) + self.qtgui_freq_sink_x_0.enable_axis_labels(True) + self.qtgui_freq_sink_x_0.enable_control_panel(True) + self.qtgui_freq_sink_x_0.set_fft_window_normalized(False) + + + + labels = ['', '', '', '', '', + '', '', '', '', ''] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ["blue", "red", "green", "black", "cyan", + "magenta", "yellow", "dark red", "dark green", "dark blue"] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + + for i in range(1): + if len(labels[i]) == 0: + self.qtgui_freq_sink_x_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_freq_sink_x_0.set_line_label(i, labels[i]) + self.qtgui_freq_sink_x_0.set_line_width(i, widths[i]) + self.qtgui_freq_sink_x_0.set_line_color(i, colors[i]) + self.qtgui_freq_sink_x_0.set_line_alpha(i, alphas[i]) + + self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.qwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_0_win, 1, 0, 1, 6) + for r in range(1, 2): + self.top_grid_layout.setRowStretch(r, 1) + for c in range(0, 6): + self.top_grid_layout.setColumnStretch(c, 1) + self.osmosdr_source_0 = osmosdr.source( + args="numchan=" + str(1) + " " + '' + ) + self.osmosdr_source_0.set_time_unknown_pps(osmosdr.time_spec_t()) + self.osmosdr_source_0.set_sample_rate(samp_rate) + self.osmosdr_source_0.set_center_freq((freq-xlate_offset1), 0) + self.osmosdr_source_0.set_freq_corr(ppm_corr, 0) + self.osmosdr_source_0.set_dc_offset_mode(0, 0) + self.osmosdr_source_0.set_iq_balance_mode(0, 0) + self.osmosdr_source_0.set_gain_mode(False, 0) + self.osmosdr_source_0.set_gain(sdr_gain, 0) + self.osmosdr_source_0.set_if_gain(sdr_ifgain, 0) + self.osmosdr_source_0.set_bb_gain(20, 0) + self.osmosdr_source_0.set_antenna('', 0) + self.osmosdr_source_0.set_bandwidth(0, 0) + self.network_udp_sink_0 = network.udp_sink(gr.sizeof_gr_complex, 1, udp_dest_addr, (first_port+1), 0, udp_packet_size, False) + self.mmse_resampler_xx_0 = filter.mmse_resampler_cc(0, (float(float(if_samp_rate)/float(out_sample_rate)))) + self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(first_decim, firdes.low_pass(1, samp_rate, options_low_pass, options_low_pass*0.2), (xlate_offset1+xlate_offset_fine1), samp_rate) + self.analog_agc3_xx_0 = analog.agc3_cc((1e-3), (1e-4), 1.0, 1.0, 1) + self.analog_agc3_xx_0.set_max_gain(65536) + + + ################################################## + # Connections + ################################################## + self.connect((self.analog_agc3_xx_0, 0), (self.mmse_resampler_xx_0, 0)) + self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.analog_agc3_xx_0, 0)) + self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.qtgui_freq_sink_x_0_0, 0)) + self.connect((self.mmse_resampler_xx_0, 0), (self.network_udp_sink_0, 0)) + self.connect((self.osmosdr_source_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0)) + self.connect((self.osmosdr_source_0, 0), (self.qtgui_freq_sink_x_0, 0)) + + + def closeEvent(self, event): + self.settings = Qt.QSettings("GNU Radio", "telive_1ch_simple_gr310_udp") + self.settings.setValue("geometry", self.saveGeometry()) + self.stop() + self.wait() + + event.accept() + + def get_xlate_offset_fine1(self): + return self.xlate_offset_fine1 + + def set_xlate_offset_fine1(self, xlate_offset_fine1): + self.xlate_offset_fine1 = xlate_offset_fine1 + self.set_variable_qtgui_label_0_0((self.freq+self.xlate_offset_fine1)) + self.freq_xlating_fir_filter_xxx_0.set_center_freq((self.xlate_offset1+self.xlate_offset_fine1)) + + def get_samp_rate(self): + return self.samp_rate + + def set_samp_rate(self, samp_rate): + self.samp_rate = samp_rate + self.set_if_samp_rate(self.samp_rate/self.first_decim) + self.freq_xlating_fir_filter_xxx_0.set_taps(firdes.low_pass(1, self.samp_rate, self.options_low_pass, self.options_low_pass*0.2)) + self.osmosdr_source_0.set_sample_rate(self.samp_rate) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_freq(self): + return self.freq + + def set_freq(self, freq): + self.freq = freq + Qt.QMetaObject.invokeMethod(self._freq_line_edit, "setText", Qt.Q_ARG("QString", eng_notation.num_to_str(self.freq))) + self.set_variable_qtgui_label_0_0((self.freq+self.xlate_offset_fine1)) + self.osmosdr_source_0.set_center_freq((self.freq-self.xlate_offset1), 0) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_first_decim(self): + return self.first_decim + + def set_first_decim(self, first_decim): + self.first_decim = first_decim + self.set_if_samp_rate(self.samp_rate/self.first_decim) + + def get_xlate_offset1(self): + return self.xlate_offset1 + + def set_xlate_offset1(self, xlate_offset1): + self.xlate_offset1 = xlate_offset1 + self.freq_xlating_fir_filter_xxx_0.set_center_freq((self.xlate_offset1+self.xlate_offset_fine1)) + self.osmosdr_source_0.set_center_freq((self.freq-self.xlate_offset1), 0) + self.qtgui_freq_sink_x_0.set_frequency_range((self.freq-self.xlate_offset1), self.samp_rate) + + def get_variable_qtgui_label_0_0(self): + return self.variable_qtgui_label_0_0 + + def set_variable_qtgui_label_0_0(self, variable_qtgui_label_0_0): + self.variable_qtgui_label_0_0 = variable_qtgui_label_0_0 + Qt.QMetaObject.invokeMethod(self._variable_qtgui_label_0_0_label, "setText", Qt.Q_ARG("QString", str(self._variable_qtgui_label_0_0_formatter(self.variable_qtgui_label_0_0)))) + + def get_udp_packet_size(self): + return self.udp_packet_size + + def set_udp_packet_size(self, udp_packet_size): + self.udp_packet_size = udp_packet_size + + def get_udp_dest_addr(self): + return self.udp_dest_addr + + def set_udp_dest_addr(self, udp_dest_addr): + self.udp_dest_addr = udp_dest_addr + + def get_telive_receiver_name(self): + return self.telive_receiver_name + + def set_telive_receiver_name(self, telive_receiver_name): + self.telive_receiver_name = telive_receiver_name + + def get_telive_receiver_channels(self): + return self.telive_receiver_channels + + def set_telive_receiver_channels(self, telive_receiver_channels): + self.telive_receiver_channels = telive_receiver_channels + + def get_sdr_ifgain(self): + return self.sdr_ifgain + + def set_sdr_ifgain(self, sdr_ifgain): + self.sdr_ifgain = sdr_ifgain + self.osmosdr_source_0.set_if_gain(self.sdr_ifgain, 0) + + def get_sdr_gain(self): + return self.sdr_gain + + def set_sdr_gain(self, sdr_gain): + self.sdr_gain = sdr_gain + self.osmosdr_source_0.set_gain(self.sdr_gain, 0) + + def get_ppm_corr(self): + return self.ppm_corr + + def set_ppm_corr(self, ppm_corr): + self.ppm_corr = ppm_corr + self.osmosdr_source_0.set_freq_corr(self.ppm_corr, 0) + + def get_out_sample_rate(self): + return self.out_sample_rate + + def set_out_sample_rate(self, out_sample_rate): + self.out_sample_rate = out_sample_rate + self.mmse_resampler_xx_0.set_resamp_ratio((float(float(self.if_samp_rate)/float(self.out_sample_rate)))) + + def get_options_low_pass(self): + return self.options_low_pass + + def set_options_low_pass(self, options_low_pass): + self.options_low_pass = options_low_pass + self.freq_xlating_fir_filter_xxx_0.set_taps(firdes.low_pass(1, self.samp_rate, self.options_low_pass, self.options_low_pass*0.2)) + + def get_if_samp_rate(self): + return self.if_samp_rate + + def set_if_samp_rate(self, if_samp_rate): + self.if_samp_rate = if_samp_rate + self.mmse_resampler_xx_0.set_resamp_ratio((float(float(self.if_samp_rate)/float(self.out_sample_rate)))) + self.qtgui_freq_sink_x_0_0.set_frequency_range(0, self.if_samp_rate) + + def get_first_port(self): + return self.first_port + + def set_first_port(self, first_port): + self.first_port = first_port + + + + +def main(top_block_cls=telive_1ch_simple_gr310_udp, options=None): + + if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + style = gr.prefs().get_string('qtgui', 'style', 'raster') + Qt.QApplication.setGraphicsSystem(style) + qapp = Qt.QApplication(sys.argv) + + tb = top_block_cls() + + tb.start() + + tb.show() + + def sig_handler(sig=None, frame=None): + tb.stop() + tb.wait() + + Qt.QApplication.quit() + + signal.signal(signal.SIGINT, sig_handler) + signal.signal(signal.SIGTERM, sig_handler) + + timer = Qt.QTimer() + timer.start(500) + timer.timeout.connect(lambda: None) + + qapp.exec_() + +if __name__ == '__main__': + main() diff --git a/src/receiver1udp b/src/receiver1udp new file mode 100755 index 0000000..7f60a7b --- /dev/null +++ b/src/receiver1udp @@ -0,0 +1,73 @@ +#!/bin/bash +# +# receiver1udp (c) 2023 Jacek Lipkowski SQ5BPF <sq5bpf(a)lipkowski.org> +# +# This is an example how to get I/Q data via udp packets, +# feed them to a qpsk demodulator, and feed the result to tetra-rx +# +# Originally this was developed to work with the osmo-tetra-sq5bpf tree +# but will work with original osmo-tetra too +# +# +# To use with an rtl-sdr dongle: +# +# - run the demod/telive_1ch_simple_gr310_udp.py (you can also use the telive_1ch_simple_gr310_udp.grc in gnuradio-companion) +# +# - run ./receiver1udp +# +# - enter the frequency in the receiver window, set the ppm (frequency correction) and the gain +# + + +if [ "$1" ]; then + RXID=$1 +else + RXID=1 +fi + + +# you can also set GR_VERSION yourself outside of this script --sq5bpf +[ "$GR_VERSION" ] || GR_VERSION=`gnuradio-config-info -v|cut -d . -f 1-2|tr -d v` +case $GR_VERSION in + 3.6) + GR_DIR=gnuradio-3.6 + PYT=2 + ;; + 3.7) + GR_DIR=gnuradio-3.7 + PYT=2 + ;; + 3.10) + GR_DIR=gnuradio-3.10 + PYT=3 + ;; + *) + echo "Unsupported gnuradio version $GR_VERSION" + exit 1 + ;; +esac + +UDP_PORT=42001 + + +ulimit -c unlimited + +#tetra-rx args: -a turns on pseudo-afc , -i uses an internal float_t_bits +# -r turns on fragment reassembly, -s tries to dump unknown SDS protocols as text +# +#if you have problems with the receiver, then try to remove -a + +case "$PYT" in + 2) + socat -b 4096 UDP-RECV:${UDP_PORT} STDOUT | demod/simdemod2.py -o /dev/stdout -i /dev/stdin | ./float_to_bits -a /dev/stdin /dev/stdout | ./tetra-rx /dev/stdin + ;; + 3) + socat -b 4096 UDP-RECV:${UDP_PORT} STDOUT | demod/simdemod3.py | ./tetra-rx /dev/stdin + ;; + *) + echo "Dont know how to handle pythin version [$PYT]" + exit 1 +esac + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[XL] Change in osmo-tetra[master]: add the gnuradio 3.10 demodulator and receiver from telive

by laforge

Attention is currently required from: wbokslag, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34222 ) Change subject: add the gnuradio 3.10 demodulator and receiver from telive ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81f20fa115822b3ad642b638f6414d8249a8ac6a Gerrit-Change-Number: 34222 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:50:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: (5 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/05323a65_ba1da355 PS2, Line 11: PCH, we have not the same flexibility as we have it in osmo-bsc. > you mean osmo-bts here? Done https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/97db3a6f_3252b292 PS2, Line 14: osmo-bts (cofirm PAGING messages, send non confirmed IMMEDIATE > confirm Done File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/4a5c72c2_f079adc7 PS2, Line 559: if (!pch->confirm) > why are you making so many suppositions here? Just do whatever the request asks you to do. […] The problem is that we can not really chose here if we want a confirmation or not. The Ericsson RBS BTS will send the IMM ASS send message whether we want it or not. And this will generate a confirmation. There is only one thing we could do, I am not even sure if this works or not but in case no conformation is requested, we could leave the propritary Mobile-ID (that is how Ericssin calls it) out. Then there may be no IMM ASS sent. I didn't try this as I thought that this is a situation that is not relevant in practice anyway. As far as I understand, you would use the pch->confirm flag to decide if the message has to go through pcu_rx_rr_imm_ass_pch() or pcu_rx_rr_paging_pch(). It would work, but it would logically turn the "confirm" flag into a "is_imm_ass" flag, which I think may be confusing. That is basically why I added this extra logic + error messages. What do you think? https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/a3b40f5b_32417af2 PS2, Line 561: "PCU sends IMMEDIATE ASSIGNMENT via PCH but requests no conformation, will send confirmation anyway!\n"); > confirmation Done https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/16f42202_e6d9ce85 PS2, Line 566: if (pch->confirm) > this also should go out. In theory osmo-bts would be capable to confirm paging MAC blocks. In osmo-bsc have this since it would require some RSL message from the BTS. This however, is nor specified, nor is it needed. Someone may still try to get a confirmation. I think we should have an error message in this case to raise some awareness. What we could do though is to send the confirmation as we receive the paging message (right here). But I do not think that this has any practical value, other then it makes the behavior somewhat more coherent to that of osmo-bts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:49:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: osmith, pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 to look at the new patch set (#3). Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... pcuif_proto: check confirm flag in struct gsm_pcu_if_pch Since osmo-bsc uses RSL (with a propritary Ericsson RBS specific extension) to send a confirmed IMMEDIATE ASSIGNMENT messages via PCH, we have not the same flexibility as we have it in osmo-bts. Even though it would be possible to mimic the flexibility of osmo-bts (confirm PAGING messages, send non confirmed IMMEDIATE ASSIGNMENT messages via 3gpp standard RSL messages.) it is a theoretical corner case that is not occurring in the real world. So lets just check the confirm flag and the message contents and log an error in case someone tries to use one of aforementioned corner cases. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/34192/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 to look at the new patch set (#3). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a confirmation when the MAC block is sent. CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 48 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34060/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/34060/comment/2d433ad0_77e28e27 PS2, Line 11: both cases we send a confirmation back to the PCU. For details see > no: we send confirmation back if the PCU asks for it. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:49:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/986913bc_3f40… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; > > ... Sounds simple, but then also means that they need their own f_init* etc. […] I tried to implement what I suggested, and the complexity of using enums and doing proper encapsulation turned out to be too high. The patch can be found here: https://cgit.osmocom.org/osmo-ttcn3-hacks/commit/?h=fixeria/asci&id=a3fda67…. So indeed, Harald was right: I had to add module's own init function for the derived component type... I don't like the result, so we agreed with @jolly that using string constants is a lot simpler. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:46:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File msc/MSC_Tests_ASCI.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/24f70ba0_a57a… PS3, Line 667: testcase TC_no_callref() runs on asci_CT { f_TC_asci_call(COORD_TEST_NO_CALLREF); } better use regular spacing/newlines in all these here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:43:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 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: I2833750a8cf1def74f92a5a50f0d271891cee05f Gerrit-Change-Number: 34232 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:40:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: sigtran: Document SCTP (peer) primary address configuration

by osmith

Attention is currently required from: laforge, pespin, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 ) Change subject: sigtran: Document SCTP (peer) primary address configuration ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File common/chapters/sigtran.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225/comment/8adb1144_aa22… PS1, Line 426: assoc > spec is still abbreviated, not sure if on purpose Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 Gerrit-Change-Number: 34225 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:40:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: sigtran: Document SCTP (peer) primary address configuration

by pespin

Attention is currently required from: laforge, pespin, dexter. Hello osmith, Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 to look at the new patch set (#3). Change subject: sigtran: Document SCTP (peer) primary address configuration ...................................................................... sigtran: Document SCTP (peer) primary address configuration Related: OS#6076 Related: SYS#6501 Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 --- M common/chapters/sigtran.adoc 1 file changed, 95 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/25/34225/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 Gerrit-Change-Number: 34225 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 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: I2833750a8cf1def74f92a5a50f0d271891cee05f Gerrit-Change-Number: 34232 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:16:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by jolly

Attention is currently required from: jolly, laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 to look at the new patch set (#3). Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... ASCI: Add tests for voice group/broadcast calls at MSC Related: OS#4854 Change-Id: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn A msc/MSC_Tests_ASCI.ttcn 4 files changed, 699 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/33979/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 ) Change subject: ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 ...................................................................... ASCI: Update commit hash of titan.ProtocolModules.MobileL3_v13.4.0 After fixing GCC and BCC transaction ID, the new head is: b6602eb357673f097ea1a1d22edd568ecd239da1 Related: OS#4854 Change-Id: I2833750a8cf1def74f92a5a50f0d271891cee05f --- M deps/Makefile 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/34232/1 diff --git a/deps/Makefile b/deps/Makefile index c9aa1cf..0c8688f 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -104,7 +104,7 @@ titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A-5-ga75b589 titan.ProtocolModules.M3UA_commit= c496d298876fed55c2b730278b7ee77982555563 -titan.ProtocolModules.MobileL3_v13.4.0_commit= 76a3557f69834b6171652aaeaeef220444c35ba7 +titan.ProtocolModules.MobileL3_v13.4.0_commit= b6602eb357673f097ea1a1d22edd568ecd239da1 titan.ProtocolModules.NAS_EPS_15.2.0.1_commit= R.1.A-2-g2ba853c titan.ProtocolModules.NS_v7.3.0_commit= R.2.A-6-gf73f195 titan.ProtocolModules.RTP_commit= R.5.A-4-g83ee83a -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34232 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: I2833750a8cf1def74f92a5a50f0d271891cee05f Gerrit-Change-Number: 34232 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: sigtran: Document SCTP (peer) primary address configuration

by osmith

Attention is currently required from: laforge, pespin, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 ) Change subject: sigtran: Document SCTP (peer) primary address configuration ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File common/chapters/sigtran.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225/comment/1eef76f0_0758… PS1, Line 426: assoc > Done spec is still abbreviated, not sure if on purpose -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I8737ca3033293391c999395e2db1fe19cac3e911 Gerrit-Change-Number: 34225 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 09:04:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream tests: Eliminate timestamps from output

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224 ) Change subject: stream tests: Eliminate timestamps from output ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I didn't see any reason as to why it should be my patch introducing the differing behavior, because […] Simply and plain for me: I just submitted a test patch based on libosmo-netif master and it's passing tests fine: https://gerrit.osmocom.org/c/libosmo-netif/+/34231 which means whatever problem you are having, it may be a local problem or something related to your patch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c Gerrit-Change-Number: 34224 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 08:49:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: TEST: DONT MERGE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34231 ) Change subject: TEST: DONT MERGE ...................................................................... TEST: DONT MERGE Change-Id: I5e220f6fd3a30ca921a2dea915275fcd4ae30ac4 --- A bla M include/osmocom/netif/ipa.h 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/31/34231/1 diff --git a/bla b/bla new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bla diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 1923253..75c0933 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -23,7 +23,7 @@ uint8_t proto_ext; } __attribute__ ((packed)); -#define OSMO_IPA_MSGB_CB(__msg) ((struct osmo_ipa_msgb_cb *)&((__msg)->cb[0])) +#define OSMO_IPA_MSGB_CB(__msg) ((struct osmo_ipa_msgb_cb *)&((__msg)->cb[0])) #define osmo_ipa_msgb_cb_proto(__x) OSMO_IPA_MSGB_CB(__x)->proto #define osmo_ipa_msgb_cb_proto_ext(__x) OSMO_IPA_MSGB_CB(__x)->proto_ext -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5e220f6fd3a30ca921a2dea915275fcd4ae30ac4 Gerrit-Change-Number: 34231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: dia2gsup: Fix logfile name

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34229 ) Change subject: dia2gsup: Fix logfile name ...................................................................... dia2gsup: Fix logfile name Change-Id: I26e480ee8358476dcda72d51c3d135a0806ca82b --- M osmo_dia2gsup-master/Dockerfile 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/osmo_dia2gsup-master/Dockerfile b/osmo_dia2gsup-master/Dockerfile index f8f535b..08c1e82 100644 --- a/osmo_dia2gsup-master/Dockerfile +++ b/osmo_dia2gsup-master/Dockerfile @@ -23,6 +23,6 @@ COPY osmo_dia2gsup.config /data/osmo_dia2gsup.config WORKDIR /data -CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo_dia2gsup.config' /tmp/osmo_dia2gsup/_build/default/bin/osmo-dia2gsup > /data/osmo_dia2gsup.config.log 2>&1"] +CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo_dia2gsup.config' /tmp/osmo_dia2gsup/_build/default/bin/osmo-dia2gsup > /data/osmo_dia2gsup.log 2>&1"] #EXPOSE -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I26e480ee8358476dcda72d51c3d135a0806ca82b Gerrit-Change-Number: 34229 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream tests: Eliminate timestamps from output

by arehbein

Attention is currently required from: pespin, daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34224 ) Change subject: stream tests: Eliminate timestamps from output ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I'm sorry but I just have the feeling that you are now just simply giving an excuse saying they are […] I didn't see any reason as to why it should be my patch introducing the differing behavior, because I didn't change any of the patch logic in between leaving for vacation and working on it again now without 'random' times. I tried resetting libosmocore to an older patch (pre-'my vacation'), but that didn't fix it. So I looked around a bit and isolated the only other changes have been made to libosmo-netif recently. I eliminated those changes and it works now. The result can be found on the branch `arehbein/stream_tests_timestamp_behavior`. It's a result of resetting `master` to `8355b65d` and applying the patch for client-side IPA segm. support as well as IPA-mode for sending messages. ``` $ git branch arehbein/libosmo-netif_segm_cb_changes arehbein/osmo_io_ipa arehbein/stream_tests_no_timestamps * arehbein/stream_tests_timestamp_behavior ``` ``` $ git log --pretty=format:"%h %an %x09%s" arehbein/stream_tests_timestamp_behavior..master # Commits on master, but not on ... aede0106 arehbein stream test: Fix test output check f990b307 arehbein stream: Add server-side (segmentation) support for IPA 74b62628 Pau Espin Pedrol stream: Use new flag OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED for SCTP sockets 18c160a0 Pau Espin Pedrol stream_cli: Forward SCTP MSG_NOTIFICATION to upper layers deafe50c Pau Espin Pedrol stream: Refactor sctp_recvmsg_wrapper() logging a49a2b4d Pau Espin Pedrol stream_srv: Log SCTP REMOTE_ERROR events bcfa37ad Pau Espin Pedrol stream_srv: sctp: Log error cause of COMM_LOST event 7d143015 Pau Espin Pedrol sctp: Document relevant RFC specs 48f9a3c2 Pau Espin Pedrol stream_cli: Proper handling of send() socket errors 3ee52742 Pau Espin Pedrol stream_srv: Handle ESHUTDOWN and other write() errors destroying the socket a69a958a Pau Espin Pedrol stream: Append data to current tail of message upon recv() b8fb6954 Pau Espin Pedrol stream_srv: Improve logging lines accepting new connections 7e68ac2c Pau Espin Pedrol stream_srv: call setsockopt(SO_NOSIGPIPE) also in srv sockets f42d4c3b Pau Espin Pedrol stream_srv: Use LOGSLNK() to print log line 1f7c44a1 Pau Espin Pedrol stream_cli: Increase log level of established conn to INFO ``` ``` $ git log --pretty=format:"%h %an %x09%s" master..arehbein/stream_tests_timestamp_behavior # Commits on ..., but not on master b4caa60f arehbein stream: Add and use IPA send function 7dc6be89 arehbein stream: Add client-side (segmentation) support for IPA 4d7172fa arehbein stream: Add server-side (segmentation) support for IPA ``` The commits titled `stream: Add server-side (segmentation) support for IPA` only differ in positional data in one spot as well as in reference hashes pertaining to git data. The last commit on `arehbein/stream_tests....` doesn't make a difference (tried that with `git rebase` and breaking before the patch is applied). There are a couple of changes one could look at, is it really worth going through them all with git bisect, adding my commits on top (including resolving merge conflicts) and checking if timestamps go 'random' to find out what causes a minor fluctuation in select-loop iterations that are needed to achieve the same end result? Especially considering that the reason is most likely some logic running over variable amounts of select loop iterations. What difference does it make, or what would the consequential action be? I have stated a reason why we shouldn't need timestamps, as well. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7faed932927d4f6e328a28c7f30a647a7272e89c Gerrit-Change-Number: 34224 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Aug 2023 20:10:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: dia2gsup: Fix logfile name

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34229 ) Change subject: dia2gsup: Fix logfile name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I26e480ee8358476dcda72d51c3d135a0806ca82b Gerrit-Change-Number: 34229 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, 28 Aug 2023 19:27:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER: Origin-State-Id in DWR and DWA messages is optional

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 ) Change subject: DIAMETER: Origin-State-Id in DWR and DWA messages is optional ...................................................................... DIAMETER: Origin-State-Id in DWR and DWA messages is optional Change-Id: I02e6f97a308f1752711aafed39c1d7534a382c70 --- M library/DIAMETER_Templates.ttcn 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/34230/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 85725fc..63db7fc 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1678,8 +1678,8 @@ ete_id := ete_id, avps := superset( tr_AVP_OriginHost(orig_host), - tr_AVP_OriginRealm(orig_realm), - tr_AVP_OriginStateId(state_id) + tr_AVP_OriginRealm(orig_realm) + /* tr_AVP_OriginStateId(state_id) is optional */ )); /* RFC 6733, section 5.5.2 "Device-Watchdog-Answer" */ @@ -1714,8 +1714,8 @@ avps := superset( tr_AVP_ResultCode(DIAMETER_SUCCESS), tr_AVP_OriginHost(orig_host), - tr_AVP_OriginRealm(orig_realm), - tr_AVP_OriginStateId(state_id) + tr_AVP_OriginRealm(orig_realm) + /* tr_AVP_OriginStateId(state_id) is optional */ )); function f_DIAMETER_get_avp(PDU_DIAMETER pdu, template (present) AVP_Code avp_code) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 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: I02e6f97a308f1752711aafed39c1d7534a382c70 Gerrit-Change-Number: 34230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: dia2gsup: Fix logfile name

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34229 ) Change subject: dia2gsup: Fix logfile name ...................................................................... dia2gsup: Fix logfile name Change-Id: I26e480ee8358476dcda72d51c3d135a0806ca82b --- M osmo_dia2gsup-master/Dockerfile 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/34229/1 diff --git a/osmo_dia2gsup-master/Dockerfile b/osmo_dia2gsup-master/Dockerfile index f8f535b..08c1e82 100644 --- a/osmo_dia2gsup-master/Dockerfile +++ b/osmo_dia2gsup-master/Dockerfile @@ -23,6 +23,6 @@ COPY osmo_dia2gsup.config /data/osmo_dia2gsup.config WORKDIR /data -CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo_dia2gsup.config' /tmp/osmo_dia2gsup/_build/default/bin/osmo-dia2gsup > /data/osmo_dia2gsup.config.log 2>&1"] +CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo_dia2gsup.config' /tmp/osmo_dia2gsup/_build/default/bin/osmo-dia2gsup > /data/osmo_dia2gsup.log 2>&1"] #EXPOSE -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I26e480ee8358476dcda72d51c3d135a0806ca82b Gerrit-Change-Number: 34229 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

2024

2023

2022

gerrit-log August 2023