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

Change in osmo-bsc[master]: pcu_sock: inform when no PDCH is available at all

by dexter

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31111 to look at the new patch set (#2). Change subject: pcu_sock: inform when no PDCH is available at all ...................................................................... pcu_sock: inform when no PDCH is available at all In case no PDCH is currently available (resources exhausted, or simply a bug that prevents TS to be recognized as usable for PDCH) display an informative message to inform the user about this. Change-Id: Ie3e5409cd798f6027404c0ff95297af850e516c4 Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/31111/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3e5409cd798f6027404c0ff95297af850e516c4 Gerrit-Change-Number: 31111 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I'd normally always add a backwards compatibility #define in case some unknown application might hav […] I've added one in this patch: #define GSM0808_DATA_FULL_RPREF GSM0808_DATA_FULL_PREF -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:50:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: Get rid of openbsc leftover references

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31116 ) Change subject: Get rid of openbsc leftover references ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0b4f536b16f3693ef16de8505036943c3a30b1df Gerrit-Change-Number: 31116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:49:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I'd normally always add a backwards compatibility #define in case some unknown application might have used the name with typo. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:48:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index c7cf1d8..96ac6af 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -446,10 +446,11 @@ }; /* GSM 08.08 3.2.2.11 Channel Type */ +#define GSM0808_DATA_FULL_RPREF GSM0808_DATA_FULL_PREF enum gsm0808_chan_rate_type_data { GSM0808_DATA_FULL_BM = 0x8, GSM0808_DATA_HALF_LM = 0x9, - GSM0808_DATA_FULL_RPREF = 0xa, + GSM0808_DATA_FULL_PREF = 0xa, GSM0808_DATA_HALF_PREF = 0xb, GSM0808_DATA_FULL_PREF_NO_CHANGE = 0x1a, GSM0808_DATA_HALF_PREF_NO_CHANGE = 0x1b, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/f90af13e_f22ce9ad PS3, Line 23: gsmtap-sapi pdtch : gsmtap-sapi ptcch Question: if I have 'gsmtap-sapi pdtch' in my config file, does this enable all GPRS categories? Similarly, if I do 'no gsmtap-sapi pdtch' and then 'gsmtap-category gprs dl-ctrl', will I see only the dl-ctrl messages or nothing? Oh, there is also 'pacch'... Here is another proposal, hopefully making all my questions above void: gsmtap ... gsmtap-sapi tch/f gsmtap-sapi tch/h gsmtap-sapi pdch (enable-all|disable-all) gsmtap-sapi pdch (dl-dummy|dl-ctrl|...) This way it looks more logical to me, and somehow consistent. P.S. there is no SAPI in GSMTAP. P.P.S. This probably comes from osmo-bts-sysmo, where the L1 prims have SAPI field. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:37:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 3: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/221d65ad_3074e131 PS2, Line 13: gsmtap > Ok, let's see what the others think about the command style/consistency. Ack File src/host/layer23/include/osmocom/bb/common/l23_app.h: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/17421f82_f6d394f5 PS3, Line 20: l23_gsmtap_category > Maybe l23_gsmtap_gprs_category? Or have GPRS prefix in all enum entries? Ack File src/host/layer23/src/common/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/e6ff6ea6_4de2c66a PS3, Line 138: gsmtap_sapi_names > There exists gsmtap_gsm_channel_names[] in libosmocore. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:36:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31094 ) Change subject: gsm_08_08.h: fix typo in GSM0808_DATA_FULL_PREF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25f46bf3893bb68203414300587756cf2fdb04f7 Gerrit-Change-Number: 31094 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 3: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/e4590ff6_c3d752c9 PS2, Line 13: gsmtap > I'm not mixing them here, I'm establishing 2 layers of granularity. […] Ok, let's see what the others think about the command style/consistency. File src/host/layer23/include/osmocom/bb/common/l23_app.h: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/b7db2693_38af60c8 PS3, Line 20: l23_gsmtap_category Maybe l23_gsmtap_gprs_category? Or have GPRS prefix in all enum entries? File src/host/layer23/src/common/vty.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/924827a2_3b38d154 PS3, Line 138: gsmtap_sapi_names There exists gsmtap_gsm_channel_names[] in libosmocore.git, maybe use it? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:24:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: Get rid of openbsc leftover references

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31116 ) Change subject: Get rid of openbsc leftover references ...................................................................... Get rid of openbsc leftover references Get rid of the global variable since it's only used once inside a function anyway. Change-Id: I0b4f536b16f3693ef16de8505036943c3a30b1df --- M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/main.c 2 files changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/31116/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 92a4325..d96e080 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -64,14 +64,6 @@ int (*l23_app_exit)(void) = NULL; int quit = 0; -const char *openbsc_copyright = - "%s" - "%s\n" - "License GPLv2+: GNU GPL version 2 or later " - "<http://gnu.org/licenses/gpl.html>\n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n\n"; - static void print_usage(const char *app) { printf("Usage: %s\n", app); @@ -210,7 +202,12 @@ { struct l23_app_info *app; app = l23_app_info(); - printf(openbsc_copyright, + + printf("%s" + "%s\n" + "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n" + "This is free software: you are free to change and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n\n", app && app->copyright ? app->copyright : "", app && app->contribution ? app->contribution : ""); } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 881c283..41baaf3 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -74,14 +74,6 @@ const char *debug_default = "DCS:DNB:DPLMN:DRR:DMM:DSIM:DCC:DMNCC:DSS:DLSMS:DPAG:DSUM:DSAP:DGPS:DMOB:DPRIM:DLUA:DGAPK"; -const char *openbsc_copyright = - "%s" - "%s\n" - "License GPLv2+: GNU GPL version 2 or later " - "<http://gnu.org/licenses/gpl.html>\n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n\n"; - static void print_usage(const char *app) { printf("Usage: %s\n", app); @@ -216,7 +208,12 @@ { struct l23_app_info *app; app = l23_app_info(); - printf(openbsc_copyright, + + printf("%s" + "%s\n" + "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n" + "This is free software: you are free to change and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n\n", app && app->copyright ? app->copyright : "", app && app->contribution ? app->contribution : ""); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0b4f536b16f3693ef16de8505036943c3a30b1df Gerrit-Change-Number: 31116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: add indication to communicate E1 parameters

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31113 ) Change subject: pcuif_proto: add indication to communicate E1 parameters ...................................................................... Abandoned (see message) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301 Gerrit-Change-Number: 31113 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: add indication to communicate E1 parameters

by dexter

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31113 ) Change subject: pcuif_proto: add indication to communicate E1 parameters ...................................................................... Patch Set 1: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/8f0bfb53_dda0c6d6 PS1, Line 10: setup. To avioud duplicate configuration the BSC has to communicate the > "avoid" Done Patchset: PS1: I have fixed the comments now (in both patches). Will post an updated version with the next push. Unfortunately there are two patches like this with the same change ID. One for osmo-bsc, and one for osmo-pcu. This is an error. I will keep the one for osmo-pcu and abandon the one for osmo-bsc. The patch will then be pushed again with a new change ID. File include/osmocom/bsc/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/1299d256_444bc44e PS1, Line 263: uint8_t pdch_trx_no; > this was not yet changed to trx_nr, why? There are two patches around with the same change id, I have seen it and I will change it. https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/d93ee48e_c69b35e4 PS1, Line 264: uint8_t pdch_ts; > this was not yet changed to ts_nr, why? There are two patches around with the same change id, I have seen it and I will change it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301 Gerrit-Change-Number: 31113 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:14:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31107 ) Change subject: layer23: Integreate mobile further into l23_app ...................................................................... layer23: Integreate mobile further into l23_app Several functions and data structures in mobile app are refactored to follow more closely the l23_app API and structures. These movements allow starting to use already some shared infrastructure defined under layer23/common. This is not a full migration to l23_app, since mobile still keeps a separate main() with a few extra code. This commit is rather a step towards an eventual merge of mobile's main.cpp into layer23/common/main.c This is a preparation commit to later one adding gsmtap VTY configuration to all l23 apps. Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 165 insertions(+), 91 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h index 7a3669d..940dbce 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h +++ b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h @@ -8,9 +8,6 @@ struct osmocom_ms; struct vty; -int l23_app_init(const char *config_file); -int l23_app_exit(void); -int l23_app_work(int *quit); int mobile_delete(struct osmocom_ms *ms, int force); struct osmocom_ms *mobile_new(char *name); int mobile_work(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 285672d..efd3a75 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -29,6 +29,7 @@ #include <osmocom/bb/common/gps.h> #include <osmocom/bb/common/sap_interface.h> #include <osmocom/bb/common/sim.h> +#include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/mobile/gsm48_rr.h> #include <osmocom/bb/mobile/gsm480_ss.h> @@ -43,8 +44,7 @@ #include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/primitives.h> -#include <osmocom/vty/ports.h> -#include <osmocom/vty/logging.h> +#include <osmocom/vty/vty.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/core/msgb.h> @@ -58,12 +58,12 @@ extern void *l23_ctx; extern struct llist_head ms_list; -extern int vty_reading; int mncc_recv_internal(struct osmocom_ms *ms, int msg_type, void *arg); int mncc_recv_external(struct osmocom_ms *ms, int msg_type, void *arg); int mncc_recv_dummy(struct osmocom_ms *ms, int msg_type, void *arg); -static int quit; +static int _quit; +extern int quit; /* l23 main */ /* handle ms instance */ int mobile_work(struct osmocom_ms *ms) @@ -381,20 +381,20 @@ case S_GLOBAL_SHUTDOWN: /* force to exit, if signalled */ if (signal_data && *((uint8_t *)signal_data)) - quit = 1; + _quit = 1; llist_for_each_entry_safe(ms, ms2, &ms_list, entity) - mobile_delete(ms, quit); + mobile_delete(ms, _quit); /* quit, after all MS processes are gone */ - quit = 1; + _quit = 1; break; } return 0; } /* global work handler */ -int l23_app_work(int *_quit) +int _mobile_app_work(void) { struct osmocom_ms *ms, *ms2; int work = 0; @@ -424,12 +424,12 @@ } /* return, if a shutdown was scheduled (quit = 1) */ - *_quit = quit; + quit = _quit; return work; } /* global exit */ -int l23_app_exit(void) +int _mobile_app_exit(void) { osmo_signal_unregister_handler(SS_L1CTL, &gsm322_l1_signal, NULL); osmo_signal_unregister_handler(SS_L1CTL, &mobile_signal_cb, NULL); @@ -442,53 +442,10 @@ return 0; } -static struct vty_app_info vty_info = { - .name = "OsmocomBB", - .version = PACKAGE_VERSION, -}; -/* global init */ -int l23_app_init(const char *config_file) +int _mobile_app_start(void) { - struct telnet_connection dummy_conn; - int rc = 0; - - osmo_gps_init(); - -#ifdef WITH_GAPK_IO - /* Init GAPK audio I/O */ - gapk_io_init(); -#endif - - vty_info.tall_ctx = l23_ctx; - vty_init(&vty_info); - logging_vty_add_cmds(); - ms_vty_init(); - dummy_conn.priv = NULL; - vty_reading = 1; - if (config_file != NULL) { - rc = vty_read_config_file(config_file, &dummy_conn); - if (rc < 0) { - LOGP(DMOB, LOGL_FATAL, "Failed to parse the configuration " - "file '%s'\n", config_file); - LOGP(DMOB, LOGL_FATAL, "Please make sure the file " - "'%s' exists, or use an example from " - "'doc/examples/mobile/'\n", config_file); - return rc; - } - LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); - } - vty_reading = 0; - rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); - if (rc < 0) { - LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", - vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); - return rc; - } - - osmo_signal_register_handler(SS_GLOBAL, &global_signal_cb, NULL); - osmo_signal_register_handler(SS_L1CTL, &mobile_signal_cb, NULL); - osmo_signal_register_handler(SS_L1CTL, &gsm322_l1_signal, NULL); + int rc; if (llist_empty(&ms_list)) { struct osmocom_ms *ms; @@ -503,16 +460,60 @@ return rc; } - quit = 0; + _quit = 0; return 0; } +/* global init */ +int l23_app_init(void) +{ + l23_app_start = _mobile_app_start; + l23_app_work = _mobile_app_work; + l23_app_exit = _mobile_app_exit; + osmo_gps_init(); + +#ifdef WITH_GAPK_IO + /* Init GAPK audio I/O */ + gapk_io_init(); +#endif + + osmo_signal_register_handler(SS_GLOBAL, &global_signal_cb, NULL); + osmo_signal_register_handler(SS_L1CTL, &mobile_signal_cb, NULL); + osmo_signal_register_handler(SS_L1CTL, &gsm322_l1_signal, NULL); + + return 0; +} + +static int _mobile_vty_init(void) +{ + return ms_vty_init(); +} + +static int l23_cfg_supported(void) +{ + return L23_OPT_TAP | L23_OPT_VTY | L23_OPT_DBG; +} + +static struct vty_app_info _mobile_vty_info = { + .name = "mobile", + .version = PACKAGE_VERSION, +}; + +static struct l23_app_info info = { + .copyright = "Copyright (C) 2010-2015 Andreas Eversberg, Sylvain Munaut, Holger Freyther, Harald Welte\n", + .contribution = "Contributions by Alex Badea, Pablo Neira, Steve Markgraf and others\n", + .cfg_supported = &l23_cfg_supported, + .vty_info = &_mobile_vty_info, + .vty_init = _mobile_vty_init, +}; + struct l23_app_info *l23_app_info(void) { - return NULL; /* TODO: implement mobile as a full l23_app. */ + return &info; } + void mobile_set_started(struct osmocom_ms *ms, bool state) { ms->started = state; diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 088e6c9..4627b25 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -19,6 +19,8 @@ #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/l23_app.h> +#include <osmocom/bb/common/vty.h> #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/core/talloc.h> @@ -27,6 +29,10 @@ #include <osmocom/core/gsmtap.h> #include <osmocom/core/signal.h> #include <osmocom/core/application.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/ports.h> #include <arpa/inet.h> @@ -42,13 +48,21 @@ #include <time.h> #include <libgen.h> +#include "config.h" + void *l23_ctx = NULL; struct llist_head ms_list; static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; +static char *config_file = NULL; char *config_dir = NULL; int daemonize = 0; +int quit = 0; + +int (*l23_app_start)(void) = NULL; +int (*l23_app_work)(void) = NULL; +int (*l23_app_exit)(void) = NULL; int mobile_delete(struct osmocom_ms *ms, int force); int mobile_signal_cb(unsigned int subsys, unsigned int signal, @@ -61,12 +75,12 @@ "DCS:DNB:DPLMN:DRR:DMM:DSIM:DCC:DMNCC:DSS:DLSMS:DPAG:DSUM:DSAP:DGPS:DMOB:DPRIM:DLUA:DGAPK"; const char *openbsc_copyright = - "Copyright (C) 2010-2015 Andreas Eversberg, Sylvain Munaut, Holger Freyther, Harald Welte\n" - "Contributions by Alex Badea, Pablo Neira, Steve Markgraf and others\n\n" + "%s" + "%s\n" "License GPLv2+: GNU GPL version 2 or later " "<http://gnu.org/licenses/gpl.html>\n" "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n"; + "There is NO WARRANTY, to the extent permitted by law.\n\n"; static void print_usage(const char *app) { @@ -198,13 +212,56 @@ } } -int main(int argc, char **argv) +static void print_copyright(void) { - char *config_file; - int quit = 0; + struct l23_app_info *app; + app = l23_app_info(); + printf(openbsc_copyright, + app && app->copyright ? app->copyright : "", + app && app->contribution ? app->contribution : ""); +} + +static int _vty_init(struct l23_app_info *app) +{ + static struct vty_app_info l23_vty_info = { + .name = "OsmocomBB", + .version = PACKAGE_VERSION, + }; int rc; - printf("%s\n", openbsc_copyright); + OSMO_ASSERT(app->vty_info); + app->vty_info->tall_ctx = l23_ctx; + vty_init(app->vty_info ? : &l23_vty_info); + logging_vty_add_cmds(); + if (app->vty_init) + app->vty_init(); + if (config_file) { + LOGP(DLGLOBAL, LOGL_INFO, "Using configuration from '%s'\n", config_file); + l23_vty_reading = true; + rc = vty_read_config_file(config_file, NULL); + l23_vty_reading = false; + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_FATAL, + "Failed to parse the configuration file '%s'\n", config_file); + return rc; + } + } + rc = telnet_init_default(l23_ctx, NULL, OSMO_VTY_PORT_BB); + if (rc < 0) { + LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", + vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); + return rc; + } + return rc; +} + +int main(int argc, char **argv) +{ + int rc; + struct l23_app_info *app; + unsigned int app_supp_opt = 0x00; + + print_copyright(); srand(time(NULL)); @@ -217,21 +274,23 @@ /* Init default stderr logging */ osmo_init_logging2(l23_ctx, &log_info); + rc = l23_app_init(); + if (rc < 0) { + fprintf(stderr, "Failed during l23_app_init()\n"); + exit(1); + } + + app = l23_app_info(); + if (app && app->cfg_supported != NULL) + app_supp_opt = app->cfg_supported(); + + rc = handle_options(argc, argv); if (rc) { /* Abort in case of parsing errors */ fprintf(stderr, "Error in command line options. Exiting.\n"); return 1; } - if (gsmtap_ip) { - gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); - if (!gsmtap_inst) { - fprintf(stderr, "Failed during gsmtap_init()\n"); - exit(1); - } - gsmtap_source_add_sink(gsmtap_inst); - } - if (custom_cfg_file) { /* Use full path provided by user */ config_file = talloc_strdup(l23_ctx, custom_cfg_file); @@ -250,9 +309,27 @@ config_dir = talloc_strdup(l23_ctx, config_file); config_dir = dirname(config_dir); - rc = l23_app_init(config_file); - if (rc) - exit(rc); + if (app_supp_opt & L23_OPT_VTY) { + if (_vty_init(app) < 0) + exit(1); + } + + if (gsmtap_ip) { + gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); + if (!gsmtap_inst) { + fprintf(stderr, "Failed during gsmtap_init()\n"); + exit(1); + } + gsmtap_source_add_sink(gsmtap_inst); + } + + if (l23_app_start) { + rc = l23_app_start(); + if (rc < 0) { + fprintf(stderr, "Failed during l23_app_start()\n"); + exit(1); + } + } signal(SIGINT, sighandler); signal(SIGTSTP, sighandler); @@ -271,7 +348,7 @@ } while (1) { - l23_app_work(&quit); + l23_app_work(); if (quit && llist_empty(&ms_list)) break; osmo_select_main(0); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 3ffdc54..05690ab 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -106,12 +106,11 @@ return 0; } -int vty_reading = 0; static int hide_default = 0; static void vty_restart(struct vty *vty, struct osmocom_ms *ms) { - if (vty_reading) + if (l23_vty_reading) return; if (ms->shutdown != MS_SHUTDOWN_NONE) return; @@ -1183,7 +1182,7 @@ } if (!found) { - if (!vty_reading) { + if (!l23_vty_reading) { vty_out(vty, "MS name '%s' does not exits, try " "'ms %s create'%s", argv[0], argv[0], VTY_NEWLINE); @@ -2270,7 +2269,7 @@ struct gsm_support *sup = &ms->support; \ if (!sup->item) { \ vty_out(vty, desc " not supported%s", VTY_NEWLINE); \ - if (vty_reading) \ + if (l23_vty_reading) \ return CMD_SUCCESS; \ return CMD_WARNING; \ } \ @@ -2288,7 +2287,7 @@ struct gsm_support *sup = &ms->support; \ if (!sup->item) { \ vty_out(vty, desc " not supported%s", VTY_NEWLINE); \ - if (vty_reading) \ + if (l23_vty_reading) \ return CMD_SUCCESS; \ return CMD_WARNING; \ } \ @@ -2381,7 +2380,7 @@ set->class_900 = atoi(argv[0]); - if (set->class_900 < sup->class_900 && !vty_reading) + if (set->class_900 < sup->class_900 && !l23_vty_reading) vty_out(vty, "Note: You selected a higher class than supported " " by hardware!%s", VTY_NEWLINE); @@ -2402,7 +2401,7 @@ set->class_850 = atoi(argv[0]); - if (set->class_850 < sup->class_850 && !vty_reading) + if (set->class_850 < sup->class_850 && !l23_vty_reading) vty_out(vty, "Note: You selected a higher class than supported " " by hardware!%s", VTY_NEWLINE); @@ -2423,7 +2422,7 @@ set->class_400 = atoi(argv[0]); - if (set->class_400 < sup->class_400 && !vty_reading) + if (set->class_400 < sup->class_400 && !l23_vty_reading) vty_out(vty, "Note: You selected a higher class than supported " " by hardware!%s", VTY_NEWLINE); @@ -2443,7 +2442,7 @@ set->class_dcs = atoi(argv[0]); if (((set->class_dcs + 1) & 3) < ((sup->class_dcs + 1) & 3) - && !vty_reading) + && !l23_vty_reading) vty_out(vty, "Note: You selected a higher class than supported " " by hardware!%s", VTY_NEWLINE); @@ -2463,7 +2462,7 @@ set->class_pcs = atoi(argv[0]); if (((set->class_pcs + 1) & 3) < ((sup->class_pcs + 1) & 3) - && !vty_reading) + && !l23_vty_reading) vty_out(vty, "Note: You selected a higher class than supported " " by hardware!%s", VTY_NEWLINE); @@ -2489,7 +2488,7 @@ else ch_cap = GSM_CAP_SDCCH; - if (ch_cap > sup->ch_cap && !vty_reading) { + if (ch_cap > sup->ch_cap && !l23_vty_reading) { vty_out(vty, "You selected an higher capability than supported " " by hardware!%s", VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> 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, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by pespin

Attention is currently required from: osmith, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31107 ) Change subject: layer23: Integreate mobile further into l23_app ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: Readding +1 from laforge after fixing fixeria's comments. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:12:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by fixeria

Attention is currently required from: osmith, jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31107 ) Change subject: layer23: Integreate mobile further into l23_app ...................................................................... Patch Set 2: Code-Review+1 (3 comments) File src/host/layer23/src/mobile/app_mobile.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/ab176e6f_ece83209 PS1, Line 495: L23_OPT_ARFCN > This one should be removed, because the mobile app does not have -a. […] Done https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/09a26181_8338de38 PS1, Line 499: modem > copy-paste Done https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/93fb7a41_74c5886c PS1, Line 504: copyright > Copyright (C) 2010-2015 Andreas Eversberg, Sylvain Munaut, Holger Freyther, Harald Welte […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:10:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI llc_queue and codel code has been taken from osmo-pcu.git 6a5b1b1f3ef83f87a9df1d4511e22f59039e11ed and have been refactored to fit in libosmo-gprs (removed llc_pdu structs, reworked struct types being enqueued, etc.). Support for queues based on radio_prio has also been added. Related: OS#5500 Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e --- M include/osmocom/gprs/rlcmac/Makefile.am A include/osmocom/gprs/rlcmac/codel.h A include/osmocom/gprs/rlcmac/gre.h A include/osmocom/gprs/rlcmac/llc_queue.h M include/osmocom/gprs/rlcmac/rlcmac.h M include/osmocom/gprs/rlcmac/rlcmac_private.h M src/rlcmac/Makefile.am A src/rlcmac/codel.c A src/rlcmac/gre.c A src/rlcmac/llc_queue.c M src/rlcmac/rlcmac.c M src/rlcmac/rlcmac_prim.c 12 files changed, 716 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am index db16d94..b8ff1e0 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -1,4 +1,7 @@ noinst_HEADERS = \ + codel.h \ + gre.h \ + llc_queue.h \ rlcmac_private.h \ $(NULL) diff --git a/include/osmocom/gprs/rlcmac/codel.h b/include/osmocom/gprs/rlcmac/codel.h new file mode 100644 index 0000000..0314f11 --- /dev/null +++ b/include/osmocom/gprs/rlcmac/codel.h @@ -0,0 +1,96 @@ +/* codel.h + * + * This is an implementation of the CoDel algorithm based on the reference + * pseudocode (see http://queue.acm.org/appendices/codel.html). + * Instead of abstracting the queue itself, the following implementation + * provides a time stamp based automaton. The main work is done by a single + * decision function which updates the state and tells whether to pass or to + * drop a packet after it has been taken from the queue. + * + * Copyright (C) 2015-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 General Public License for more details. + */ + +#pragma once + +#include <time.h> + +/* Spec default values */ +#define GPRS_CODEL_DEFAULT_INTERVAL_MS 100 +#define GPRS_CODEL_DEFAULT_MAXPACKET 512 + +struct gprs_codel { + int dropping; + unsigned count; + struct timespec first_above_time; + struct timespec drop_next; + struct timespec target; + struct timespec interval; + unsigned maxpacket; +}; + +/*! + * \brief Decide about packet drop and update CoDel state + * + * This function takes timing information and decides whether the packet in + * question should be dropped in order to keep related queue in a 'good' state. + * The function is meant to be called when the packet is dequeued. + * + * The CoDel state is updated by this function. + * + * \param state A pointer to the CoDel state of this queue + * \param recv The time when the packet has entered the queue, + * use NULL if dequeueing was not possible because the queue is + * empty + * \param now The current (dequeueing) time + * \param bytes The number of bytes currently stored in the queue (-1 if + * unknown) + * + * \return != 0 if the packet should be dropped, 0 otherwise + */ +int gprs_codel_control(struct gprs_codel *state, const struct timespec *recv, + const struct timespec *now, int bytes); + +/*! + * \brief Initialise CoDel state + * + * This function initialises the CoDel state object. It sets the interval time + * to the default value (GPRS_CODEL_DEFAULT_INTERVAL_MS). + * + * \param state A pointer to the CoDel state of this queue + */ +void gprs_codel_init(struct gprs_codel *state); + +/*! + * \brief Set interval time + * + * This function changes the interval time. + * The target time is derived from the interval time as proposed in the spec + * (5% of interval time). + * + * \param state A pointer to the CoDel state of this queue + * \param interval_ms The initial interval in ms to be used (<= 0 selects the + * default value) + */ +void gprs_codel_set_interval(struct gprs_codel *state, int interval_ms); + +/*! + * \brief Set max packet size + * + * This function changes the maxpacket value. If no more than this number of + * bytes are still stored in the queue, no dropping will be done. + * + * \param state A pointer to the CoDel state of this queue + * \param maxpacket The value in bytes + */ +void gprs_codel_set_maxpacket(struct gprs_codel *state, int maxpacket); diff --git a/include/osmocom/gprs/rlcmac/gre.h b/include/osmocom/gprs/rlcmac/gre.h new file mode 100644 index 0000000..ea50ddb --- /dev/null +++ b/include/osmocom/gprs/rlcmac/gre.h @@ -0,0 +1,25 @@ +/* GPRS RLC/MAC Entity (one per MS) */ +#pragma once + +#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/rlcmac/llc_queue.h> + +struct gprs_rlcmac_ul_tbf; + +struct gprs_rlcmac_entity { + struct llist_head entry; /* item in (struct gprs_rlcmac_ctx)->gre_list */ + uint32_t tlli; + + struct gprs_rlcmac_llc_queue *llc_queue; + + struct gprs_rlcmac_ul_tbf *ul_tbf; +}; + +struct gprs_rlcmac_entity *gprs_rlcmac_entity_alloc(uint32_t tlli); +void gprs_rlcmac_entity_free(struct gprs_rlcmac_entity *gre); + +int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); + +#define LOGGRE(gre, level, fmt, args...) \ + LOGRLCMAC(level, "GRE(%08x) " fmt, (gre)->tlli, ## args) diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h new file mode 100644 index 0000000..7e941fb --- /dev/null +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -0,0 +1,62 @@ +#pragma once + +#include <stdint.h> +#include <string.h> +#include <time.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/gprs/rlcmac/codel.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/rlcmac/rlcmac.h> + +struct gprs_rlcmac_entity; + +/* Highet/Lowest radio priority (biggest number) as per 3GPP TS 24.008 version 16.7.0 Release 16 section 10.5.7.2: + * "All other values are interpreted as priority level 4 by this version of the protocol." */ +#define _GPRS_RLCMAC_RADIO_PRIO_HIGHEST 1 +#define _GPRS_RLCMAC_RADIO_PRIO_LOWEST 4 +/* Normalize 0..N-1 (to be used in arrays): */ +#define RADIO_PRIO_NORM(radio_prio) ((radio_prio) - _GPRS_RLCMAC_RADIO_PRIO_HIGHEST) + +enum gprs_rlcmac_llc_queue_sapi_prio { /* lowest value has highest prio */ + GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_GMM = 0, /* SAPI 1 */ + GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_TOM_SMS, /* SAPI 2,7,8 */ + GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_OTHER, /* Other SAPIs */ + _GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_SIZE /* used to calculate size of enum */ +}; + +struct gprs_llc_prio_queue { + struct gprs_codel codel_state; + struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ +}; + +struct gprs_rlcmac_llc_queue { + struct gprs_rlcmac_entity *gre; /* backpointer */ + uint32_t avg_queue_delay; /* Average delay of data going through the queue */ + size_t queue_size; + size_t queue_octets; + bool use_codel; + struct gprs_llc_prio_queue pq[RADIO_PRIO_NORM(_GPRS_RLCMAC_RADIO_PRIO_LOWEST) + 1][_GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ +}; + +struct gprs_rlcmac_llc_queue *gprs_rlcmac_llc_queue_alloc(struct gprs_rlcmac_entity *gre); +void gprs_rlcmac_llc_queue_free(struct gprs_rlcmac_llc_queue *q); +void gprs_rlcmac_llc_queue_clear(struct gprs_rlcmac_llc_queue *q); + +void gprs_rlcmac_llc_queue_set_codel_params(struct gprs_rlcmac_llc_queue *q, bool use, unsigned int interval_msec); + +int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio); +struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q); + +static inline size_t gprs_rlcmac_llc_queue_size(const struct gprs_rlcmac_llc_queue *q) +{ + return q->queue_size; +} + +static inline size_t gprs_rlcmac_llc_queue_octets(const struct gprs_rlcmac_llc_queue *q) +{ + return q->queue_octets; +} diff --git a/include/osmocom/gprs/rlcmac/rlcmac.h b/include/osmocom/gprs/rlcmac/rlcmac.h index 2b5f208..e433a08 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac.h +++ b/include/osmocom/gprs/rlcmac/rlcmac.h @@ -35,3 +35,4 @@ }; void osmo_gprs_rlcmac_set_log_cat(enum osmo_gprs_rlcmac_log_cat logc, int logc_num); +int osmo_gprs_rlcmac_set_codel_params(bool use, unsigned int interval_msec); diff --git a/include/osmocom/gprs/rlcmac/rlcmac_private.h b/include/osmocom/gprs/rlcmac/rlcmac_private.h index fb3ec7a..26284c1 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_private.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_private.h @@ -18,16 +18,27 @@ #define msgb_rlcmac_prim(msg) ((struct osmo_gprs_rlcmac_prim *)(msg)->l1h) struct gprs_rlcmac_ctx { - enum osmo_gprs_rlcmac_location location; + struct { + enum osmo_gprs_rlcmac_location location; + struct { + bool use; + uint32_t interval_msec; + } codel; + } cfg; osmo_gprs_rlcmac_prim_up_cb rlcmac_up_cb; void *rlcmac_up_cb_user_data; osmo_gprs_rlcmac_prim_down_cb rlcmac_down_cb; void *rlcmac_down_cb_user_data; + + struct llist_head gre_list; /* contains (struct gprs_rlcmac_entity)->entry */ }; extern struct gprs_rlcmac_ctx *g_ctx; +/* rlcmac.c */ +struct gprs_rlcmac_entity *gprs_rlcmac_find_entity_by_tlli(uint32_t tlli); + /* rlcmac_prim.c */ int gprs_rlcmac_prim_call_up_cb(struct osmo_gprs_rlcmac_prim *rlcmac_prim); int gprs_rlcmac_prim_call_down_cb(struct osmo_gprs_rlcmac_prim *rlcmac_prim); diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 2e82e25..47e88b6 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,6 +22,9 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ + codel.c \ + gre.c \ + llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ ts_24_008.c \ diff --git a/src/rlcmac/codel.c b/src/rlcmac/codel.c new file mode 100644 index 0000000..a6e331e --- /dev/null +++ b/src/rlcmac/codel.c @@ -0,0 +1,175 @@ +/* codel.c + * + * Copyright (C) 2015-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 General Public License for more details. + */ + +#include <stdint.h> +#include <stdlib.h> +#include <math.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer_compat.h> +#include <osmocom/gprs/rlcmac/codel.h> +#include <osmocom/gprs/rlcmac/rlcmac_private.h> + +static void control_law(struct gprs_codel *state, struct timespec *delta) +{ + /* 256 / sqrt(x), limited to 255 */ + static uint8_t inv_sqrt_tab[] = {255, + 255, 181, 147, 128, 114, 104, 96, 90, 85, 80, 77, 73, 71, 68, + 66, 64, 62, 60, 58, 57, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, + 45, 45, 44, 43, 43, 42, 42, 41, 40, 40, 39, 39, 39, 38, 38, 37, + 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 32, 32, + 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 29, 28, + 28, 28, 28, 28, 28, 27, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, + 26, 26, 25, 25, 25, 25, 25, 25, 25, 25, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17 + }; + uint_fast32_t delta_usecs; + uint_fast32_t inv_sqrt; + div_t q; + + if (state->count >= ARRAY_SIZE(inv_sqrt_tab)) + inv_sqrt = 16; + else + inv_sqrt = inv_sqrt_tab[state->count]; + + /* delta = state->interval / sqrt(count) */ + delta_usecs = state->interval.tv_sec * 1000000 + state->interval.tv_nsec/1000; + delta_usecs = delta_usecs * inv_sqrt / 256; + + q = div(delta_usecs, 1000000); + delta->tv_sec = q.quot; + delta->tv_nsec = q.rem * 1000; +} + +void gprs_codel_init(struct gprs_codel *state) +{ + static const struct gprs_codel init_state = {0}; + + *state = init_state; + gprs_codel_set_interval(state, -1); + gprs_codel_set_maxpacket(state, -1); +} + +void gprs_codel_set_interval(struct gprs_codel *state, int interval_ms) +{ + div_t q; + + if (interval_ms <= 0) + interval_ms = GPRS_CODEL_DEFAULT_INTERVAL_MS; + + q = div(interval_ms, 1000); + state->interval.tv_sec = q.quot; + state->interval.tv_nsec = q.rem * 1000000; + + /* target ~ 5% of interval */ + q = div(interval_ms * 13 / 256, 1000); + state->target.tv_sec = q.quot; + state->target.tv_nsec = q.rem * 1000000; +} + +void gprs_codel_set_maxpacket(struct gprs_codel *state, int maxpacket) +{ + + if (maxpacket < 0) + maxpacket = GPRS_CODEL_DEFAULT_MAXPACKET; + + state->maxpacket = maxpacket; +} + +/* + * This is an broken up variant of the algorithm being described in + * http://queue.acm.org/appendices/codel.html + */ +int gprs_codel_control(struct gprs_codel *state, const struct timespec *recv, + const struct timespec *now, int bytes) +{ + struct timespec sojourn_time; + struct timespec delta; + + if (recv == NULL) + goto stop_dropping; + + timespecsub(now, recv, &sojourn_time); + + if (timespeccmp(&sojourn_time, &state->target, <)) + goto stop_dropping; + + if (bytes >= 0 && (unsigned)bytes <= state->maxpacket) + goto stop_dropping; + + if (!timespecisset(&state->first_above_time)) { + timespecadd(now, &state->interval, &state->first_above_time); + goto not_ok_to_drop; + } + + if (timespeccmp(now, &state->first_above_time, <)) + goto not_ok_to_drop; + + /* Ok to drop */ + + if (!state->dropping) { + int recently = 0; + int in_drop_cycle = 0; + if (timespecisset(&state->drop_next)) { + timespecsub(now, &state->drop_next, &delta); + in_drop_cycle = timespeccmp(&delta, &state->interval, <); + recently = in_drop_cycle; + } + if (!recently) { + timespecsub(now, &state->first_above_time, &delta); + recently = !timespeccmp(&delta, &state->interval, <); + }; + if (!recently) + return 0; + + state->dropping = 1; + + if (in_drop_cycle && state->count > 2) + state->count -= 2; + else + state->count = 1; + + state->drop_next = *now; + } else { + if (timespeccmp(now, &state->drop_next, <)) + return 0; + + state->count += 1; + } + + control_law(state, &delta); + timespecadd(&state->drop_next, &delta, &state->drop_next); + + LOGRLCMAC(LOGL_INFO, + "CoDel decided to drop packet, window = %d.%03dms, count = %d\n", + (int)delta.tv_sec, (int)(delta.tv_nsec / 1000000), state->count); + + return 1; + +stop_dropping: + timespecclear(&state->first_above_time); +not_ok_to_drop: + state->dropping = 0; + return 0; +} diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c new file mode 100644 index 0000000..7acd4f6 --- /dev/null +++ b/src/rlcmac/gre.c @@ -0,0 +1,75 @@ +/* GPRS RLC/MAC Entity (one per MS) */ +/* + * (C) 2023 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 <stdbool.h> + +#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/rlcmac/rlcmac_private.h> +#include <osmocom/gprs/rlcmac/gre.h> + +struct gprs_rlcmac_entity *gprs_rlcmac_entity_alloc(uint32_t tlli) +{ + struct gprs_rlcmac_entity *gre; + + gre = talloc_zero(g_ctx, struct gprs_rlcmac_entity); + if (!gre) + return NULL; + + gre->llc_queue = gprs_rlcmac_llc_queue_alloc(gre); + if (!gre->llc_queue) + goto err_free_gre; + gprs_rlcmac_llc_queue_set_codel_params(gre->llc_queue, + g_ctx->cfg.codel.use, + g_ctx->cfg.codel.interval_msec); + + gre->tlli = tlli; + llist_add_tail(&gre->entry, &g_ctx->gre_list); + + return gre; + +err_free_gre: + talloc_free(gre); + return NULL; +} + +void gprs_rlcmac_entity_free(struct gprs_rlcmac_entity *gre) +{ + if (!gre) + return; + gprs_rlcmac_llc_queue_free(gre->llc_queue); + llist_del(&gre->entry); + talloc_free(gre); +} + +int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio) +{ + int rc; + rc = gprs_rlcmac_llc_queue_enqueue(gre->llc_queue, ll_pdu, ll_pdu_len, + sapi, radio_prio); + if (rc < 0) + return rc; + + /* TODO: here a new UL TBF will be created if not available yet */ + + return rc; +} diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c new file mode 100644 index 0000000..1422f1f --- /dev/null +++ b/src/rlcmac/llc_queue.c @@ -0,0 +1,212 @@ +/* llc_queue.c + * + * Copyright (C) 2012 Ivan Klyuchnikov + * Copyright (C) 2012 Andreas Eversberg <jolly(a)eversberg.eu> + * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2023 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 General Public License for more details. + */ + + +#include <stdio.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/timer_compat.h> +#include <osmocom/gprs/rlcmac/rlcmac_private.h> +#include <osmocom/gprs/rlcmac/llc_queue.h> +#include <osmocom/gprs/rlcmac/gre.h> + +struct llc_queue_entry_hdr { + struct timespec recv_time; +}; + +struct gprs_rlcmac_llc_queue *gprs_rlcmac_llc_queue_alloc(struct gprs_rlcmac_entity *gre) +{ + struct gprs_rlcmac_llc_queue *q; + uint32_t i, j; + + q = talloc_zero(gre, struct gprs_rlcmac_llc_queue); + if (!q) + return NULL; + + q->gre = gre; + q->queue_size = 0; + q->queue_octets = 0; + q->avg_queue_delay = 0; + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + INIT_LLIST_HEAD(&q->pq[i][j].queue); + gprs_codel_init(&q->pq[i][j].codel_state); + } + } + + return q; +} + +void gprs_rlcmac_llc_queue_free(struct gprs_rlcmac_llc_queue *q) +{ + talloc_free(q); +} + +void gprs_rlcmac_llc_queue_set_codel_params(struct gprs_rlcmac_llc_queue *q, bool use, unsigned int interval_msec) +{ + unsigned int i, j; + + q->use_codel = use; + + if (!q->use_codel) + return; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) + gprs_codel_set_interval(&q->pq[i][j].codel_state, interval_msec); +} + +static enum gprs_rlcmac_llc_queue_sapi_prio gprs_rlcmac_llc_sapi2prio(enum osmo_gprs_rlcmac_llc_sapi sapi) +{ + switch (sapi) { + case OSMO_GPRS_RLCMAC_LLC_SAPI_GMM: + return GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_GMM; + case OSMO_GPRS_RLCMAC_LLC_SAPI_TOM2: + case OSMO_GPRS_RLCMAC_LLC_SAPI_SMS: + case OSMO_GPRS_RLCMAC_LLC_SAPI_TOM8: + return GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_TOM_SMS; + default: + return GPRS_RLCMAC_LLC_QUEUE_SAPI_PRIO_OTHER; + } +} + +int gprs_rlcmac_llc_queue_enqueue(struct gprs_rlcmac_llc_queue *q, uint8_t *ll_pdu, unsigned int ll_pdu_len, + enum osmo_gprs_rlcmac_llc_sapi sapi, uint8_t radio_prio) +{ + struct llc_queue_entry_hdr *ehdr; + enum gprs_rlcmac_llc_queue_sapi_prio sapi_prio; + struct msgb *msg; + + /* Trim to expected values 1..4, (3GPP TS 24.008) 10.5.7.2 */ + if (radio_prio < _GPRS_RLCMAC_RADIO_PRIO_HIGHEST) + radio_prio = _GPRS_RLCMAC_RADIO_PRIO_HIGHEST; + else if (radio_prio > _GPRS_RLCMAC_RADIO_PRIO_LOWEST) + radio_prio = _GPRS_RLCMAC_RADIO_PRIO_LOWEST; + + sapi_prio = gprs_rlcmac_llc_sapi2prio(sapi); + + msg = msgb_alloc_headroom(sizeof(*ehdr) + ll_pdu_len, 0, "llc_queue_msg"); + msg->l1h = msgb_put(msg, sizeof(*ehdr)); + ehdr = (struct llc_queue_entry_hdr *)msg->l1h; + + osmo_clock_gettime(CLOCK_MONOTONIC, &ehdr->recv_time); + + if (ll_pdu_len) { + msg->l2h = msgb_put(msg, ll_pdu_len); + memcpy(msg->l2h, ll_pdu, ll_pdu_len); + } else { + msg->l2h = NULL; + } + + msgb_enqueue(&q->pq[RADIO_PRIO_NORM(radio_prio)][sapi_prio].queue, msg); + q->queue_size += 1; + q->queue_octets += ll_pdu_len; + + return 0; +} + +void gprs_rlcmac_llc_queue_clear(struct gprs_rlcmac_llc_queue *q) +{ + struct msgb *msg; + unsigned int i, j; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + while ((msg = msgb_dequeue(&q->pq[i][j].queue))) + msgb_free(msg); + } + } + + q->queue_size = 0; + q->queue_octets = 0; +} + +#define ALPHA 0.5f + +static struct msgb *gprs_rlcmac_llc_queue_pick_msg(struct gprs_rlcmac_llc_queue *q, struct gprs_llc_prio_queue **prioq) +{ + struct msgb *msg; + struct timespec tv_now, tv_result; + uint32_t lifetime; + unsigned int i, j; + const struct llc_queue_entry_hdr *ehdr; + + for (i = 0; i < ARRAY_SIZE(q->pq); i++) { + for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { + if ((msg = msgb_dequeue(&q->pq[i][j].queue))) { + *prioq = &q->pq[i][j]; + goto found; + } + } + } + return NULL; + +found: + ehdr = msgb_l1(msg); + + q->queue_size -= 1; + q->queue_octets -= msgb_l2len(msg); + + /* take the second time */ + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); + timespecsub(&tv_now, &ehdr->recv_time, &tv_result); + + lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; + q->avg_queue_delay = q->avg_queue_delay * ALPHA + lifetime * (1-ALPHA); + + return msg; +} + +struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q) +{ + struct msgb *msg; + struct timespec tv_now; + uint32_t octets = 0, frames = 0; + struct gprs_llc_prio_queue *prioq; + const struct llc_queue_entry_hdr *ehdr; + + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); + + while ((msg = gprs_rlcmac_llc_queue_pick_msg(q, &prioq))) { + ehdr = msgb_l1(msg); + if (q->use_codel) { + int bytes = gprs_rlcmac_llc_queue_octets(q); + if (gprs_codel_control(&prioq->codel_state, &ehdr->recv_time, &tv_now, bytes)) { + /* Drop frame: */ + frames++; + octets += msg->len; + msgb_free(msg); + /* rate_ctr_inc(CTR_LLC_FRAME_DROPPED); */ + } + } + + /* dequeue current msg */ + break; + } + + if (frames > 0) { + LOGGRE(q->gre, LOGL_NOTICE, "Discarding %u LLC PDUs (%u octets) due to codel algo, " + "new_queue_size=%zu\n", frames, octets, gprs_rlcmac_llc_queue_size(q)); + } + + msgb_pull_to_l2(msg); + + return msg; +} diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index faf3489..13a3e84 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -19,9 +19,14 @@ * */ +#include <stdbool.h> + #include <osmocom/gprs/rlcmac/rlcmac.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> +#include <osmocom/gprs/rlcmac/gre.h> + +#define GPRS_CODEL_SLOW_INTERVAL_MS 4000 struct gprs_rlcmac_ctx *g_ctx; @@ -33,7 +38,36 @@ talloc_free(g_ctx); g_ctx = talloc_zero(NULL, struct gprs_rlcmac_ctx); - g_ctx->location = location; + g_ctx->cfg.location = location; + g_ctx->cfg.codel.use = true; + g_ctx->cfg.codel.interval_msec = GPRS_CODEL_SLOW_INTERVAL_MS; + INIT_LLIST_HEAD(&g_ctx->gre_list); return 0; } + +/*! Set CoDel parameters used in the Tx queue of LLC PDUs waiting to be transmitted. + * \param[in] use Whether to enable or disable use of CoDel algo. + * \param[in] interval_msec Interval at which CoDel triggers, in milliseconds. (0 = use default interval value) + * \returns 0 on success; negative on error. + */ +int osmo_gprs_rlcmac_set_codel_params(bool use, unsigned int interval_msec) +{ + if (interval_msec == 0) + interval_msec = GPRS_CODEL_SLOW_INTERVAL_MS; + + g_ctx->cfg.codel.use = use; + g_ctx->cfg.codel.interval_msec = interval_msec; + return 0; +} + +struct gprs_rlcmac_entity *gprs_rlcmac_find_entity_by_tlli(uint32_t tlli) +{ + struct gprs_rlcmac_entity *gre; + + llist_for_each_entry(gre, &g_ctx->gre_list, entry) { + if (gre->tlli == tlli) + return gre; + } + return NULL; +} diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index 1d5dcc9..23de05d 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -35,6 +35,7 @@ #include <osmocom/gprs/rlcmac/rlcmac.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> +#include <osmocom/gprs/rlcmac/gre.h> #define RLCMAC_MSGB_HEADROOM 0 @@ -213,7 +214,22 @@ static int rlcmac_prim_handle_grr_unitdata_req(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { - int rc = gprs_rlcmac_prim_handle_unsupported(rlcmac_prim); + struct gprs_rlcmac_entity *gre; + int rc; + + gre = gprs_rlcmac_find_entity_by_tlli(rlcmac_prim->grr.tlli); + if (!gre) { + LOGRLCMAC(LOGL_INFO, "TLLI=0x%08x not found, creating entity on the fly\n", + rlcmac_prim->grr.tlli); + gre = gprs_rlcmac_entity_alloc(rlcmac_prim->grr.tlli); + } + OSMO_ASSERT(gre); + + rc = gprs_rlcmac_entity_llc_enqueue(gre, + rlcmac_prim->grr.ll_pdu, + rlcmac_prim->grr.ll_pdu_len, + rlcmac_prim->grr.unitdata_req.sapi, + rlcmac_prim->grr.unitdata_req.radio_prio); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:08:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/9aa60d0f_004ca7b3 PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, > I think a better idea would be to validate AMR params before trying to apply them here. […] whatever, what I mean is that you are changing the behavior here silently, marking stuff as applied which wasn't before. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:08:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/dbc93846_5e8450ca PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, > I think a better idea would be to validate AMR params before trying to apply them here. […] Checking codecs_bitmask != 0 should be enough. Some additional checks e.g. number of bits set <= 4 can be added too. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:08:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/7f8ca305_51789386 PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, > you are missing calling "continue;" here if error is returned. I think a better idea would be to validate AMR params before trying to apply them here. Otherwise we set lchan->tch_mode above, fail to apply the AMR params and thus do not set req->applied, which is weird. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:06:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/8d0298c5_1ce808be PS2, Line 26: gsmtap-category > I'm not really liking this proposal, it differs too much from separations done in other apps. If you really think I should, I can remove the "gsmtap-" prefix from commands (I actually prefer the way it is now). Other than that, I don't see it makes sense to substantialy change namings. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:05:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/c88183a4_f02fdff1 PS2, Line 13: gsmtap > But there is no dedicated 'gsmtap' node in other apps, so it already does not match. […] I'm not mixing them here, I'm establishing 2 layers of granularity. First based on lchan, and then further specify in the lchan which kind of messages we want (this is important in gprs because there may be lots of DUMMY messages). https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/86c174e5_70ce782d PS2, Line 26: gsmtap-category > I don't like the inconsistency between 'gsmtap-sapi' and 'gsmtap-category'. My proposal: […] I'm not really liking this proposal, it differs too much from separations done in other apps. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 11:04:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by pespin

Attention is currently required from: osmith, jolly, pespin. Hello osmith, Jenkins Builder, jolly, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 to look at the new patch set (#2). Change subject: layer23: Integreate mobile further into l23_app ...................................................................... layer23: Integreate mobile further into l23_app Several functions and data structures in mobile app are refactored to follow more closely the l23_app API and structures. These movements allow starting to use already some shared infrastructure defined under layer23/common. This is not a full migration to l23_app, since mobile still keeps a separate main() with a few extra code. This commit is rather a step towards an eventual merge of mobile's main.cpp into layer23/common/main.c This is a preparation commit to later one adding gsmtap VTY configuration to all l23 apps. Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 165 insertions(+), 91 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/07/31107/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/host/trxcon/src/trxcon_fsm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31115/comment/ccf819e0_e3dc3bce PS1, Line 453: l1sched_lchan_set_amr_cfg(lchan, you are missing calling "continue;" here if error is returned. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 10:45:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31114 ) Change subject: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 Gerrit-Change-Number: 31114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 10:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: add indication to communicate E1 parameters

by pespin

Attention is currently required from: laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31113 ) Change subject: pcuif_proto: add indication to communicate E1 parameters ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/68e22a68_7c0b77e8 PS1, Line 11: E1 parameters (which TS, SS etc.) to the PCU. Lets add a new primitive > duplicate would mean that both the PCU and the BSC would have to have "matching" configuration of ho […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301 Gerrit-Change-Number: 31113 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 09:38:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/rlcmac/llc_queue.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/31098/comment/267dbdb9_008a83c0 PS3, Line 155: break; > Good catch, this is wrong :) that's because I added an extra axis of priorities and updated the code […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 31 Jan 2023 08:02:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31114 ) Change subject: trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind ...................................................................... trxcon: make l1sched_a5_burst_dec() accept l1sched_burst_ind Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 --- M src/host/trxcon/src/sched_trx.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/31114/1 diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 4cedd8a..d2040c5 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -623,20 +623,20 @@ } static void l1sched_a5_burst_dec(struct l1sched_lchan_state *lchan, - uint32_t fn, sbit_t *burst) + struct l1sched_burst_ind *bi) { ubit_t ks[114]; int i; /* Generate keystream for a DL burst */ - osmo_a5(lchan->a5.algo, lchan->a5.key, fn, ks, NULL); + osmo_a5(lchan->a5.algo, lchan->a5.key, bi->fn, ks, NULL); /* Apply keystream over ciphertext */ for (i = 0; i < 57; i++) { if (ks[i]) - burst[i + 3] *= -1; + bi->burst[i + 3] *= -1; if (ks[i + 57]) - burst[i + 88] *= -1; + bi->burst[i + 88] *= -1; } } @@ -782,7 +782,7 @@ /* Perform A5/X decryption if required */ if (lchan->a5.algo) - l1sched_a5_burst_dec(lchan, bi->fn, &bi->burst[0]); + l1sched_a5_burst_dec(lchan, bi); /* Put burst to handler */ handler(lchan, bi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5dd16cff1c9730a496748681842f571d25653cb9 Gerrit-Change-Number: 31114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31115 ) Change subject: trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() ...................................................................... trxcon: move AMR mode setting to l1sched_lchan_set_amr_cfg() Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 32 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/31115/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 4b743ca..0ea1ba0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -436,6 +436,8 @@ void l1sched_deactivate_all_lchans(struct l1sched_ts *ts); int l1sched_set_lchans(struct l1sched_ts *ts, uint8_t chan_nr, int active, uint8_t tch_mode, uint8_t tsc); +int l1sched_lchan_set_amr_cfg(struct l1sched_lchan_state *lchan, + uint8_t codecs_bitmask, uint8_t start_codec); int l1sched_activate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan); int l1sched_deactivate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan); struct l1sched_lchan_state *l1sched_find_lchan(struct l1sched_ts *ts, diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index d2040c5..267f128 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -452,6 +452,33 @@ return rc; } +int l1sched_lchan_set_amr_cfg(struct l1sched_lchan_state *lchan, + uint8_t codecs_bitmask, uint8_t start_codec) +{ + int n = 0; + int acum = 0; + int pos; + + while ((pos = ffs(codecs_bitmask)) != 0) { + acum += pos; + LOGP_LCHANC(lchan, LOGL_DEBUG, "AMR codec[%u] = %u\n", n, acum - 1); + lchan->amr.codec[n++] = acum - 1; + codecs_bitmask >>= pos; + } + if (n == 0) { + LOGP_LCHANC(lchan, LOGL_ERROR, "Empty AMR codec mode bitmask!\n"); + return -EINVAL; + } + + lchan->amr.codecs = n; + lchan->amr.dl_ft = start_codec; + lchan->amr.dl_cmr = start_codec; + lchan->amr.ul_ft = start_codec; + lchan->amr.ul_cmr = start_codec; + + return 0; +} + int l1sched_activate_lchan(struct l1sched_ts *ts, enum l1sched_lchan_type chan) { const struct l1sched_lchan_desc *lchan_desc = &l1sched_lchan_desc[chan]; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index e3224a9..0c37f35 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -35,7 +35,6 @@ #include <osmocom/bb/trxcon/phyif.h> #include <osmocom/bb/trxcon/l1ctl.h> #include <osmocom/bb/l1sched/l1sched.h> -#include <osmocom/bb/l1sched/logging.h> #define S(x) (1 << (x)) @@ -451,29 +450,9 @@ continue; lchan->tch_mode = req->mode; if (req->mode == GSM48_CMODE_SPEECH_AMR) { - uint8_t bmask = req->amr.codecs_bitmask; - int n = 0; - int acum = 0; - int pos; - while ((pos = ffs(bmask)) != 0) { - acum += pos; - LOGPFSML(fi, LOGL_DEBUG, - LOGP_LCHAN_NAME_FMT " AMR codec[%u] = %u\n", - LOGP_LCHAN_NAME_ARGS(lchan), n, acum - 1); - lchan->amr.codec[n++] = acum - 1; - bmask >>= pos; - } - if (n == 0) { - LOGPFSML(fi, LOGL_ERROR, - LOGP_LCHAN_NAME_FMT " Empty AMR codec mode bitmask!\n", - LOGP_LCHAN_NAME_ARGS(lchan)); - continue; - } - lchan->amr.codecs = n; - lchan->amr.dl_ft = req->amr.start_codec; - lchan->amr.dl_cmr = req->amr.start_codec; - lchan->amr.ul_ft = req->amr.start_codec; - lchan->amr.ul_cmr = req->amr.start_codec; + l1sched_lchan_set_amr_cfg(lchan, + req->amr.codecs_bitmask, + req->amr.start_codec); } req->applied = true; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia9504d6194a4aac6256f7d4caf73eb42bb58563e Gerrit-Change-Number: 31115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/7707255a_df939daf PS2, Line 13: gsmtap > I still prefer the way it looks this way, the commands are more self descriptive and easy to match i […] But there is no dedicated 'gsmtap' node in other apps, so it already does not match. The command style in both osmo-bts (gsmtap-sapi) and osmo-pcu (gsmtap-category) does not match either, you're just mixing them up here. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 20:04:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/5f13da34_ed918a95 PS2, Line 26: gsmtap-category I don't like the inconsistency between 'gsmtap-sapi' and 'gsmtap-category'. My proposal: gsmtap remote-host HOST lchan (bcch|ccch|rach|agch|...) lchan (enable-all|disable-all) pchan pdch (dl-dummy|dl-ctrl|...) pchan pdch (enable-all|disable-all) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 20:02:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by pespin

Attention is currently required from: jolly, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/3ae97f48_a444eef3 PS2, Line 13: gsmtap > The 'gsmtap' prefix in each command looks redundant to me, given that they all belong to 'gsmtap' no […] I still prefer the way it looks this way, the commands are more self descriptive and easy to match in other apps too. File src/host/layer23/include/osmocom/bb/common/l23_app.h: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/c7ee473c_79a94526 PS2, Line 19: bts > BTS? Ack, I'll fix -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 20:01:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: rework check logic for ts

by pespin

Attention is currently required from: laforge, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30876 ) Change subject: pcu_sock: rework check logic for ts ...................................................................... Patch Set 7: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30876/comment/86309528_6901caba PS2, Line 96: static bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) > yes, that matches my understanding of the PCU interface. […] Yes -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icaab52ab73c38889dfadb523b89bb54cafacc99a Gerrit-Change-Number: 30876 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 19:58:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-rlcmac

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31077 ) Change subject: modem: Initial integration of libosmo-gprs-rlcmac ...................................................................... modem: Initial integration of libosmo-gprs-rlcmac This commit places code to forward unitdata LLC<->RLCMAC. Depends: libosmo-gprs.git Change-Id I1870fa6a264612c5a669bfb832e6e8c0a892cb74 Related: OS#5500 Change-Id: I0e628d9ddaa5ad6a205f07746d4176d1b8df7eb0 --- M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/rlcmac.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/llc.c A src/host/layer23/src/modem/rlcmac.c 8 files changed, 177 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index 912b7d4..818b149 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -27,6 +27,7 @@ DLUA, DGAPK, DTUN, + DRLCMAC, DLLC, DSNDCP, }; diff --git a/src/host/layer23/include/osmocom/bb/modem/Makefile.am b/src/host/layer23/include/osmocom/bb/modem/Makefile.am index 4a91c39..4acb21b 100644 --- a/src/host/layer23/include/osmocom/bb/modem/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/modem/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ modem.h \ llc.h \ + rlcmac.h \ sndcp.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/modem/rlcmac.h b/src/host/layer23/include/osmocom/bb/modem/rlcmac.h new file mode 100644 index 0000000..d1b054f --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/rlcmac.h @@ -0,0 +1,8 @@ +#pragma once + +#include <stdbool.h> + +struct osmocom_ms; + +int modem_rlcmac_init(struct osmocom_ms *ms); + diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index 66dc416..a31eb22 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -153,16 +153,22 @@ .color = "\033[0;37m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DRLCMAC] = { + .name = "DRLCMAC", + .description = "Radio Link Control / Medium Access Control (RLC/MAC)", + .color = "\033[0;38m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DLLC] = { .name = "DLLC", .description = "GPRS Logical Link Control Protocol (LLC)", - .color = "\033[0;38m", + .color = "\033[0;39m", .enabled = 1, .loglevel = LOGL_NOTICE, }, [DSNDCP] = { .name = "DSNDCP", .description = "GPRS Sub-Network Dependent Control Protocol (SNDCP)", - .color = "\033[0;39m", + .color = "\033[0;40m", .enabled = 1, .loglevel = LOGL_NOTICE, }, }; diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index e13ea2d..7ce71dc 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -19,6 +19,7 @@ $(top_srcdir)/src/common/main.c \ app_modem.c \ llc.c \ + rlcmac.c \ sndcp.c \ vty.c \ $(NULL) diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 1be2cbc..14fdf2f 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -48,6 +48,7 @@ #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/sysinfo.h> #include <osmocom/bb/common/apn.h> +#include <osmocom/bb/modem/rlcmac.h> #include <osmocom/bb/modem/llc.h> #include <osmocom/bb/modem/sndcp.h> #include <osmocom/bb/modem/vty.h> @@ -552,6 +553,11 @@ app_data.ms = osmocom_ms_alloc(l23_ctx, "1"); OSMO_ASSERT(app_data.ms); + if ((rc = modem_rlcmac_init(app_data.ms))) { + LOGP(DRLCMAC, LOGL_FATAL, "Failed initializing RLC/MAC layer\n"); + return rc; + } + if ((rc = modem_llc_init(app_data.ms, NULL))) { LOGP(DLLC, LOGL_FATAL, "Failed initializing LLC layer\n"); return rc; diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c index 196c240..4bb0684 100644 --- a/src/host/layer23/src/modem/llc.c +++ b/src/host/layer23/src/modem/llc.c @@ -33,6 +33,7 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gprs/llc/llc_prim.h> #include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> #include <osmocom/gprs/sndcp/sndcp_prim.h> #include <osmocom/bb/common/logging.h> @@ -141,10 +142,22 @@ const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); int rc = 0; + osmo_static_assert(sizeof(struct osmo_gprs_llc_grr_prim) == sizeof(struct osmo_gprs_rlcmac_grr_prim), + _grr_prim_size); + switch (llc_prim->oph.sap) { case OSMO_GPRS_LLC_SAP_GRR: - LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s l3=[%s]\n", __func__, pdu_name, + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s ll=[%s]\n", __func__, pdu_name, osmo_hexdump(llc_prim->grr.ll_pdu, llc_prim->grr.ll_pdu_len)); + /* Forward it to lower layers, pass ownership over to RLCMAC: */ + /* Optimization: LLC-GRR-UNITDATA-IND is 1-to-1 ABI compatible with + RLCMAC-GRR-UNITDATA-IND, we just need to adapt the header. + See osmo_static_assert(_grr_prim_size) above. + */ + llc_prim->oph.sap = OSMO_GPRS_RLCMAC_SAP_GRR; + llc_prim->oph.primitive = OSMO_GPRS_RLCMAC_GRR_UNITDATA; + osmo_gprs_rlcmac_prim_upper_down((struct osmo_gprs_rlcmac_prim *)llc_prim); + rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ break; default: LOGP(DLLC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c new file mode 100644 index 0000000..83dcd6c --- /dev/null +++ b/src/host/layer23/src/modem/rlcmac.c @@ -0,0 +1,138 @@ +/* GPRS RLC/MAC protocol implementation as per 3GPP TS 44.060 */ +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * 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/lienses/>. + * + */ + +#include <errno.h> +#include <stdint.h> +#include <stdbool.h> +#include <inttypes.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/crypt/kdf.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/llc/llc_prim.h> + +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/apn.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/modem/rlcmac.h> + +static int modem_rlcmac_handle_grr(struct osmo_gprs_rlcmac_prim *rlcmac_prim) +{ + int rc; + + osmo_static_assert(sizeof(struct osmo_gprs_rlcmac_grr_prim) == sizeof(struct osmo_gprs_llc_grr_prim), + _grr_prim_size); + + switch (rlcmac_prim->oph.primitive) { + case OSMO_GPRS_RLCMAC_GRR_UNITDATA: + /* Forward it to upper layers, pass ownership over to LLC: */ + /* Optimization: RLCMAC-GRR-UNITDATA-IND is 1-to-1 ABI compatible with + LLC-GRR-UNITDATA-IND, we just need to adapt the header. + See osmo_static_assert(_grr_prim_size) above. + */ + rlcmac_prim->oph.sap = OSMO_GPRS_LLC_SAP_GRR; + rlcmac_prim->oph.primitive = OSMO_GPRS_LLC_GRR_UNITDATA; + osmo_gprs_llc_prim_lower_up((struct osmo_gprs_llc_prim *)rlcmac_prim); + rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ + break; + case OSMO_GPRS_RLCMAC_GRR_DATA: + default: + LOGP(DRLCMAC, LOGL_NOTICE, "%s(): Unexpected Rx RLCMAC GRR prim %u\n", + __func__, rlcmac_prim->oph.primitive); + rc = -EINVAL; + break; + } + return rc; +} + +static int modem_rlcmac_handle_gmmrr(struct osmo_gprs_rlcmac_prim *rlcmac_prim) +{ + int rc; + switch (rlcmac_prim->oph.primitive) { + case OSMO_GPRS_RLCMAC_GMMRR_PAGE: + LOGP(DRLCMAC, LOGL_ERROR, "%s(): TODO: implement answering to paging indication TLLI=0x%08x\n", + __func__, rlcmac_prim->gmmrr.page_ind.tlli); + rc = 0; + break; + default: + LOGP(DRLCMAC, LOGL_NOTICE, "%s(): Unexpected Rx RLCMAC GMMRR prim %u\n", + __func__, rlcmac_prim->oph.primitive); + rc = -EINVAL; + } + return rc; +} + +static int modem_rlcmac_prim_up_cb(struct osmo_gprs_rlcmac_prim *rlcmac_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_rlcmac_prim_name(rlcmac_prim); + int rc = 0; + + switch (rlcmac_prim->oph.sap) { + case OSMO_GPRS_RLCMAC_SAP_GRR: + LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x ll=[%s]\n", + __func__, pdu_name, rlcmac_prim->grr.tlli, + osmo_hexdump(rlcmac_prim->grr.ll_pdu, rlcmac_prim->grr.ll_pdu_len)); + rc = modem_rlcmac_handle_grr(rlcmac_prim); + break; + case OSMO_GPRS_RLCMAC_SAP_GMMRR: + LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Rx %s\n", + __func__, pdu_name); + rc = modem_rlcmac_handle_gmmrr(rlcmac_prim); + break; + default: + LOGP(DRLCMAC, LOGL_NOTICE, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +static int modem_rlcmac_prim_down_cb(struct osmo_gprs_rlcmac_prim *rlcmac_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_rlcmac_prim_name(rlcmac_prim); + int rc = 0; + + switch (rlcmac_prim->oph.sap) { + default: + LOGP(DRLCMAC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +int modem_rlcmac_init(struct osmocom_ms *ms) +{ + int rc; + rc = osmo_gprs_rlcmac_init(OSMO_GPRS_RLCMAC_LOCATION_MS); + if (rc != 0) + return rc; + + osmo_gprs_rlcmac_set_log_cat(OSMO_GPRS_RLCMAC_LOGC_RLCMAC, DRLCMAC); + + osmo_gprs_rlcmac_prim_set_up_cb(modem_rlcmac_prim_up_cb, ms); + osmo_gprs_rlcmac_prim_set_down_cb(modem_rlcmac_prim_down_cb, ms); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0e628d9ddaa5ad6a205f07746d4176d1b8df7eb0 Gerrit-Change-Number: 31077 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... modem: Initial integration of libosmo-gprs-{llc,sndcp} Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a --- M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/llc.h A src/host/layer23/include/osmocom/bb/modem/sndcp.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c A src/host/layer23/src/modem/llc.c A src/host/layer23/src/modem/sndcp.c 10 files changed, 436 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index 5259f35..912b7d4 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -27,6 +27,8 @@ DLUA, DGAPK, DTUN, + DLLC, + DSNDCP, }; extern const struct log_info log_info; diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 523ad8e..5e04894 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -183,6 +183,22 @@ struct gprs_settings { struct llist_head apn_list; + + /* RFC1144 TCP/IP header compression */ + struct { + int active; + int passive; + int s01; + } pcomp_rfc1144; + + /* V.42vis data compression */ + struct { + int active; + int passive; + int p0; + int p1; + int p2; + } dcomp_v42bis; }; int gprs_settings_init(struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/modem/Makefile.am b/src/host/layer23/include/osmocom/bb/modem/Makefile.am index 309a514..4a91c39 100644 --- a/src/host/layer23/include/osmocom/bb/modem/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/modem/Makefile.am @@ -1,4 +1,6 @@ noinst_HEADERS = \ modem.h \ + llc.h \ + sndcp.h \ vty.h \ $(NULL) diff --git a/src/host/layer23/include/osmocom/bb/modem/llc.h b/src/host/layer23/include/osmocom/bb/modem/llc.h new file mode 100644 index 0000000..5fe5d49 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/llc.h @@ -0,0 +1,8 @@ +#pragma once + +#include <stdbool.h> + +struct osmocom_ms; + +int modem_llc_init(struct osmocom_ms *ms, const char *cipher_plugin_path); + diff --git a/src/host/layer23/include/osmocom/bb/modem/sndcp.h b/src/host/layer23/include/osmocom/bb/modem/sndcp.h new file mode 100644 index 0000000..b2e6f0f --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/modem/sndcp.h @@ -0,0 +1,10 @@ +#pragma once + +#include <stdbool.h> + +struct osmocom_ms; +struct osmobb_apn; + +int modem_sndcp_init(struct osmocom_ms *ms); +int modem_sndcp_sn_xid_req(struct osmobb_apn *apn); +int modem_sndcp_sn_unitdata_req(struct osmobb_apn *apn, uint8_t *npdu, size_t npdu_len); diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index 34c171f..66dc416 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -153,6 +153,18 @@ .color = "\033[0;37m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DLLC] = { + .name = "DLLC", + .description = "GPRS Logical Link Control Protocol (LLC)", + .color = "\033[0;38m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DSNDCP] = { + .name = "DSNDCP", + .description = "GPRS Sub-Network Dependent Control Protocol (SNDCP)", + .color = "\033[0;39m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; const struct log_info log_info = { diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index 4f369ad..e13ea2d 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -18,6 +18,8 @@ modem_SOURCES = \ $(top_srcdir)/src/common/main.c \ app_modem.c \ + llc.c \ + sndcp.c \ vty.c \ $(NULL) modem_LDADD = \ diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 6b8466d..1be2cbc 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -48,6 +48,8 @@ #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/sysinfo.h> #include <osmocom/bb/common/apn.h> +#include <osmocom/bb/modem/llc.h> +#include <osmocom/bb/modem/sndcp.h> #include <osmocom/bb/modem/vty.h> #include <l1ctl_proto.h> @@ -105,7 +107,7 @@ LOGPAPN(LOGL_DEBUG, apn, "system wants to transmit IPv%c pkt to %s (%zu bytes)\n", iph->version == 4 ? '4' : '6', osmo_sockaddr_ntop(&dst.u.sa, addrstr), pkt_len); - /* TODO: prepare & transmit SNDCP UNITDATA.req */ + rc = modem_sndcp_sn_unitdata_req(apn, msgb_data(msg), pkt_len); free_ret: msgb_free(msg); @@ -539,6 +541,8 @@ int l23_app_init(void) { + int rc; + l23_app_start = _modem_start; log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); @@ -548,6 +552,16 @@ app_data.ms = osmocom_ms_alloc(l23_ctx, "1"); OSMO_ASSERT(app_data.ms); + if ((rc = modem_llc_init(app_data.ms, NULL))) { + LOGP(DLLC, LOGL_FATAL, "Failed initializing LLC layer\n"); + return rc; + } + + if ((rc = modem_sndcp_init(app_data.ms))) { + LOGP(DSNDCP, LOGL_FATAL, "Failed initializing SNDCP layer\n"); + return rc; + } + osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); lapdm_channel_set_l3(&app_data.ms->lapdm_channel, &modem_rslms_cb, app_data.ms); return 0; diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c new file mode 100644 index 0000000..196c240 --- /dev/null +++ b/src/host/layer23/src/modem/llc.c @@ -0,0 +1,168 @@ +/* GPRS LLC protocol implementation as per 3GPP TS 04.64 */ +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * 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/lienses/>. + * + */ + +#include <errno.h> +#include <stdint.h> +#include <stdbool.h> +#include <inttypes.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/crypt/kdf.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/sndcp/sndcp_prim.h> + +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/apn.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/modem/llc.h> + +static int modem_llc_handle_ll_gmm(struct osmo_gprs_llc_prim *llc_prim) +{ + struct msgb *msg; + + switch (llc_prim->oph.primitive) { + case OSMO_GPRS_LLC_LL_UNITDATA: + break; + case OSMO_GPRS_LLC_LL_RESET: + case OSMO_GPRS_LLC_LL_ESTABLISH: + case OSMO_GPRS_LLC_LL_XID: + case OSMO_GPRS_LLC_LL_DATA: + case OSMO_GPRS_LLC_LL_STATUS: + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx LL prim %u\n", + __func__, llc_prim->oph.primitive); + return -EINVAL; + } + + msg = msgb_alloc(4096, "gsm0408_rx"); + msgb_tlli(msg) = llc_prim->ll.tlli; + msgb_gmmh(msg) = msgb_put(msg, llc_prim->ll.l3_pdu_len); + if (llc_prim->ll.l3_pdu_len > 0) + memcpy(msgb_gmmh(msg), llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); + + //TODO: submit to GMM? + //TODO: free msg? + return 0; +} + +static int modem_llc_handle_ll_sndcp(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + switch (llc_prim->oph.primitive) { + case OSMO_GPRS_LLC_LL_RESET: + case OSMO_GPRS_LLC_LL_ESTABLISH: + case OSMO_GPRS_LLC_LL_XID: + case OSMO_GPRS_LLC_LL_DATA: + case OSMO_GPRS_LLC_LL_UNITDATA: + case OSMO_GPRS_LLC_LL_STATUS: + /* Forward it to upper layers, pass owneserip over to SNDCP: */ + osmo_gprs_sndcp_prim_lower_up(llc_prim); + rc = 1; /* Tell LLC that we take ownership of the prim. */ + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx LL prim %u\n", + __func__, llc_prim->oph.primitive); + rc = -EINVAL; + } + return rc; +} + +int modem_llc_prim_up_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGM: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x\n", + __func__, pdu_name, llc_prim->llgmm.tlli); + break; + case OSMO_GPRS_LLC_SAP_LL: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x SAPI=%s l3=[%s]\n", + __func__, pdu_name, llc_prim->ll.tlli, + osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + + switch (llc_prim->ll.sapi) { + case OSMO_GPRS_LLC_SAPI_GMM: + rc = modem_llc_handle_ll_gmm(llc_prim); + break; + case OSMO_GPRS_LLC_SAPI_SNDCP3: + case OSMO_GPRS_LLC_SAPI_SNDCP5: + case OSMO_GPRS_LLC_SAPI_SNDCP9: + case OSMO_GPRS_LLC_SAPI_SNDCP11: + rc = modem_llc_handle_ll_sndcp(llc_prim); + break; + case OSMO_GPRS_LLC_SAPI_TOM2: + case OSMO_GPRS_LLC_SAPI_SMS: + case OSMO_GPRS_LLC_SAPI_TOM8: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unimplemented Rx llc_sapi %s\n", __func__, pdu_name); + rc = -EINVAL; + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx llc_sapi %s\n", __func__, pdu_name); + rc = -EINVAL; + break; + } + break; + default: + LOGP(DLLC, LOGL_NOTICE, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +int modem_llc_prim_down_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_GRR: + LOGP(DLLC, LOGL_DEBUG, "%s(): Rx %s l3=[%s]\n", __func__, pdu_name, + osmo_hexdump(llc_prim->grr.ll_pdu, llc_prim->grr.ll_pdu_len)); + break; + default: + LOGP(DLLC, LOGL_DEBUG, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return rc; +} + +int modem_llc_init(struct osmocom_ms *ms, const char *cipher_plugin_path) +{ + int rc; + rc = osmo_gprs_llc_init(OSMO_GPRS_LLC_LOCATION_MS, cipher_plugin_path); + if (rc != 0) + return rc; + + osmo_gprs_llc_set_log_cat(OSMO_GPRS_LLC_LOGC_LLC, DLLC); + + osmo_gprs_llc_prim_set_up_cb(modem_llc_prim_up_cb, ms); + osmo_gprs_llc_prim_set_down_cb(modem_llc_prim_down_cb, ms); + return rc; +} diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c new file mode 100644 index 0000000..eba8d11 --- /dev/null +++ b/src/host/layer23/src/modem/sndcp.c @@ -0,0 +1,201 @@ +/* GPRS SNDCP User/SN/SNSM interfaces as per 3GPP TS 04.65 */ +/* (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * 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/lienses/>. + * + */ + +#include <stdbool.h> +#include <stdint.h> +#include <errno.h> +#include <stdio.h> + +#include <netinet/ip.h> +#include <netinet/ip6.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/endian.h> +#include <osmocom/core/tun.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/sndcp/sndcp_prim.h> +#include <osmocom/gprs/sndcp/sndcp.h> + +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/apn.h> +#include <osmocom/bb/common/ms.h> +#include <osmocom/bb/modem/sndcp.h> + +/* Received SN-XID.cnf from SNDCP layer: */ +static int modem_sndcp_handle_sn_xid_cnf(struct osmobb_apn *apn, struct osmo_gprs_sndcp_prim *sndcp_prim) +{ + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx SN-XID.cnf: TODO IMPLEMENT!\n", __func__); + return 0; +} + +/* Received SN-UNITDTA.ind from SNDCP layer: */ +static int modem_sndcp_handle_sn_unitdata_ind(struct osmobb_apn *apn, struct osmo_gprs_sndcp_prim *sndcp_prim) +{ + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + struct msgb *msg; + int rc; + + LOGP(DSNDCP, LOGL_DEBUG, "Rx %s TLLI=0x%08x SAPI=%s NSAPI=%u NPDU=[%s]\n", + npdu_name, + sndcp_prim->sn.tlli, osmo_gprs_llc_sapi_name(sndcp_prim->sn.sapi), + sndcp_prim->sn.data_req.nsapi, + osmo_hexdump(sndcp_prim->sn.data_ind.npdu, sndcp_prim->sn.data_ind.npdu_len)); + + msg = msgb_alloc(sndcp_prim->sn.data_ind.npdu_len, "tx_tun"); + memcpy(msgb_put(msg, sndcp_prim->sn.data_ind.npdu_len), + sndcp_prim->sn.data_ind.npdu, + sndcp_prim->sn.data_ind.npdu_len); + rc = osmo_tundev_send(apn->tun, msg); + return rc; +} + +static int modem_sndcp_prim_up_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) +{ + struct osmocom_ms *ms = user_data; + struct osmobb_apn *apn; + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + int rc = 0; + + if (sndcp_prim->oph.sap != OSMO_GPRS_SNDCP_SAP_SN) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, npdu_name); + OSMO_ASSERT(0); + } + + /* TODO: properly retrieve APN/PDP based on TLLI/SAPI/NSAPI: */ + apn = llist_first_entry_or_null(&ms->gprs.apn_list, struct osmobb_apn, list); + if (!apn) { + LOGP(DSNDCP, LOGL_NOTICE, "Unable to find destination APN: Rx %s\n", npdu_name); + return -ENODEV; + } + + switch (OSMO_PRIM_HDR(&sndcp_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_SNDCP_SN_UNITDATA, PRIM_OP_INDICATION): + rc = modem_sndcp_handle_sn_unitdata_ind(apn, sndcp_prim); + break; + case OSMO_PRIM(OSMO_GPRS_SNDCP_SN_XID, PRIM_OP_CONFIRM): + rc = modem_sndcp_handle_sn_xid_cnf(apn, sndcp_prim); + break; + default: + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, npdu_name); + break; + }; + return rc; +} + +static int modem_sndcp_prim_down_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + int rc = 0; + + if (llc_prim->oph.sap != OSMO_GPRS_LLC_SAP_LL) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_REQUEST): + LOGP(DSNDCP, LOGL_DEBUG, "%s(): Rx %s TLLI=0x%08x SAPI=%s L3=[%s]\n", + __func__, pdu_name, + llc_prim->ll.tlli, osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + rc = 1; /* Tell SNDCP layer we took msgb ownsership and transfer it to LLC */ + break; + default: + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, pdu_name); + break; + }; + return rc; +} + +static int modem_sndcp_prim_snsm_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) +{ + const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); + + if (sndcp_prim->oph.sap != OSMO_GPRS_SNDCP_SAP_SNSM) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, npdu_name); + OSMO_ASSERT(0); + } + + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, npdu_name); + return 0; +} + + +int modem_sndcp_init(struct osmocom_ms *ms) +{ + int rc; + rc = osmo_gprs_sndcp_init(); + if (rc != 0) + return rc; + + osmo_gprs_sndcp_set_log_cat(OSMO_GPRS_SNDCP_LOGC_SNDCP, DSNDCP); + osmo_gprs_sndcp_set_log_cat(OSMO_GPRS_SNDCP_LOGC_SLHC, DSNDCP); + + osmo_gprs_sndcp_prim_set_up_cb(modem_sndcp_prim_up_cb, ms); + osmo_gprs_sndcp_prim_set_down_cb(modem_sndcp_prim_down_cb, ms); + osmo_gprs_sndcp_prim_set_snsm_cb(modem_sndcp_prim_snsm_cb, ms); + return rc; +} + +int modem_sndcp_sn_xid_req(struct osmobb_apn *apn) +{ + struct osmo_gprs_sndcp_prim *sndcp_prim; + int rc; + struct osmocom_ms *ms = apn->ms; + struct gprs_settings *set = &ms->gprs; + + /* TODO: look up PDP context IDs from ms once we have GMM layer. */ + uint32_t tlli = 0xe1c5d364; + uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; + uint8_t nsapi = 1; + + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, sapi, nsapi); + OSMO_ASSERT(sndcp_prim); + sndcp_prim->sn.xid_req.pcomp_rfc1144.active = set->pcomp_rfc1144.active; + sndcp_prim->sn.xid_req.pcomp_rfc1144.s01 = set->pcomp_rfc1144.s01; + sndcp_prim->sn.xid_req.dcomp_v42bis.active = set->dcomp_v42bis.active; + sndcp_prim->sn.xid_req.dcomp_v42bis.p0 = set->dcomp_v42bis.p0; + sndcp_prim->sn.xid_req.dcomp_v42bis.p1 = set->dcomp_v42bis.p1; + sndcp_prim->sn.xid_req.dcomp_v42bis.p2 = set->dcomp_v42bis.p2; + rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); + return rc; +} + +int modem_sndcp_sn_unitdata_req(struct osmobb_apn *apn, uint8_t *npdu, size_t npdu_len) +{ + struct osmo_gprs_sndcp_prim *sndcp_prim; + int rc; + + /* TODO: look up PDP context IDs from apn->ms once we have GMM layer. */ + uint32_t tlli = 0xe1c5d364; + uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; + uint8_t nsapi = 1; + + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, sapi, nsapi, npdu, npdu_len); + OSMO_ASSERT(sndcp_prim); + rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/47506186_d27c1bcf PS2, Line 13: gsmtap The 'gsmtap' prefix in each command looks redundant to me, given that they all belong to 'gsmtap' node. File src/host/layer23/include/osmocom/bb/common/l23_app.h: https://gerrit.osmocom.org/c/osmocom-bb/+/31108/comment/f147e573_6bd89028 PS2, Line 19: bts BTS? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 19:56:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by fixeria

Attention is currently required from: osmith, jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31107 ) Change subject: layer23: Integreate mobile further into l23_app ...................................................................... Patch Set 1: Code-Review-1 (3 comments) File src/host/layer23/src/mobile/app_mobile.c: https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/59eb6617_100f6557 PS1, Line 495: L23_OPT_ARFCN This one should be removed, because the mobile app does not have -a. The ARFCN is set via the VTY interface / config file. https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/98c6b0bd_fec7ed82 PS1, Line 499: modem copy-paste https://gerrit.osmocom.org/c/osmocom-bb/+/31107/comment/7e1b508d_8e0d8297 PS1, Line 504: copyright Copyright (C) 2010-2015 Andreas Eversberg, Sylvain Munaut, Holger Freyther, Harald Welte Contributions by Alex Badea, Pablo Neira, Steve Markgraf and others -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 19:49:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: add indication to communicate E1 parameters

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31113 ) Change subject: pcuif_proto: add indication to communicate E1 parameters ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31113/comment/8d38f202_c61577be PS1, Line 11: E1 parameters (which TS, SS etc.) to the PCU. Lets add a new primitive > What do you mean with "to avoid duplicate configuration" here? where would the duplicate configurati […] duplicate would mean that both the PCU and the BSC would have to have "matching" configuration of how the E1 timeslots are used. Prone to error and complex. I like the approach to keep the information in one place (BSC, which already has E1 related config), and informing the other (PCU) via some message/socket. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia7928489130c1205b06bb9b10de0fb1461843301 Gerrit-Change-Number: 31113 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 19:01:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: rework check logic for ts

by laforge

Attention is currently required from: pespin, fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30876 ) Change subject: pcu_sock: rework check logic for ts ...................................................................... Patch Set 7: Code-Review+1 (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30876/comment/0f117354_86d92456 PS2, Line 96: static bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) > When I understand this correctly, then pcu_tx_info_ind() should be run each time there is a change w […] yes, that matches my understanding of the PCU interface. I'm sure @pespin is more familiar with the details. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icaab52ab73c38889dfadb523b89bb54cafacc99a Gerrit-Change-Number: 30876 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:58:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: fix sourcecode formatting

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31110 ) Change subject: pcu_sock: fix sourcecode formatting ...................................................................... pcu_sock: fix sourcecode formatting Change-Id: I593c16efa1639aa8d2f90735bfdc9750cf695ecd Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 2893821..f233d0f 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -163,7 +163,7 @@ bts_sm = bts->site_mgr; - LOGP(DPCU, LOGL_INFO, "Sending info for BTS %d\n",bts->nr); + LOGP(DPCU, LOGL_INFO, "Sending info for BTS %d\n", bts->nr); rlcc = &bts->gprs.cell.rlc_cfg; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I593c16efa1639aa8d2f90735bfdc9750cf695ecd Gerrit-Change-Number: 31110 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: fix sourcecode formatting

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31110 ) Change subject: pcu_sock: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I593c16efa1639aa8d2f90735bfdc9750cf695ecd Gerrit-Change-Number: 31110 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:57:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 ) Change subject: rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e Gerrit-Change-Number: 31098 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:56:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by laforge

Attention is currently required from: arehbein, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30982 ) Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:56:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Support configuring GSMTAP through VTY in l23 apps.

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31108 ) Change subject: layer23: Support configuring GSMTAP through VTY in l23 apps. ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2582a1633d37d350a7f4c2bb5e03793bdf46e839 Gerrit-Change-Number: 31108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:55:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Integreate mobile further into l23_app

by laforge

Attention is currently required from: osmith, jolly, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31107 ) Change subject: layer23: Integreate mobile further into l23_app ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3141b6cb4a0482970f434180ef8dda3af1d4aa0c Gerrit-Change-Number: 31107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:54:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-rlcmac

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31077 ) Change subject: modem: Initial integration of libosmo-gprs-rlcmac ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0e628d9ddaa5ad6a205f07746d4176d1b8df7eb0 Gerrit-Change-Number: 31077 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:53:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmocom-bb[master]: modem: Initial integration of libosmo-gprs-{llc,sndcp}

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31007 ) Change subject: modem: Initial integration of libosmo-gprs-{llc,sndcp} ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I820328009ccdd1f8112aeb163efa064ec1465d2a Gerrit-Change-Number: 31007 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:53:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in libosmocore[master]: SI: add missing header

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31080 ) Change subject: SI: add missing header ...................................................................... SI: add missing header Previous SI10 patch added function without exposing it via public header. Let's fix this. Fixes: 600d4eeab71665c0aec0a11a226d231f109534ca Change-Id: Ia7530e9c8a21f6f99f3aac7baea5cbb38763c4f3 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index 2a93c5e..93a9e21 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -35,6 +35,7 @@ const char *gsm48_cc_state_name(uint8_t state); const char *gsm48_cc_msg_name(uint8_t msgtype); const char *gsm48_rr_msg_name(uint8_t msgtype); +const char *gsm48_rr_short_pd_msg_name(uint8_t msgtype); const char *rr_cause_name(uint8_t cause); const char *osmo_rai_name(const struct gprs_ra_id *rai); char *osmo_rai_name_buf(char *buf, size_t buf_len, const struct gprs_ra_id *rai); diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 6f5c3a3..919500b 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -438,7 +438,7 @@ }; /*! return string representation of RR Message Type using the RR short protocol discriminator */ -const char *gsm48_rr_msg_type_short_name(uint8_t msgtype) +const char *gsm48_rr_short_pd_msg_name(uint8_t msgtype) { return get_value_string(rr_msg_type_short_names, msgtype); } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 7b5cd94..ebfa42e 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -330,6 +330,7 @@ osmo_gsm48_rest_octets_si13_encode; osmo_gsm48_rest_octets_si3_decode; osmo_gsm48_rest_octets_si4_decode; +gsm48_rr_short_pd_msg_name; gsm48_rr_msg_name; gsm48_cc_state_name; gsm48_construct_ra; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia7530e9c8a21f6f99f3aac7baea5cbb38763c4f3 Gerrit-Change-Number: 31080 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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, 3 months

1
0
0 0

Change in libosmocore[master]: SI: add missing header

by laforge

Attention is currently required from: fixeria, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31080 ) Change subject: SI: add missing header ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia7530e9c8a21f6f99f3aac7baea5cbb38763c4f3 Gerrit-Change-Number: 31080 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Jan 2023 18:52:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Fix 3GPP Spec number

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 ) Change subject: DIAMETER_Templates: Fix 3GPP Spec number ...................................................................... DIAMETER_Templates: Fix 3GPP Spec number It's 3GPP TS 29.272, not 29.262. Change-Id: I33d437593a13a92151e33e86534e2189b541b5ea --- M library/DIAMETER_Templates.ttcn 1 file changed, 22 insertions(+), 22 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 964708f..67cd78d 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -563,7 +563,7 @@ -/* TS 29.262 7.3.53 RAND */ +/* TS 29.272 7.3.53 RAND */ template (value) GenericAVP ts_AVP_RAND(template (value) octetstring rand) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_RAND), @@ -573,7 +573,7 @@ } } -/* TS 29.262 7.3.54 XRES */ +/* TS 29.272 7.3.54 XRES */ template (value) GenericAVP ts_AVP_XRES(template (value) octetstring xres) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_XRES), @@ -583,7 +583,7 @@ } } -/* TS 29.262 7.3.55 XRES */ +/* TS 29.272 7.3.55 XRES */ template (value) GenericAVP ts_AVP_AUTN(template (value) octetstring autn) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AUTN), @@ -593,7 +593,7 @@ } } -/* TS 29.262 7.3.56 KASME */ +/* TS 29.272 7.3.56 KASME */ template (value) GenericAVP ts_AVP_KASME(template (value) octetstring kasme) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), @@ -603,7 +603,7 @@ } } -/* TS 29.262 7.3.23 Item-Number */ +/* TS 29.272 7.3.23 Item-Number */ template (value) GenericAVP ts_AVP_ItemNumber(uint32_t num) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_KASME), @@ -613,7 +613,7 @@ } } -/* TS 29.262 7.3.18 E-UTRAN Vector */ +/* TS 29.272 7.3.18 E-UTRAN Vector */ template (value) GenericAVP ts_AVP_EutranVec(uint32_t item_num, octetstring rand, octetstring xres, octetstring autn, octetstring kasme) := { avp := { @@ -630,7 +630,7 @@ } } -/* TS 29.262 7.3.2 Subscription-Data */ +/* TS 29.272 7.3.2 Subscription-Data */ template (value) GenericAVP ts_AVP_3GPP_SubscriptionData(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscription_Data), @@ -650,7 +650,7 @@ } -/* TS 29.262 7.3.17 Authentication-Info */ +/* TS 29.272 7.3.17 Authentication-Info */ template (value) GenericAVP ts_AVP_3GPP_AuthInfo(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Authentication_Info), @@ -669,7 +669,7 @@ } } -/* TS 29.262 7.3.9 Visited-PLMN-Id */ +/* TS 29.272 7.3.9 Visited-PLMN-Id */ template (value) GenericAVP ts_AVP_3GPP_VisitedPlmnId(template (value) octetstring id) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Visited_PLMN_Id), @@ -687,7 +687,7 @@ } } -/* TS 29.262 7.3.13 RAT-Type */ +/* TS 29.272 7.3.13 RAT-Type */ template (value) GenericAVP ts_AVP_PCC_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), @@ -714,7 +714,7 @@ } } -/* TS 29.262 7.3.7 ULR-Flags */ +/* TS 29.272 7.3.7 ULR-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULR_Flags), @@ -732,7 +732,7 @@ } } -/* TS 29.262 7.3.8 ULA-Flags */ +/* TS 29.272 7.3.8 ULA-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlaFlags(template (value) UINT32 flags) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_ULA_Flags), @@ -785,7 +785,7 @@ } -/* TS 29.262 7.3.27 Context-Identifier */ +/* TS 29.272 7.3.27 Context-Identifier */ template (value) GenericAVP ts_AVP_3GPP_ContextId(uint32_t ctx) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Context_Identifier), @@ -795,7 +795,7 @@ } } -/* Ts 29.262 7.3.29 Subscriber-Status */ +/* Ts 29.272 7.3.29 Subscriber-Status */ template (value) GenericAVP ts_AVP_3GPP_SubscriberStatus(template (value) AAA_3GPP_Subscriber_Status sts) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Subscriber_Status), @@ -814,7 +814,7 @@ } } -/* TS 29.262 7.3.33 All-APN-Configurations-Included-Indicator */ +/* TS 29.272 7.3.33 All-APN-Configurations-Included-Indicator */ template (value) GenericAVP ts_AVP_3GPP_AllApnConfigsIncl(template (value) AAA_3GPP_All_APN_Configurations_Included_Indicator ind := All_APN_CONFIGURATIONS_INCLUDED) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_All_APN_Configurations_Included_Indicator), @@ -824,7 +824,7 @@ } } -/* TS 29.262 7.3.34 APN-Configuration-Profile */ +/* TS 29.272 7.3.34 APN-Configuration-Profile */ template (value) GenericAVP ts_AVP_3GPP_ApnConfigProfile(template (value) AVP_list content) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile), @@ -834,7 +834,7 @@ } } -/* TS 29.262 7.3.35 APN-Configuration */ +/* TS 29.272 7.3.35 APN-Configuration */ template (value) GenericAVP ts_AVP_3GPP_ApnConfig(uint32_t ctx, AAA_3GPP_PDN_Type pdn_type, charstring apn) := { avp := { @@ -850,7 +850,7 @@ } } -/* TS 29.262 7.3.36 Service-Selection (refers to RFC 5778) */ +/* TS 29.272 7.3.36 Service-Selection (refers to RFC 5778) */ template (value) GenericAVP ts_AVP_ServiceSelection(charstring apn) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection), @@ -949,7 +949,7 @@ } -/* TS 29.262 7.3.41 AMBR */ +/* TS 29.272 7.3.41 AMBR */ template (value) GenericAVP ts_AVP_3GPP_AMBR(uint32_t ul, uint32_t dl) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_AMBR), @@ -1142,7 +1142,7 @@ } } -/* TS 29.262 7.3.62 PDN-Type */ +/* TS 29.272 7.3.62 PDN-Type */ template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_PDN_Type), @@ -1348,7 +1348,7 @@ tr_AVP_3GPP_VisitedPlmnId )); -/* TS 29.262 5.2.3.1 + 7.2.6 Authentication Information Answer */ +/* TS 29.272 5.2.3.1 + 7.2.6 Authentication Information Answer */ template (value) PDU_DIAMETER ts_DIA_AIA(template (value) AVP_list auth_info_contents, template (value) octetstring sess_id := c_def_sess_id, @@ -1391,7 +1391,7 @@ )); -/* TS 29.262 7.2.3 Update Location Request */ +/* TS 29.272 7.2.3 Update Location Request */ template (value) PDU_DIAMETER ts_DIA_ULR(/* template (value) */ hexstring imsi, template (value) octetstring sess_id := c_def_sess_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I33d437593a13a92151e33e86534e2189b541b5ea Gerrit-Change-Number: 31097 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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, 3 months

1
0
0 0

2024

2023

2022

gerrit-log January 2023