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

Change in libosmo-gprs[master]: llc: check-in basic LLC definitions from osmo-sgsn.git

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29393 ) Change subject: llc: check-in basic LLC definitions from osmo-sgsn.git ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6ed0f4820b3a12a00be71ce63757765551743101 Gerrit-Change-Number: 29393 Gerrit-PatchSet: 2 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: Mon, 19 Sep 2022 08:49:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: Initial libosmo-gprs-llc library skeleton

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29392 ) Change subject: Initial libosmo-gprs-llc library skeleton ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ia537acc6f4e6ab576dc7959d427b80f62c474296 Gerrit-Change-Number: 29392 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: Mon, 19 Sep 2022 08:48:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: doc: Document use of Osmux in IPA Abis against OsmoBTS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29351 ) Change subject: doc: Document use of Osmux in IPA Abis against OsmoBTS ...................................................................... doc: Document use of Osmux in IPA Abis against OsmoBTS Related: SYS#5987 Change-Id: I41788f8d3bc29735cc30516f429311b73ba71910 --- M doc/manuals/chapters/osmux_bsc.adoc 1 file changed, 47 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/osmux_bsc.adoc b/doc/manuals/chapters/osmux_bsc.adoc index 0a11d17..268ffdf 100644 --- a/doc/manuals/chapters/osmux_bsc.adoc +++ b/doc/manuals/chapters/osmux_bsc.adoc @@ -14,14 +14,14 @@ ==== {program-name} in a 3GPP AoIP network setup Osmux usage in {program-name} in managed through the VTY command `osmux -(on|off|only)`. Once enabled (`on` or `only`), {program-name} will start -appending the vendor specific _Osmux Support_ IE in _BSSMAP RESET_ and _BSSMAP -RESET-ACK_ message towards the MSC in order to announce it supports Osmux. This -way, the MSC can decide whether to use Osmux or not based on this information -when setting up a call (this time using _Osmux CID_ IE). It should be noted that -this option should not be enabled unless MSC managing {program-name} supports -handling this extension IE (like OsmoMSC), a 3rd-party MSC might otherwise -refuse the related _RESET_/_RESET-ACK_ messages. +(on|off|only)` under the `msc` node. Once enabled (`on` or `only`), +{program-name} will start appending the vendor specific _Osmux Support_ IE in +_BSSMAP RESET_ and _BSSMAP RESET-ACK_ message towards the MSC in order to +announce it supports Osmux. This way, the MSC can decide whether to use Osmux or +not based on this information when setting up a call (this time using _Osmux +CID_ IE). It should be noted that this option should not be enabled unless MSC +managing {program-name} supports handling this extension IE (like OsmoMSC), a +3rd-party MSC might otherwise refuse the related _RESET_/_RESET-ACK_ messages. {program-name} will behave differently during call set up based on the VTY command presented above: @@ -41,3 +41,42 @@ calls on the CN-side, this is, if _BSSMAP Assign Request_ from MSC doesn't contain an _Osmux CID_ IE, it will reject the assignment and the call set up will fail. + +==== Osmux in the ip.access Abis interface + +{program-name} can also talk Osmux instead of RTP to an OsmoBTS which supports +the feature. Osmux usage agains the BTS in {program-name} in managed through the +VTY command `osmux (on|off|only)` under the `bts` node. + +If a BTS supports Osmux, it may announce the _OSMUX_ BTS feature towards the BSC +over OML. This way, the {program-name} becomes aware that this BTS supports +using Osmux to transfer voice call user data when the AMR codec is selected. + +It is then up to {program-name} to decide whether to use Osmux or not when +establishing a new call. If {program-name} decides to use Osmux for a given +call, it will instruct its co-located MGW to set up an Osmux connection in the +endpoint (using the `X-Osmux extension`) and then it will forward the received +Osmux CID to the BTS in the the _IPACC CRCX/MDCX_ messages by means of an extra _Osmux +CID_ IE appended to it. +The IP address and port provided in the same messages refer to the +address and port where Osmux frames with the provided CID are expected to be +received. Similarly, the BTS appends an _Osmux CID_ IE to the _IPACC +CRCX/MDCX ACK_ message it generates, this time with its own local Osmux CID, +which {program-name} will in turn forward back to the co-located MGW. +Same goes for the BTS' local IP address and port where Osmux frames are expected +to be received. + +{program-name} will behave differently during call set up based on the VTY +command `use (on|off|only)` under each `bts` node presented above: + +* `off`: {program-name} will never attempt use of Osmux against this BTS (default). +* `on`: {program-name} will use Osmux against the BTS if the BTS announced Osmux + support during OML bringup, and if MGW provided a valid Osmux CID during _MGCP + CRCX_. Otherwise BSC will simply automatically fall back to using RTP for each + call. For non-AMR calls, RTP will always be used. +* `only`: Same as per `on`, except that {program-name} will accept only Osmux + calls on the BTS-side. This is, if _MGCP CRCX ACK_ from MGW doesn't + contain an _Osmux CID_ IE or _IPACC CRCX ACK_ from BSC doesn't + contain an _Osmux CID_ IE, it will reject the assignment and the call set up + will fail. This means also that only AMR calls (`Channel Mode GSM3`) are + allowed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I41788f8d3bc29735cc30516f429311b73ba71910 Gerrit-Change-Number: 29351 Gerrit-PatchSet: 2 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: vty: Allow setting LAC as hexadecimal value

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29358 ) Change subject: vty: Allow setting LAC as hexadecimal value ...................................................................... vty: Allow setting LAC as hexadecimal value The LAC value currently configured is now printed as hexadecimal value too. It can still be entered as a decimal value in order to keep backward compatibility, though the hexadecimal one is now preferred. Related: OS#5631 Depends: libosmocore.git Ia2b7fbbf5502c28374c21dbff548232680da27d4 Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 --- M TODO-RELEASE M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg M doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg M doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg M doc/examples/osmo-bsc/osmo-bsc-4trx.cfg M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg M doc/manuals/chapters/bts-examples.adoc M doc/manuals/chapters/bts.adoc M doc/manuals/chapters/handover.adoc M src/osmo-bsc/bts_vty.c M tests/ctrl/osmo-bsc-apply-config-file.cfg M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/neighbor_ident.vty 20 files changed, 45 insertions(+), 46 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index f172501..532f154 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmogsm >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID +libosmocore >1.7.0 vty hexadecimal range support (location_area_code) diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg index 8ef1619..7d676d6 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus01-4trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg index 7c9b847..464b37f 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-4trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg index 6db88b5..844bf05 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.dug20-rus02-8trx.cfg @@ -33,7 +33,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg index a90cfa1..82283c8 100644 --- a/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg +++ b/doc/examples/osmo-bsc/ericsson/osmo-bsc.rbs2308.cfg @@ -39,7 +39,7 @@ type rbs2000 band PCS1900 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 33 diff --git a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg index a8e8e5c..0b0afa8 100644 --- a/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg +++ b/doc/examples/osmo-bsc/nokia/osmo-bsc.insite.cfg @@ -27,7 +27,7 @@ type nokia_site band GSM1900 cell_identity 1 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 training_sequence_code 7 diff --git a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg index 206a3c7..f2fcf77 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg @@ -11,7 +11,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg index 2258495..5e1ac11 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg @@ -4,7 +4,7 @@ bts 0 type osmo-bts band GSM-1800 - location_area_code 23 + location_area_code 0x0017 ipa unit-id 1800 0 trx 0 rf_locked 0 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 22afa07..17ca152 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -23,7 +23,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index 21187c7..a053dbe 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -22,7 +22,7 @@ type osmo-bts band DCS1800 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 diff --git a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg index a308db5..8d75296 100644 --- a/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg +++ b/doc/examples/osmo-bsc/siemens/osmo-bsc.bs11.cfg @@ -39,7 +39,7 @@ type bs11 band GSM900 cell_identity 1 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 oml e1 line 2 timeslot 1 sub-slot full diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc index 2afc8ff..1f3652b 100644 --- a/doc/manuals/chapters/bts-examples.adoc +++ b/doc/manuals/chapters/bts-examples.adoc @@ -26,7 +26,7 @@ type nanobts <2> band DCS1800 <3> cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 @@ -104,7 +104,7 @@ type nanobts band DCS1800 cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 @@ -197,7 +197,7 @@ band GSM900 om2000 version-limit oml gen 12 rev 10 <2> cell_identity 0 - location_area_code 1 + location_area_code 0x0001 training_sequence_code 7 base_station_id_code 63 ms max power 15 diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 4662c1a..177d1c5 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -108,7 +108,7 @@ type osmo-bts band DCS1800 description The new BTS in Baikonur - location_area_code 2342 + location_area_code 0x0926 cell_identity 5 base_station_id_code 63 ip.access unit_id 8888 0 diff --git a/doc/manuals/chapters/handover.adoc b/doc/manuals/chapters/handover.adoc index f567259..4affe3b 100644 --- a/doc/manuals/chapters/handover.adoc +++ b/doc/manuals/chapters/handover.adoc @@ -223,15 +223,15 @@ network bts 0 - # this cell's LAC=23 CI=5 - location_area_code 23 + # this cell's LAC=0x0017 CI=5 + location_area_code 0x0017 cell_identity 5 # reference bts 1 neighbor lac-ci 23 6 bts 1 - # this cell's LAC=23 CI=6 - location_area_code 23 + # this cell's LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # reference bts 0 neighbor lac-ci 23 5 @@ -252,8 +252,8 @@ network bts 0 - # this cell's LAC=23 CI=5 - location_area_code 23 + # this cell's LAC=0x0017 CI=5 + location_area_code 0x0017 cell_identity 5 # this cell's ARFCN=1 BSIC=1 trx 0 @@ -263,8 +263,8 @@ neighbor lac-ci 23 6 arfcn 2 bsic 2 bts 1 - # LAC=23 CI=6 - location_area_code 23 + # LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # this cell's ARFCN=2 BSIC=2 trx 0 @@ -286,8 +286,8 @@ # BSC Alpha's osmo-bsc.cfg network bts 0 - # this cell's LAC=23 CI=6 - location_area_code 23 + # this cell's LAC=0x0017 CI=6 + location_area_code 0x0017 cell_identity 6 # this cell's ARFCN=2 BSIC=2 trx 0 @@ -299,8 +299,8 @@ # BSC Beta's osmo-bsc.cfg network bts 0 - # this cell's LAC=42 CI=3 - location_area_code 42 + # this cell's LAC=0x002A CI=3 + location_area_code 0x002A cell_identity 3 # this cell's ARFCN=1 BSIC=3 trx 0 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3900768..c473e94 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -276,17 +276,15 @@ DEFUN_USRATTR(cfg_bts_lac, cfg_bts_lac_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), - "location_area_code <0-65535>", - "Set the Location Area Code (LAC) of this BTS\n" "LAC\n") + "location_area_code (<0-65535>|<0x0000-0xffff>)", + "Set the Location Area Code (LAC) of this BTS\n" + "LAC in decimal format\n" + "LAC in hexadecimal format\n") { struct gsm_bts *bts = vty->index; - int lac = atoi(argv[0]); - - if (lac < 0 || lac > 0xffff) { - vty_out(vty, "%% LAC %d is not in the valid range (0-65535)%s", - lac, VTY_NEWLINE); + int lac; + if (osmo_str_to_int(&lac, argv[0], 0, 0, 0xffff) < 0) return CMD_WARNING; - } if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) { vty_out(vty, "%% LAC %d is reserved by GSM 04.08%s", @@ -4307,7 +4305,7 @@ vty_out(vty, " description %s%s", bts->description, VTY_NEWLINE); vty_out(vty, " band %s%s", gsm_band_name(bts->band), VTY_NEWLINE); vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE); - vty_out(vty, " location_area_code %u%s", bts->location_area_code, + vty_out(vty, " location_area_code 0x%04x%s", bts->location_area_code, VTY_NEWLINE); if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED) vty_out(vty, " dtx uplink%s%s", diff --git a/tests/ctrl/osmo-bsc-apply-config-file.cfg b/tests/ctrl/osmo-bsc-apply-config-file.cfg index 0094cd7..5f27465 100644 --- a/tests/ctrl/osmo-bsc-apply-config-file.cfg +++ b/tests/ctrl/osmo-bsc-apply-config-file.cfg @@ -3,7 +3,7 @@ type osmo-bts band DCS1800 cell_identity 123 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 55 ms max power 15 cell reselection hysteresis 4 diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index baf5f36..b1c5bdf 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -20,7 +20,7 @@ type osmo-bts band DCS1800 cell_identity 6969 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 63 ms max power 15 cell reselection hysteresis 4 @@ -77,7 +77,7 @@ type osmo-bts band DCS1800 cell_identity 123 - location_area_code 1 + location_area_code 0x0001 base_station_id_code 55 ms max power 15 cell reselection hysteresis 4 diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index d237ab7..6830b48 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -257,7 +257,7 @@ return NULL; } - bts->location_area_code = 23; + bts->location_area_code = 0x0017; bts->cell_identity = ci++; bts->c0->arfcn = arfcn++; diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 32e2c53..83b6c5e 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -160,7 +160,7 @@ bts->c0->arfcn = 866; bts->cell_identity = 1337; bts->network->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 }; - bts->location_area_code = 1; + bts->location_area_code = 0x0001; bts->gprs.rac = 0; uint8_t attr_bts_expected[] = { 0x19, 0x73, 0x6d, 0x67, 0x61, 0x5b, 0x55, 0x18, 0x06, 0x0e, 0x00, diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 950d852..211159c 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -21,7 +21,7 @@ OsmoBSC(config-net)# bts 0 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 10 -OsmoBSC(config-net-bts)# location_area_code 20 +OsmoBSC(config-net-bts)# location_area_code 0x0014 OsmoBSC(config-net-bts)# cell_identity 30 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 40 @@ -31,7 +31,7 @@ OsmoBSC(config-net)# bts 1 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 11 -OsmoBSC(config-net-bts)# location_area_code 21 +OsmoBSC(config-net-bts)# location_area_code 0x0015 OsmoBSC(config-net-bts)# cell_identity 31 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 41 @@ -41,7 +41,7 @@ OsmoBSC(config-net)# bts 2 OsmoBSC(config-net-bts)# type osmo-bts OsmoBSC(config-net-bts)# base_station_id_code 12 -OsmoBSC(config-net-bts)# location_area_code 22 +OsmoBSC(config-net-bts)# location_area_code 0x0016 OsmoBSC(config-net-bts)# cell_identity 65535 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 42 @@ -53,7 +53,7 @@ bts 0 ... cell_identity 30 - location_area_code 20 + location_area_code 0x0014 base_station_id_code 10 ... trx 0 @@ -63,7 +63,7 @@ bts 1 ... cell_identity 31 - location_area_code 21 + location_area_code 0x0015 base_station_id_code 11 ... trx 0 @@ -73,7 +73,7 @@ bts 2 ... cell_identity 65535 - location_area_code 22 + location_area_code 0x0016 base_station_id_code 12 ... trx 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9090d73ae9d39244b79b9dbafa1b164faebabc52 Gerrit-Change-Number: 29358 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: lint: ignore MACRO_WITH_FLOW_CONTROL

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29359 ) Change subject: lint: ignore MACRO_WITH_FLOW_CONTROL ...................................................................... lint: ignore MACRO_WITH_FLOW_CONTROL It seems that we don't care about this one, e.g. here: https://gerrit.osmocom.org/c/osmo-msc/+/28848 Change-Id: I79da5a426db59031e3b16aecedeaa1498c91e847 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index b0c3985..7a60ad6 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -68,6 +68,7 @@ # * LINE_CONTINUATIONS: false positives # * LINE_SPACING: we don't always put a blank line after declarations # * LONG_LINE*: should be 120 chars, but exceptions are done often so don't fail here +# * MACRO_WITH_FLOW_CONTROL: not followed # * MISSING_SPACE: warns about breaking strings at space characters, not useful for long strings of hex chars # * PREFER_DEFINED_ATTRIBUTE_MACRO: macros like __packed not defined in libosmocore # * PREFER_FALLTHROUGH: pseudo keyword macro "fallthrough" is not defined in libosmocore @@ -108,6 +109,7 @@ --ignore LONG_LINE \ --ignore LONG_LINE_COMMENT \ --ignore LONG_LINE_STRING \ + --ignore MACRO_WITH_FLOW_CONTROL \ --ignore MISSING_SPACE \ --ignore PREFER_DEFINED_ATTRIBUTE_MACRO \ --ignore PREFER_FALLTHROUGH \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79da5a426db59031e3b16aecedeaa1498c91e847 Gerrit-Change-Number: 29359 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: lint: ignore MACRO_WITH_FLOW_CONTROL

by osmith

Attention is currently required from: neels, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29359 ) Change subject: lint: ignore MACRO_WITH_FLOW_CONTROL ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > i have made one too, OSMO_NAME_C_IMPL(), but still i think it's ok to let the linter complain about […] I think the linter is most useful if it only complains in clear cases of something done wrong, otherwise it becomes annoying for users IMHO. I see it complain about this and then getting overridden a lot, so therefore I think it makes sense to just ignore this check. Similar to how in theory we have a line limit of 120 characters in our coding guidelines, but also break that so often that automatically checking for it would be annoying. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79da5a426db59031e3b16aecedeaa1498c91e847 Gerrit-Change-Number: 29359 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 19 Sep 2022 08:36:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: rename enum osmo_gprs_llc_{primitive->prim_type}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29410 ) Change subject: llc: rename enum osmo_gprs_llc_{primitive->prim_type} ...................................................................... llc: rename enum osmo_gprs_llc_{primitive->prim_type} Change-Id: Ie0f9cd174934c54940217b89e46568a7c1b76b96 --- M include/osmocom/gprs/llc/llc_prim.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/10/29410/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 834c27a..ddb1732 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -2,7 +2,7 @@ /* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum osmo_gprs_llc_primitive { +enum osmo_gprs_llc_prim_type { /* GMM <-> LLME */ OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie0f9cd174934c54940217b89e46568a7c1b76b96 Gerrit-Change-Number: 29410 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 ) Change subject: llc: separate enum osmo_gprs_llc_primitive to llc_prim.h ...................................................................... llc: separate enum osmo_gprs_llc_primitive to llc_prim.h Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d --- M include/osmocom/gprs/llc/Makefile.am M include/osmocom/gprs/llc/llc.h A include/osmocom/gprs/llc/llc_prim.h 3 files changed, 31 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/09/29409/1 diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index 5f44218..f4b10a9 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,5 +1,6 @@ llc_HEADERS = \ llc.h \ + llc_prim.h \ $(NULL) llcdir = $(includedir)/osmocom/gprs/llc diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 0207214..8d55b09 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -77,35 +77,6 @@ OSMO_GPRS_LLC_XID_T_RESET = 12, }; -/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ -/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ -enum osmo_gprs_llc_primitive { - /* GMM <-> LLME */ - OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ - OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ - OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ - OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ - OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ - OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ - OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ - OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ - /* LLE <-> (GMM/SNDCP/SMS/TOM) */ - OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ - OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ - OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ - OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ - OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ - OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ - /* LLE <-> RLC/MAC (MS side) */ - OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ - OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ - /* LLE <-> BSSGP (SGSN side) */ - OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ -}; - /* Section 4.5.2 Logical Link States + Annex C.2 */ enum osmo_gprs_llc_lle_state { OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h new file mode 100644 index 0000000..834c27a --- /dev/null +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -0,0 +1,30 @@ +#pragma once + +/* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ +/* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ +enum osmo_gprs_llc_primitive { + /* GMM <-> LLME */ + OSMO_GPRS_LLC_LLGMM_ASSIGN, /* Req: TLLI old, TLLI new, Kc, CiphAlg */ + OSMO_GPRS_LLC_LLGMM_RESET, /* Req/Cnf: TLLI */ + OSMO_GPRS_LLC_LLGMM_TRIGGER, /* Req: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_SUSPEND, /* Req: TLLI, Page */ + OSMO_GPRS_LLC_LLGMM_RESUME, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_PAGE, /* Ind: TLLI */ + OSMO_GPRS_LLC_LLGMM_IOV, /* Req: TLLI */ + OSMO_GPRS_LLC_LLGMM_STATUS, /* Ind: TLLI, Cause */ + OSMO_GPRS_LLC_LLGMM_PSHO, /* Req/Ind/Cnf: TLLI, Ciph, IOV-UI, Old XID */ + OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ + /* LLE <-> (GMM/SNDCP/SMS/TOM) */ + OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ + OSMO_GPRS_LLC_LL_ESTABLISH, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_RELEASE, /* Req/Ind/Cnf: TLLI, Local, Cause */ + OSMO_GPRS_LLC_LL_XID, /* Req/Ind/Rsp/Cnf: TLLI, XID Req/Neg, N201-I, N201-U */ + OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ + OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ + OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + /* LLE <-> RLC/MAC (MS side) */ + OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ + OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ + /* LLE <-> BSSGP (SGSN side) */ + OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ida9ce56f48474313064d798ea7b9a72e9b99bb8d Gerrit-Change-Number: 29409 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add definitions of service primitive parameters

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 ) Change subject: llc: add definitions of service primitive parameters ...................................................................... llc: add definitions of service primitive parameters Change-Id: Iaa520a818b05c962e0d3be9607d3a8c5991f539e --- M include/osmocom/gprs/llc/llc_prim.h 1 file changed, 172 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/11/29411/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index ddb1732..f58c5fa 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -1,5 +1,12 @@ #pragma once +/* 3GPP TS 44.064, section 7.1 "Definition of service primitives and parameters" */ + +#include <stdint.h> +#include <stddef.h> + +#include <osmocom/core/prim.h> + /* TS 04.64 Section 7.1.2 Table 7: LLC layer primitives (GMM/SNDCP/SMS/TOM) */ /* TS 04.65 Section 5.1.2 Table 2: Service primitives used by SNDCP */ enum osmo_gprs_llc_prim_type { @@ -28,3 +35,168 @@ /* LLE <-> BSSGP (SGSN side) */ OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ }; + +/* Parameters for OSMO_GPRS_LLC_LLGMM_* prims */ +struct osmo_gprs_llc_llgmm_prim { + /* Common fields */ + uint32_t tlli; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_LLGMM_ASSIGN | Req */ + struct { + uint32_t tlli_new; + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + uint8_t kc[16]; /* max 16 * 8 = 128 bits */ + /* TODO: Integrity Key & Algo */ + } assign_req; + /* OSMO_GPRS_LLC_LLGMM_TRIGGER | Req */ + struct { + uint8_t cause; + } trigger_req; + /* OSMO_GPRS_LLC_LLGMM_SUSPEND | Req */ + struct { + uint8_t page; + } suspend_req; + /* OSMO_GPRS_LLC_LLGMM_STATUS | Ind */ + struct { + uint8_t cause; + } status_ind; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Ind */ + struct { + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + } psho_ind; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Req */ + struct { + uint8_t gea; /* GEA/0 = 0, GEA/1 = 1, ... */ + uint8_t kc[16]; /* max 16 * 8 = 128 bits */ + } psho_req; + /* OSMO_GPRS_LLC_LLGMM_PSHO | Cnf */ + struct { + uint32_t iov_ui; + /* TODO: old XID indicator */ + } psho_cnf; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_LL_* prims */ +struct osmo_gprs_llc_ll_prim { + /* Common fields */ + uint32_t tlli; + /* OSMO_GPRS_LLC_LL_[UNIT]DATA */ + uint8_t *l3_pdu; + size_t l3_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_LL_RESET | Ind */ + struct { + /* TODO: old XID indicator */ + } reset_ind; + /* OSMO_GPRS_LLC_LL_ESTABLISH | { Req, Ind, Rsp, Cnf } */ + struct { + /* TODO: XID Req/Neg */ + uint16_t n201_i; /* only for Ind & Cnf */ + uint16_t n201_u; /* only for Ind & Cnf */ + } establish; + /* OSMO_GPRS_LLC_LL_RELEASE | Req */ + struct { + uint8_t local; + } release_req; + /* OSMO_GPRS_LLC_LL_RELEASE | Ind */ + struct { + uint8_t cause; + } release_ind; + /* OSMO_GPRS_LLC_LL_XID | { Req, Ind, Rsp, Cnf } */ + struct { + /* TODO: XID Req/Neg */ + uint16_t n201_i; /* only for Ind & Cnf */ + uint16_t n201_u; /* only for Ind & Cnf */ + } xid; + /* OSMO_GPRS_LLC_LL_DATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t reference; /* TODO: confirm type */ + uint8_t radio_prio; /* only for the MS side */ + } data_req; + /* OSMO_GPRS_LLC_LL_DATA | Cnf */ + struct { + uint8_t reference; /* TODO: confirm type */ + } data_cnf; + /* OSMO_GPRS_LLC_LL_UNITDATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t radio_prio; /* only for the MS side */ + bool apply_gea; /* Cipher */ + bool apply_gia; /* Integrity Protection */ + } unitdata_req; + /* OSMO_GPRS_LLC_LL_UNITDATA | Ind */ + struct { + bool apply_gea; /* Cipher */ + bool apply_gia; /* Integrity Protection */ + /* TODO: MAC Verified */ + /* TODO: LLC MAC */ + } unitdata_ind; + /* OSMO_GPRS_LLC_LL_STATUS | Ind */ + struct { + uint8_t cause; + } status_ind; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_GRR_* prims */ +struct osmo_gprs_llc_grr_prim { + /* Common fields */ + uint32_t tlli; + uint8_t *ll_pdu; + size_t ll_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_GRR_[UNIT]DATA | Req */ + struct { + uint8_t qos_params[3]; + uint8_t radio_prio; + uint8_t cause; /* only for OSMO_GPRS_LLC_GRR_UNITDATA | Req */ + uint8_t sapi; + } data_req; + }; +}; + +/* Parameters for OSMO_GPRS_LLC_BSSGP_* prims */ +struct osmo_gprs_llc_bssgp_prim { + /* Common fields */ + uint32_t tlli; + uint8_t *ll_pdu; + size_t ll_pdu_len; + /* Specific fields */ + union { + /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Req */ + struct { + uint8_t qos_params[3]; + bool rlc_confirm; + uint8_t sapi; + /* TODO: MOCN specific parameters: + * - Redirect indication + * - IMSI + * - GMM cause + * - V(U) for redirect + * - Redirect complete */ + } unitdata_req; + /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Ind */ + struct { + uint16_t cell_id; + /* TODO: MOCN specific parameters: + * - Redirect attempt + * - IMSI + * - V(U) for redirect */ + } unitdata_ind; + }; +}; + +struct osmo_gprs_llc_prim { + struct osmo_prim_hdr oph; + union { + struct osmo_gprs_llc_llgmm_prim llgmm; + struct osmo_gprs_llc_ll_prim ll; + struct osmo_gprs_llc_grr_prim grr; + struct osmo_gprs_llc_bssgp_prim bssgp; + }; +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iaa520a818b05c962e0d3be9607d3a8c5991f539e Gerrit-Change-Number: 29411 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-tetra[master]: added support for fill bits and basic link defragmentation (also than...

by fixeria

Attention is currently required from: wbokslag. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/29387 ) Change subject: added support for fill bits and basic link defragmentation (also thanks to SQ5BPF) ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/29387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I41c9438b0b12c2fac9dff1b226eec5b33f30fbb4 Gerrit-Change-Number: 29387 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sun, 18 Sep 2022 16:11:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022