December 2022 - gerrit-log - lists.osmocom.org

Change in osmo-trx[master]: configure.ac: fix: properly check whether to enable ms-trx

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30783 ) Change subject: configure.ac: fix: properly check whether to enable ms-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Gerrit-Change-Number: 30783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 24 Dec 2022 09:37:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by msuraev

Attention is currently required from: osmith, pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 4: (1 comment) File src/sgsn/gprs_sndcp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/938618c1_436ecd54 PS4, Line 44: It's better to keep the empty line separating includes from defines - makes it easier to read. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 18:08:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]

by msuraev

Attention is currently required from: osmith, pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 ) Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: Explaining why this rename is necessary in commit message would be handy. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 Gerrit-Change-Number: 30786 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 18:05:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 18:04:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by msuraev

Attention is currently required from: osmith, pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-sgsn/+/30784/comment/2065d5c0_bf7da4b8 PS3, Line 10: entangled with the LLC once. typo: LLC one -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 18:00:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 7: Code-Review-1 (1 comment) Patchset: PS7: If you change rpm spec file you should also change debian files to avoid divergence between different packages. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 17:59:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by laforge

Attention is currently required from: neels, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30699 ) Change subject: Vty: Fixup config shown/written from vty ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 4 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Fri, 23 Dec 2022 17:52:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-gsm-manuals[master]: rate counter: add StatsD note

by msuraev

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 to look at the new patch set (#3). Change subject: rate counter: add StatsD note ...................................................................... rate counter: add StatsD note Add passage explaining basic visualisation of stat and rate counter items with Netdata so user can start utilizing them without any special configuration. Related: OS#5671 Change-Id: I124503c3707bbe005abbfb4245abe2829c6ff57c --- M common/chapters/counters-overview.adoc 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/15/30715/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 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: I124503c3707bbe005abbfb4245abe2829c6ff57c Gerrit-Change-Number: 30715 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-gsm-manuals[master]: rate counter: add StatsD note

by msuraev

Attention is currently required from: osmith. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 ) Change subject: rate counter: add StatsD note ...................................................................... Patch Set 2: (5 comments) File common/chapters/counters-overview.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/7130cc92_ff94… PS2, Line 127: does > please use the same max line height as the rest of the file, it seems to be < 80 characters The agreed upon limit is 120 which is way more convenient than 80. https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/285fe48e_cb69… PS2, Line 129: StatsD > * throughout the file it's written as "statsd" […] The rest of the file can be fixed in a separate commit (unless we're talking about the name of the binary). https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/470854c1_41de… PS2, Line 130: Netdata > the Netdata dashboard Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/d70eb2c6_cb28… PS2, Line 130: via > maybe add a colon at the end, so it's a full sentence? "via:" […] Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/4d469c3c_6fe8… PS2, Line 131: statsD isavailable > statsd is available Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 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: I124503c3707bbe005abbfb4245abe2829c6ff57c Gerrit-Change-Number: 30715 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 17:48:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by keith

Attention is currently required from: neels, keith. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 to look at the new patch set (#4). Change subject: Vty: Fixup config shown/written from vty ...................................................................... Vty: Fixup config shown/written from vty This commit fixes the following errors: Missing timeout param for mslookup. Fails to start reading a written config if an msc node is configured in the mslookup server. Places the individual msc node services in the top-level wildcard node due to incorrect indentation. * Add missing timeout param. * Add missing "ipa-name" part to mslookup-server-msc section. * Add one extra space indentation for msc services. This commit also adds a DEFINE for the default timeout value. Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 --- M include/osmocom/hlr/dgsm.h M src/dgsm.c M src/dgsm_vty.c M tests/test_nodes.vty 4 files changed, 29 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/99/30699/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 4 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by pespin

Attention is currently required from: neels, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30699 ) Change subject: Vty: Fixup config shown/written from vty ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: Please submit different patches to fix different issues, otherwise reviewing is difficult. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 3 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Fri, 23 Dec 2022 17:29:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by keith

Attention is currently required from: neels, pespin, keith. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 to look at the new patch set (#3). Change subject: Vty: Fixup config shown/written from vty ...................................................................... Vty: Fixup config shown/written from vty This commit fixes the following errors: Missing timeout param for mslookup. Fails to start reading a written config if an msc node is configured in the mslookup server. Places the individual msc node services in the top-level wildcard node due to incorrect indentation. * Add missing timeout param. * Add missing "ipa-name" part to mslookup-server-msc section. * Add one extra space indentation for msc services. This commit also adds a DEFINE for the default timeout value. Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 --- M include/osmocom/hlr/dgsm.h M src/dgsm.c M src/dgsm_vty.c M tests/test_nodes.vty 4 files changed, 20 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/99/30699/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 3 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: Vty: Fixup config shown/written from vty

by keith

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-hlr/+/30699 to look at the new patch set (#2). Change subject: Vty: Fixup config shown/written from vty ...................................................................... Vty: Fixup config shown/written from vty This commit fixes the following errors: Missing timeout param for mslookup. Fails to start reading a written config if an msc node is configured in the mslookup server. Places the individual msc node services in the top-level wildcard node due to incorrect indentation. * Add missing timeout param. * Add missing "ipa-name" part to mslookup-server-msc section. * Add one extra space indentation for msc services. This commit also adds a DEFINE for the default timeout value. Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 --- M include/osmocom/hlr/dgsm.h M src/dgsm.c M src/dgsm_vty.c 3 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/99/30699/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibb60e74a0803f05f37ac13ca529d77b4cb736025 Gerrit-Change-Number: 30699 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI As per what's specified in 3GPP TS 48.018 section 11.3.9 Cell Identifier. Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa --- M include/osmocom/gprs/llc/llc_prim.h M tests/llc/llc_prim_test.c 2 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/87/30787/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 4f359d8..23b41cf 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -7,7 +7,7 @@ #include <osmocom/core/prim.h> #include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/gprs/llc/llc.h> /* Section 7.1.0 */ @@ -214,6 +214,11 @@ }; }; +struct osmo_gprs_llc_bssgp_prim_cell_id { + struct gprs_ra_id rai; + uint16_t ci; +}; + /* Parameters for OSMO_GPRS_LLC_BSSGP_* prims */ struct osmo_gprs_llc_bssgp_prim { /* Common fields */ @@ -236,7 +241,7 @@ } dl_unitdata_req; /* OSMO_GPRS_LLC_BSSGP_UL_UNITDATA | Ind */ struct { - struct gsm0808_cell_id cell_id; + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id; /* TODO: MOCN specific parameters: * - Redirect attempt * - IMSI diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 63f99aa..ab3bf65 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -144,14 +144,15 @@ struct osmo_gprs_llc_prim *llc_prim; const uint32_t tlli = 0xe1c5d364; int rc; - struct gsm0808_cell_id cell_id = { - .id_discr = CELL_IDENT_LAC_AND_CI, - .id = { - .lac_and_ci = { - .lac = 0x0304, - .ci = 0x9876, - }, + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id = { + .rai = { + .mcc = 901, + .mnc = 70, + .mnc_3_digits = false, + .lac = 0x0304, + .rac = 0x01, }, + .ci = 0x9876, }; printf("==== %s() [start] ====\n", __func__); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by pespin

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-sgsn/+/30785 to look at the new patch set (#4). Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] This leaves only NS protocol related code in gprs_gb.[c,h], which will be renamed to gprs_ns.[c,h] in a follow up patch. Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 --- M include/osmocom/sgsn/gprs_gb.h M include/osmocom/sgsn/gprs_gmm.h M src/sgsn/gprs_gb.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_sndcp.c 5 files changed, 55 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/30785/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 3: (2 comments) File src/sgsn/gprs_gmm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2272): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/80394072_fecfd2fc PS3, Line 2319: void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2272): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/05ee6553_cdc82d27 PS3, Line 2363: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 16:20:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Patch Set 2: (1 comment) File src/sgsn/gprs_bssgp.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2269): https://gerrit.osmocom.org/c/osmo-sgsn/+/30784/comment/f0c967e4_a03788fe PS2, Line 94: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 16:17:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 2: (2 comments) File src/sgsn/gprs_gmm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2268): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/73a6d28d_81a4d639 PS2, Line 2319: void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2268): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/126113ab_154cb06f PS2, Line 2363: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 16:17:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Patch Set 1: (2 comments) File src/sgsn/gprs_gmm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2266): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/251a997d_cc4f00a7 PS1, Line 2319: void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2266): https://gerrit.osmocom.org/c/osmo-sgsn/+/30785/comment/512cf962_50ef337d PS1, Line 2363: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 16:17:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by pespin

pespin has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Create new specific file for BSSGP code Right now there's no much code there since the related code is totally entangled with the LLC once. This will eventually change in the future when we switch to use libosmo-gprs. Hence, this commit is a preparation to have already some place to put new BSSGP specific code in the future. Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/gprs_bssgp.h M include/osmocom/sgsn/gprs_gb.h M src/sgsn/Makefile.am A src/sgsn/gprs_bssgp.c M src/sgsn/gprs_gb.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am 10 files changed, 118 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/30784/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 ) Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ...................................................................... Rename gprs_gb.[c,h] -> gprs_ns.[c,h] Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 --- M include/osmocom/sgsn/Makefile.am R include/osmocom/sgsn/gprs_ns.h M src/sgsn/Makefile.am R src/sgsn/gprs_ns.c M src/sgsn/gprs_sndcp.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am 9 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/30786/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 Gerrit-Change-Number: 30786 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Patch Set 1: (1 comment) File src/sgsn/gprs_bssgp.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2264): https://gerrit.osmocom.org/c/osmo-sgsn/+/30784/comment/29a6a787_36f23db8 PS1, Line 94: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 16:15:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Create new specific file for BSSGP code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 ) Change subject: Create new specific file for BSSGP code ...................................................................... Create new specific file for BSSGP code Right now there's no much code there since the related code is totally entangled with the LLC once. This will eventually change in the future when we switch to use libosmo-gprs. Hence, this commit is a preparation to have already some place to put new BSSGP specific code in the future. Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/gprs_bssgp.h M include/osmocom/sgsn/gprs_gb.h M src/sgsn/Makefile.am A src/sgsn/gprs_bssgp.c M src/sgsn/gprs_gb.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am 10 files changed, 118 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/30784/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 515c79c..3b1f840 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -2,6 +2,7 @@ common.h \ crc24.h \ debug.h \ + gprs_bssgp.h \ gprs_gb.h \ gprs_gmm.h \ gprs_gmm_fsm.h \ diff --git a/include/osmocom/sgsn/gprs_bssgp.h b/include/osmocom/sgsn/gprs_bssgp.h new file mode 100644 index 0000000..0feaa97 --- /dev/null +++ b/include/osmocom/sgsn/gprs_bssgp.h @@ -0,0 +1,12 @@ +#pragma once + +#include <osmocom/core/msgb.h> + +/* Called by bssgp layer when a prim is received from lower layers. */ +int sgsn_bssgp_rx_prim(struct osmo_prim_hdr *oph); + +/* called by the bssgp layer to send NS PDUs */ +int sgsn_bssgp_dispatch_ns_unitdata_req_cb(void *ctx, struct msgb *msg); + +/* page a MS in its routing area */ +int sgsn_bssgp_page_ps_ra(struct sgsn_mm_ctx *mmctx); diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h index 9162367..e39ebc6 100644 --- a/include/osmocom/sgsn/gprs_gb.h +++ b/include/osmocom/sgsn/gprs_gb.h @@ -10,11 +10,5 @@ /* Has to be called whenever any PDU (signaling, data, ...) has been received */ void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); -/* page a MS in its routing area */ -int gprs_gb_page_ps_ra(struct sgsn_mm_ctx *mmctx); - -/* called by the bssgp layer to send NS PDUs */ -int gprs_gb_send_cb(void *ctx, struct msgb *msg); - /* called by the ns layer */ int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx); diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am index 9e4a342..8bc5ccb 100644 --- a/src/sgsn/Makefile.am +++ b/src/sgsn/Makefile.am @@ -40,6 +40,7 @@ $(NULL) osmo_sgsn_SOURCES = \ + gprs_bssgp.c \ gprs_gb.c \ gprs_gmm_attach.c \ gprs_gmm.c \ diff --git a/src/sgsn/gprs_bssgp.c b/src/sgsn/gprs_bssgp.c new file mode 100644 index 0000000..77500c5 --- /dev/null +++ b/src/sgsn/gprs_bssgp.c @@ -0,0 +1,94 @@ +/* GPRS BSSGP protocol implementation as per 3GPP TS 08.18 */ + +/* (C) 2010 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2010 by On-Waves + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +#include <osmocom/core/prim.h> +#include <osmocom/core/rate_ctr.h> + +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gprs/gprs_ns2.h> + +#include <osmocom/sgsn/gprs_llc.h> +#include <osmocom/sgsn/gprs_gmm.h> +#include <osmocom/sgsn/sgsn_rim.h> + +/* call-back function for the BSSGP protocol */ +int sgsn_bssgp_rx_prim(struct osmo_prim_hdr *oph) +{ + struct osmo_bssgp_prim *bp; + bp = container_of(oph, struct osmo_bssgp_prim, oph); + + switch (oph->sap) { + case SAP_BSSGP_LL: + switch (oph->primitive) { + case PRIM_BSSGP_UL_UD: + return gprs_llc_rcvmsg(oph->msg, bp->tp); + } + break; + case SAP_BSSGP_GMM: + switch (oph->primitive) { + case PRIM_BSSGP_GMM_SUSPEND: + return gprs_gmm_rx_suspend(bp->ra_id, bp->tlli); + case PRIM_BSSGP_GMM_RESUME: + return gprs_gmm_rx_resume(bp->ra_id, bp->tlli, + bp->u.resume.suspend_ref); + } + break; + case SAP_BSSGP_NM: + break; + case SAP_BSSGP_RIM: + return sgsn_rim_rx_from_gb(bp, oph->msg); + } + return 0; +} + +int sgsn_bssgp_page_ps_ra(struct sgsn_mm_ctx *mmctx) +{ + struct bssgp_paging_info pinfo; + int rc; + + /* FIXME: page whole routing area, not only the last known cell */ + + /* initiate PS PAGING procedure */ + memset(&pinfo, 0, sizeof(pinfo)); + pinfo.mode = BSSGP_PAGING_PS; + pinfo.scope = BSSGP_PAGING_BVCI; + pinfo.bvci = mmctx->gb.bvci; + pinfo.imsi = mmctx->imsi; + pinfo.ptmsi = &mmctx->p_tmsi; + pinfo.drx_params = mmctx->drx_parms; + pinfo.qos[0] = 0; // FIXME + rc = bssgp_tx_paging(mmctx->gb.nsei, 0, &pinfo); + rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PAGING_PS)); + + return rc; +} + +/* called by the bssgp layer to send NS PDUs */ +int sgsn_bssgp_dispatch_ns_unitdata_req_cb(void *ctx, struct msgb *msg) +{ + struct gprs_ns2_inst *nsi = (struct gprs_ns2_inst *) ctx; + struct osmo_gprs_ns2_prim nsp = {}; + nsp.nsei = msgb_nsei(msg); + nsp.bvci = msgb_bvci(msg); + osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, PRIM_OP_REQUEST, msg); + return gprs_ns2_recv_prim(nsi, &nsp.oph); +} \ No newline at end of file diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c index 96157a0..703223f 100644 --- a/src/sgsn/gprs_gb.c +++ b/src/sgsn/gprs_gb.c @@ -84,40 +84,6 @@ return rc; } - -int gprs_gb_page_ps_ra(struct sgsn_mm_ctx *mmctx) -{ - struct bssgp_paging_info pinfo; - int rc; - - /* FIXME: page whole routing area, not only the last known cell */ - - /* initiate PS PAGING procedure */ - memset(&pinfo, 0, sizeof(pinfo)); - pinfo.mode = BSSGP_PAGING_PS; - pinfo.scope = BSSGP_PAGING_BVCI; - pinfo.bvci = mmctx->gb.bvci; - pinfo.imsi = mmctx->imsi; - pinfo.ptmsi = &mmctx->p_tmsi; - pinfo.drx_params = mmctx->drx_parms; - pinfo.qos[0] = 0; // FIXME - rc = bssgp_tx_paging(mmctx->gb.nsei, 0, &pinfo); - rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PAGING_PS)); - - return rc; -} - -/* called by the bssgp layer to send NS PDUs */ -int gprs_gb_send_cb(void *ctx, struct msgb *msg) -{ - struct gprs_ns2_inst *nsi = (struct gprs_ns2_inst *) ctx; - struct osmo_gprs_ns2_prim nsp = {}; - nsp.nsei = msgb_nsei(msg); - nsp.bvci = msgb_bvci(msg); - osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, PRIM_OP_REQUEST, msg); - return gprs_ns2_recv_prim(nsi, &nsp.oph); -} - void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp) { switch (nsp->u.status.cause) { diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 033637d..caab953 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -57,6 +57,7 @@ #include <osmocom/sgsn/gprs_mm_state_gb_fsm.h> #include <osmocom/sgsn/gtp_mme.h> #include <osmocom/sgsn/sgsn_rim.h> +#include <osmocom/sgsn/gprs_bssgp.h> #include <gtp.h> #include <pdp.h> @@ -781,7 +782,7 @@ LOGMMCTXP(LOGL_INFO, mm, "Paging MS in GMM state %s, MM state %s\n", osmo_fsm_inst_state_name(mm->gmm_fsm), osmo_fsm_inst_state_name(mm->gb.mm_state_fsm)); - gprs_gb_page_ps_ra(mm); + sgsn_bssgp_page_ps_ra(mm); /* FIXME: queue the packet we received from GTP */ break; diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index c775922..77797b9 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -62,6 +62,7 @@ #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_ranap.h> #include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/ctrl/control_if.h> #include <osmocom/ctrl/ports.h> @@ -97,34 +98,11 @@ struct sgsn_instance *sgsn; -/* call-back function for the BSSGP protocol */ +/* call-back function for the BSSGP protocol. + * Must be left here so that we can add a new one in tests/sgsn_test */ int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { - struct osmo_bssgp_prim *bp; - bp = container_of(oph, struct osmo_bssgp_prim, oph); - - switch (oph->sap) { - case SAP_BSSGP_LL: - switch (oph->primitive) { - case PRIM_BSSGP_UL_UD: - return gprs_llc_rcvmsg(oph->msg, bp->tp); - } - break; - case SAP_BSSGP_GMM: - switch (oph->primitive) { - case PRIM_BSSGP_GMM_SUSPEND: - return gprs_gmm_rx_suspend(bp->ra_id, bp->tlli); - case PRIM_BSSGP_GMM_RESUME: - return gprs_gmm_rx_resume(bp->ra_id, bp->tlli, - bp->u.resume.suspend_ref); - } - break; - case SAP_BSSGP_NM: - break; - case SAP_BSSGP_RIM: - return sgsn_rim_rx_from_gb(bp, oph->msg); - } - return 0; + return sgsn_bssgp_rx_prim(oph); } static void signal_handler(int signum) @@ -434,7 +412,7 @@ exit(1); } sgsn->cfg.nsi = sgsn_nsi; - bssgp_set_bssgp_callback(gprs_gb_send_cb, sgsn_nsi); + bssgp_set_bssgp_callback(sgsn_bssgp_dispatch_ns_unitdata_req_cb, sgsn_nsi); gprs_llc_init("/usr/local/lib/osmocom/crypt/"); sgsn_rate_ctr_init(); diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 0929f1f..db76c35 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -37,6 +37,7 @@ #include <osmocom/gprs/gprs_ns2.h> #include <osmocom/sgsn/gprs_gb.h> #include <osmocom/sgsn/gprs_gmm.h> +#include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/sgsn/gprs_sgsn.h> #include <osmocom/sgsn/gtp_mme.h> #include <osmocom/sgsn/vty.h> @@ -1284,7 +1285,7 @@ return CMD_WARNING; } - gprs_gb_page_ps_ra(mm); + sgsn_bssgp_page_ps_ra(mm); return CMD_SUCCESS; } diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index bd8e19c..5a01903 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -47,6 +47,7 @@ $(NULL) sgsn_test_LDADD = \ + $(top_builddir)/src/sgsn/gprs_bssgp.o \ $(top_builddir)/src/sgsn/gprs_llc.o \ $(top_builddir)/src/sgsn/gprs_gb.o \ $(top_builddir)/src/sgsn/gprs_sndcp.o \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I816396ab5ccb86032bbc21b41a959934a7768780 Gerrit-Change-Number: 30784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h]

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 ) Change subject: Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] ...................................................................... Move some functions gprs_gb.[c,h] -> gprs_gmm.[c,h] This leaves only NS protocol related code in gprs_gb.[c,h], which will be renamed to gprs_ns.[c,h] in a follow up patch. Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 --- M include/osmocom/sgsn/gprs_gb.h M include/osmocom/sgsn/gprs_gmm.h M src/sgsn/gprs_gb.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_sndcp.c 5 files changed, 54 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/30785/1 diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h index e39ebc6..235b118 100644 --- a/include/osmocom/sgsn/gprs_gb.h +++ b/include/osmocom/sgsn/gprs_gb.h @@ -5,10 +5,5 @@ #include <osmocom/core/msgb.h> #include <osmocom/sgsn/gprs_llc.h> -int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, - bool drop_cipherable); -/* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); - /* called by the ns layer */ int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx); diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index e2b17d2..0d04280 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -28,6 +28,11 @@ int gprs_gmm_rx_resume(struct gprs_ra_id *raid, uint32_t tlli, uint8_t suspend_ref); +int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, + bool drop_cipherable); +/* Has to be called whenever any PDU (signaling, data, ...) has been received */ +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); + time_t gprs_max_time_to_idle(void); int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type); diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c index 703223f..b676917 100644 --- a/src/sgsn/gprs_gb.c +++ b/src/sgsn/gprs_gb.c @@ -31,59 +31,9 @@ #include "bscconfig.h" -#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h> #include <osmocom/sgsn/gprs_sgsn.h> -#include <osmocom/sgsn/gprs_gmm.h> -#include <osmocom/sgsn/gprs_sm.h> #include <osmocom/sgsn/debug.h> -/* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { - msgid2mmctx(mmctx, msg); - if (mmctx->gb.llme) - osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL); -} - -/* Main entry point for incoming 04.08 GPRS messages from Gb */ -int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, - bool drop_cipherable) -{ - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t pdisc = gsm48_hdr_pdisc(gh); - struct sgsn_mm_ctx *mmctx; - struct gprs_ra_id ra_id; - int rc = -EINVAL; - - bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); - mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); - if (mmctx) { - rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PKTS_SIG_IN)); - mmctx->gb.llme = llme; - gprs_gb_recv_pdu(mmctx, msg); - } - - /* MMCTX can be NULL */ - - switch (pdisc) { - case GSM48_PDISC_MM_GPRS: - rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); - break; - case GSM48_PDISC_SM_GPRS: - rc = gsm0408_rcv_gsm(mmctx, msg, llme); - break; - default: - LOGMMCTXP(LOGL_NOTICE, mmctx, - "Unknown GSM 04.08 discriminator 0x%02x: %s\n", - pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); - /* FIXME: return status message */ - break; - } - - /* MMCTX can be invalid */ - - return rc; -} - void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp) { switch (nsp->u.status.cause) { diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 09a058d..c6a30e6 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -60,6 +60,7 @@ #include <osmocom/sgsn/signal.h> #include <osmocom/sgsn/gprs_sndcp.h> #include <osmocom/sgsn/gprs_ranap.h> +#include <osmocom/sgsn/gprs_sm.h> #include <pdp.h> @@ -2313,3 +2314,50 @@ osmo_fsm_inst_dispatch(mmctx->gmm_fsm, E_GMM_RESUME, NULL); return 0; } + +/* Has to be called whenever any PDU (signaling, data, ...) has been received */ +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { + msgid2mmctx(mmctx, msg); + if (mmctx->gb.llme) + osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL); +} + +/* Main entry point for incoming 04.08 GPRS messages from Gb */ +int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, + bool drop_cipherable) +{ + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); + uint8_t pdisc = gsm48_hdr_pdisc(gh); + struct sgsn_mm_ctx *mmctx; + struct gprs_ra_id ra_id; + int rc = -EINVAL; + + bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); + mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); + if (mmctx) { + rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PKTS_SIG_IN)); + mmctx->gb.llme = llme; + gprs_gb_recv_pdu(mmctx, msg); + } + + /* MMCTX can be NULL */ + + switch (pdisc) { + case GSM48_PDISC_MM_GPRS: + rc = gsm0408_rcv_gmm(mmctx, msg, llme, drop_cipherable); + break; + case GSM48_PDISC_SM_GPRS: + rc = gsm0408_rcv_gsm(mmctx, msg, llme); + break; + default: + LOGMMCTXP(LOGL_NOTICE, mmctx, + "Unknown GSM 04.08 discriminator 0x%02x: %s\n", + pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); + /* FIXME: return status message */ + break; + } + + /* MMCTX can be invalid */ + + return rc; +} \ No newline at end of file diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 83aec0c..0a12b90 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -41,7 +41,7 @@ #include <osmocom/sgsn/gprs_sndcp_pcomp.h> #include <osmocom/sgsn/gprs_sndcp_dcomp.h> #include <osmocom/sgsn/gprs_sndcp_comp.h> - +#include <osmocom/sgsn/gprs_gmm.h> #define DEBUG_IP_PACKETS 0 /* 0=Disabled, 1=Enabled */ #if DEBUG_IP_PACKETS == 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dcbe1d0f75cb91ec8b700e239e2ba16fff030a2 Gerrit-Change-Number: 30785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Rename gprs_gb.[c,h] -> gprs_ns.[c,h]

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 ) Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ...................................................................... Rename gprs_gb.[c,h] -> gprs_ns.[c,h] Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 --- M include/osmocom/sgsn/Makefile.am R include/osmocom/sgsn/gprs_ns.h M src/sgsn/Makefile.am R src/sgsn/gprs_ns.c M src/sgsn/gprs_sndcp.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c 8 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/30786/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 3b1f840..64ba16f 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -3,12 +3,12 @@ crc24.h \ debug.h \ gprs_bssgp.h \ - gprs_gb.h \ gprs_gmm.h \ gprs_gmm_fsm.h \ gprs_gmm_attach.h \ gprs_mm_state_gb_fsm.h \ gprs_mm_state_iu_fsm.h \ + gprs_ns.h \ gprs_llc.h \ gprs_llc_xid.h \ gprs_ranap.h \ diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_ns.h similarity index 100% rename from include/osmocom/sgsn/gprs_gb.h rename to include/osmocom/sgsn/gprs_ns.h diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am index 8bc5ccb..f97d2ba 100644 --- a/src/sgsn/Makefile.am +++ b/src/sgsn/Makefile.am @@ -41,11 +41,11 @@ osmo_sgsn_SOURCES = \ gprs_bssgp.c \ - gprs_gb.c \ gprs_gmm_attach.c \ gprs_gmm.c \ gprs_gmm_fsm.c \ gprs_mm_state_gb_fsm.c \ + gprs_ns.c \ gprs_sgsn.c \ gprs_sm.c \ gprs_sndcp.c \ diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_ns.c similarity index 100% rename from src/sgsn/gprs_gb.c rename to src/sgsn/gprs_ns.c diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 0a12b90..2d0276f 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -32,7 +32,7 @@ #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/gprs_sndcp.h> diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index caab953..a2d0c7a 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -45,7 +45,7 @@ #include <osmocom/sgsn/signal.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/gprs_sgsn.h> #include <osmocom/sgsn/gprs_gmm.h> diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 77797b9..b744310 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -61,7 +61,7 @@ #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_ranap.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/ctrl/control_if.h> diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index db76c35..7a94f79 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -35,7 +35,7 @@ #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/gprs/gprs_ns2.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/sgsn/gprs_sgsn.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 Gerrit-Change-Number: 30786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: fix: properly check whether to enable ms-trx

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30783 ) Change subject: configure.ac: fix: properly check whether to enable ms-trx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Gerrit-Change-Number: 30783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 16:13:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: fix: properly check whether to enable ms-trx

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30783 ) Change subject: configure.ac: fix: properly check whether to enable ms-trx ...................................................................... configure.ac: fix: properly check whether to enable ms-trx Condition 'test ENABLE_MS_TRX' is always true because 'ENABLE_MS_TRX' is a string literal, not a variable... Because of this, automeke will unconditionally try to configure the submodule. Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Fixes: b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/83/30783/1 diff --git a/configure.ac b/configure.ac index 699fb32..ff1ae8b 100644 --- a/configure.ac +++ b/configure.ac @@ -334,7 +334,7 @@ AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) -if test ENABLE_MS_TRX; then +if test "x$with_mstrx" = "xyes"; then AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbb9278c688bfe506d5ad726f16a6c200572de1b Gerrit-Change-Number: 30783 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-hnbgw[master]: context_map: Lower loglevel to INFO when deallocating context IDs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/30723 ) Change subject: context_map: Lower loglevel to INFO when deallocating context IDs ...................................................................... context_map: Lower loglevel to INFO when deallocating context IDs Change-Id: Iefe13934d097d646db232127040feb02db37bc38 --- M src/osmo-hnbgw/context_map.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 7549942..98dffad 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -165,7 +165,7 @@ void context_map_deactivate(struct hnbgw_context_map *map) { - LOG_MAP(map, DMAIN, LOGL_NOTICE, "Deactivating\n"); + LOG_MAP(map, DMAIN, LOGL_INFO, "Deactivating\n"); /* set the state to reserved. We still show up in the list and * avoid re-allocation of the context-id until we are cleaned up @@ -205,7 +205,7 @@ case MAP_S_RESERVED2: /* second time we see this reserved * entry: remove it */ - LOG_MAP(map, DMAIN, LOGL_NOTICE, "Deallocating\n"); + LOG_MAP(map, DMAIN, LOGL_INFO, "Deallocating\n"); map->state = MAP_S_NULL; llist_del(&map->cn_list); llist_del(&map->hnb_list); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/30723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iefe13934d097d646db232127040feb02db37bc38 Gerrit-Change-Number: 30723 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: Move gprs_gb_parse.[c,h] to tests/sgsn/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30774 ) Change subject: Move gprs_gb_parse.[c,h] to tests/sgsn/ ...................................................................... Move gprs_gb_parse.[c,h] to tests/sgsn/ That big file is really only used by tests/sgsn/sgsn_test nowadays, so let's keep it out of osmo-sgsn app code base. Change-Id: Ia5a639832f52b2f015a2800bd0d94a28d7bc689b --- M debian/copyright M include/osmocom/sgsn/Makefile.am M src/gprs/Makefile.am M tests/sgsn/Makefile.am R tests/sgsn/gprs_gb_parse.c R tests/sgsn/gprs_gb_parse.h M tests/sgsn/sgsn_test.c 7 files changed, 10 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/debian/copyright b/debian/copyright index 33d6585..d4e7451 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,7 +33,6 @@ include/osmocom/sgsn/crc24.h include/osmocom/sgsn/debug.h include/osmocom/sgsn/gb_proxy.h - include/osmocom/sgsn/gprs_gb_parse.h include/osmocom/sgsn/gprs_gmm.h include/osmocom/sgsn/gprs_llc.h include/osmocom/sgsn/gprs_sgsn.h @@ -53,6 +52,7 @@ tests/gprs/gprs_test.ok tests/gtphub/Makefile.am tests/gtphub/gtphub_test.ok + tests/sgsn/gprs_gb_parse.h tests/sgsn/Makefile.am tests/sgsn/sgsn_test.ok tests/slhc/Makefile.am @@ -78,7 +78,6 @@ include/osmocom/sgsn/signal.h src/gprs/gprs_llc_parse.c src/gprs/crc24.c - src/gprs/gprs_gb_parse.c src/gprs/gprs_utils.c src/gprs/sgsn_ares.c src/gtphub/gtphub.c @@ -103,6 +102,7 @@ src/sgsn/sgsn_main.c src/sgsn/sgsn_vty.c tests/gtphub/gtphub_test.c + tests/sgsn/gprs_gb_parse.c tests/sgsn/sgsn_test.c tests/slhc/slhc_test.c tests/sndcp_xid/sndcp_xid_test.c diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 289f502..515c79c 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -3,7 +3,6 @@ crc24.h \ debug.h \ gprs_gb.h \ - gprs_gb_parse.h \ gprs_gmm.h \ gprs_gmm_fsm.h \ gprs_gmm_attach.h \ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 170ded8..1533dc0 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -29,7 +29,6 @@ noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = \ - gprs_gb_parse.c \ gprs_llc_parse.c \ crc24.c \ gprs_utils.c \ diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 72a7714..bd8e19c 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -29,8 +29,13 @@ sgsn_test \ $(NULL) +noinst_HEADERS = \ + gprs_gb_parse.h \ + $(NULL) + sgsn_test_SOURCES = \ sgsn_test.c \ + gprs_gb_parse.c \ $(NULL) sgsn_test_LDFLAGS = \ @@ -66,7 +71,6 @@ $(top_builddir)/src/sgsn/sgsn_rim.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(top_builddir)/src/gprs/gprs_llc_parse.o \ - $(top_builddir)/src/gprs/gprs_gb_parse.o \ $(top_builddir)/src/gprs/crc24.o \ $(top_builddir)/src/gprs/sgsn_ares.o \ $(LIBOSMOABIS_LIBS) \ diff --git a/src/gprs/gprs_gb_parse.c b/tests/sgsn/gprs_gb_parse.c similarity index 99% rename from src/gprs/gprs_gb_parse.c rename to tests/sgsn/gprs_gb_parse.c index e6a82ac..3338911 100644 --- a/src/gprs/gprs_gb_parse.c +++ b/tests/sgsn/gprs_gb_parse.c @@ -21,7 +21,7 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> -#include <osmocom/sgsn/gprs_gb_parse.h> +#include "gprs_gb_parse.h" #include <osmocom/sgsn/gprs_utils.h> diff --git a/include/osmocom/sgsn/gprs_gb_parse.h b/tests/sgsn/gprs_gb_parse.h similarity index 100% rename from include/osmocom/sgsn/gprs_gb_parse.h rename to tests/sgsn/gprs_gb_parse.h diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 2c41e8e..a09f1a5 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -27,7 +27,6 @@ #include <osmocom/gsm/gsup.h> #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/sgsn/gprs_utils.h> -#include <osmocom/sgsn/gprs_gb_parse.h> #include <osmocom/sgsn/gprs_gmm_fsm.h> #include <osmocom/gprs/gprs_bssgp.h> @@ -42,6 +41,8 @@ #include <stdio.h> +#include "gprs_gb_parse.h" + void *tall_sgsn_ctx; static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia5a639832f52b2f015a2800bd0d94a28d7bc689b Gerrit-Change-Number: 30774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: HACK: try to figure out make distcheck failures..

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30604 ) Change subject: HACK: try to figure out make distcheck failures.. ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7ca3b1f4d64d693892c06fcf55cf066ee07b6fc3 Gerrit-Change-Number: 30604 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: HACK: remove the subdir..

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30605 ) Change subject: HACK: remove the subdir.. ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I237ba6233c375226655b8a0dd2b3c490bd7c581a Gerrit-Change-Number: 30605 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: mstrx: add proper autoconf check

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30782 ) Change subject: mstrx: add proper autoconf check ...................................................................... mstrx: add proper autoconf check Change-Id: I0f5d0547d029ad59b166123026afc2162f611778 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/82/30782/1 diff --git a/configure.ac b/configure.ac index 699fb32..ff1ae8b 100644 --- a/configure.ac +++ b/configure.ac @@ -334,7 +334,7 @@ AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"]) AC_MSG_RESULT([LDFLAGS="$LDFLAGS"]) -if test ENABLE_MS_TRX; then +if test "x$with_mstrx" = "xyes"; then AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0f5d0547d029ad59b166123026afc2162f611778 Gerrit-Change-Number: 30782 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: obs: put git submodules into source packages

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 ) Change subject: obs: put git submodules into source packages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 Gerrit-Change-Number: 30779 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 15:16:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-gsm-tester[master]: jenkins-build-common: use 'git submodule update'

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 ) Change subject: jenkins-build-common: use 'git submodule update' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3 Gerrit-Change-Number: 30781 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 15:16:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: ipc: remove old autotools workaround

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30780 ) Change subject: ipc: remove old autotools workaround ...................................................................... ipc: remove old autotools workaround Closes: OS#5845 Change-Id: I3f8a0204b1fda52d1228add8afde620274b164a5 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 7d8dd43..1653663 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -17,19 +17,11 @@ libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC -#work around distclean issue on older autotools vers: -#a direct build of ../uhd/UHDDevice.cpp tries to clean -#../uhd/.dep/UHDDevice.Plo twice and fails -uhddev_ipc.cpp: - echo "#include \"../uhd/UHDDevice.cpp\"" >$@ -CLEANFILES= uhddev_ipc.cpp -BUILT_SOURCES = uhddev_ipc.cpp - if DEVICE_UHD bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c uhddev_ipc.cpp +ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp ipc_driver_test_LDADD = \ shm.lo \ $(top_builddir)/Transceiver52M/device/common/libdevice_common.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3f8a0204b1fda52d1228add8afde620274b164a5 Gerrit-Change-Number: 30780 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: ipc: remove old autotools workaround

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30780 ) Change subject: ipc: remove old autotools workaround ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3f8a0204b1fda52d1228add8afde620274b164a5 Gerrit-Change-Number: 30780 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 23 Dec 2022 15:01:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-msc[master]: fix sdp_msg_to_sdp_str(), never add fmtp for unset codec

by Jenkins Builder

Attention is currently required from: neels, laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30111 ) Change subject: fix sdp_msg_to_sdp_str(), never add fmtp for unset codec ...................................................................... Patch Set 2: Verified-1 (1 comment) File src/libmsc/sdp_msg.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2261): https://gerrit.osmocom.org/c/osmo-msc/+/30111/comment/7a63cb4a_fe67dd12 PS2, Line 266: codec->rate > 0? codec->rate : 8000); spaces required around that '?' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1892efd9360585f98419ebbd0df180f7f3a8160d Gerrit-Change-Number: 30111 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 23 Dec 2022 14:55:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg.c: parse send/recv mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30110 ) Change subject: sdp_msg.c: parse send/recv mode ...................................................................... sdp_msg.c: parse send/recv mode Related: SYS#5066 Change-Id: I529c0bfad1cab376e26173ed48db2767c7dfaa64 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.c M tests/sdp_msg/sdp_msg_test.ok 4 files changed, 35 insertions(+), 9 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index cf1e560..1b905b7 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -9,6 +9,14 @@ { return get_value_string(sdp_msg_payload_type_names, payload_type); } int sdp_subtype_name_to_payload_type(const char *subtype_name); +enum sdp_mode_e { + SDP_MODE_UNSET = 0, + SDP_MODE_SENDONLY = 1, + SDP_MODE_RECVONLY = 2, + SDP_MODE_SENDRECV = 3, + SDP_MODE_INACTIVE = 4, +}; + struct sdp_audio_codec { /* Payload type number, like 3 for GSM-FR. */ unsigned int payload_type; @@ -26,6 +34,7 @@ struct sdp_msg { struct osmo_sockaddr_str rtp; unsigned int ptime; + enum sdp_mode_e mode; struct sdp_audio_codecs audio_codecs; }; diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 0aa5763..97e871b 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -227,6 +227,14 @@ return 0; } +static const char * const sdp_mode_str[] = { + [SDP_MODE_UNSET] = "-", + [SDP_MODE_SENDONLY] = "sendonly", + [SDP_MODE_RECVONLY] = "recvonly", + [SDP_MODE_SENDRECV] = "sendrecv", + [SDP_MODE_INACTIVE] = "inactive", +}; + /* Convert struct sdp_msg to the actual SDP protocol representation */ int sdp_msg_to_sdp_str_buf(char *dst, size_t dst_size, const struct sdp_msg *sdp) { @@ -271,6 +279,9 @@ OSMO_STRBUF_PRINTF(sb, "a=ptime:%d\r\n", sdp->ptime > 0? sdp->ptime : 20); + if (sdp->mode != SDP_MODE_UNSET && sdp->mode < ARRAY_SIZE(sdp_mode_str)) + OSMO_STRBUF_PRINTF(sb, "a=%s\r\n", sdp_mode_str[sdp->mode]); + return sb.chars_needed; } @@ -296,9 +307,6 @@ #define A_FMTP "fmtp:" #define A_PTIME "ptime:" #define A_RTCP "rtcp:" -#define A_SENDRECV "sendrecv" -#define A_SENDONLY "sendonly" -#define A_RECVONLY "recvonly" if (osmo_str_startswith(src, A_RTPMAP)) { /* "a=rtpmap:3 GSM/8000" */ @@ -355,19 +363,24 @@ /* TODO? */ } - else if (osmo_str_startswith(src, A_SENDRECV)) { + else if (osmo_str_startswith(src, sdp_mode_str[SDP_MODE_SENDRECV])) { /* "a=sendrecv" */ - /* TODO? */ + sdp->mode = SDP_MODE_SENDRECV; } - else if (osmo_str_startswith(src, A_SENDONLY)) { + else if (osmo_str_startswith(src, sdp_mode_str[SDP_MODE_SENDONLY])) { /* "a=sendonly" */ - /* TODO? */ + sdp->mode = SDP_MODE_SENDONLY; } - else if (osmo_str_startswith(src, A_RECVONLY)) { + else if (osmo_str_startswith(src, sdp_mode_str[SDP_MODE_RECVONLY])) { /* "a=recvonly" */ - /* TODO? */ + sdp->mode = SDP_MODE_RECVONLY; + } + + else if (osmo_str_startswith(src, sdp_mode_str[SDP_MODE_INACTIVE])) { + /* "a=inactive" */ + sdp->mode = SDP_MODE_INACTIVE; } return 0; diff --git a/tests/sdp_msg/sdp_msg_test.c b/tests/sdp_msg/sdp_msg_test.c index ee48e80..a1ffac0 100644 --- a/tests/sdp_msg/sdp_msg_test.c +++ b/tests/sdp_msg/sdp_msg_test.c @@ -61,6 +61,7 @@ "a=rtpmap:101 telephone-event/8000\r\n" "a=fmtp:101 0-15\r\n" "a=ptime:20\r\n" + "a=sendrecv\r\n" , }, { @@ -116,6 +117,7 @@ "a=rtpmap:101 telephone-event/8000\r\n" "a=fmtp:101 0-15\r\n" "a=ptime:20\r\n" + "a=sendrecv\r\n" , }, }; diff --git a/tests/sdp_msg/sdp_msg_test.ok b/tests/sdp_msg/sdp_msg_test.ok index 5f84ddd..51a236b 100644 --- a/tests/sdp_msg/sdp_msg_test.ok +++ b/tests/sdp_msg/sdp_msg_test.ok @@ -42,6 +42,7 @@ sdp_msg_to_sdp_str_buf: a=rtpmap:101 telephone-event/8000\r\n sdp_msg_to_sdp_str_buf: a=fmtp:101 0-15\r\n sdp_msg_to_sdp_str_buf: a=ptime:20\r\n +sdp_msg_to_sdp_str_buf: a=sendrecv\r\n [0] ok [1] @@ -95,6 +96,7 @@ sdp_msg_to_sdp_str_buf: a=rtpmap:101 telephone-event/8000\r\n sdp_msg_to_sdp_str_buf: a=fmtp:101 0-15\r\n sdp_msg_to_sdp_str_buf: a=ptime:20\r\n +sdp_msg_to_sdp_str_buf: a=sendrecv\r\n [2] ok -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I529c0bfad1cab376e26173ed48db2767c7dfaa64 Gerrit-Change-Number: 30110 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-gsm-tester[master]: jenkins-build-common: use 'git submodule update'

by osmith

osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 ) Change subject: jenkins-build-common: use 'git submodule update' ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3 Gerrit-Change-Number: 30781 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year, 4 months

1
0
0 0

Change in osmo-gsm-tester[master]: jenkins-build-common: use 'git submodule update'

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 ) Change subject: jenkins-build-common: use 'git submodule update' ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: jenkins failure is unrelated. This patch is needed to fix the osmo-gsm-tester_build-osmo-trx jenkins job which has been failing. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3 Gerrit-Change-Number: 30781 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 14:47:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-gsm-tester[master]: jenkins-build-common: use 'git submodule update'

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 ) Change subject: jenkins-build-common: use 'git submodule update' ...................................................................... jenkins-build-common: use 'git submodule update' Now that we use git submodules in osmo-trx, make sure to initialize and update them before attempting to build. Fix for: Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3 --- M contrib/jenkins-build-common.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/30781/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 4a17d4d..b41fc05 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -102,6 +102,8 @@ echo "$(git rev-parse HEAD) $repo" >> "$prefix_real/${name}_git_hashes.txt" + git submodule update --init + cd "$base" } -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3 Gerrit-Change-Number: 30781 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: ipc: remove old autotools workaround

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30780 ) Change subject: ipc: remove old autotools workaround ...................................................................... ipc: remove old autotools workaround Closes: OS#5845 Change-Id: I3f8a0204b1fda52d1228add8afde620274b164a5 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 1 insertion(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/80/30780/1 diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 7d8dd43..1653663 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -17,19 +17,11 @@ libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC -#work around distclean issue on older autotools vers: -#a direct build of ../uhd/UHDDevice.cpp tries to clean -#../uhd/.dep/UHDDevice.Plo twice and fails -uhddev_ipc.cpp: - echo "#include \"../uhd/UHDDevice.cpp\"" >$@ -CLEANFILES= uhddev_ipc.cpp -BUILT_SOURCES = uhddev_ipc.cpp - if DEVICE_UHD bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c uhddev_ipc.cpp +ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp ipc_driver_test_LDADD = \ shm.lo \ $(top_builddir)/Transceiver52M/device/common/libdevice_common.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3f8a0204b1fda52d1228add8afde620274b164a5 Gerrit-Change-Number: 30780 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: mslookup: use apn functions from libosmocore

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30777 ) Change subject: mslookup: use apn functions from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I09d3c617fd6eb4075084ee106d3f3c5803861d2f Gerrit-Change-Number: 30777 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 14:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: obs: put git submodules into source packages

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 ) Change subject: obs: put git submodules into source packages ...................................................................... obs: put git submodules into source packages We started using git submodules with osmo-trx. Adjust the obs scripts to actually make the git submodules part of the source packages. Note that this didn't fail in jenkins before with the rpm build verification, as jenkins updates git submodules on its own. Fix for: [ 165s] Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 --- M scripts/obs/lib/git.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index 8081a54..db1509b 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -56,6 +56,8 @@ lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path) print(f"{project}: 'git reset --hard {branch}'") lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path) + print(f"{project}: 'git submodule update --init'") + lib.run_cmd(["git", "submodule", "update", "--init"], cwd=repo_path) def checkout_from_review(project, gerrit_id): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 Gerrit-Change-Number: 30779 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: obs: put git submodules into source packages

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 ) Change subject: obs: put git submodules into source packages ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: merging this now, as this is trivial and required to fix the osmocom:master repository. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 Gerrit-Change-Number: 30779 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 14:19:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: obs: put git submodules into source packages

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 ) Change subject: obs: put git submodules into source packages ...................................................................... obs: put git submodules into source packages We started using git submodules with osmo-trx. Adjust the obs scripts to actually make the git submodules part of the source packages. Note that this didn't fail in jenkins before with the rpm build verification, as jenkins updates git submodules on its own. Fix for: [ 165s] Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 --- M scripts/obs/lib/git.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/30779/1 diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index 8081a54..db1509b 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -56,6 +56,8 @@ lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path) print(f"{project}: 'git reset --hard {branch}'") lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path) + print(f"{project}: 'git submodule update --init'") + lib.run_cmd(["git", "submodule", "update", "--init"], cwd=repo_path) def checkout_from_review(project, gerrit_id): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3 Gerrit-Change-Number: 30779 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: clang-format: proper c++ standard

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30536 ) Change subject: clang-format: proper c++ standard ...................................................................... clang-format: proper c++ standard Change-Id: I9828093a08ed8b4c2a11f482f674368ac137d4dc --- M .clang-format 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/.clang-format b/.clang-format index a11c325..8c68525 100644 --- a/.clang-format +++ b/.clang-format @@ -515,7 +515,7 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp03 +Standard: Cpp11 TabWidth: 8 UseTab: Always ... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9828093a08ed8b4c2a11f482f674368ac137d4dc Gerrit-Change-Number: 30536 Gerrit-PatchSet: 18 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: clang-format: proper c++ standard

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30536 ) Change subject: clang-format: proper c++ standard ...................................................................... Patch Set 17: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9828093a08ed8b4c2a11f482f674368ac137d4dc Gerrit-Change-Number: 30536 Gerrit-PatchSet: 17 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Dec 2022 13:41:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: ipc: add missing override

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30487 ) Change subject: ipc: add missing override ...................................................................... ipc: add missing override Change-Id: Ib1493ac10b40d24372075d4cebd67015192675e0 --- M Transceiver52M/device/ipc/IPCDevice.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/device/ipc/IPCDevice.h b/Transceiver52M/device/ipc/IPCDevice.h index 35279a2..f70c95e 100644 --- a/Transceiver52M/device/ipc/IPCDevice.h +++ b/Transceiver52M/device/ipc/IPCDevice.h @@ -199,7 +199,7 @@ virtual double minRxGain(void) override; /* FIXME: return rx_gains[chan] ? receive factor from IPC Driver? */ - double rssiOffset(size_t chan) { return 0.0f; }; + double rssiOffset(size_t chan) override { return 0.0f; }; double setPowerAttenuation(int atten, size_t chan) override; double getPowerAttenuation(size_t chan = 0) override; 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib1493ac10b40d24372075d4cebd67015192675e0 Gerrit-Change-Number: 30487 Gerrit-PatchSet: 21 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: clean up mutex, scopedlock, and signal classes

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30486 ) Change subject: clean up mutex, scopedlock, and signal classes ...................................................................... clean up mutex, scopedlock, and signal classes This also uncovers very interesting design decisions like the copying of mutexes and condition vars depending on recursive locks that were previously hidden by shady c function calls.. We have perfectly good c++11 versions for all of that. While we're at it, also use the initialization list for the other (still copy constructable) vectors, which cleans up the radio interfaces. Change-Id: Idc9e3b1144c5b93f5dad2f8e0e30f1058477aa52 --- M CommonLibs/Interthread.h M CommonLibs/Threads.cpp M CommonLibs/Threads.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/radioBuffer.cpp M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp M tests/CommonLibs/InterthreadTest.cpp 13 files changed, 96 insertions(+), 237 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Interthread.h b/CommonLibs/Interthread.h index 881e1a8..207ada2 100644 --- a/CommonLibs/Interthread.h +++ b/CommonLibs/Interthread.h @@ -517,7 +517,7 @@ @param timeout The blocking timeout in ms. @return Pointer at key or NULL on timeout. */ - D* read(const K &key, unsigned timeout) const + D* read(const K &key, unsigned timeout) { if (timeout==0) return readNoBlock(key); ScopedLock lock(mLock); @@ -537,7 +537,7 @@ @param key The key to read from. @return Pointer at key. */ - D* read(const K &key) const + D* read(const K &key) { ScopedLock lock(mLock); typename Map::const_iterator iter = mMap.find(key); diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index b6750ab..377a1b0 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -43,71 +43,6 @@ #endif -Mutex gStreamLock; ///< Global lock to control access to cout and cerr. - -void lockCout() -{ - gStreamLock.lock(); - Timeval entryTime; - cout << entryTime << " " << osmo_gettid() << ": "; -} - - -void unlockCout() -{ - cout << dec << endl << flush; - gStreamLock.unlock(); -} - - -void lockCerr() -{ - gStreamLock.lock(); - Timeval entryTime; - cerr << entryTime << " " << osmo_gettid() << ": "; -} - -void unlockCerr() -{ - cerr << dec << endl << flush; - gStreamLock.unlock(); -} - - - - - - - -Mutex::Mutex() -{ - bool res; - res = pthread_mutexattr_init(&mAttribs); - assert(!res); - res = pthread_mutexattr_settype(&mAttribs,PTHREAD_MUTEX_RECURSIVE); - assert(!res); - res = pthread_mutex_init(&mMutex,&mAttribs); - assert(!res); -} - - -Mutex::~Mutex() -{ - pthread_mutex_destroy(&mMutex); - bool res = pthread_mutexattr_destroy(&mAttribs); - assert(!res); -} - - - - -/** Block for the signal up to the cancellation timeout. */ -void Signal::wait(Mutex& wMutex, unsigned timeout) const -{ - Timeval then(timeout); - struct timespec waitTime = then.timespec(); - pthread_cond_timedwait(&mSignal,&wMutex.mMutex,&waitTime); -} void set_selfthread_name(const char *name) { diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h index 5ff137b..24fec00 100644 --- a/CommonLibs/Threads.h +++ b/CommonLibs/Threads.h @@ -28,143 +28,96 @@ #ifndef THREADS_H #define THREADS_H -#include "config.h" - +#include <chrono> +#include <mutex> +#include <condition_variable> #include <pthread.h> #include <iostream> -#include <assert.h> +#include <cassert> #include <unistd.h> +#include "config.h" +#include "Timeval.h" + class Mutex; - -/**@name Multithreaded access for standard streams. */ -//@{ - -/**@name Functions for gStreamLock. */ -//@{ -extern Mutex gStreamLock; ///< global lock for cout and cerr -void lockCerr(); ///< call prior to writing cerr -void unlockCerr(); ///< call after writing cerr -void lockCout(); ///< call prior to writing cout -void unlockCout(); ///< call after writing cout -//@} - -/**@name Macros for standard messages. */ -//@{ -#define COUT(text) { lockCout(); std::cout << text; unlockCout(); } -#define CERR(text) { lockCerr(); std::cerr << __FILE__ << ":" << __LINE__ << ": " << text; unlockCerr(); } -#ifdef NDEBUG -#define DCOUT(text) {} -#define OBJDCOUT(text) {} -#else -#define DCOUT(text) { COUT(__FILE__ << ":" << __LINE__ << " " << text); } -#define OBJDCOUT(text) { DCOUT(this << " " << text); } -#endif -//@} -//@} - - - /**@defgroup C++ wrappers for pthread mechanisms. */ //@{ -/** A class for recursive mutexes based on pthread_mutex. */ +/** A class for recursive mutexes. */ class Mutex { + std::recursive_mutex m; - private: + public: - pthread_mutex_t mMutex; - pthread_mutexattr_t mAttribs; + void lock() { + m.lock(); + } - public: + bool trylock() { + return m.try_lock(); + } - Mutex(); - - ~Mutex(); - - void lock() { pthread_mutex_lock(&mMutex); } - - bool trylock() { return pthread_mutex_trylock(&mMutex)==0; } - - void unlock() { pthread_mutex_unlock(&mMutex); } + void unlock() { + m.unlock(); + } friend class Signal; - }; - class ScopedLock { + Mutex &mMutex; - private: - Mutex& mMutex; - - public: - ScopedLock(Mutex& wMutex) :mMutex(wMutex) { mMutex.lock(); } - ~ScopedLock() { mMutex.unlock(); } - + public: + ScopedLock(Mutex &wMutex) : mMutex(wMutex) { + mMutex.lock(); + } + ~ScopedLock() { + mMutex.unlock(); + } }; - - - -/** A C++ interthread signal based on pthread condition variables. */ +/** A C++ interthread signal. */ class Signal { + /* any, because for some reason our mutex is recursive... */ + std::condition_variable_any mSignal; - private: + public: - mutable pthread_cond_t mSignal; + void wait(Mutex &wMutex, unsigned timeout) { + mSignal.wait_for(wMutex.m, std::chrono::milliseconds(timeout)); + } - public: + void wait(Mutex &wMutex) { + mSignal.wait(wMutex.m); + } - Signal() { int s = pthread_cond_init(&mSignal,NULL); assert(!s); } + void signal() { + mSignal.notify_one(); + } - ~Signal() { pthread_cond_destroy(&mSignal); } - - /** - Block for the signal up to the cancellation timeout. - Under Linux, spurious returns are possible. - */ - void wait(Mutex& wMutex, unsigned timeout) const; - - /** - Block for the signal. - Under Linux, spurious returns are possible. - */ - void wait(Mutex& wMutex) const - { pthread_cond_wait(&mSignal,&wMutex.mMutex); } - - void signal() { pthread_cond_signal(&mSignal); } - - void broadcast() { pthread_cond_broadcast(&mSignal); } - + void broadcast() { + mSignal.notify_all(); + } }; - - -#define START_THREAD(thread,function,argument) \ - thread.start((void *(*)(void*))function, (void*)argument); - void set_selfthread_name(const char *name); void thread_enable_cancel(bool cancel); /** A C++ wrapper for pthread threads. */ class Thread { - - private: - + private: pthread_t mThread; pthread_attr_t mAttrib; // FIXME -- Can this be reduced now? size_t mStackSize; - - public: - + public: /** Create a thread in a non-running state. */ - Thread(size_t wStackSize = 0):mThread((pthread_t)0) { - pthread_attr_init(&mAttrib); // (pat) moved this here. - mStackSize=wStackSize; + Thread(size_t wStackSize = 0) : mThread((pthread_t)0) + { + pthread_attr_init(&mAttrib); // (pat) moved this here. + mStackSize = wStackSize; } /** @@ -172,14 +125,17 @@ It should be stopped and joined. */ // (pat) If the Thread is destroyed without being started, then mAttrib is undefined. Oops. - ~Thread() { pthread_attr_destroy(&mAttrib); } - + ~Thread() + { + pthread_attr_destroy(&mAttrib); + } /** Start the thread on a task. */ - void start(void *(*task)(void*), void *arg); + void start(void *(*task)(void *), void *arg); /** Join a thread that will stop on its own. */ - void join() { + void join() + { if (mThread) { int s = pthread_join(mThread, NULL); assert(!s); @@ -187,7 +143,10 @@ } /** Send cancellation to thread */ - void cancel() { pthread_cancel(mThread); } + void cancel() + { + pthread_cancel(mThread); + } }; #ifdef HAVE_ATOMIC_OPS diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index cbe1e27..c9894f0 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -135,12 +135,13 @@ Transceiver::Transceiver(const struct trx_cfg *cfg, GSM::Time wTransmitLatency, RadioInterface *wRadioInterface) - : cfg(cfg), mClockSocket(-1), - mRxLowerLoopThread(nullptr), mTxLowerLoopThread(nullptr), - mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface), - mChans(cfg->num_chans), mOn(false), mForceClockInterface(false), - mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), - mMaxExpectedDelayNB(0), mWriteBurstToDiskMask(0) + : mChans(cfg->num_chans), cfg(cfg), + mCtrlSockets(mChans), mClockSocket(-1), + mTxPriorityQueues(mChans), mReceiveFIFO(mChans), + mRxServiceLoopThreads(mChans), mRxLowerLoopThread(nullptr), mTxLowerLoopThread(nullptr), + mTxPriorityQueueServiceLoopThreads(mChans), mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface), + mOn(false),mForceClockInterface(false), mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0), + mMaxExpectedDelayNB(0), mWriteBurstToDiskMask(0), mVersionTRXD(mChans), mStates(mChans) { txFullScale = mRadioInterface->fullScaleInputValue(); rxFullScale = mRadioInterface->fullScaleOutputValue(); @@ -208,14 +209,7 @@ } mDataSockets.resize(mChans, -1); - mCtrlSockets.resize(mChans); - mTxPriorityQueueServiceLoopThreads.resize(mChans); - mRxServiceLoopThreads.resize(mChans); - mTxPriorityQueues.resize(mChans); - mReceiveFIFO.resize(mChans); - mStates.resize(mChans); - mVersionTRXD.resize(mChans); /* Filler table retransmissions - support only on channel 0 */ if (cfg->filler == FILLER_DUMMY) diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 0389e60..1860884 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -148,6 +148,7 @@ } ChannelCombination; private: + size_t mChans; struct ctrl_msg { char data[101]; ctrl_msg() {}; @@ -218,7 +219,7 @@ /** drive handling of control messages from GSM core */ int ctrl_sock_handle_rx(int chan); - size_t mChans; + bool mOn; ///< flag to indicate that transceiver is powered on bool mForceClockInterface; ///< flag to indicate whether IND CLOCK shall be sent unconditionally after transceiver is started bool mHandover[8][8]; ///< expect handover to the timeslot/subslot diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index 3f5da1f..404ef75 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -169,14 +169,13 @@ const std::vector<std::string>& tx_paths, const std::vector<std::string>& rx_paths): tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chan_num), lo_offset(offset), - tx_paths(tx_paths), rx_paths(rx_paths) + tx_paths(tx_paths), rx_paths(rx_paths), m_ctr(chans) { if (iface == MULTI_ARFCN) { LOGC(DDEV, INFO) << "Multi-ARFCN: "<< chan_num << " logical chans -> 1 physical chans"; chans = 1; } - m_ctr.resize(chans); for (size_t i = 0; i < chans; i++) { memset(&m_ctr[i], 0, sizeof(m_ctr[i])); m_ctr[i].chan = i; diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 2e40aa3..8bf4836 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -58,18 +58,12 @@ IPCDevice::IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), tx_attenuation(), - tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), shm_dec(0), started(false) + : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), sk_chan_state(chans, ipc_per_trx_sock_state()), + tx_attenuation(), tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), shm_dec(0), + rx_buffers(chans), started(false), tx_gains(chans), rx_gains(chans) { LOGC(DDEV, INFO) << "creating IPC device..."; - rx_gains.resize(chans); - tx_gains.resize(chans); - - rx_buffers.resize(chans); - - sk_chan_state.resize(chans, ipc_per_trx_sock_state()); - /* Set up per-channel Rx timestamp based Ring buffers */ for (size_t i = 0; i < rx_buffers.size(); i++) rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t)); diff --git a/Transceiver52M/radioBuffer.cpp b/Transceiver52M/radioBuffer.cpp index 62f6553..ec868e5 100644 --- a/Transceiver52M/radioBuffer.cpp +++ b/Transceiver52M/radioBuffer.cpp @@ -28,7 +28,7 @@ RadioBuffer::RadioBuffer(size_t numSegments, size_t segmentLen, size_t hLen, bool outDirection) - : writeIndex(0), readIndex(0), availSamples(0) + : writeIndex(0), readIndex(0), availSamples(0), segments(numSegments) { if (!outDirection) hLen = 0; @@ -36,7 +36,6 @@ buffer = new float[2 * (hLen + numSegments * segmentLen)]; bufferLen = numSegments * segmentLen; - segments.resize(numSegments); for (size_t i = 0; i < numSegments; i++) segments[i] = &buffer[2 * (hLen + i * segmentLen)]; diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index 875245d..311af34 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -39,9 +39,10 @@ RadioInterface::RadioInterface(RadioDevice *wDevice, size_t tx_sps, size_t rx_sps, size_t chans, int wReceiveOffset, GSM::Time wStartTime) - : mDevice(wDevice), mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), - underrun(false), overrun(false), writeTimestamp(0), readTimestamp(0), - receiveOffset(wReceiveOffset), mOn(false) + : mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mReceiveFIFO(mChans), mDevice(wDevice), + sendBuffer(mChans), recvBuffer(mChans), convertRecvBuffer(mChans), + convertSendBuffer(mChans), powerScaling(mChans), underrun(false), overrun(false), + writeTimestamp(0), readTimestamp(0), receiveOffset(wReceiveOffset), mOn(false) { mClock.set(wStartTime); } @@ -58,15 +59,6 @@ return false; } - close(); - - sendBuffer.resize(mChans); - recvBuffer.resize(mChans); - convertSendBuffer.resize(mChans); - convertRecvBuffer.resize(mChans); - mReceiveFIFO.resize(mChans); - powerScaling.resize(mChans); - for (size_t i = 0; i < mChans; i++) { sendBuffer[i] = new RadioBuffer(NUMCHUNKS, CHUNK * mSPSTx, 0, true); recvBuffer[i] = new RadioBuffer(NUMCHUNKS, CHUNK * mSPSRx, 0, false); diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index efe5606..cd40ddf 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -31,6 +31,9 @@ class RadioInterface { protected: + size_t mSPSTx; + size_t mSPSRx; + size_t mChans; Thread mAlignRadioServiceLoopThread; ///< thread that synchronizes transmit and receive sections @@ -38,10 +41,6 @@ RadioDevice *mDevice; ///< the USRP object - size_t mSPSTx; - size_t mSPSRx; - size_t mChans; - std::vector<RadioBuffer *> sendBuffer; std::vector<RadioBuffer *> recvBuffer; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index eaf0886..eeb0c97 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -44,8 +44,9 @@ RadioInterfaceMulti::RadioInterfaceMulti(RadioDevice *radio, size_t tx_sps, size_t rx_sps, size_t chans) : RadioInterface(radio, tx_sps, rx_sps, chans), - outerSendBuffer(NULL), outerRecvBuffer(NULL), - dnsampler(NULL), upsampler(NULL), channelizer(NULL), synthesis(NULL) + outerSendBuffer(NULL), outerRecvBuffer(NULL), history(mChans), active(MCHANS, false), + rx_freq_state(mChans), tx_freq_state(mChans), dnsampler(NULL), upsampler(NULL), channelizer(NULL), + synthesis(NULL) { } @@ -74,12 +75,12 @@ for (std::vector<signalVector*>::iterator it = history.begin(); it != history.end(); ++it) delete *it; - mReceiveFIFO.resize(0); - powerScaling.resize(0); - history.resize(0); - active.resize(0); - rx_freq_state.resize(0); - tx_freq_state.resize(0); + mReceiveFIFO.clear(); + powerScaling.clear(); + history.clear(); + active.clear(); + rx_freq_state.clear(); + tx_freq_state.clear(); RadioInterface::close(); } @@ -154,18 +155,9 @@ close(); - sendBuffer.resize(mChans); - recvBuffer.resize(mChans); convertSendBuffer.resize(1); convertRecvBuffer.resize(1); - mReceiveFIFO.resize(mChans); - powerScaling.resize(mChans); - history.resize(mChans); - rx_freq_state.resize(mChans); - tx_freq_state.resize(mChans); - active.resize(MCHANS, false); - /* 4 == sps */ inchunk = RESAMP_INRATE * 4; outchunk = RESAMP_OUTRATE * 4; diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp index b92432f..37167ae 100644 --- a/Transceiver52M/radioInterfaceResamp.cpp +++ b/Transceiver52M/radioInterfaceResamp.cpp @@ -100,13 +100,6 @@ close(); - sendBuffer.resize(1); - recvBuffer.resize(1); - convertSendBuffer.resize(1); - convertRecvBuffer.resize(1); - mReceiveFIFO.resize(1); - powerScaling.resize(1); - switch (type) { case RadioDevice::RESAMP_64M: resamp_inrate = RESAMP_64M_INRATE; diff --git a/tests/CommonLibs/InterthreadTest.cpp b/tests/CommonLibs/InterthreadTest.cpp index 462df08..a00980f 100644 --- a/tests/CommonLibs/InterthreadTest.cpp +++ b/tests/CommonLibs/InterthreadTest.cpp @@ -29,9 +29,9 @@ #include "Threads.h" #include "Interthread.h" #include <iostream> +#include <mutex> -using namespace std; - +std::mutex dbg_cout; InterthreadQueue<int> gQ; InterthreadMap<int,int> gMap; @@ -41,6 +41,8 @@ int m_last_read_val; int m_last_write_val; +#define CERR(text) { dbg_cout.lock() ; std::cerr << text; dbg_cout.unlock(); } + void* qWriter(void*) { int *p; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Idc9e3b1144c5b93f5dad2f8e0e30f1058477aa52 Gerrit-Change-Number: 30486 Gerrit-PatchSet: 21 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2024

2023

2022

gerrit-log December 2022