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

Change in libosmo-netif[master]: amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30752 ) Change subject: amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN ...................................................................... amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN Fixes: 678c7fc8fe4fd11e09ccd642ad60c10c365bd19a Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24 --- M include/osmocom/netif/amr.h 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/30752/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 0eb26e2..1cc4385 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -139,20 +139,20 @@ * * NOTE: These constants refer to the length of one AMR speech frame-block, * not counting CMR, TOC. */ -#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75 */ -#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15 */ -#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90 */ -#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70 */ -#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40 */ -#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95 */ -#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2 */ -#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2 */ -#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID */ -#define AMR_FT_GSM_EFR_SID_LEN 43 /* GSM-EFR SID */ -#define AMR_FT_TDMA_EFR_SID_LEN 38 /* TDMA-EFR SID */ -#define AMR_FT_PDC_EFR_SID_LEN 37 /* PDC-EFR SID */ +#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75 */ +#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15 */ +#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90 */ +#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70 */ +#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40 */ +#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95 */ +#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2 */ +#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2 */ +#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID */ +#define AMR_FT_GSM_EFR_SID_LEN ((AMR_FT_GSM_EFR_SID_LEN_BITS+7)/8) /* GSM-EFR SID */ +#define AMR_FT_TDMA_EFR_SID_LEN ((AMR_FT_TDMA_EFR_SID_LEN_BITS+7)/8) /* TDMA-EFR SID */ +#define AMR_FT_PDC_EFR_SID_LEN ((AMR_FT_PDC_EFR_SID_LEN_BITS+7)/8) /* PDC-EFR SID */ /* version 16.0.0 Release 16: 12-14 for future use */ -#define AMR_FT_NO_DATA_LEN 0 /* NO_DATA */ +#define AMR_FT_NO_DATA_LEN ((AMR_FT_NO_DATA_LEN_BITS+7)/8) /* NO_DATA */ int osmo_amr_ft_valid(uint8_t amr_ft); size_t osmo_amr_bytes(uint8_t amr_cmr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24 Gerrit-Change-Number: 30752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: amr: constify input buffer in osmo_amr_is_oa()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30754 ) Change subject: amr: constify input buffer in osmo_amr_is_oa() ...................................................................... amr: constify input buffer in osmo_amr_is_oa() Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e --- M include/osmocom/netif/amr.h M src/amr.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/54/30754/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 47f7f3d..e8f08d4 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -159,7 +159,7 @@ size_t osmo_amr_bytes(uint8_t amr_cmr); size_t osmo_amr_bits(uint8_t amr_ft); -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len); +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len); int osmo_amr_oa_to_bwe(uint8_t *payload, unsigned int payload_len); int osmo_amr_bwe_to_oa(uint8_t *payload, unsigned int payload_len, unsigned int payload_maxlen); diff --git a/src/amr.c b/src/amr.c index 66f41c6..b648d54 100644 --- a/src/amr.c +++ b/src/amr.c @@ -113,7 +113,7 @@ * \param[inout] payload user provided memory containing the AMR payload. * \param[in] payload_len overall length of the AMR payload. * \returns true when the payload is octet aligned. */ -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len) +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len) { /* NOTE: The distinction between octet-aligned and bandwith-efficient * mode normally relys on out of band methods that explicitly select -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e Gerrit-Change-Number: 30754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30755 ) Change subject: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() ...................................................................... amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() The header conversion is now much clearer. Take the chance to delay the memset(buf) after the checks. Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 --- M src/amr.c 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/55/30755/1 diff --git a/src/amr.c b/src/amr.c index b648d54..e4f0dd8 100644 --- a/src/amr.c +++ b/src/amr.c @@ -203,11 +203,14 @@ { uint8_t buf[256]; /* The header is only valid after shifting first two bytes to OA mode */ + struct amr_hdr_bwe *bwe_hdr = (struct amr_hdr_bwe *)payload; struct amr_hdr *oa_hdr; unsigned int i; unsigned int oa_payload_len; + uint8_t ft; - memset(buf, 0, sizeof(buf)); + if (payload_len < sizeof(struct amr_hdr_bwe)) + return -1; if (payload_len + 1 > payload_maxlen) return -1; @@ -215,15 +218,19 @@ if (payload_len + 1 > sizeof(buf)) return -1; - buf[0] = payload[0] & 0xf0; - buf[1] = payload[0] << 4; - buf[1] |= (payload[1] >> 4) & 0x0c; + ft = (bwe_hdr->ft_hi << 1) | bwe_hdr->ft_lo; + if (!osmo_amr_ft_valid(ft)) + return -1; + + memset(buf, 0, sizeof(buf)); + oa_hdr = (struct amr_hdr *)buf; + oa_hdr->cmr = bwe_hdr->cmr; + oa_hdr->f = bwe_hdr->f; + oa_hdr->ft = ft; + oa_hdr->q = bwe_hdr->q; /* Calculate new payload length */ - oa_hdr = (struct amr_hdr *)buf; - if (!osmo_amr_ft_valid(oa_hdr->ft)) - return -1; - oa_payload_len = 2 + osmo_amr_bytes(oa_hdr->ft); + oa_payload_len = 2 + osmo_amr_bytes(ft); for (i = 2; i < oa_payload_len - 1; i++) { buf[i] = payload[i - 1] << 2; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 Gerrit-Change-Number: 30755 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 16:09:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-bts[master]: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power

by daniel

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30689 ) Change subject: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I reran the tests and the only ones that failed on my machine (that don't fail in jenkins) are TC_speech_osmux_tch{h,f} I believe this is unrelated to this patch and some sort of configuration issue on my part: 20221220150640643 DL1P NOTICE (bts=0,trx=0,ts=1,ss=0) SACCH no SI available (lchan.c:266) 20221220150640643 DRSL INFO (bts=0,trx=0,ts=1,ss=0) Rx RSL IPAC_CRCX (rsl.c:3819) 20221220150640643 DRSL ERROR (bts=0,trx=0,ts=1,ss=0) Rx RSL IPAC XXcx with Osmux CIDgoes against configured Osmux policy 'off' (rsl.c:2823) 20221220150640643 DRSL NOTICE (bts=0,trx=0,ts=1,ss=0) RSL Tx IPAC_CRCX_NACK (rsl.c:2651) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ida1d7bbf094958b9142af306dbf84206729a609e Gerrit-Change-Number: 30689 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 16:09:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-bts[master]: rsl: allow configuration of HR GSM RTP format via CHANNEL ACTIVATE

by Jenkins Builder

Attention is currently required from: dexter. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30726 ) Change subject: rsl: allow configuration of HR GSM RTP format via CHANNEL ACTIVATE ...................................................................... Patch Set 2: (1 comment) File src/common/rsl.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2181): https://gerrit.osmocom.org/c/osmo-bts/+/30726/comment/6b62f5a5_4ad76eaa PS2, Line 1633: } else if (TLVP_VAL(tp, RSL_IE_OSMO_HR_GSM_RTP_FMT)[0] == 0x01) { please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id53ebebdf987fc59cf4e38bcddb75663fd7bb8fc Gerrit-Change-Number: 30726 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 15:28:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-bts[master]: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/30725 to look at the new patch set (#2). Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload ...................................................................... l1sap: Accept RFC5993 and TS 101.318 HR GSM payload Unfotunately there are two different RTP formats for HR GSM specified and it is unclear which should be used with GSM networks. Also esch BTS model may have a preference for either one or the other format. Lets set internal flags to determine the preference for each BTS model and then lets use this information to convert incoming RTP packets into the prefered format. Doing so we will make sure that always both formats are accepted. Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Related: OS#5688 --- M include/osmo-bts/bts.h M src/common/l1sap.c M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 7 files changed, 71 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/30725/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Gerrit-Change-Number: 30725 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... jobs/master-builds: use osmo-iuh/master for asn1c As discussed with Pau, let's build the "osmo-iuh/master" branch of our asn1c.git repository in jenkins. This branch is what we actually use for osmo-iuh and "master" should track upstream master. Related: OS#2435 Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/30751/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fc713ed..0f22a77 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -48,12 +48,16 @@ trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org git_base_url: https://gerrit.osmocom.org + branches: + - master ssh: - docs_ftp.osmocom.org # in alphabetical order repos: - - asn1c + - asn1c: + branches: + - osmo-iuh/master - libasn1c: # Full triggers would be: @@ -518,8 +522,7 @@ scm: - git: url: "{git_base_url}/{repos}" - branches: - - 'origin/master' + branches: '{obj:branches}' refspec: name: wipe-workspace: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-iuh[master]: contrib/jenkins.sh: werror with WITH_MANUALS too

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30750 ) Change subject: contrib/jenkins.sh: werror with WITH_MANUALS too ...................................................................... contrib/jenkins.sh: werror with WITH_MANUALS too Change-Id: I6f1bbbc8d3ac04e8a82fb954c59ec30d6be46c13 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/50/30750/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ad59c84..36a4b61 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -28,7 +28,7 @@ CONFIG="--enable-werror" if [ "$WITH_MANUALS" = "1" ]; then - CONFIG=" --enable-manuals" + CONFIG="$CONFIG --enable-manuals" fi set +x -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6f1bbbc8d3ac04e8a82fb954c59ec30d6be46c13 Gerrit-Change-Number: 30750 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-trx[master]: properly update osmocom-bb submodule, for real this time..

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30607 ) Change subject: properly update osmocom-bb submodule, for real this time.. ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I suggest additionally removing the 'branch' from .gitmodules to avoid confusion. (accidentally marked as resolved, undone) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icb3ba575cf5235db7e6c03df3d7d45133d535c50 Gerrit-Change-Number: 30607 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 15:13:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: TRXCON_EV_DCH_REL_REQ does not switch to TRXCON_ST_RESET

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30485 ) Change subject: trxcon: TRXCON_EV_DCH_REL_REQ does not switch to TRXCON_ST_RESET ...................................................................... trxcon: TRXCON_EV_DCH_REL_REQ does not switch to TRXCON_ST_RESET It's not really clear to me how the L1 is supposed to handle the L1CTL_DM_REL_REQ message, which maps to the TRXCON_EV_DCH_REL_REQ in our case. Lookig at the layer23 code I see that it's sent along with the L1CTL_RESET_REQ (maps to the TRXCON_EV_RESET_SCHED_REQ). The layer1 firmware does reset some parameters on receipt of the L1CTL_DM_REL_REQ and some more parameters on the L1CTL_RESET_REQ. It's clear though that we should not switch to the TRXCON_ST_RESET on receipt of the L1CTL_DM_REL_REQ. The layer23 application (e.g. mobile) may send L1CTL_DM_EST_REQ right after that, and we won't be able to transition from the TRXCON_ST_RESET directly to the TRXCON_ST_DEDICATED. Such transition is neither implemented nor permitted by 3GPP TS 44.004, Figure 5.1. Ideally, according to 3GPP TS 44.004, Figure 5.1, we should have an additional transient state 'TUNING DCH' in the trxcon_fsm and switch there on reciept of the L1CTL_DM_REL_REQ. But currently it's not implemented and adding it would require some effort. As a temporary solution, let's do not change the current state and stay in the TRXCON_ST_DEDICATED. This workaround is needed to make mobile terminated calls work in the mobile app. Change-Id: I5bbe6ca4cc6299f9faf343822c992a6872a45081 Related: OS#5599 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 11b60ac..e3224a9 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -428,7 +428,7 @@ break; case TRXCON_EV_DCH_REL_REQ: l1sched_reset(trxcon->sched, false); - osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); + /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; case TRXCON_EV_SET_TCH_MODE_REQ: { @@ -551,7 +551,7 @@ break; case TRXCON_EV_DCH_REL_REQ: l1sched_reset(trxcon->sched, false); - osmo_fsm_inst_state_chg(fi, TRXCON_ST_RESET, 0, 0); + /* TODO: switch to (not implemented) TRXCON_ST_DCH_TUNING? */ break; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5bbe6ca4cc6299f9faf343822c992a6872a45081 Gerrit-Change-Number: 30485 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: TRXCON_EV_DCH_REL_REQ does not switch to TRXCON_ST_RESET

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30485 ) Change subject: trxcon: TRXCON_EV_DCH_REL_REQ does not switch to TRXCON_ST_RESET ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5bbe6ca4cc6299f9faf343822c992a6872a45081 Gerrit-Change-Number: 30485 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Dec 2022 15:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: rework writing BA to file, move to a function

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30614 ) Change subject: mobile: rework writing BA to file, move to a function ...................................................................... mobile: rework writing BA to file, move to a function Sometimes I am seeing error messages like this: DCS ERROR Failed to write BA list The problem is that there can be several BA entries which need to be written, and for each of them we're calling fwrite() twice. This function returns number of items written, so the final sum of returned values would be: len(BA list) * 2. Thus expecting it to be 2 regardless of len(BA list) is wrong. Fix this by checking the sum in each iteration, not at the end. Take a chance to refactor the code and move to a function. Change-Id: Id8bc216c146127d9c9995379c9e56450d328f46d --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 49 insertions(+), 31 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index d288596..9b3806f 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -5123,17 +5123,60 @@ return 0; } +static void gsm322_write_ba(struct osmocom_ms *ms) +{ + const struct gsm322_ba_list *ba; + char *ba_filename; + FILE *fp; + + ba_filename = talloc_asprintf(ms, "%s/%s.ba", config_dir, ms->name); + OSMO_ASSERT(ba_filename != NULL); + + LOGP(DCS, LOGL_INFO, "Writing stored BA list to '%s'\n", ba_filename); + + fp = fopen(ba_filename, "w"); + talloc_free(ba_filename); + if (fp == NULL) { + LOGP(DCS, LOGL_ERROR, + "Failed to open '%s' for writing: %s\n", + ba_filename, strerror(errno)); + return; + } + + fputs(ba_version, fp); + + llist_for_each_entry(ba, &ms->cellsel.ba_list, entry) { + size_t rc = 0; + uint8_t buf[] = { + ba->mcc >> 8, ba->mcc & 0xff, + ba->mnc >> 8, ba->mnc & 0xff, + }; + + LOGP(DCS, LOGL_INFO, + "Writing stored BA list entry (mcc=%s mnc=%s %s, %s)\n", + gsm_print_mcc(ba->mcc), gsm_print_mnc(ba->mnc), + gsm_get_mcc(ba->mcc), gsm_get_mnc(ba->mcc, ba->mnc)); + + rc += fwrite(buf, sizeof(buf), 1, fp); + rc += fwrite(ba->freq, sizeof(ba->freq), 1, fp); + + /* fwrite() returns count of written items, should be 2 */ + if (rc != 2) { + LOGP(DCS, LOGL_ERROR, + "Writing stored BA list: fwrite() failed (rc=%zu)\n", rc); + break; + } + } + + fclose(fp); +} + int gsm322_exit(struct osmocom_ms *ms) { struct gsm322_plmn *plmn = &ms->plmn; struct gsm322_cellsel *cs = &ms->cellsel; struct llist_head *lh, *lh2; struct msgb *msg; - FILE *fp; - char *ba_filename; - struct gsm322_ba_list *ba; - uint8_t buf[4]; - int rc = 0; int i; LOGP(DPLMN, LOGL_INFO, "exit PLMN process\n"); @@ -5161,32 +5204,7 @@ cs->si = NULL; /* store BA list */ - ba_filename = talloc_asprintf(ms, "%s/%s.ba", config_dir, ms->name); - if (ba_filename) { - fp = fopen(ba_filename, "w"); - talloc_free(ba_filename); - if (fp) { - fputs(ba_version, fp); - llist_for_each_entry(ba, &cs->ba_list, entry) { - buf[0] = ba->mcc >> 8; - buf[1] = ba->mcc & 0xff; - buf[2] = ba->mnc >> 8; - buf[3] = ba->mnc & 0xff; - - LOGP(DCS, LOGL_INFO, "Write stored BA list (mcc=%s " - "mnc=%s %s, %s)\n", gsm_print_mcc(ba->mcc), - gsm_print_mnc(ba->mnc), gsm_get_mcc(ba->mcc), - gsm_get_mnc(ba->mcc, ba->mnc)); - - rc += fwrite(buf, 4, 1, fp); - rc += fwrite(ba->freq, sizeof(ba->freq), 1, fp); - } - fclose(fp); - } - } - - if (rc != 2) - LOGP(DCS, LOGL_ERROR, "Failed to write BA list\n"); + gsm322_write_ba(ms); /* free lists */ while ((msg = msgb_dequeue(&plmn->event_queue))) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8bc216c146127d9c9995379c9e56450d328f46d Gerrit-Change-Number: 30614 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30613 ) Change subject: layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h ...................................................................... layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h The mobile app crashes when using a Calypso phone and specifically when using its built-in SIM reader. The problem is that msg->l2h is NULL in rx_l1_sim_conf(), so msg->l1h must be used instead. Assert failed msgb->l2h /usr/local/include/osmocom/core/msgb.h:162 Change-Id: I7c68a3ad393be5fd0413e00e119a06db59672357 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 7482788..94079c7 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -736,10 +736,7 @@ /* just forward the SIM response to the SIM handler */ static int rx_l1_sim_conf(struct osmocom_ms *ms, struct msgb *msg) { - uint16_t len = msgb_l2len(msg); - uint8_t *data = msg->data; - - LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); + LOGP(DL1C, LOGL_INFO, "SIM %s\n", msgb_hexdump_l1(msg)); sim_apdu_resp(ms, msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c68a3ad393be5fd0413e00e119a06db59672357 Gerrit-Change-Number: 30613 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: rework writing BA to file, move to a function

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30614 ) Change subject: mobile: rework writing BA to file, move to a function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8bc216c146127d9c9995379c9e56450d328f46d Gerrit-Change-Number: 30614 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 14:56:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737/comment/4395235e_aaf4… PS1, Line 653: h0h1 := -, > As you can see, this template is marked 'private'. […] Ah I see it's left this way because it is then initialized in child templates, thanks for the explanation! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 14:52:18 +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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737/comment/c8ec2d87_272f… PS1, Line 653: h0h1 := -, > And when you encode the template then it gives no problem later? Just willing to understand/learn wh […] As you can see, this template is marked 'private'. It's a common base for both ts_L1CTL_DM_EST_REQ_H0 and ts_L1CTL_DM_EST_REQ_H1, which are built on top of it (note the 'modifies' keyword below). The point is to have common fields initialized in the base template and initialize the 'h0h1' field in the child templates. TITAN warned us that 'h0h1' is missing in the template definition, but this is intentional, so in this patch we explicitly tell it that this field should remain uninitialized. The '-' in TTCN-3 is a bit like the undefined in JavaScript. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 14:47:39 +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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737/comment/81949745_8817… PS1, Line 653: h0h1 := -, > Explicitly tells the compiler that this field is intentionally unitialized here. And when you encode the template then it gives no problem later? Just willing to understand/learn what is this used for. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 14:22:29 +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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move tr_PTCCHDownlinkMsg to the proper module

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30740 ) Change subject: library: move tr_PTCCHDownlinkMsg to the proper module ...................................................................... library: move tr_PTCCHDownlinkMsg to the proper module Change-Id: I9d5967142f2fbb1125434e99d7dd2557264d71c3 Related: OS#5500 --- M library/RLCMAC_Templates.ttcn M library/RLCMAC_Types.ttcn 2 files changed, 38 insertions(+), 40 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index d4204c7..7d7ff28 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -827,4 +827,42 @@ payload := data } + template PTCCHDownlinkMsg + tr_PTCCHDownlinkMsg(template (present) uint7_t tai0_ta := ?, + template (present) uint7_t tai1_ta := ?, + template (present) uint7_t tai2_ta := ?, + template (present) uint7_t tai3_ta := ?, + template (present) uint7_t tai4_ta := ?, + template (present) uint7_t tai5_ta := ?, + template (present) uint7_t tai6_ta := ?, + template (present) uint7_t tai7_ta := ?, + template (present) uint7_t tai8_ta := ?, + template (present) uint7_t tai9_ta := ?, + template (present) uint7_t tai10_ta := ?, + template (present) uint7_t tai11_ta := ?, + template (present) uint7_t tai12_ta := ?, + template (present) uint7_t tai13_ta := ?, + template (present) uint7_t tai14_ta := ?, + template (present) uint7_t tai15_ta := ?) := { + ta_idx := { + { spare := '0'B, ta_val := tai0_ta }, + { spare := '0'B, ta_val := tai1_ta }, + { spare := '0'B, ta_val := tai2_ta }, + { spare := '0'B, ta_val := tai3_ta }, + { spare := '0'B, ta_val := tai4_ta }, + { spare := '0'B, ta_val := tai5_ta }, + { spare := '0'B, ta_val := tai6_ta }, + { spare := '0'B, ta_val := tai7_ta }, + { spare := '0'B, ta_val := tai8_ta }, + { spare := '0'B, ta_val := tai9_ta }, + { spare := '0'B, ta_val := tai10_ta }, + { spare := '0'B, ta_val := tai11_ta }, + { spare := '0'B, ta_val := tai12_ta }, + { spare := '0'B, ta_val := tai13_ta }, + { spare := '0'B, ta_val := tai14_ta }, + { spare := '0'B, ta_val := tai15_ta } + }, + padding := '2B2B2B2B2B2B2B'O + } + } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index b01a7e2..76aeb22 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -389,44 +389,4 @@ external function dec_PTCCHDownlinkMsg(in octetstring stream) return PTCCHDownlinkMsg with { extension "prototype(convert) decode(RAW)" }; - template PTCCHDownlinkMsg tr_PTCCHDownlinkMsg( - template (present) uint7_t tai0_ta := ?, - template (present) uint7_t tai1_ta := ?, - template (present) uint7_t tai2_ta := ?, - template (present) uint7_t tai3_ta := ?, - template (present) uint7_t tai4_ta := ?, - template (present) uint7_t tai5_ta := ?, - template (present) uint7_t tai6_ta := ?, - template (present) uint7_t tai7_ta := ?, - template (present) uint7_t tai8_ta := ?, - template (present) uint7_t tai9_ta := ?, - template (present) uint7_t tai10_ta := ?, - template (present) uint7_t tai11_ta := ?, - template (present) uint7_t tai12_ta := ?, - template (present) uint7_t tai13_ta := ?, - template (present) uint7_t tai14_ta := ?, - template (present) uint7_t tai15_ta := ? - ) := { - ta_idx := { - { spare := '0'B, ta_val := tai0_ta }, - { spare := '0'B, ta_val := tai1_ta }, - { spare := '0'B, ta_val := tai2_ta }, - { spare := '0'B, ta_val := tai3_ta }, - { spare := '0'B, ta_val := tai4_ta }, - { spare := '0'B, ta_val := tai5_ta }, - { spare := '0'B, ta_val := tai6_ta }, - { spare := '0'B, ta_val := tai7_ta }, - { spare := '0'B, ta_val := tai8_ta }, - { spare := '0'B, ta_val := tai9_ta }, - { spare := '0'B, ta_val := tai10_ta }, - { spare := '0'B, ta_val := tai11_ta }, - { spare := '0'B, ta_val := tai12_ta }, - { spare := '0'B, ta_val := tai13_ta }, - { spare := '0'B, ta_val := tai14_ta }, - { spare := '0'B, ta_val := tai15_ta } - }, - padding := '2B2B2B2B2B2B2B'O - } - - } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30740 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: I9d5967142f2fbb1125434e99d7dd2557264d71c3 Gerrit-Change-Number: 30740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: add ts_PTCCHDownlinkMsg

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30741 ) Change subject: library/RLCMAC_Templates: add ts_PTCCHDownlinkMsg ...................................................................... library/RLCMAC_Templates: add ts_PTCCHDownlinkMsg Change-Id: Ia47a5c6a5b27b41a5339f1e8ce60405b01de0a1f Related: OS#5500 --- M library/RLCMAC_Templates.ttcn 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 7d7ff28..612ce02 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -827,6 +827,43 @@ payload := data } + template (value) PTCCHDownlinkMsg + ts_PTCCHDownlinkMsg(template (value) uint7_t tai0_ta := 0, + template (value) uint7_t tai1_ta := 0, + template (value) uint7_t tai2_ta := 0, + template (value) uint7_t tai3_ta := 0, + template (value) uint7_t tai4_ta := 0, + template (value) uint7_t tai5_ta := 0, + template (value) uint7_t tai6_ta := 0, + template (value) uint7_t tai7_ta := 0, + template (value) uint7_t tai8_ta := 0, + template (value) uint7_t tai9_ta := 0, + template (value) uint7_t tai10_ta := 0, + template (value) uint7_t tai11_ta := 0, + template (value) uint7_t tai12_ta := 0, + template (value) uint7_t tai13_ta := 0, + template (value) uint7_t tai14_ta := 0, + template (value) uint7_t tai15_ta := 0) := { + ta_idx := { + { spare := '0'B, ta_val := tai0_ta }, + { spare := '0'B, ta_val := tai1_ta }, + { spare := '0'B, ta_val := tai2_ta }, + { spare := '0'B, ta_val := tai3_ta }, + { spare := '0'B, ta_val := tai4_ta }, + { spare := '0'B, ta_val := tai5_ta }, + { spare := '0'B, ta_val := tai6_ta }, + { spare := '0'B, ta_val := tai7_ta }, + { spare := '0'B, ta_val := tai8_ta }, + { spare := '0'B, ta_val := tai9_ta }, + { spare := '0'B, ta_val := tai10_ta }, + { spare := '0'B, ta_val := tai11_ta }, + { spare := '0'B, ta_val := tai12_ta }, + { spare := '0'B, ta_val := tai13_ta }, + { spare := '0'B, ta_val := tai14_ta }, + { spare := '0'B, ta_val := tai15_ta } + }, + padding := '2B2B2B2B2B2B2B'O + } template PTCCHDownlinkMsg tr_PTCCHDownlinkMsg(template (present) uint7_t tai0_ta := ?, template (present) uint7_t tai1_ta := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30741 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: Ia47a5c6a5b27b41a5339f1e8ce60405b01de0a1f Gerrit-Change-Number: 30741 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: add ts_RLCMAC_DL_DUMMY_CTRL

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30742 ) Change subject: library/RLCMAC_Templates: add ts_RLCMAC_DL_DUMMY_CTRL ...................................................................... library/RLCMAC_Templates: add ts_RLCMAC_DL_DUMMY_CTRL Change-Id: I6c2f3677151f6c4bb013e1515f43942ffc24969f Related: OS#5500 --- M library/RLCMAC_Templates.ttcn 1 file changed, 33 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 612ce02..a4cd993 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -506,10 +506,21 @@ } } - template DlMacHeader t_RLCMAC_DlMacH(template (present) MacPayloadType pt, - template (present) boolean rrbp_valid, - template (present) MacRrbp rrbp, - template (present) uint3_t usf) := { + template (value) DlMacHeader + ts_RLCMAC_DlMacH(template (value) MacPayloadType pt := MAC_PT_RLCMAC_NO_OPT, + template (value) boolean rrbp_valid := false, + template (value) MacRrbp rrbp := RRBP_Nplus13_mod_2715648, + template (value) uint3_t usf := 7) := { + payload_type := pt, + rrbp := rrbp, + rrbp_valid := rrbp_valid, + usf := usf + } + template DlMacHeader + t_RLCMAC_DlMacH(template (present) MacPayloadType pt, + template (present) boolean rrbp_valid, + template (present) MacRrbp rrbp, + template (present) uint3_t usf) := { payload_type := pt, rrbp := rrbp, rrbp_valid := rrbp_valid, @@ -529,6 +540,24 @@ } } + template (value) RlcmacDlBlock + ts_RLCMAC_DL_DUMMY_CTRL(template (value) DlMacHeader mac_hdr := ts_RLCMAC_DlMacH, + template (value) PageMode page_mode := PAGE_MODE_NORMAL) := { + ctrl := { + mac_hdr := mac_hdr, + opt := omit, + payload := { + msg_type := PACKET_DL_DUMMY_CTRL, + u := { + dl_dummy := { + page_mode := page_mode, + persistence_levels_present := '0'B, + persistence_levels := omit + } + } + } + } + } template RlcmacDlBlock tr_RLCMAC_DL_DUMMY_CTRL(template uint3_t usf := ?, template PageMode page_mode := ?) := { ctrl := { mac_hdr := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30742 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: I6c2f3677151f6c4bb013e1515f43942ffc24969f Gerrit-Change-Number: 30742 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... library/L1CTL_Types: eliminate warning about missing 'h0h1' field Change-Id: I73c86eea4708823e9c004a5b830793ce705dcb75 --- M library/L1CTL_Types.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 1b50703..d525924 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -650,6 +650,7 @@ payload := { dm_est_req := { tsc := tsc, + h0h1 := -, tch_mode := L1CTL_CHAN_MODE_SIGN, audio_mode := t_L1CTL_AudioModeFwd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: add send template for L1CTL_DATA_IND

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30738 ) Change subject: library/L1CTL_Types: add send template for L1CTL_DATA_IND ...................................................................... library/L1CTL_Types: add send template for L1CTL_DATA_IND We need to be able to send L1ctlDlMessage to the l1gprs_test [1], a special program for testing the MS side GRR implementation. Change-Id: Id163cb53afcbf803caf60a5b1a5768c67a9a2bf0 Related: [1] I36ceec4035b2ea593d47998f3f14f1415c606765 Related: OS#5500 --- M library/L1CTL_Types.ttcn 1 file changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index d525924..c8767e2 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -855,7 +855,33 @@ payload := * }; - /* for matching against incoming DATA_IND */ + /* for sending and matching L1CTL_DATA_IND */ + template (value) L1ctlDlMessage + ts_L1CTL_DATA_IND(template (value) RslChannelNr chan_nr, + template (value) RslLinkId link_id, + template (value) octetstring l2_data, + template (value) GsmBandArfcn arfcn, + template (value) uint32_t fn := 1337, + template (value) GsmRxLev rx_level := 63, + template (value) uint8_t num_biterr := 0, + template (value) uint8_t fire_crc := 0) := { + header := ts_L1ctlHeader(L1CTL_DATA_IND), + dl_info := { + chan_nr := chan_nr, + link_id := link_id, + arfcn := arfcn, + frame_nr := fn, + rx_level := rx_level, + snr := 0, + num_biterr := num_biterr, + fire_crc := fire_crc + }, + payload := { + data_ind := { + payload := l2_data + } + } + }; template L1ctlDlMessage tr_L1CTL_DATA_IND(template (present) RslChannelNr chan_nr, template (present) RslLinkId link_id := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30738 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: Id163cb53afcbf803caf60a5b1a5768c67a9a2bf0 Gerrit-Change-Number: 30738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_PortType: allow sending L1ctlDlMessage via L1CTL_PT

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30739 ) Change subject: library/L1CTL_PortType: allow sending L1ctlDlMessage via L1CTL_PT ...................................................................... library/L1CTL_PortType: allow sending L1ctlDlMessage via L1CTL_PT We need to be able to send L1ctlDlMessage to the l1gprs_test [1], a special program for testing the MS side GRR implementation. Change-Id: I18e7585a8e93e3fafeda63b7325cfcc73e792abd Related: [1] I36ceec4035b2ea593d47998f3f14f1415c606765 Related: OS#5500 --- M library/L1CTL_PortType.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index e521730..c44b2ae 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -316,6 +316,12 @@ pout.id := 0; } with { extension "prototype(fast)" } + private function L1CTL_to_UD_dl(in L1ctlDlMessage pin, out UD_send_data pout) { + var L1ctlDlMessageLV msg_lv := { msg := pin }; + pout.data := enc_L1ctlDlMessageLV(msg_lv); + pout.id := 0; + } with { extension "prototype(fast)" } + private function UD_to_L1CTL_dl(in UD_send_data pin, out L1ctlDlMessage pout) { var L1ctlDlMessageLV msg_lv := dec_L1ctlDlMessageLV(pin.data); pout:= msg_lv.msg; @@ -323,6 +329,7 @@ type port L1CTL_PT message { out L1ctlUlMessage + out L1ctlDlMessage out L1CTL_connect in L1ctlDlMessage in L1CTL_connect_result @@ -330,6 +337,7 @@ in UD_connected } with { extension "user UD_PT out(L1ctlUlMessage -> UD_send_data: function(L1CTL_to_UD_ul); + L1ctlDlMessage -> UD_send_data: function(L1CTL_to_UD_dl); L1CTL_connect -> UD_connect: function(L1CTL_to_UD_connect)) in(UD_send_data -> L1ctlDlMessage: function(UD_to_L1CTL_dl); UD_connect_result -> L1CTL_connect_result: function(UD_to_L1CTL_connect_result); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30739 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: I18e7585a8e93e3fafeda63b7325cfcc73e792abd Gerrit-Change-Number: 30739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737/comment/6d20d848_f540… PS1, Line 653: h0h1 := -, > what does this "-" do here? Explicitly tells the compiler that this field is intentionally unitialized here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 13:30:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by Hoernchen

Attention is currently required from: Hoernchen, fixeria, pespin. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 to look at the new patch set (#26). Change subject: ms-trx support ...................................................................... ms-trx support This is basically a trxcon that includes a transceiver, and can just be used with existing and future apps supporting the trxcon interface, i.e. mobile or ccch_scan. Supports bladerf and uhd. Currently using hardcoded sched/prios aimed at a setup with working, reliable usb and reserved cores, for example a raspi 4 (ONLY 4, not 3, not 2, not any other version) Additionally builds test tools used for development: osmo-trx-syncthing* see https://osmocom.org/projects/baseband/wiki/MS-side_GPRS for the project description and details Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 --- M .gitignore M .gitmodules M Makefile.am M Transceiver52M/Makefile.am A Transceiver52M/ms/bladerf_specific.h A Transceiver52M/ms/itrq.h A Transceiver52M/ms/l1ctl_server.c A Transceiver52M/ms/l1ctl_server_cb.cpp A Transceiver52M/ms/logging.c A Transceiver52M/ms/ms.cpp A Transceiver52M/ms/ms.h A Transceiver52M/ms/ms_rx_burst.h A Transceiver52M/ms/ms_rx_burst_test.cpp A Transceiver52M/ms/ms_rx_lower.cpp A Transceiver52M/ms/ms_upper.cpp A Transceiver52M/ms/ms_upper.h A Transceiver52M/ms/sch.c A Transceiver52M/ms/sch.h A Transceiver52M/ms/uhd_specific.h M configure.ac M contrib/jenkins.sh M osmocom-bb 22 files changed, 3,473 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/30416/26 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 26 Gerrit-Owner: Hoernchen <ewild(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: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

Change in libosmocore[master]: gsm_08_58: add IEI to signal HR GSM RTP format via RSL

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30724 ) Change subject: gsm_08_58: add IEI to signal HR GSM RTP format via RSL ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: BLocking until detailed explanation is provided on why is this needed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I843c8a0cbe5898311f3af3294cec7c8bc96c4eb8 Gerrit-Change-Number: 30724 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 13:05:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-bts[master]: rsl.adoc: add info about RSL_IE_OSMO_HR_GSM_RTP_FMT

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30728 ) Change subject: rsl.adoc: add info about RSL_IE_OSMO_HR_GSM_RTP_FMT ...................................................................... Patch Set 2: Code-Review-1 (2 comments) File doc/manuals/abis/rsl.adoc: https://gerrit.osmocom.org/c/osmo-bts/+/30728/comment/cc59fb63_c826c405 PS2, Line 1096: On the receiving side (Downlink) osmoBTS will always accept both formats. The format OsmoBTS https://gerrit.osmocom.org/c/osmo-bts/+/30728/comment/9c4a0498_d53c51f7 PS2, Line 1106: (Bits 7 - 1 are reserved for future use and must be set to zero.) so how does the BSC know which format does the BTS support? It just selects one without knowing which ones are supported? Why does OsmoBSC need to know which format is going to be used? Can this simply be configured in OsmoBSC or inferred from bts type in osmo-bsc.cfg? I'm not sure having an extension IE is the way to go here. Let's try to understand better the motivations and requirements first. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1d40f688ad1729efffee846e7f9efd06cf64ce28 Gerrit-Change-Number: 30728 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 13:05:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-abis[master]: trau_sync: add Ericsson RBS GPRS TRAU synchronization pattern (16kbps)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30716 ) Change subject: trau_sync: add Ericsson RBS GPRS TRAU synchronization pattern (16kbps) ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/30716/comment/07477726_dcddf33c PS1, Line 10: introduces a propritary synchronization pattern. There are slightly different > Done I still see "propritary" written there? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8398f8bbfc51530e37c4328f25155b774394e779 Gerrit-Change-Number: 30716 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:58:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-abis[master]: trau_sync: add Ericsson RBS GPRS TRAU synchronization pattern (64kbps)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30747 ) Change subject: trau_sync: add Ericsson RBS GPRS TRAU synchronization pattern (64kbps) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9d62089db557d37c924cc42fc8e3b608000ef4be Gerrit-Change-Number: 30747 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:58:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: add ts_RLCMAC_DL_DUMMY_CTRL

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30742 ) Change subject: library/RLCMAC_Templates: add ts_RLCMAC_DL_DUMMY_CTRL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30742 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: I6c2f3677151f6c4bb013e1515f43942ffc24969f Gerrit-Change-Number: 30742 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:56:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/RLCMAC_Templates: add ts_PTCCHDownlinkMsg

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30741 ) Change subject: library/RLCMAC_Templates: add ts_PTCCHDownlinkMsg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30741 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: Ia47a5c6a5b27b41a5339f1e8ce60405b01de0a1f Gerrit-Change-Number: 30741 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:55:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move tr_PTCCHDownlinkMsg to the proper module

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30740 ) Change subject: library: move tr_PTCCHDownlinkMsg to the proper module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30740 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: I9d5967142f2fbb1125434e99d7dd2557264d71c3 Gerrit-Change-Number: 30740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:55:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_PortType: allow sending L1ctlDlMessage via L1CTL_PT

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30739 ) Change subject: library/L1CTL_PortType: allow sending L1ctlDlMessage via L1CTL_PT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30739 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: I18e7585a8e93e3fafeda63b7325cfcc73e792abd Gerrit-Change-Number: 30739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:54:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: add send template for L1CTL_DATA_IND

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30738 ) Change subject: library/L1CTL_Types: add send template for L1CTL_DATA_IND ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30738/comment/f75278a4_684f… PS1, Line 864: template (value) uint32_t fn := 1337, this random fn number looks a bit weird? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30738 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: Id163cb53afcbf803caf60a5b1a5768c67a9a2bf0 Gerrit-Change-Number: 30738 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:54:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/L1CTL_Types: eliminate warning about missing 'h0h1' field

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 ) Change subject: library/L1CTL_Types: eliminate warning about missing 'h0h1' field ...................................................................... Patch Set 1: (1 comment) File library/L1CTL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737/comment/b5989ce3_19e6… PS1, Line 653: h0h1 := -, what does this "-" do here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30737 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: I73c86eea4708823e9c004a5b830793ce705dcb75 Gerrit-Change-Number: 30737 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:53:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Fix tx data dropped upon show socket write

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30722 ) Change subject: stream: Fix tx data dropped upon show socket write ...................................................................... stream: Fix tx data dropped upon show socket write On some stream socket types like TCP it is expected that the send() syscall may return a short write, ie not all bytes being copied to the socket. In that case we need to keep the bytes not copied and attempt to submit them later. Related: OS#5836 Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb --- M src/stream.c 1 file changed, 22 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/stream.c b/src/stream.c index 503fe3c..feb6c22 100644 --- a/src/stream.c +++ b/src/stream.c @@ -335,16 +335,14 @@ struct sctp_sndrcvinfo sinfo; #endif struct msgb *msg; - struct llist_head *lh; int ret; if (llist_empty(&cli->tx_queue)) { osmo_fd_write_disable(&cli->ofd); return 0; } - lh = cli->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); + msg = llist_first_entry(&cli->tx_queue, struct msgb, list); + llist_del(&msg->list); if (!osmo_stream_cli_is_connected(cli)) { LOGSCLI(cli, LOGL_ERROR, "not connected, dropping data!\n"); @@ -379,13 +377,20 @@ default: ret = -ENOTSUP; } + + if (ret >= 0 && ret < msgb_length(msg)) { + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); + /* Update msgb and re-add it at the start of the queue: */ + msgb_pull(msg, ret); + llist_add(&msg->list, &cli->tx_queue); + return 0; + } + if (ret < 0) { if (errno == EPIPE || errno == ENOTCONN) { osmo_stream_cli_reconnect(cli); } LOGSCLI(cli, LOGL_ERROR, "error %d to send\n", ret); - } else if (ret < msgb_length(msg)) { - LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); } msgb_free(msg); @@ -1309,16 +1314,14 @@ struct sctp_sndrcvinfo sinfo; #endif struct msgb *msg; - struct llist_head *lh; int ret; if (llist_empty(&conn->tx_queue)) { osmo_fd_write_disable(&conn->ofd); return; } - lh = conn->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); + msg = llist_first_entry(&conn->tx_queue, struct msgb, list); + llist_del(&msg->list); LOGP(DLINP, LOGL_DEBUG, "sending %u bytes of data\n", msg->len); @@ -1349,10 +1352,17 @@ ret = -1; errno = ENOTSUP; } + + if (ret >= 0 && ret < msgb_length(msg)) { + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); + /* Update msgb and re-add it at the start of the queue: */ + msgb_pull(msg, ret); + llist_add(&msg->list, &conn->tx_queue); + return; + } + if (ret == -1) /* send(): On error -1 is returned, and errno is set appropriately */ LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", strerror(errno)); - else if (ret < msgb_length(msg)) - LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb Gerrit-Change-Number: 30722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(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, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Avoid useless polling if tx_queue becomes empty

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30721 ) Change subject: stream: Avoid useless polling if tx_queue becomes empty ...................................................................... stream: Avoid useless polling if tx_queue becomes empty Before this patch, the WRITE poll flag was being left ON and waited to be polled again by the kernel in order to disable it. Let's spate that extra polling cycle which only creates more polling triggers, context switches, etc. Change-Id: I1dd2145249a7322ad95e49be588fd472f00734e1 --- M src/stream.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 1ca4e9a..503fe3c 100644 --- a/src/stream.c +++ b/src/stream.c @@ -387,7 +387,12 @@ } else if (ret < msgb_length(msg)) { LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); } + msgb_free(msg); + + if (llist_empty(&cli->tx_queue)) + osmo_fd_write_disable(&cli->ofd); + return 0; } @@ -1351,8 +1356,11 @@ msgb_free(msg); - if (llist_empty(&conn->tx_queue) && (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY)) - osmo_stream_srv_destroy(conn); + if (llist_empty(&conn->tx_queue)) { + osmo_fd_write_disable(&conn->ofd); + if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) + osmo_stream_srv_destroy(conn); + } } static int osmo_stream_srv_cb(struct osmo_fd *ofd, unsigned int what) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1dd2145249a7322ad95e49be588fd472f00734e1 Gerrit-Change-Number: 30721 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Log read/write flags

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30718 ) Change subject: stream: Log read/write flags ...................................................................... stream: Log read/write flags Change-Id: I57b064fa0498be76579ae9597ab9217d659aae41 --- M src/stream.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index d3e9ad8..b784b21 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1356,7 +1356,7 @@ struct osmo_stream_srv *conn = ofd->data; int rc = 0; - LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); + LOGP(DLINP, LOGL_DEBUG, "connected read/write (what=0x%x)\n", what); if (what & OSMO_FD_READ) rc = osmo_stream_srv_read(conn); if (rc != -EBADF && (what & OSMO_FD_WRITE)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I57b064fa0498be76579ae9597ab9217d659aae41 Gerrit-Change-Number: 30718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: osmo_stream_*_write: Unifiy way to get data and length

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30719 ) Change subject: stream: osmo_stream_*_write: Unifiy way to get data and length ...................................................................... stream: osmo_stream_*_write: Unifiy way to get data and length Change-Id: I5b5d6f7a5a1722bd01c13d32557c21d8a0889966 --- M src/stream.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index b784b21..e9860c3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -355,7 +355,7 @@ switch (cli->sk_domain) { case AF_UNIX: - ret = send(cli->ofd.fd, msg->data, msg->len, 0); + ret = send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; case AF_UNSPEC: case AF_INET: @@ -366,13 +366,13 @@ memset(&sinfo, 0, sizeof(sinfo)); sinfo.sinfo_ppid = htonl(msgb_sctp_ppid(msg)); sinfo.sinfo_stream = msgb_sctp_stream(msg); - ret = sctp_send(cli->ofd.fd, msg->data, msgb_length(msg), + ret = sctp_send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), &sinfo, MSG_NOSIGNAL); break; #endif case IPPROTO_TCP: default: - ret = send(cli->ofd.fd, msg->data, msgb_length(msg), 0); + ret = send(cli->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; } break; @@ -1317,7 +1317,7 @@ switch (conn->srv->sk_domain) { case AF_UNIX: - ret = send(conn->ofd.fd, msg->data, msg->len, 0); + ret = send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; case AF_INET: case AF_INET6: @@ -1328,13 +1328,13 @@ memset(&sinfo, 0, sizeof(sinfo)); sinfo.sinfo_ppid = htonl(msgb_sctp_ppid(msg)); sinfo.sinfo_stream = msgb_sctp_stream(msg); - ret = sctp_send(conn->ofd.fd, msg->data, msgb_length(msg), + ret = sctp_send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), &sinfo, MSG_NOSIGNAL); break; #endif case IPPROTO_TCP: default: - ret = send(conn->ofd.fd, msg->data, msg->len, 0); + ret = send(conn->ofd.fd, msgb_data(msg), msgb_length(msg), 0); break; } break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5b5d6f7a5a1722bd01c13d32557c21d8a0889966 Gerrit-Change-Number: 30719 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Log error on short send

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30720 ) Change subject: stream: Log error on short send ...................................................................... stream: Log error on short send This is clearly a problem on TCP streams which needs to be addressed in the future. Related: OS#5836 Change-Id: I9bd257b80a378b779df84e204673f8e394eca5b6 --- M src/stream.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream.c b/src/stream.c index e9860c3..1ca4e9a 100644 --- a/src/stream.c +++ b/src/stream.c @@ -384,6 +384,8 @@ osmo_stream_cli_reconnect(cli); } LOGSCLI(cli, LOGL_ERROR, "error %d to send\n", ret); + } else if (ret < msgb_length(msg)) { + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); } msgb_free(msg); return 0; @@ -1344,6 +1346,8 @@ } if (ret == -1) /* send(): On error -1 is returned, and errno is set appropriately */ LOGP(DLINP, LOGL_ERROR, "error to send: %s\n", strerror(errno)); + else if (ret < msgb_length(msg)) + LOGP(DLINP, LOGL_ERROR, "short send: %d < exp %u\n", ret, msgb_length(msg)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9bd257b80a378b779df84e204673f8e394eca5b6 Gerrit-Change-Number: 30720 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Fix tx data dropped upon show socket write

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30722 ) Change subject: stream: Fix tx data dropped upon show socket write ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3755aada02ceb186fb990604e3496126fe47e1fb Gerrit-Change-Number: 30722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(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: Wed, 21 Dec 2022 12:52:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-netif[master]: stream: Avoid useless polling if tx_queue becomes empty

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30721 ) Change subject: stream: Avoid useless polling if tx_queue becomes empty ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I1dd2145249a7322ad95e49be588fd472f00734e1 Gerrit-Change-Number: 30721 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 12:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: Proper separation of public & private APIs, Introduce llc_prim API

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30489 ) Change subject: llc: Proper separation of public & private APIs, Introduce llc_prim API ...................................................................... llc: Proper separation of public & private APIs, Introduce llc_prim API Most of the existing (and added) data structures are kept private, since most of those don't really need to be used outside internal code in the library. Most if not all the interaction from upper and lower layers towards LLC is now done through the new llc_prim pubic interface. This interface is based on 3GPP TS 44.064 section 7.1.2. This commit also implements some of the code paths of the public API by means on importing LLC code from osmo-sgsn.git commit 57b63875c762a784127a13becd1c2549ca6c5454. The import of code cannot be done in a separate commit since existing code in osmo-sgsn.git is low quality and has tons of layer violations in all directions. Hence, this commit aims at being an initial point of having some working LLC stack by means of a few unit tests, but by no means aims to be a total working implementation. Some code paths are missing; bugs are expected at this point. Related: OS#5502 Change-Id: I588eb576b2703262f4ab9566ec362920d8390cfd --- M include/osmocom/gprs/llc/Makefile.am M include/osmocom/gprs/llc/llc.h M include/osmocom/gprs/llc/llc_prim.h A include/osmocom/gprs/llc/llc_private.h M src/llc/Makefile.am A src/llc/llc.c A src/llc/llc_bssgp.c A src/llc/llc_grr.c A src/llc/llc_ll.c A src/llc/llc_llgmm.c M src/llc/llc_pdu.c M src/llc/llc_prim.c M src/llc/llc_xid.c M tests/llc/Makefile.am A tests/llc/llc_prim_test.c A tests/llc/llc_prim_test.err A tests/llc/llc_prim_test.ok M tests/llc/pdu_codec_test.c M tests/llc/pdu_codec_test.ok A tests/llc/xid_codec_test.c A tests/llc/xid_codec_test.err A tests/llc/xid_codec_test.ok M tests/testsuite.at 23 files changed, 2,805 insertions(+), 402 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/Makefile.am b/include/osmocom/gprs/llc/Makefile.am index f4b10a9..df56a08 100644 --- a/include/osmocom/gprs/llc/Makefile.am +++ b/include/osmocom/gprs/llc/Makefile.am @@ -1,3 +1,7 @@ +noinst_HEADERS = \ + llc_private.h \ + $(NULL) + llc_HEADERS = \ llc.h \ llc_prim.h \ diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 8ae403a..062150e 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -33,156 +33,7 @@ return get_value_string(osmo_gprs_llc_sapi_names, val); } -/* Section 6.3.0 Control field formats */ -enum osmo_gprs_llc_frame_fmt { - OSMO_GPRS_LLC_FMT_I, /* 6.3.1 Information transfer format - I */ - OSMO_GPRS_LLC_FMT_S, /* 6.3.2 Supervisory format - S */ - OSMO_GPRS_LLC_FMT_UI, /* 6.3.3 Unconfirmed Information format - UI */ - OSMO_GPRS_LLC_FMT_U, /* 6.3.4 Unnumbered format - U */ -}; - -extern const struct value_string osmo_gprs_llc_frame_fmt_names[]; - -static inline const char *osmo_gprs_llc_frame_fmt_name(enum osmo_gprs_llc_frame_fmt val) -{ - return get_value_string(osmo_gprs_llc_frame_fmt_names, val); -} - -/* Section 6.4 Commands and responses */ -enum osmo_gprs_llc_frame_func { - /* 6.4.1 Unnumbered (U) frames */ - OSMO_GPRS_LLC_FUNC_SABM, /* 6.4.1.1 */ - OSMO_GPRS_LLC_FUNC_DISC, /* 6.4.1.2 */ - OSMO_GPRS_LLC_FUNC_UA, /* 6.4.1.3 */ - OSMO_GPRS_LLC_FUNC_DM, /* 6.4.1.4 */ - OSMO_GPRS_LLC_FUNC_FRMR, /* 6.4.1.5 */ - OSMO_GPRS_LLC_FUNC_XID, /* 6.4.1.6 */ - OSMO_GPRS_LLC_FUNC_NULL, /* 6.4.1.7 */ - /* 6.4.2 Unconfirmed Information (UI) frame */ - OSMO_GPRS_LLC_FUNC_UI, /* 6.4.2.1 */ - OSMO_GPRS_LLC_FUNC_UI_DUMMY, /* 6.4.2.2 */ - /* 6.4.3 Combined Information (I) and Supervisory (S) frames */ - OSMO_GPRS_LLC_FUNC_RR, /* 6.4.3.1 */ - OSMO_GPRS_LLC_FUNC_ACK, /* 6.4.3.2 */ - OSMO_GPRS_LLC_FUNC_SACK, /* 6.4.3.3 */ - OSMO_GPRS_LLC_FUNC_RNR, /* 6.4.3.4 */ -}; - -extern const struct value_string osmo_gprs_llc_frame_func_names[]; - -static inline const char *osmo_gprs_llc_frame_func_name(enum osmo_gprs_llc_frame_func val) -{ - return get_value_string(osmo_gprs_llc_frame_func_names, val); -} - -/* Section 6.4.1.6 / Table 6 */ -enum osmo_gprs_llc_xid_type { - OSMO_GPRS_LLC_XID_T_VERSION = 0, - OSMO_GPRS_LLC_XID_T_IOV_UI = 1, - OSMO_GPRS_LLC_XID_T_IOV_I = 2, - OSMO_GPRS_LLC_XID_T_T200 = 3, - OSMO_GPRS_LLC_XID_T_N200 = 4, - OSMO_GPRS_LLC_XID_T_N201_U = 5, - OSMO_GPRS_LLC_XID_T_N201_I = 6, - OSMO_GPRS_LLC_XID_T_mD = 7, - OSMO_GPRS_LLC_XID_T_mU = 8, - OSMO_GPRS_LLC_XID_T_kD = 9, - OSMO_GPRS_LLC_XID_T_kU = 10, - OSMO_GPRS_LLC_XID_T_L3_PAR = 11, - OSMO_GPRS_LLC_XID_T_RESET = 12, - OSMO_GPRS_LLC_XID_T_IIOV_UI = 13, - OSMO_GPRS_LLC_XID_T_IIOV_UI_CNT = 14, - OSMO_GPRS_LLC_XID_T_MAC_IOV_UI = 15, -}; - -extern const struct value_string osmo_gprs_llc_xid_type_names[]; - -static inline const char *osmo_gprs_llc_xid_type_name(enum osmo_gprs_llc_xid_type val) -{ - return get_value_string(osmo_gprs_llc_xid_type_names, val); -} - -struct osmo_gprs_llc_xid_field { - enum osmo_gprs_llc_xid_type type; - /* Fixed-length value */ - uint32_t val; - /* Variable-length value */ - struct { - const uint8_t *val; - uint8_t val_len; - } var; -}; - -/* 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 */ - OSMO_GPRS_LLC_LLES_ASSIGNED_ADM = 2, /* TLLI assigned */ - OSMO_GPRS_LLC_LLES_LOCAL_EST = 3, /* Local Establishment */ - OSMO_GPRS_LLC_LLES_REMOTE_EST = 4, /* Remote Establishment */ - OSMO_GPRS_LLC_LLES_ABM = 5, - OSMO_GPRS_LLC_LLES_LOCAL_REL = 6, /* Local Release */ - OSMO_GPRS_LLC_LLES_TIMER_REC = 7, /* Timer Recovery */ -}; - -enum osmo_gprs_llc_llme_state { - OSMO_GPRS_LLC_LLMS_UNASSIGNED = 1, /* No TLLI yet */ - OSMO_GPRS_LLC_LLMS_ASSIGNED = 2, /* TLLI assigned */ -}; - -/* Section 8.9.9 LLC layer parameter default values */ -struct osmo_gprs_llc_params { - uint16_t iov_i_exp; - uint16_t t200_201; - uint16_t n200; - uint16_t n201_u; - uint16_t n201_i; - uint16_t mD; - uint16_t mU; - uint16_t kD; - uint16_t kU; -}; - -#define OSMO_GPRS_LLC_PDU_F_CMD_RSP (1 << 0) /* 6.2.2 Commmand/Response bit (C/R) */ -#define OSMO_GPRS_LLC_PDU_F_FOLL_FIN (1 << 1) /* 6.3.5.1 Poll/Final bit (P/F) */ -#define OSMO_GPRS_LLC_PDU_F_ACK_REQ (1 << 2) /* 6.3.5.2 Acknowledgement request bit (A) */ -#define OSMO_GPRS_LLC_PDU_F_MAC_PRES (1 << 3) /* 6.3.5.2a Integrity Protection bit (IP) */ -#define OSMO_GPRS_LLC_PDU_F_ENC_MODE (1 << 4) /* 6.3.5.5.1 Encryption mode bit (E) */ -#define OSMO_GPRS_LLC_PDU_F_PROT_MODE (1 << 5) /* 6.3.5.5.2 Protected Mode bit (PM) */ - -struct osmo_gprs_llc_pdu_decoded { - enum osmo_gprs_llc_sapi sapi; - enum osmo_gprs_llc_frame_fmt fmt; - enum osmo_gprs_llc_frame_func func; - uint32_t flags; /* see OSMO_GPRS_LLC_PDU_F_* above */ - uint32_t seq_rx; /* 6.3.5.4.5 Receive sequence number N(R) */ - uint32_t seq_tx; /* 6.3.5.4.3 Send sequence number N(S) */ - uint32_t fcs; /* 5.5 Frame Check Sequence (FCS) field */ - uint32_t mac; /* 5.5a Message Authentication Code (MAC) field */ - struct { - uint8_t len; /* Indicates the number of octets in the bitmap */ - uint8_t r[32]; /* The R(n) bitmap */ - } sack; /* 6.3.5.4.6 SACK bitmap R(n) */ - size_t data_len; - const uint8_t *data; -}; - -void osmo_gprs_llc_pdu_hdr_dump_buf(char *buf, size_t buf_size, - const struct osmo_gprs_llc_pdu_decoded *pdu); -const char *osmo_gprs_llc_pdu_hdr_dump(const struct osmo_gprs_llc_pdu_decoded *pdu); - -int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu, - const uint8_t *data, size_t data_len); -int osmo_gprs_llc_pdu_encode(struct msgb *msg, const struct osmo_gprs_llc_pdu_decoded *pdu); - -uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len); - -bool osmo_gprs_llc_xid_field_is_valid(const struct osmo_gprs_llc_xid_field *field); -int osmo_gprs_llc_xid_decode(struct osmo_gprs_llc_xid_field *fields, - unsigned int max_fields, - const uint8_t *data, size_t data_len); -int osmo_gprs_llc_xid_encode(struct msgb *msg, - const struct osmo_gprs_llc_xid_field *fields, - unsigned int num_fields); +int osmo_gprs_llc_init(enum osmo_gprs_llc_location location); enum osmo_gprs_llc_log_cat { OSMO_GPRS_LLC_LOGC_LLC, @@ -190,8 +41,3 @@ }; void osmo_gprs_llc_set_log_cat(enum osmo_gprs_llc_log_cat logc, int logc_num); - -/* TODO: move to llc_private.h */ -extern int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX]; - -#define LOGLLC(lvl, fmt, args...) LOGP(g_llc_log_cat[OSMO_GPRS_LLC_LOGC_LLC], lvl, fmt, ## args) diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index a26c1c5..4f359d8 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -7,6 +7,8 @@ #include <osmocom/core/prim.h> #include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gprs/llc/llc.h> /* Section 7.1.0 */ enum osmo_gprs_llc_prim_sap { @@ -39,6 +41,12 @@ OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, /* Req: TLLI */ }; +extern const struct value_string osmo_gprs_llc_llgmm_prim_type_names[]; +static inline const char *osmo_gprs_llc_llgmm_prim_type_name(enum osmo_gprs_llc_llgmm_prim_type val) +{ + return get_value_string(osmo_gprs_llc_llgmm_prim_type_names, val); +} + /* TS 04.65 Section 7.2.2 "Layer 3 - LLE primitives" */ enum osmo_gprs_llc_ll_prim_type { OSMO_GPRS_LLC_LL_RESET, /* Ind: TLLI */ @@ -50,18 +58,37 @@ OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ }; +extern const struct value_string osmo_gprs_llc_ll_prim_type_names[]; +static inline const char *osmo_gprs_llc_ll_prim_type_name(enum osmo_gprs_llc_ll_prim_type val) +{ + return get_value_string(osmo_gprs_llc_ll_prim_type_names, val); +} + /* TS 04.65 Section 7.2.3 "LLE - RLC/MAC primitives" (MS side) */ enum osmo_gprs_llc_grr_prim_type { 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 */ }; +extern const struct value_string osmo_gprs_llc_grr_prim_type_names[]; +static inline const char *osmo_gprs_llc_grr_prim_type_name(enum osmo_gprs_llc_grr_prim_type val) +{ + return get_value_string(osmo_gprs_llc_grr_prim_type_names, val); +} + /* TS 04.65 Section 7.2.4 "LLE - BSSGP primitives" (SGSN side) */ enum osmo_gprs_llc_bssgp_prim_type { OSMO_GPRS_LLC_BSSGP_DL_UNITDATA, /* Req: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ OSMO_GPRS_LLC_BSSGP_UL_UNITDATA, /* Ind: TLLI, LL-PDU, Cell Id, edirect attempt, IMSI, V(U) for redirect, ... */ }; +extern const struct value_string osmo_gprs_llc_bssgp_prim_type_names[]; +static inline const char *osmo_gprs_llc_bssgp_prim_type_name(enum osmo_gprs_llc_bssgp_prim_type val) +{ + return get_value_string(osmo_gprs_llc_bssgp_prim_type_names, val); +} + + /* Parameters for OSMO_GPRS_LLC_LLGMM_* prims */ struct osmo_gprs_llc_llgmm_prim { /* Common fields */ @@ -108,7 +135,8 @@ struct osmo_gprs_llc_ll_prim { /* Common fields */ uint32_t tlli; - /* OSMO_GPRS_LLC_LL_[UNIT]DATA */ + enum osmo_gprs_llc_sapi sapi; + /* OSMO_GPRS_LLC_LL_[UNIT]DATA, OSMO_GPRS_LLC_LL_XID */ uint8_t *l3_pdu; size_t l3_pdu_len; /* Specific fields */ @@ -133,7 +161,7 @@ } release_ind; /* OSMO_GPRS_LLC_LL_XID | { Req, Ind, Rsp, Cnf } */ struct { - /* TODO: XID Req/Neg */ + /* XID Req/Neg are encoded as buffer in l3_pdu + l3_pdu_len */ uint16_t n201_i; /* only for Ind & Cnf */ uint16_t n201_u; /* only for Ind & Cnf */ } xid; @@ -194,7 +222,7 @@ size_t ll_pdu_len; /* Specific fields */ union { - /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Req */ + /* OSMO_GPRS_LLC_BSSGP_DL_UNITDATA | Req */ struct { uint8_t qos_params[3]; bool rlc_confirm; @@ -205,15 +233,15 @@ * - GMM cause * - V(U) for redirect * - Redirect complete */ - } unitdata_req; - /* OSMO_GPRS_LLC_BSSGP_UNITDATA | Ind */ + } dl_unitdata_req; + /* OSMO_GPRS_LLC_BSSGP_UL_UNITDATA | Ind */ struct { - uint16_t cell_id; + struct gsm0808_cell_id cell_id; /* TODO: MOCN specific parameters: * - Redirect attempt * - IMSI * - V(U) for redirect */ - } unitdata_ind; + } ul_unitdata_ind; }; }; @@ -226,3 +254,30 @@ struct osmo_gprs_llc_bssgp_prim bssgp; }; }; + +typedef int (*osmo_gprs_llc_prim_up_cb)(struct osmo_gprs_llc_prim *llc_prim, void *up_user_data); +void osmo_gprs_llc_prim_set_up_cb(osmo_gprs_llc_prim_up_cb up_cb, void *up_user_data); + +typedef int (*osmo_gprs_llc_prim_down_cb)(struct osmo_gprs_llc_prim *llc_prim, void *down_user_data); +void osmo_gprs_llc_prim_set_down_cb(osmo_gprs_llc_prim_down_cb down_cb, void *down_user_data); + +int osmo_gprs_llc_prim_upper_down(struct osmo_gprs_llc_prim *llc_prim); +int osmo_gprs_llc_prim_lower_up(struct osmo_gprs_llc_prim *llc_prim); + +const char *osmo_gprs_llc_prim_name(const struct osmo_gprs_llc_prim *llc_prim); + +/* Alloc primitive for LLGMM SAP: */ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli); + +/* Alloc primitive for LL SAP: */ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_xid_req(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_par, unsigned int l3_par_len); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_xid_resp(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_par, unsigned int l3_par_len); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_unitdata_req(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_pdu, size_t l3_pdu_len); + +/* Alloc primitive for BSSGP SAP: */ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_bssgp_ul_unitdata_ind( + uint32_t tlli, uint8_t *ll_pdu, size_t ll_pdu_len); diff --git a/include/osmocom/gprs/llc/llc_private.h b/include/osmocom/gprs/llc/llc_private.h new file mode 100644 index 0000000..05d9dec --- /dev/null +++ b/include/osmocom/gprs/llc/llc_private.h @@ -0,0 +1,399 @@ +#pragma once + +/* 3GPP TS 44.064, private header */ + +#include <stdint.h> +#include <stddef.h> + +#include <osmocom/core/timer.h> +#include <osmocom/core/msgb.h> +#include <osmocom/crypt/gprs_cipher.h> + +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc.h> + +extern int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX]; + +#define LOGLLC(lvl, fmt, args...) LOGP(g_llc_log_cat[OSMO_GPRS_LLC_LOGC_LLC], lvl, fmt, ## args) + +#define GPRS_LLME_RESET_AGE (0) + +/* 3GPP TS 44.064 § 8.3 TLLI assignment procedures */ +#define TLLI_UNASSIGNED (0xffffffff) + +/* GSM 04.08 - 10.5.1.2 */ +#define GSM_KEY_SEQ_INVAL 7 + +#define CRC24_LENGTH 3 +#define UI_HDR_LEN 3 +#define N202 4 + +#define msgb_llc_prim(msg) ((struct osmo_gprs_llc_prim *)(msg)->l1h) + + +/* Section 6.3.0 Control field formats */ +enum gprs_llc_frame_fmt { + OSMO_GPRS_LLC_FMT_I, /* 6.3.1 Information transfer format - I */ + OSMO_GPRS_LLC_FMT_S, /* 6.3.2 Supervisory format - S */ + OSMO_GPRS_LLC_FMT_UI, /* 6.3.3 Unconfirmed Information format - UI */ + OSMO_GPRS_LLC_FMT_U, /* 6.3.4 Unnumbered format - U */ +}; + +extern const struct value_string gprs_llc_frame_fmt_names[]; + +static inline const char *gprs_llc_frame_fmt_name(enum gprs_llc_frame_fmt val) +{ + return get_value_string(gprs_llc_frame_fmt_names, val); +} + +/* Section 6.4 Commands and responses */ +enum gprs_llc_frame_func { + /* 6.4.1 Unnumbered (U) frames */ + OSMO_GPRS_LLC_FUNC_SABM, /* 6.4.1.1 */ + OSMO_GPRS_LLC_FUNC_DISC, /* 6.4.1.2 */ + OSMO_GPRS_LLC_FUNC_UA, /* 6.4.1.3 */ + OSMO_GPRS_LLC_FUNC_DM, /* 6.4.1.4 */ + OSMO_GPRS_LLC_FUNC_FRMR, /* 6.4.1.5 */ + OSMO_GPRS_LLC_FUNC_XID, /* 6.4.1.6 */ + OSMO_GPRS_LLC_FUNC_NULL, /* 6.4.1.7 */ + /* 6.4.2 Unconfirmed Information (UI) frame */ + OSMO_GPRS_LLC_FUNC_UI, /* 6.4.2.1 */ + OSMO_GPRS_LLC_FUNC_UI_DUMMY, /* 6.4.2.2 */ + /* 6.4.3 Combined Information (I) and Supervisory (S) frames */ + OSMO_GPRS_LLC_FUNC_RR, /* 6.4.3.1 */ + OSMO_GPRS_LLC_FUNC_ACK, /* 6.4.3.2 */ + OSMO_GPRS_LLC_FUNC_SACK, /* 6.4.3.3 */ + OSMO_GPRS_LLC_FUNC_RNR, /* 6.4.3.4 */ +}; + +extern const struct value_string gprs_llc_frame_func_names[]; + +static inline const char *gprs_llc_frame_func_name(enum gprs_llc_frame_func val) +{ + return get_value_string(gprs_llc_frame_func_names, val); +} + +/* Section 6.4.1.6 / Table 6 */ +enum gprs_llc_xid_type { + OSMO_GPRS_LLC_XID_T_VERSION = 0, + OSMO_GPRS_LLC_XID_T_IOV_UI = 1, + OSMO_GPRS_LLC_XID_T_IOV_I = 2, + OSMO_GPRS_LLC_XID_T_T200 = 3, + OSMO_GPRS_LLC_XID_T_N200 = 4, + OSMO_GPRS_LLC_XID_T_N201_U = 5, + OSMO_GPRS_LLC_XID_T_N201_I = 6, + OSMO_GPRS_LLC_XID_T_mD = 7, + OSMO_GPRS_LLC_XID_T_mU = 8, + OSMO_GPRS_LLC_XID_T_kD = 9, + OSMO_GPRS_LLC_XID_T_kU = 10, + OSMO_GPRS_LLC_XID_T_L3_PAR = 11, + OSMO_GPRS_LLC_XID_T_RESET = 12, + OSMO_GPRS_LLC_XID_T_IIOV_UI = 13, + OSMO_GPRS_LLC_XID_T_IIOV_UI_CNT = 14, + OSMO_GPRS_LLC_XID_T_MAC_IOV_UI = 15, +}; + +extern const struct value_string gprs_llc_xid_type_names[]; + +static inline const char *gprs_llc_xid_type_name(enum gprs_llc_xid_type val) +{ + return get_value_string(gprs_llc_xid_type_names, val); +} + +struct gprs_llc_xid_field { + enum gprs_llc_xid_type type; + /* Fixed-length value */ + uint32_t val; + /* Variable-length value */ + struct { + uint8_t *val; + uint8_t val_len; + } var; +}; + +/* Section 4.5.2 Logical Link States + Annex C.2 */ +enum gprs_llc_lle_state { + OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ + OSMO_GPRS_LLC_LLES_ASSIGNED_ADM = 2, /* TLLI assigned */ + OSMO_GPRS_LLC_LLES_LOCAL_EST = 3, /* Local Establishment */ + OSMO_GPRS_LLC_LLES_REMOTE_EST = 4, /* Remote Establishment */ + OSMO_GPRS_LLC_LLES_ABM = 5, + OSMO_GPRS_LLC_LLES_LOCAL_REL = 6, /* Local Release */ + OSMO_GPRS_LLC_LLES_TIMER_REC = 7, /* Timer Recovery */ +}; +extern const struct value_string gprs_llc_lle_state_names[]; +static inline const char *gprs_llc_lle_state_name(enum gprs_llc_lle_state val) +{ + return get_value_string(gprs_llc_lle_state_names, val); +} + +enum gprs_llc_llme_state { + OSMO_GPRS_LLC_LLMS_UNASSIGNED = 1, /* No TLLI yet */ + OSMO_GPRS_LLC_LLMS_ASSIGNED = 2, /* TLLI assigned */ +}; + +extern const struct value_string gprs_llc_llme_state_names[]; +static inline const char *gprs_llc_llme_state_name(enum gprs_llc_llme_state val) +{ + return get_value_string(gprs_llc_llme_state_names, val); +} + +/* Section 8.9.9 LLC layer parameter default values */ +struct gprs_llc_params { + uint16_t iov_i_exp; + uint16_t t200_201; + uint16_t n200; + uint16_t n201_u; + uint16_t n201_i; + uint16_t mD; + uint16_t mU; + uint16_t kD; + uint16_t kU; +}; + +#define OSMO_GPRS_LLC_PDU_F_CMD_RSP (1 << 0) /* 6.2.2 Commmand/Response bit (C/R) */ +#define OSMO_GPRS_LLC_PDU_F_FOLL_FIN (1 << 1) /* 6.3.5.1 Poll/Final bit (P/F) */ +#define OSMO_GPRS_LLC_PDU_F_ACK_REQ (1 << 2) /* 6.3.5.2 Acknowledgement request bit (A) */ +#define OSMO_GPRS_LLC_PDU_F_MAC_PRES (1 << 3) /* 6.3.5.2a Integrity Protection bit (IP) */ +#define OSMO_GPRS_LLC_PDU_F_ENC_MODE (1 << 4) /* 6.3.5.5.1 Encryption mode bit (E) */ +#define OSMO_GPRS_LLC_PDU_F_PROT_MODE (1 << 5) /* 6.3.5.5.2 Protected Mode bit (PM) */ + +struct gprs_llc_pdu_decoded { + enum osmo_gprs_llc_sapi sapi; + enum gprs_llc_frame_fmt fmt; + enum gprs_llc_frame_func func; + uint32_t flags; /* see OSMO_GPRS_LLC_PDU_F_* above */ + uint32_t seq_rx; /* 6.3.5.4.5 Receive sequence number N(R) */ + uint32_t seq_tx; /* 6.3.5.4.3 Send sequence number N(S) */ + uint32_t fcs; /* 5.5 Frame Check Sequence (FCS) field */ + uint32_t mac; /* 5.5a Message Authentication Code (MAC) field */ + struct { + uint8_t len; /* Indicates the number of octets in the bitmap */ + uint8_t r[32]; /* The R(n) bitmap */ + } sack; /* 6.3.5.4.6 SACK bitmap R(n) */ + size_t data_len; + uint8_t *data; +}; + +struct gprs_llc_llme; + +/* 3GPP TS 44.064 § 4.7.1: Logical Link Entity: One per DLCI (TLLI + SAPI) */ +struct gprs_llc_lle { + struct llist_head list; + + uint32_t sapi; + + struct gprs_llc_llme *llme; /* backpointer to the Logical Link Management Entity */ + + enum gprs_llc_lle_state state; + + struct osmo_timer_list t200; + struct osmo_timer_list t201; /* wait for acknowledgement */ + + uint16_t v_sent; + uint16_t v_ack; + uint16_t v_recv; + + uint16_t vu_send; + uint16_t vu_recv; + + /* non-standard LLC state */ + uint16_t vu_recv_last; + uint16_t vu_recv_duplicates; + + /* Overflow Counter for ABM */ + uint32_t oc_i_send; + uint32_t oc_i_recv; + + /* Overflow Counter for unconfirmed transfer */ + uint32_t oc_ui_send; + uint32_t oc_ui_recv; + + unsigned int retrans_ctr; + + struct gprs_llc_params params; + + /* Copy of the XID fields array we have sent with the last + * network originated XID-Request. Since the phone + * may strip the optional fields in the confirmation + * we need to remeber those fields in order to be + * able to create the compression entity. */ + struct gprs_llc_xid_field *xid; + unsigned int xid_len; + + /* Copy of last XID-Request fields array received from the peer: We need + to remember it to be able to send an Xid-Response back when SNDCP + provides us with layer3 XID field */ + struct gprs_llc_xid_field *rx_xid; + unsigned int rx_xid_len; + +}; + +#define NUM_SAPIS 16 + +/* 3GPP TS 44.064 § 4.7.3: Logical Link Management Entity: One per TLLI */ +struct gprs_llc_llme { + struct llist_head list; + + enum gprs_llc_llme_state state; + + uint32_t tlli; + uint32_t old_tlli; + + /* Crypto parameters */ + enum gprs_ciph_algo algo; + uint8_t kc[16]; + uint8_t cksn; + /* 3GPP TS 44.064 § 8.9.2: */ + uint32_t iov_ui; + + /* over which BSSGP BTS ctx do we need to transmit */ + uint16_t bvci; + uint16_t nsei; + struct gprs_llc_lle lle[NUM_SAPIS]; + + /* Compression entities */ + struct { + /* In these two list_heads we will store the + * data and protocol compression entities, + * together with their compression states */ + struct llist_head *proto; + struct llist_head *data; + } comp; + + /* Internal management */ + uint32_t age_timestamp; +}; + +static inline struct gprs_llc_lle *gprs_llc_llme_get_lle(struct gprs_llc_llme *llme, + enum osmo_gprs_llc_sapi sapi) { + OSMO_ASSERT(sapi < NUM_SAPIS); + return &llme->lle[sapi]; +} + +struct gprs_llc_ctx { + enum osmo_gprs_llc_location location; + osmo_gprs_llc_prim_up_cb llc_up_cb; + void *llc_up_cb_user_data; + + osmo_gprs_llc_prim_down_cb llc_down_cb; + void *llc_down_cb_user_data; + + struct llist_head llme_list; +}; + +extern struct gprs_llc_ctx *g_ctx; + +/* llc_bssgp.c */ +int gprs_llc_prim_lower_up_bssgp(struct osmo_gprs_llc_prim *llc_prim); +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_bssgp_dl_unitdata_req( + uint32_t tlli, uint8_t *ll_pdu, size_t ll_pdu_len); + +/* llc_grr.c */ +int gprs_llc_prim_lower_up_grr(struct osmo_gprs_llc_prim *llc_prim); + +/* llc_ll.c */ +int gprs_llc_prim_ll_upper_down(struct osmo_gprs_llc_prim *llc_prim); +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_xid_ind(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_par, unsigned int l3_par_len); +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_xid_cnf(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_par, unsigned int l3_par_len); +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_unitdata_ind( + uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, + uint8_t *l3_pdu, size_t l3_pdu_len); +int gprs_llc_lle_submit_prim_ll_xid_ind(struct gprs_llc_lle *lle, + const struct gprs_llc_xid_field *xid_field_request_l3); +int gprs_llc_lle_submit_prim_ll_xid_cnf(struct gprs_llc_lle *lle, + const struct gprs_llc_xid_field *xid_field_response_l3, + const struct gprs_llc_xid_field *xid_field_request_l3); + +/* llc_llgmm.c */ +int gprs_llc_prim_llgmm_upper_down(struct osmo_gprs_llc_prim *llc_prim); + +/* llc.c */ +struct gprs_llc_llme *gprs_llc_llme_alloc(uint32_t tlli); +struct gprs_llc_llme *gprs_llc_find_llme_by_tlli(uint32_t tlli); +struct gprs_llc_lle *gprs_llc_find_lle_by_tlli_sapi(uint32_t tlli, uint8_t sapi); +struct gprs_llc_lle *gprs_llc_lle_for_rx_by_tlli_sapi(const uint32_t tlli, + uint8_t sapi, enum gprs_llc_frame_func cmd); +int gprs_llc_lle_hdr_rx(struct gprs_llc_lle *lle, struct gprs_llc_pdu_decoded *pdu_dec); +void gprs_llc_llme_free(struct gprs_llc_llme *llme); +int gprs_llc_lle_tx_xid(const struct gprs_llc_lle *lle, uint8_t *xid_payload, unsigned int xid_payload_len, bool is_cmd); +int gprs_llc_lle_tx_xid_req(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len); +int gprs_llc_lle_tx_xid_resp(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len); +int gprs_llc_lle_tx_ui(struct gprs_llc_lle *lle, uint8_t *l3_pdu, size_t l3_pdu_len, bool encryptable); + +/* llc_prim.c: */ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc(enum osmo_gprs_llc_prim_sap sap, unsigned int type, + enum osmo_prim_operation operation, + unsigned int l3_len); +int gprs_llc_prim_handle_unsupported(struct osmo_gprs_llc_prim *llc_prim); +int gprs_llc_prim_call_down_cb(struct osmo_gprs_llc_prim *llc_prim); +int gprs_llc_prim_call_up_cb(struct osmo_gprs_llc_prim *llc_prim); + +/* llc_xid.c: */ +bool gprs_llc_xid_field_is_valid(const struct gprs_llc_xid_field *field); +int gprs_llc_xid_decode(struct gprs_llc_xid_field *fields, + unsigned int max_fields, + uint8_t *data, size_t data_len); +int gprs_llc_xid_encode(uint8_t *data, size_t data_len, + const struct gprs_llc_xid_field *fields, + unsigned int num_fields); +struct gprs_llc_xid_field *gprs_llc_xid_deepcopy(void *ctx, + const struct gprs_llc_xid_field *src_xid, + size_t src_xid_len); + +/* llc_pdu.c: */ +int gprs_llc_pdu_decode(struct gprs_llc_pdu_decoded *pdu, + uint8_t *data, size_t data_len); +int gprs_llc_pdu_encode(struct msgb *msg, const struct gprs_llc_pdu_decoded *pdu); +void gprs_llc_pdu_hdr_dump_buf(char *buf, size_t buf_size, + const struct gprs_llc_pdu_decoded *pdu); +const char *gprs_llc_pdu_hdr_dump(const struct gprs_llc_pdu_decoded *pdu); +uint32_t gprs_llc_fcs(const uint8_t *data, size_t len); + + + +/** + * \short Check if N(U) should be considered a retransmit + * + * Implements the range check as of GSM 04.64 8.4.2 + * Receipt of unacknowledged information. + * + * @returns Returns 1 if (V(UR)-32) <= N(U) < V(UR) + * @param nu N(U) unconfirmed sequence number of the UI frame + * @param vur V(UR) unconfirmend received state variable + */ +static inline int gprs_llc_is_retransmit(uint16_t nu, uint16_t vur) +{ + int delta = (vur - nu) & 0x1ff; + return 0 < delta && delta < 32; +} + +/* 6.2.2 Command/Response bit (C/R) */ +static inline bool gprs_llc_received_cr_is_cmd(uint8_t cr) +{ + if (g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) + return !cr; /*received from MS */ + else + return !!cr; /*received from SGSN */ + +} + +static inline void gprs_llc_encode_is_cmd_as_cr(bool is_cmd, uint32_t *flags) +{ + if (g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) + *flags |= OSMO_GPRS_LLC_PDU_F_CMD_RSP; /*Transmit to MS */ + else + *flags &= ~OSMO_GPRS_LLC_PDU_F_CMD_RSP; /* Transmit to SGSN */ + +} + +#define LOGLLME(llme, level, fmt, args...) \ + LOGLLC(level, "LLME(%08x/%08x){%s} " fmt, (llme)->old_tlli, \ + (llme)->tlli, gprs_llc_llme_state_name((llme)->state), ## args) +#define LOGLLE(lle, level, fmt, args...) \ + LOGLLC(level, "LLE(%08x/%08x,%s){%s} " fmt, \ + (lle)->llme->old_tlli, (lle)->llme->tlli, \ + osmo_gprs_llc_sapi_name((lle)->sapi), \ + gprs_llc_lle_state_name((lle)->state), ## args) diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 317b855..8d64231 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -25,6 +25,11 @@ libosmo_gprs_llc_la_SOURCES = \ crc24.c \ + llc.c \ + llc_bssgp.c \ + llc_ll.c \ + llc_llgmm.c \ + llc_grr.c \ llc_pdu.c \ llc_prim.c \ llc_xid.c \ diff --git a/src/llc/llc.c b/src/llc/llc.c new file mode 100644 index 0000000..402afab --- /dev/null +++ b/src/llc/llc.c @@ -0,0 +1,645 @@ +/* GPRS LLC as per 3GPP TS 44.064 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> +#include <arpa/inet.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> + +#include <osmocom/gsm/gsm_utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + + +struct gprs_llc_ctx *g_ctx; + +const struct value_string gprs_llc_llme_state_names[] = { + { OSMO_GPRS_LLC_LLMS_UNASSIGNED, "UNASSIGNED" }, + { OSMO_GPRS_LLC_LLMS_ASSIGNED, "ASSIGNED" }, + { 0, NULL } +}; + +const struct value_string gprs_llc_lle_state_names[] = { + { OSMO_GPRS_LLC_LLES_UNASSIGNED, "UNASSIGNED" }, + { OSMO_GPRS_LLC_LLES_ASSIGNED_ADM, "ASSIGNED_ADM" }, + { OSMO_GPRS_LLC_LLES_LOCAL_EST, "LOCAL_EST" }, + { OSMO_GPRS_LLC_LLES_REMOTE_EST, "REMOTE_EST" }, + { OSMO_GPRS_LLC_LLES_ABM, "ABM" }, + { OSMO_GPRS_LLC_LLES_LOCAL_REL, "LOCAL_REL" }, + { OSMO_GPRS_LLC_LLES_TIMER_REC, "TIMER_REC" }, + { 0, NULL } +}; + +/* Section 8.9.9 LLC layer parameter default values */ +static const struct gprs_llc_params llc_default_params[NUM_SAPIS] = { + [1] = { + .t200_201 = 5, + .n200 = 3, + .n201_u = 400, + }, + [2] = { + .t200_201 = 5, + .n200 = 3, + .n201_u = 270, + }, + [3] = { + .iov_i_exp = 27, + .t200_201 = 5, + .n200 = 3, + .n201_u = 500, + .n201_i = 1503, + .mD = 1520, + .mU = 1520, + .kD = 16, + .kU = 16, + }, + [5] = { + .iov_i_exp = 27, + .t200_201 = 10, + .n200 = 3, + .n201_u = 500, + .n201_i = 1503, + .mD = 760, + .mU = 760, + .kD = 8, + .kU = 8, + }, + [7] = { + .t200_201 = 20, + .n200 = 3, + .n201_u = 270, + }, + [8] = { + .t200_201 = 20, + .n200 = 3, + .n201_u = 270, + }, + [9] = { + .iov_i_exp = 27, + .t200_201 = 20, + .n200 = 3, + .n201_u = 500, + .n201_i = 1503, + .mD = 380, + .mU = 380, + .kD = 4, + .kU = 4, + }, + [11] = { + .iov_i_exp = 27, + .t200_201 = 40, + .n200 = 3, + .n201_u = 500, + .n201_i = 1503, + .mD = 190, + .mU = 190, + .kD = 2, + .kU = 2, + }, +}; + +int osmo_gprs_llc_init(enum osmo_gprs_llc_location location) +{ + OSMO_ASSERT(location == OSMO_GPRS_LLC_LOCATION_MS || location == OSMO_GPRS_LLC_LOCATION_SGSN) + + if (g_ctx) + talloc_free(g_ctx); + + g_ctx = talloc_zero(NULL, struct gprs_llc_ctx); + g_ctx->location = location; + INIT_LLIST_HEAD(&g_ctx->llme_list); + return 0; +} + +static void lle_init(struct gprs_llc_llme *llme, uint8_t sapi) +{ + struct gprs_llc_lle *lle = &llme->lle[sapi]; + + lle->llme = llme; + lle->sapi = sapi; + lle->state = OSMO_GPRS_LLC_LLES_UNASSIGNED; + + /* Initialize according to parameters */ + memcpy(&lle->params, &llc_default_params[sapi], sizeof(lle->params)); +} + +struct gprs_llc_llme *gprs_llc_llme_alloc(uint32_t tlli) +{ + struct gprs_llc_llme *llme; + uint32_t i; + + llme = talloc_zero(g_ctx, struct gprs_llc_llme); + if (!llme) + return NULL; + + llme->tlli = tlli; + llme->old_tlli = TLLI_UNASSIGNED; + llme->state = OSMO_GPRS_LLC_LLMS_UNASSIGNED; + llme->age_timestamp = GPRS_LLME_RESET_AGE; + llme->cksn = GSM_KEY_SEQ_INVAL; + + for (i = 0; i < ARRAY_SIZE(llme->lle); i++) + lle_init(llme, i); + + llist_add(&llme->list, &g_ctx->llme_list); + + //llme->comp.proto = gprs_sndcp_comp_alloc(llme); + //llme->comp.data = gprs_sndcp_comp_alloc(llme); + + return llme; +} + +void gprs_llc_llme_free(struct gprs_llc_llme *llme) +{ + /* TODO: here we probably need to trigger LLGMM-RESET or LLGMM-SUSPEND towards upper layers! */ + //gprs_sndcp_sm_deactivate_ind_by_llme(llme); + //gprs_sndcp_comp_free(llme->comp.proto); + //gprs_sndcp_comp_free(llme->comp.data); + llist_del(&llme->list); + talloc_free(llme); +} + +/* lookup LLC Entity based on TLLI */ +struct gprs_llc_llme *gprs_llc_find_llme_by_tlli(uint32_t tlli) +{ + struct gprs_llc_llme *llme; + + llist_for_each_entry(llme, &g_ctx->llme_list, list) { + if (llme->tlli == tlli || llme->old_tlli == tlli) + return llme; + } + return NULL; +} + +/* lookup LLC Entity based on DLCI (TLLI+SAPI tuple) */ +struct gprs_llc_lle *gprs_llc_find_lle_by_tlli_sapi(uint32_t tlli, uint8_t sapi) +{ + struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(tlli); + if (!llme) + return NULL; + return &llme->lle[sapi]; +} + +static int gprs_llc_lle_tx_dm(const struct gprs_llc_lle *lle) +{ + int rc; + struct msgb *msg; + struct gprs_llc_pdu_decoded pdu_dec = { + .sapi = lle->sapi, + .fmt = OSMO_GPRS_LLC_FMT_U, + .func = OSMO_GPRS_LLC_FUNC_DM, + .flags = OSMO_GPRS_LLC_PDU_F_FOLL_FIN, + }; + struct osmo_gprs_llc_prim *llc_prim; + + /* LLC payload is put directly below: */ + llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + msg = llc_prim->oph.msg; + msg->l3h = msg->tail; + + rc = gprs_llc_pdu_encode(msg, &pdu_dec); + if (rc < 0) { + LOGLLC(LOGL_NOTICE, "Failed to encode U DM\n"); + msgb_free(msg); + return rc; + } + llc_prim->bssgp.ll_pdu = msgb_l3(msg); + llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + + /* Send BSSGP-DL-UNITDATA.req */ + gprs_llc_prim_call_down_cb(llc_prim); + return 0; +} + +int gprs_llc_lle_tx_xid(const struct gprs_llc_lle *lle, uint8_t *xid_payload, unsigned int xid_payload_len, bool is_cmd) +{ + int rc; + struct msgb *msg; + struct osmo_gprs_llc_prim *llc_prim; + struct gprs_llc_pdu_decoded pdu_dec = { + .sapi = lle->sapi, + .fmt = OSMO_GPRS_LLC_FMT_U, + .func = OSMO_GPRS_LLC_FUNC_XID, + .flags = OSMO_GPRS_LLC_PDU_F_FOLL_FIN, + .data_len = xid_payload_len, + .data = xid_payload, + }; + gprs_llc_encode_is_cmd_as_cr(is_cmd, &pdu_dec.flags); + + /* LLC payload is put directly below: */ + llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + msg = llc_prim->oph.msg; + msg->l3h = msg->tail; + + rc = gprs_llc_pdu_encode(msg, &pdu_dec); + if (rc < 0) { + LOGLLC(LOGL_NOTICE, "Failed to encode U DM\n"); + msgb_free(msg); + return rc; + } + llc_prim->bssgp.ll_pdu = msgb_l3(msg); + llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + + /* Send BSSGP-DL-UNITDATA.req */ + gprs_llc_prim_call_down_cb(llc_prim); + return 0; +} + +/* Transmit a UI frame over the given SAPI: + 'encryptable' indicates whether particular message can be encrypted according + to 3GPP TS 24.008 § 4.7.1.2 + */ +int gprs_llc_lle_tx_ui(struct gprs_llc_lle *lle, uint8_t *l3_pdu, size_t l3_pdu_len, bool encryptable) +{ + struct osmo_gprs_llc_prim *llc_prim; + struct msgb *msg; + int rc; + + struct gprs_llc_pdu_decoded pdu_dec = { + .sapi = lle->sapi, + .fmt = OSMO_GPRS_LLC_FMT_UI, + .func = 0, + .flags = OSMO_GPRS_LLC_PDU_F_PROT_MODE, + .seq_tx = lle->vu_send, + .data_len = l3_pdu_len, + .data = l3_pdu, + }; + gprs_llc_encode_is_cmd_as_cr(false, &pdu_dec.flags); + //TODO: what to do with: + // oc = lle->oc_ui_send; + + if (pdu_dec.data_len > lle->params.n201_u) { + LOGLLE(lle, LOGL_ERROR, "Cannot Tx %zu bytes (N201-U=%u)\n", + pdu_dec.data_len, lle->params.n201_u); + return -EFBIG; + } + + if (lle->llme->algo != GPRS_ALGO_GEA0 && encryptable) + pdu_dec.flags |= OSMO_GPRS_LLC_PDU_F_ENC_MODE; + + /* TODO: we are probably missing the ciphering enc part, see osmo-sgsn apply_gea() */ + + /* LLC payload is put directly below: */ + llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + msg = llc_prim->oph.msg; + msg->l3h = msg->tail; + + rc = gprs_llc_pdu_encode(msg, &pdu_dec); + if (rc < 0) { + LOGLLE(lle, LOGL_NOTICE, "Failed to encode U DM\n"); + msgb_free(msg); + return rc; + } + llc_prim->bssgp.ll_pdu = msgb_l3(msg); + llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + + /* Increment V(U) */ + lle->vu_send = (lle->vu_send + 1) % 512; + /* Increment Overflow Counter, if needed */ + if ((lle->vu_send + 1) / 512) + lle->oc_ui_send += 512; + + /* Send BSSGP-DL-UNITDATA.req */ + rc = gprs_llc_prim_call_down_cb(llc_prim); + return rc; +} + +/* lookup LLC Entity for RX based on DLCI (TLLI+SAPI tuple) */ +struct gprs_llc_lle *gprs_llc_lle_for_rx_by_tlli_sapi(const uint32_t tlli, + uint8_t sapi, enum gprs_llc_frame_func cmd) +{ + struct gprs_llc_lle *lle; + + /* We already know about this TLLI */ + lle = gprs_llc_find_lle_by_tlli_sapi(tlli, sapi); + if (lle) + return lle; + + /* Maybe it is a routing area update but we already know this sapi? */ + if (gprs_tlli_type(tlli) == TLLI_FOREIGN) { + lle = gprs_llc_find_lle_by_tlli_sapi(tlli, sapi); + if (lle) { + LOGLLC(LOGL_NOTICE, + "LLC RX: Found a local entry for TLLI 0x%08x\n", tlli); + return lle; + } + } + + /* 7.2.1.1 LLC belonging to unassigned TLLI+SAPI shall be discarded, + * except UID and XID frames with SAPI=1 */ + if (sapi == OSMO_GPRS_LLC_SAPI_GMM && + (cmd == OSMO_GPRS_LLC_FUNC_XID || cmd == OSMO_GPRS_LLC_FUNC_UI)) { + struct gprs_llc_llme *llme; + /* FIXME: don't use the TLLI but the 0xFFFF unassigned? */ + llme = gprs_llc_llme_alloc(tlli); + LOGLLME(llme, LOGL_NOTICE, "LLC RX: unknown TLLI 0x%08x, " + "creating LLME on the fly\n", tlli); + lle = &llme->lle[sapi]; + return lle; + } + + LOGLLC(LOGL_NOTICE, "unknown TLLI(0x%08x)/SAPI(%d): Silently dropping\n", + tlli, sapi); + return NULL; +} + +/* Generate XID message */ +static int gprs_llc_lle_generate_xid(struct gprs_llc_lle *lle, uint8_t *bytes, int bytes_len, + const uint8_t *l3par, unsigned int l3par_len) +{ + unsigned int xid_fields_len = 3 + (l3par ? 1 : 0); + struct gprs_llc_xid_field *xid_fields = + (struct gprs_llc_xid_field *)talloc_zero_size(lle->llme, sizeof(*xid_fields) * xid_fields_len); + int rc; + + OSMO_ASSERT(xid_fields); + + xid_fields[0].type = OSMO_GPRS_LLC_XID_T_VERSION; + xid_fields[0].val = 0; + + xid_fields[1].type = OSMO_GPRS_LLC_XID_T_N201_U; + xid_fields[1].val = lle->params.n201_u; + + xid_fields[2].type = OSMO_GPRS_LLC_XID_T_N201_I; + xid_fields[2].val = lle->params.n201_i; + + if (l3par_len > 0) { + xid_fields[3].type = OSMO_GPRS_LLC_XID_T_L3_PAR; + xid_fields[3].var.val_len = l3par_len; + if (l3par_len > 0) { + xid_fields[3].var.val = talloc_size(xid_fields, l3par_len); + memcpy(xid_fields[3].var.val, l3par, l3par_len); + } + } else { + xid_fields_len--; + } + + /* Store generated XID for later reference */ + talloc_free(lle->xid); + lle->xid = xid_fields; + lle->xid_len = xid_fields_len; + + rc = gprs_llc_xid_encode(bytes, bytes_len, lle->xid, lle->xid_len); + return rc; +} + +/* Set of LL-XID negotiation (See also: TS 101 351, Section 7.2.2.4) */ +int gprs_llc_lle_tx_xid_req(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len) +{ + uint8_t xid_bytes[1024]; + int xid_bytes_len; + int rc; + + /* Generate XID */ + xid_bytes_len = + gprs_llc_lle_generate_xid(lle, xid_bytes, sizeof(xid_bytes), l3par, l3par_len); + + /* Only perform XID sending if the XID message contains something */ + if (xid_bytes_len > 0) { + /* Transmit XID bytes */ + LOGLLE(lle, LOGL_NOTICE, "Sending XID type %s (%d bytes) request to MS...\n", + l3par ? "L3-Params" : "NULL", xid_bytes_len); + rc = gprs_llc_lle_tx_xid(lle, xid_bytes, xid_bytes_len, true); + } else { + LOGLLE(lle, LOGL_ERROR, + "XID-Message generation failed, XID not sent!\n"); + rc = -EINVAL; + } + + return rc; +} + +/* Generate XID response from XID-Ind received from peer */ +int gprs_llc_lle_tx_xid_resp(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len) +{ + uint8_t bytes_response[1024]; + unsigned int rc, i; + + /* Replace the SNDCP L3 xid_field with response from our upper layer: */ + for (i = 0; i < lle->rx_xid_len; i++) { + struct gprs_llc_xid_field *xid_field_l3; + if (lle->rx_xid[i].type != OSMO_GPRS_LLC_XID_T_L3_PAR) + continue; + xid_field_l3 = &lle->rx_xid[i]; + xid_field_l3->var.val = l3par; + xid_field_l3->var.val_len = l3par_len; + break; + } + + rc = gprs_llc_xid_encode(bytes_response, sizeof(bytes_response), + lle->rx_xid, lle->rx_xid_len); + TALLOC_FREE(lle->rx_xid); + lle->rx_xid_len = 0; + if (rc < 0) + return rc; + + rc = gprs_llc_lle_tx_xid(lle, bytes_response, rc, false); + return rc; +} + +/* Process an incoming XID indication and generate an appropriate response */ +static int gprs_llc_lle_process_xid_ind(struct gprs_llc_lle *lle, + uint8_t *bytes_request, + int bytes_request_len) +{ + /* Note: This function computes the response that is sent back to the + * MS when a mobile originated XID is received. */ + struct gprs_llc_xid_field xid_fields[16] = { 0 }; + unsigned int xid_fields_len; + int rc, i; + struct gprs_llc_xid_field *xid_field_request_l3 = NULL; + + /* Parse and analyze XID-Request */ + rc = gprs_llc_xid_decode(xid_fields, ARRAY_SIZE(xid_fields), + bytes_request, bytes_request_len); + if (rc < 0) { + LOGLLE(lle, LOGL_ERROR, "Failed decoding XID Fields\n"); + return rc; + } + xid_fields_len = rc; + + /* FIXME: Check the incoming XID parameters for + * for validity. Currently we just blindly + * accept all XID fields by just echoing them. + * There is a remaining risk of malfunction + * when a MS submits values which defer from + * the default! */ + + /* Store last received XID-Ind from peer: */ + lle->rx_xid = gprs_llc_xid_deepcopy(lle->llme, xid_fields, xid_fields_len); + OSMO_ASSERT(lle->rx_xid); + lle->rx_xid_len = xid_fields_len; + + /* Forward SNDCP-XID fields to Layer 3 (SNDCP) */ + for (i = 0; i < xid_fields_len; i++) { + if (xid_fields[i].type == OSMO_GPRS_LLC_XID_T_L3_PAR) { + xid_field_request_l3 = &xid_fields[i]; + gprs_llc_lle_submit_prim_ll_xid_ind(lle, xid_field_request_l3); + /* delay answer until we get LL-XID.resp from SNDCP: */ + return rc; + } + } + + rc = gprs_llc_lle_tx_xid_resp(lle, NULL, 0); + return rc; +} + +/* Process an incoming XID confirmation. 8.5.3.0 */ +static int gprs_llc_lle_process_xid_conf(struct gprs_llc_lle *lle, uint8_t *bytes, int bytes_len) +{ + /* Note: This function handles the response of a network originated + * XID-Request. There XID messages reflected by the MS are analyzed + * and processed here. The caller is called by rx_llc_xid(). */ + + struct gprs_llc_xid_field xid_fields[16] = { 0 }; + unsigned int xid_fields_len; + struct gprs_llc_xid_field *xid_field; + struct gprs_llc_xid_field *xid_field_request_l3 = NULL; + unsigned int i; + int rc; + + /* Pick layer3 XID from the XID request we have sent last */ + if (lle->xid) { + for (i = 0; i < lle->xid_len; i++) { + if (lle->xid[i].type == OSMO_GPRS_LLC_XID_T_L3_PAR) + xid_field_request_l3 = &lle->xid[i]; + } + } + + /* Parse and analyze XID-Response */ + rc = gprs_llc_xid_decode(xid_fields, ARRAY_SIZE(xid_fields), + bytes, bytes_len); + if (rc < 0) { + LOGLLE(lle, LOGL_ERROR, "Failed decoding XID Fields\n"); + return rc; + } + xid_fields_len = rc; + + for (i = 0; i < xid_fields_len; i++) { + xid_field = &xid_fields[i]; + + /* Forward SNDCP-XID fields to Layer 3 (SNDCP) */ + if (xid_field->type == OSMO_GPRS_LLC_XID_T_L3_PAR && xid_field_request_l3) { + gprs_llc_lle_submit_prim_ll_xid_cnf(lle, xid_field, xid_field_request_l3); + /* TODO: sndcp_sn_xid_conf is basically primitive LL-XID.cnf. See 8.5.3.0 */ + } else { /* Process LLC-XID fields: */ + + /* FIXME: Do something more useful with the + * echoed XID-Information. Currently we + * just ignore the response completely and + * by doing so we blindly accept any changes + * the MS might have done to the our XID + * inquiry. There is a remainig risk of + * malfunction! */ + LOGLLE(lle, LOGL_NOTICE, + "Ignoring XID-Field: XID: type %s\n", + gprs_llc_xid_type_name(xid_field->type)); + } + } + + /* Flush pending XID fields */ + TALLOC_FREE(lle->xid); + lle->xid_len = 0; + + return 0; +} + +/* Dispatch XID indications and responses coming from the MS */ +static int gprs_llc_lle_rx_llc_xid(struct gprs_llc_lle *lle, struct gprs_llc_pdu_decoded *pdu_dec) +{ + int rc = 0; + + /* FIXME: 8.5.3.3: check if XID is invalid */ + if (gprs_llc_received_cr_is_cmd(pdu_dec->flags & OSMO_GPRS_LLC_PDU_F_CMD_RSP)) { + LOGLLE(lle, LOGL_NOTICE, "Received XID indication from MS.\n"); + + rc = gprs_llc_lle_process_xid_ind(lle, pdu_dec->data, pdu_dec->data_len); + } else { + LOGLLE(lle, LOGL_NOTICE, "Received XID confirmation from MS\n"); + rc = gprs_llc_lle_process_xid_conf(lle, pdu_dec->data, pdu_dec->data_len); + /* FIXME: if we had sent a XID reset, send + * LLGMM-RESET.conf to GMM */ + } + return rc; +} + +/* Receive and process decoded LLC PDU from lower layer (GRR/BSSGP): */ +int gprs_llc_lle_hdr_rx(struct gprs_llc_lle *lle, struct gprs_llc_pdu_decoded *pdu_dec) +{ + const char *llc_pdu_name = gprs_llc_pdu_hdr_dump(pdu_dec); + + LOGLLE(lle, LOGL_DEBUG, "Rx %s\n", llc_pdu_name); + + switch (pdu_dec->func) { + case OSMO_GPRS_LLC_FUNC_SABM: + case OSMO_GPRS_LLC_FUNC_DISC: + /* send DM to properly signal we don't do ABM */ + gprs_llc_lle_tx_dm(lle); + break; + case OSMO_GPRS_LLC_FUNC_XID: /* Section 6.4.1.6 */ + gprs_llc_lle_rx_llc_xid(lle, pdu_dec); + break; + case OSMO_GPRS_LLC_FUNC_UI: + if (gprs_llc_is_retransmit(pdu_dec->seq_tx, lle->vu_recv)) { + LOGLLE(lle, LOGL_NOTICE, + "TLLI=%08x dropping UI, N(U=%d) not in window V(URV(UR:%d).\n", + lle->llme ? lle->llme->tlli : -1, + pdu_dec->seq_tx, lle->vu_recv); + + /* HACK: non-standard recovery handling. If remote LLE + * is re-transmitting the same sequence number for + * three times, don't discard the frame but pass it on + * and 'learn' the new sequence number */ + if (pdu_dec->seq_tx != lle->vu_recv_last) { + lle->vu_recv_last = pdu_dec->seq_tx; + lle->vu_recv_duplicates = 0; + } else { + lle->vu_recv_duplicates++; + if (lle->vu_recv_duplicates < 3) + return -EIO; + LOGLLE(lle, LOGL_NOTICE, "TLLI=%08x recovering " + "N(U=%d) after receiving %u duplicates\n", + lle->llme ? lle->llme->tlli : -1, + pdu_dec->seq_tx, lle->vu_recv_duplicates); + } + } + /* Increment the sequence number that we expect in the next frame */ + lle->vu_recv = (pdu_dec->seq_tx + 1) % 512; + /* Increment Overflow Counter */ + if ((pdu_dec->seq_tx + 1) / 512) + lle->oc_ui_recv += 512; + break; + case OSMO_GPRS_LLC_FUNC_NULL: + LOGLLE(lle, LOGL_DEBUG, "TLLI=%08x sends us LLC NULL\n", lle->llme ? lle->llme->tlli : -1); + break; + default: + LOGLLE(lle, LOGL_NOTICE, "Unhandled command: %s\n", + gprs_llc_frame_func_name(pdu_dec->func)); + break; + } + + return 0; +} diff --git a/src/llc/llc_bssgp.c b/src/llc/llc_bssgp.c new file mode 100644 index 0000000..48d4cde --- /dev/null +++ b/src/llc/llc_bssgp.c @@ -0,0 +1,261 @@ +/* GPRS LLC as per 3GPP TS 44.064 7.2.4 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/gsm/gsm_utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + +const struct value_string osmo_gprs_llc_bssgp_prim_type_names[] = { + { OSMO_GPRS_LLC_BSSGP_DL_UNITDATA, "DL-UNITDATA" }, + { OSMO_GPRS_LLC_BSSGP_UL_UNITDATA, "UL-UNITDATA" }, + { 0, NULL } +}; + +/******************************** + * Primitive allocation: + ********************************/ + +static inline struct osmo_gprs_llc_prim *llc_prim_bssgp_alloc(enum osmo_gprs_llc_bssgp_prim_type type, + enum osmo_prim_operation operation, + unsigned int l3_len) +{ + return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_BSSGP, type, operation, l3_len); +} + +/* 7.2.4.1 BSSGP-UL-UNITDATA.ind (SGSN):*/ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_bssgp_ul_unitdata_ind( + uint32_t tlli, uint8_t *ll_pdu, + size_t ll_pdu_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_bssgp_alloc(OSMO_GPRS_LLC_BSSGP_UL_UNITDATA, PRIM_OP_INDICATION, ll_pdu_len); + llc_prim->bssgp.tlli = tlli; + llc_prim->bssgp.ll_pdu = ll_pdu; + llc_prim->bssgp.ll_pdu_len = ll_pdu_len; + return llc_prim; +} + +/* 7.2.4.2 BSSGP-UL-UNITDATA.ind (SGSN):*/ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_bssgp_dl_unitdata_req( + uint32_t tlli, uint8_t *ll_pdu, size_t ll_pdu_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_bssgp_alloc(OSMO_GPRS_LLC_BSSGP_DL_UNITDATA, PRIM_OP_REQUEST, ll_pdu_len); + llc_prim->bssgp.tlli = tlli; + llc_prim->bssgp.ll_pdu = ll_pdu; + llc_prim->bssgp.ll_pdu_len = ll_pdu_len; + return llc_prim; +} + +/******************************** + * Handling from lower layers: + ********************************/ + +/* encrypt information field + FCS, if needed! */ +static int apply_gea(const struct gprs_llc_lle *lle, uint16_t crypt_len, uint16_t nu, + uint32_t oc, uint8_t sapi, uint8_t *fcs, uint8_t *data) +{ + uint8_t cipher_out[GSM0464_CIPH_MAX_BLOCK]; + + if (lle->llme->algo == GPRS_ALGO_GEA0) + return -EINVAL; + + /* Compute the 'Input' Paraemeter */ + uint32_t fcs_calc, iv = gprs_cipher_gen_input_ui(lle->llme->iov_ui, sapi, + nu, oc); + /* Compute gamma that we need to XOR with the data */ + int r = gprs_cipher_run(cipher_out, crypt_len, lle->llme->algo, + lle->llme->kc, iv, + fcs ? GPRS_CIPH_SGSN2MS : GPRS_CIPH_MS2SGSN); + if (r < 0) { + LOGLLC(LOGL_ERROR, "Error producing %s gamma for UI " + "frame: %d\n", get_value_string(gprs_cipher_names, + lle->llme->algo), r); + return -ENOMSG; + } + + if (fcs) { + /* Mark frame as encrypted and update FCS */ + data[2] |= 0x02; + fcs_calc = gprs_llc_fcs(data, fcs - data); + fcs[0] = fcs_calc & 0xff; + fcs[1] = (fcs_calc >> 8) & 0xff; + fcs[2] = (fcs_calc >> 16) & 0xff; + data += 3; + } + + /* XOR the cipher output with the data */ + for (r = 0; r < crypt_len; r++) + *(data + r) ^= cipher_out[r]; + + return 0; +} + + +static int gprs_llc_prim_handle_bssgp_ul_unitdata_ind(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + struct gprs_llc_hdr *lh = (struct gprs_llc_hdr *) llc_prim->bssgp.ll_pdu; + struct gprs_llc_pdu_decoded pdu_dec = {0}; + const char *llc_pdu_name = NULL; + struct gprs_llc_lle *lle = NULL; + bool drop_cipherable = false; + struct osmo_gprs_llc_prim *llc_prim_tx; + + rc = gprs_llc_pdu_decode(&pdu_dec, (uint8_t *)lh, llc_prim->bssgp.ll_pdu_len); + if (rc < 0) { + LOGLLC(LOGL_ERROR, "%s: Error parsing LLC header\n", osmo_gprs_llc_prim_name(llc_prim)); + return rc; + } + llc_pdu_name = gprs_llc_pdu_hdr_dump(&pdu_dec); + + LOGLLC(LOGL_DEBUG, "Rx %s: %s\n", osmo_gprs_llc_prim_name(llc_prim), llc_pdu_name); + + switch (gprs_tlli_type(llc_prim->bssgp.tlli)) { + case TLLI_LOCAL: + case TLLI_FOREIGN: + case TLLI_RANDOM: + case TLLI_AUXILIARY: + break; + default: + LOGLLC(LOGL_ERROR, "%s: Discarding frame with strange TLLI type\n", llc_pdu_name); + return -EINVAL; + } + + lle = gprs_llc_lle_for_rx_by_tlli_sapi(llc_prim->bssgp.tlli, pdu_dec.sapi, pdu_dec.func); + if (!lle) { + switch (pdu_dec.sapi) { + case OSMO_GPRS_LLC_SAPI_SNDCP3: + case OSMO_GPRS_LLC_SAPI_SNDCP5: + case OSMO_GPRS_LLC_SAPI_SNDCP9: + case OSMO_GPRS_LLC_SAPI_SNDCP11: +#if 0 +/* TODO: probaby send some primitive to the upper layers (GMM) */ + /* Ask an upper layer for help. */ + return gsm0408_gprs_force_reattach_oldmsg(msg, NULL); +#endif + default: + break; + } + return 0; + } + /* reset age computation */ + lle->llme->age_timestamp = GPRS_LLME_RESET_AGE; + + /* decrypt information field + FCS, if needed! */ + if (pdu_dec.flags & OSMO_GPRS_LLC_PDU_F_ENC_MODE) { + if (lle->llme->algo != GPRS_ALGO_GEA0) { + rc = apply_gea(lle, pdu_dec.data_len + 3, pdu_dec.seq_tx, + lle->oc_ui_recv, lle->sapi, NULL, + (uint8_t *)pdu_dec.data); /*TODO: either copy buffer or remove "const" from pdu_dec field "data" */ + if (rc < 0) + return rc; + pdu_dec.fcs = *(pdu_dec.data + pdu_dec.data_len); + pdu_dec.fcs |= *(pdu_dec.data + pdu_dec.data_len + 1) << 8; + pdu_dec.fcs |= *(pdu_dec.data + pdu_dec.data_len + 2) << 16; + } else { + LOGLLME(lle->llme, LOGL_NOTICE, "encrypted frame for LLC that " + "has no KC/Algo! Dropping.\n"); + return 0; + } + } else { + if (lle->llme->algo != GPRS_ALGO_GEA0 && + lle->llme->cksn != GSM_KEY_SEQ_INVAL) + drop_cipherable = true; + } + + /* We have to do the FCS check _after_ decryption */ + uint16_t crc_length = llc_prim->bssgp.ll_pdu_len - CRC24_LENGTH; + if (~pdu_dec.flags & OSMO_GPRS_LLC_PDU_F_PROT_MODE) + crc_length = OSMO_MIN(crc_length, UI_HDR_LEN + N202); + if (pdu_dec.fcs != gprs_llc_fcs((uint8_t *)lh, crc_length)) { + LOGLLE(lle, LOGL_INFO, "Dropping frame with invalid FCS\n"); + return -EIO; + } + + /* Receive and Process the actual LLC frame */ + rc = gprs_llc_lle_hdr_rx(lle, &pdu_dec); + if (rc < 0) + return rc; + + /* pdu_dec.data is only set when we need to send LL_[UNIT]DATA_IND up */ + if (pdu_dec.func == OSMO_GPRS_LLC_FUNC_UI && pdu_dec.data && pdu_dec.data_len) { + switch (pdu_dec.sapi) { + case OSMO_GPRS_LLC_SAPI_GMM: + /* send LL-UNITDATA-IND to GMM */ + llc_prim_tx = gprs_llc_prim_alloc_ll_unitdata_ind(lle->llme->tlli, + pdu_dec.sapi, + pdu_dec.data, + pdu_dec.data_len); + llc_prim_tx->ll.unitdata_ind.apply_gea = !drop_cipherable; /* TODO: is this correct? */ + llc_prim_tx->ll.unitdata_ind.apply_gia = false; /* TODO: how to set this? */ + gprs_llc_prim_call_up_cb(llc_prim_tx); + 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: + /* send LL_DATA_IND/LL_UNITDATA_IND to SNDCP */ + llc_prim_tx = gprs_llc_prim_alloc_ll_unitdata_ind(lle->llme->tlli, + pdu_dec.sapi, + pdu_dec.data, + pdu_dec.data_len); + llc_prim_tx->ll.unitdata_ind.apply_gea = !drop_cipherable; /* TODO: is this correct? */ + llc_prim_tx->ll.unitdata_ind.apply_gia = false; /* TODO: how to set this? */ + gprs_llc_prim_call_up_cb(llc_prim_tx); + break; + case OSMO_GPRS_LLC_SAPI_SMS: + /* FIXME */ + case OSMO_GPRS_LLC_SAPI_TOM2: + case OSMO_GPRS_LLC_SAPI_TOM8: + /* FIXME: send LL_DATA_IND/LL_UNITDATA_IND to TOM */ + default: + LOGLLC(LOGL_NOTICE, "Unsupported SAPI %u\n", pdu_dec.sapi); + rc = -EINVAL; + break; + } + } + + return rc; +} + +int gprs_llc_prim_lower_up_bssgp(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_BSSGP_UL_UNITDATA, PRIM_OP_INDICATION): + rc = gprs_llc_prim_handle_bssgp_ul_unitdata_ind(llc_prim); + break; + default: + rc = -ENOTSUP; + } + return rc; +} diff --git a/src/llc/llc_grr.c b/src/llc/llc_grr.c new file mode 100644 index 0000000..8486a53 --- /dev/null +++ b/src/llc/llc_grr.c @@ -0,0 +1,69 @@ +/* GPRS LLC LLGM SAP as per 3GPP TS 44.064 7.2.3 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/gsm/gsm_utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + +const struct value_string osmo_gprs_llc_grr_prim_type_names[] = { + { OSMO_GPRS_LLC_GRR_DATA, "DATA" }, + { OSMO_GPRS_LLC_GRR_UNITDATA, "UNITDATA" }, + { 0, NULL } +}; + +static int llc_prim_handle_grr_data_ind(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc = gprs_llc_prim_handle_unsupported(llc_prim); + return rc; +} + +static int llc_prim_handle_grr_unitdata_ind(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc = gprs_llc_prim_handle_unsupported(llc_prim); + return rc; +} + + +int gprs_llc_prim_lower_up_grr(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_GRR_DATA, PRIM_OP_INDICATION): + rc = llc_prim_handle_grr_data_ind(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_GRR_UNITDATA, PRIM_OP_INDICATION): + rc = llc_prim_handle_grr_unitdata_ind(llc_prim); + break; + default: + rc = -ENOTSUP; + } + return rc; +} diff --git a/src/llc/llc_ll.c b/src/llc/llc_ll.c new file mode 100644 index 0000000..51038af --- /dev/null +++ b/src/llc/llc_ll.c @@ -0,0 +1,266 @@ +/* GPRS LLC LL SAP as per 3GPP TS 44.064 7.2.2 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/gsm/gsm_utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + +const struct value_string osmo_gprs_llc_ll_prim_type_names[] = { + { OSMO_GPRS_LLC_LL_RESET, "RESET" }, + { OSMO_GPRS_LLC_LL_ESTABLISH, "ESTABLISH" }, + { OSMO_GPRS_LLC_LL_RELEASE, "RELEASE" }, + { OSMO_GPRS_LLC_LL_XID, "XID" }, + { OSMO_GPRS_LLC_LL_DATA, "DATA" }, + { OSMO_GPRS_LLC_LL_UNITDATA, "UNITDATA" }, + { OSMO_GPRS_LLC_LL_STATUS, "STATUS" }, + { 0, NULL } +}; + +/******************************** + * Primitive allocation: + ********************************/ + +static inline struct osmo_gprs_llc_prim *llc_prim_ll_alloc(enum osmo_gprs_llc_ll_prim_type type, + enum osmo_prim_operation operation, + unsigned int l3_len) +{ + return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LL, type, operation, l3_len); +} + +/* 7.2.2.4 LL-XID.req (MS/SGSN) */ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_xid_req(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_par, unsigned int l3_par_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_XID, PRIM_OP_REQUEST, l3_par_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_par; + llc_prim->ll.l3_pdu_len = l3_par_len; + return llc_prim; +} + +/* 7.2.2.4 LL-XID.ind (MS/SGSN) */ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_xid_ind(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_par, unsigned int l3_par_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_XID, PRIM_OP_INDICATION, l3_par_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_par; + llc_prim->ll.l3_pdu_len = l3_par_len; + return llc_prim; +} + +/* 7.2.2.4 LL-XID.resp (MS/SGSN) */ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_xid_resp(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_par, unsigned int l3_par_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_XID, PRIM_OP_RESPONSE, l3_par_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_par; + llc_prim->ll.l3_pdu_len = l3_par_len; + return llc_prim; +} + +/* 7.2.2.4 LL-XID.cnf (MS/SGSN) */ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_xid_cnf(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_par, unsigned int l3_par_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_XID, PRIM_OP_CONFIRM, l3_par_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_par; + llc_prim->ll.l3_pdu_len = l3_par_len; + return llc_prim; +} + +/* 7.2.2.6 LL-UNITDATA.req (MS/SGSN):*/ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_unitdata_req( + uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_pdu, size_t l3_pdu_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_REQUEST, l3_pdu_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_pdu; + llc_prim->ll.l3_pdu_len = l3_pdu_len; + return llc_prim; +} + +/* 7.2.2.6 LL-UNITDATA.ind (MS/SGSN):*/ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_unitdata_ind( + uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_pdu, size_t l3_pdu_len) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_INDICATION, l3_pdu_len); + llc_prim->ll.tlli = tlli; + llc_prim->ll.sapi = ll_sapi; + llc_prim->ll.l3_pdu = l3_pdu; + llc_prim->ll.l3_pdu_len = l3_pdu_len; + return llc_prim; +} + +/******************************** + * Handling to upper layers: + ********************************/ +/* Submit LL-XID.ind to upper layers (Figure 17) */ +int gprs_llc_lle_submit_prim_ll_xid_ind(struct gprs_llc_lle *lle, + const struct gprs_llc_xid_field *xid_field_request_l3) +{ + struct osmo_gprs_llc_prim *llc_prim_tx; + OSMO_ASSERT(xid_field_request_l3); + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); + OSMO_ASSERT(llc_prim_tx); + llc_prim_tx->ll.l3_pdu_len = xid_field_request_l3->var.val_len; + llc_prim_tx->ll.l3_pdu = msgb_put(llc_prim_tx->oph.msg, llc_prim_tx->ll.l3_pdu_len); + if (llc_prim_tx->ll.l3_pdu_len > 0) + memcpy(llc_prim_tx->ll.l3_pdu, xid_field_request_l3->var.val, + llc_prim_tx->ll.l3_pdu_len); + return gprs_llc_prim_call_up_cb(llc_prim_tx); +} + +/* Submit LL-XID.cnf to upper layers */ +int gprs_llc_lle_submit_prim_ll_xid_cnf(struct gprs_llc_lle *lle, + const struct gprs_llc_xid_field *xid_field_response_l3, + const struct gprs_llc_xid_field *xid_field_request_l3) +{ + struct osmo_gprs_llc_prim *llc_prim_tx; + OSMO_ASSERT(xid_field_response_l3); + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_cnf(lle->llme->tlli, lle->sapi, NULL, xid_field_response_l3->var.val_len); + OSMO_ASSERT(llc_prim_tx); + llc_prim_tx->ll.l3_pdu_len = xid_field_response_l3->var.val_len; + llc_prim_tx->ll.l3_pdu = msgb_put(llc_prim_tx->oph.msg, llc_prim_tx->ll.l3_pdu_len); + if (llc_prim_tx->ll.l3_pdu_len > 0) + memcpy(llc_prim_tx->ll.l3_pdu, xid_field_response_l3->var.val, + llc_prim_tx->ll.l3_pdu_len); + + + /* TODO: do something with following. Is it actually needed? */ + (void)xid_field_request_l3; + + return gprs_llc_prim_call_up_cb(llc_prim_tx); +} +/******************************** + * Handling from upper layers: + ********************************/ + + /* 7.2.2.4 LL-XID.req (MS/SGSN):*/ +static int llc_prim_handle_ll_xid_req(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc = 0; + struct gprs_llc_lle *lle; + + lle = gprs_llc_find_lle_by_tlli_sapi(llc_prim->ll.tlli, llc_prim->ll.sapi); + if (!lle) { + LOGLLC(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x SAPI 0x%02x\n", + osmo_gprs_llc_prim_name(llc_prim), llc_prim->ll.tlli, + llc_prim->ll.sapi); + rc = -ENOKEY; + goto ret_free; + } + + rc = gprs_llc_lle_tx_xid_req(lle, llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); + +ret_free: + msgb_free(llc_prim->oph.msg); + return rc; +} + + /* 7.2.2.4 LL-XID.resp (MS/SGSN):*/ +static int llc_prim_handle_ll_xid_resp(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc = 0; + struct gprs_llc_lle *lle; + + lle = gprs_llc_find_lle_by_tlli_sapi(llc_prim->ll.tlli, llc_prim->ll.sapi); + if (!lle) { + LOGLLC(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x SAPI 0x%02x\n", + osmo_gprs_llc_prim_name(llc_prim), llc_prim->ll.tlli, + llc_prim->ll.sapi); + rc = -ENOKEY; + goto ret_free; + } + + rc = gprs_llc_lle_tx_xid_resp(lle, llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); + +ret_free: + msgb_free(llc_prim->oph.msg); + return rc; +} + + /* 7.2.2.6 LL-UNITDATA.req (MS/SGSN):*/ +static int llc_prim_handle_ll_unitdata_req(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc = 0; + struct gprs_llc_lle *lle; + + lle = gprs_llc_find_lle_by_tlli_sapi(llc_prim->ll.tlli, llc_prim->ll.sapi); + if (!lle) { + struct gprs_llc_llme *llme; + LOGLLC(LOGL_NOTICE, "Rx %s: unknown TLLI 0x%08x, creating LLME on the fly\n", + osmo_gprs_llc_prim_name(llc_prim), llc_prim->ll.tlli); + llme = gprs_llc_llme_alloc(llc_prim->ll.tlli); + lle = gprs_llc_llme_get_lle(llme, llc_prim->ll.sapi); + } + + rc = gprs_llc_lle_tx_ui(lle, llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len, + llc_prim->ll.unitdata_req.apply_gea); + + msgb_free(llc_prim->oph.msg); + return rc; +} + +/* LLC higher layers push LLC primitive down to LLC layer: */ +int gprs_llc_prim_ll_upper_down(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LL_XID, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = llc_prim_handle_ll_xid_req(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LL_XID, PRIM_OP_RESPONSE): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = llc_prim_handle_ll_xid_resp(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = llc_prim_handle_ll_unitdata_req(llc_prim); + break; + /* TODO: others */ + default: + rc = gprs_llc_prim_handle_unsupported(llc_prim); + } + return rc; +} diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c new file mode 100644 index 0000000..b099a6a --- /dev/null +++ b/src/llc/llc_llgmm.c @@ -0,0 +1,288 @@ +/* GPRS LLC LLGM SAP as per 3GPP TS 44.064 7.2.1 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/gsm/gsm_utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + +const struct value_string osmo_gprs_llc_llgmm_prim_type_names[] = { + { OSMO_GPRS_LLC_LLGMM_ASSIGN, "ASSIGN" }, + { OSMO_GPRS_LLC_LLGMM_RESET, "RESET" }, + { OSMO_GPRS_LLC_LLGMM_TRIGGER, "TRIGGER" }, + { OSMO_GPRS_LLC_LLGMM_SUSPEND, "SUSPEND" }, + { OSMO_GPRS_LLC_LLGMM_RESUME, "RESUME" }, + { OSMO_GPRS_LLC_LLGMM_PAGE, "PAGE" }, + { OSMO_GPRS_LLC_LLGMM_IOV, "IOV" }, + { OSMO_GPRS_LLC_LLGMM_STATUS, "STATUS" }, + { OSMO_GPRS_LLC_LLGMM_PSHO, "PSHO" }, + { OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, "ASSIGN-USERPLANE" }, + { 0, NULL } +}; + +/* Generate XID message that will cause the GMM to reset */ +static int gprs_llc_lle_generate_xid_for_gmm_reset(struct gprs_llc_lle *lle, + uint8_t *bytes, + int bytes_len, uint32_t iov_ui) +{ + + struct gprs_llc_xid_field *fields; + const unsigned int fields_len = 2; + + fields = (struct gprs_llc_xid_field *)talloc_zero_size(lle->llme, sizeof(*fields) * fields_len); + OSMO_ASSERT(fields); + + /* First XID component must be RESET */ + fields[0].type = OSMO_GPRS_LLC_XID_T_RESET; + + fields[1].type = OSMO_GPRS_LLC_XID_T_IOV_UI; + fields[1].val = iov_ui; + + talloc_free(lle->xid); + lle->xid = fields; + lle->xid_len = fields_len; + + return gprs_llc_xid_encode(bytes, bytes_len, fields, fields_len); +} + +/******************************** + * Primitive allocation: + ********************************/ + +static inline struct osmo_gprs_llc_prim *llc_prim_llgmm_alloc(enum osmo_gprs_llc_llgmm_prim_type type, + enum osmo_prim_operation operation, + unsigned int l3_len) +{ + return gprs_llc_prim_alloc(OSMO_GPRS_LLC_SAP_LLGM, type, operation, l3_len); +} + +/* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST, 0); + llc_prim->llgmm.tlli = tlli; + return llc_prim; +} + +/* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST, 0); + llc_prim->llgmm.tlli = tlli; + return llc_prim; +} + +/* 7.2.1.2 LLGMM-RESET.cnf (SGSN):*/ +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_cnf(uint32_t tlli) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_CONFIRM, 0); + llc_prim->llgmm.tlli = tlli; + return llc_prim; +} + +/******************************** + * Handling from upper layers: + ********************************/ + +/* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ +static int llc_prim_handle_llgm_assign_req(struct osmo_gprs_llc_prim *llc_prim) +{ + uint32_t old_tlli = llc_prim->llgmm.tlli; + uint32_t new_tlli = llc_prim->llgmm.assign_req.tlli_new; + int rc = 0; + bool free = false; + struct gprs_llc_llme *llme; + unsigned int i; + + if (old_tlli == TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { + LOGLLC(LOGL_NOTICE, "Rx %s: Wrong input: Both old and new TLLI are unassigned!\n", + osmo_gprs_llc_prim_name(llc_prim)); + rc = -EINVAL; + goto ret_free; + } + + llme = gprs_llc_find_llme_by_tlli(old_tlli != TLLI_UNASSIGNED ? old_tlli : new_tlli); + if (!llme) { + LOGLLC(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x\n", + osmo_gprs_llc_prim_name(llc_prim), old_tlli); + rc = -ENOKEY; + goto ret_free; + } + + LOGLLME(llme, LOGL_NOTICE, "LLGM Assign pre (%08x => %08x)\n", old_tlli, new_tlli); + + if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { + /* TLLI Assignment 8.3.1 */ + /* New TLLI shall be assigned and used when (re)transmitting LLC frames */ + /* If old TLLI != TLLI_UNASSIGNED was assigned to LLME, then TLLI + * old is unassigned. Only TLLI new shall be accepted when + * received from peer. */ + if (llme->old_tlli != TLLI_UNASSIGNED) { + llme->old_tlli = TLLI_UNASSIGNED; + llme->tlli = new_tlli; + } else { + /* If TLLI old == TLLI_UNASSIGNED was assigned to LLME, then this is + * TLLI assignmemt according to 8.3.1 */ + llme->old_tlli = TLLI_UNASSIGNED; + llme->tlli = new_tlli; + llme->state = OSMO_GPRS_LLC_LLMS_ASSIGNED; + /* 8.5.3.1 For all LLE's */ + for (i = 0; i < ARRAY_SIZE(llme->lle); i++) { + struct gprs_llc_lle *l = &llme->lle[i]; + l->vu_send = l->vu_recv = 0; + l->retrans_ctr = 0; + l->state = OSMO_GPRS_LLC_LLES_ASSIGNED_ADM; + /* FIXME Set parameters according to table 9 */ + } + } + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { + /* TLLI Change 8.3.2 */ + /* Both TLLI Old and TLLI New are assigned; use New when + * (re)transmitting. Accept both Old and New on Rx */ + llme->old_tlli = old_tlli; + llme->tlli = new_tlli; + llme->state = OSMO_GPRS_LLC_LLMS_ASSIGNED; + } else if (old_tlli != TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { + /* TLLI Unassignment 8.3.3) */ + llme->tlli = llme->old_tlli = 0; + llme->state = OSMO_GPRS_LLC_LLMS_ASSIGNED; + for (i = 0; i < ARRAY_SIZE(llme->lle); i++) { + struct gprs_llc_lle *l = &llme->lle[i]; + l->state = OSMO_GPRS_LLC_LLES_UNASSIGNED; + } + free = true; + } + + LOGLLME(llme, LOGL_NOTICE, "LLGM Assign post (%08x => %08x)\n", old_tlli, new_tlli); + + if (free) + gprs_llc_llme_free(llme); +ret_free: + msgb_free(llc_prim->oph.msg); + return rc; +} + +/* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ +static int llc_prim_handle_llgm_reset_req(struct osmo_gprs_llc_prim *llc_prim) +{ + struct gprs_llc_lle *lle; + uint8_t xid_bytes[1024]; + int xid_bytes_len; + int rc = 0; + struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); + + if (!llme) { + LOGLLC(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x\n", + osmo_gprs_llc_prim_name(llc_prim), llc_prim->llgmm.tlli); + rc = -ENOKEY; + goto ret_free; + } + LOGLLME(llme, LOGL_INFO, "%s\n", osmo_gprs_llc_prim_name(llc_prim)); + + lle = gprs_llc_llme_get_lle(llme, OSMO_GPRS_LLC_SAPI_GMM); + + rc = osmo_get_rand_id((uint8_t *) &llme->iov_ui, 4); + if (rc < 0) { + LOGLLME(llme, LOGL_ERROR, "osmo_get_rand_id() failed for LLC XID reset: %s\n", + strerror(-rc)); + goto ret_free; + } + + /* Generate XID message */ + xid_bytes_len = gprs_llc_lle_generate_xid_for_gmm_reset(lle, xid_bytes, sizeof(xid_bytes), + llme->iov_ui); + if (xid_bytes_len < 0) { + rc = -EINVAL; + goto ret_free; + } + + /* Reset some of the LLC parameters. See GSM 04.64, 8.5.3.1 */ + lle->vu_recv = 0; + lle->vu_send = 0; + lle->oc_ui_send = 0; + lle->oc_ui_recv = 0; + + rc = gprs_llc_lle_tx_xid(lle, xid_bytes, xid_bytes_len, true); + +ret_free: + msgb_free(llc_prim->oph.msg); + return rc; +} + +/* LLC higher layers push LLC primitive down to LLC layer: */ +int gprs_llc_prim_llgmm_upper_down(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = llc_prim_handle_llgm_assign_req(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = llc_prim_handle_llgm_reset_req(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESUME, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_IOV, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_PSHO, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_ASSIGN_UP, PRIM_OP_REQUEST): + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || + g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_handle_unsupported(llc_prim); + break; + default: + rc = -ENOTSUP; + msgb_free(llc_prim->oph.msg); + } + return rc; +} diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index c031098..7246665 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -28,12 +28,7 @@ #include <osmocom/core/logging.h> #include <osmocom/gprs/llc/llc.h> - -#define UI_HDR_LEN 3 -#define N202 4 -#define CRC24_LENGTH 3 - -extern int g_log_cat; +#include <osmocom/gprs/llc/llc_private.h> const struct value_string osmo_gprs_llc_sapi_names[] = { { OSMO_GPRS_LLC_SAPI_GMM, "GMM" }, @@ -47,7 +42,7 @@ { 0, NULL } }; -const struct value_string osmo_gprs_llc_frame_fmt_names[] = { +const struct value_string gprs_llc_frame_fmt_names[] = { { OSMO_GPRS_LLC_FMT_I, "I" }, { OSMO_GPRS_LLC_FMT_S, "U" }, { OSMO_GPRS_LLC_FMT_UI, "UI" }, @@ -55,7 +50,7 @@ { 0, NULL } }; -const struct value_string osmo_gprs_llc_frame_func_names[] = { +const struct value_string gprs_llc_frame_func_names[] = { /* 6.4.1 Unnumbered (U) frames */ { OSMO_GPRS_LLC_FUNC_SABM, "SABM" }, { OSMO_GPRS_LLC_FUNC_DISC, "DISC" }, @@ -77,7 +72,7 @@ uint32_t crc24_calc(uint32_t fcs, const uint8_t *data, size_t len); -uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len) +uint32_t gprs_llc_fcs(const uint8_t *data, size_t len) { uint32_t fcs_calc; @@ -88,15 +83,15 @@ return fcs_calc; } -void osmo_gprs_llc_pdu_hdr_dump_buf(char *buf, size_t buf_size, - const struct osmo_gprs_llc_pdu_decoded *pdu) +void gprs_llc_pdu_hdr_dump_buf(char *buf, size_t buf_size, + const struct gprs_llc_pdu_decoded *pdu) { struct osmo_strbuf sb = { .buf = buf, .len = buf_size }; OSMO_STRBUF_PRINTF(sb, "SAPI=%u (%s), %s func=%s C/R=%c", pdu->sapi, osmo_gprs_llc_sapi_name(pdu->sapi), - osmo_gprs_llc_frame_fmt_name(pdu->fmt), - osmo_gprs_llc_frame_func_name(pdu->func), + gprs_llc_frame_fmt_name(pdu->fmt), + gprs_llc_frame_func_name(pdu->func), pdu->flags & OSMO_GPRS_LLC_PDU_F_CMD_RSP ? '1' : '0'); switch (pdu->fmt) { @@ -128,10 +123,10 @@ OSMO_STRBUF_PRINTF(sb, " FCS=%06x", pdu->fcs); } -const char *osmo_gprs_llc_pdu_hdr_dump(const struct osmo_gprs_llc_pdu_decoded *pdu) +const char *gprs_llc_pdu_hdr_dump(const struct gprs_llc_pdu_decoded *pdu) { static __thread char buf[256]; - osmo_gprs_llc_pdu_hdr_dump_buf(&buf[0], sizeof(buf), pdu); + gprs_llc_pdu_hdr_dump_buf(&buf[0], sizeof(buf), pdu); return buf; } @@ -144,7 +139,7 @@ #define GPRS_LLC_U_FRMR_RESP 0x08 #define GPRS_LLC_U_XID 0x0b -int osmo_gprs_llc_pdu_encode(struct msgb *msg, const struct osmo_gprs_llc_pdu_decoded *pdu) +int gprs_llc_pdu_encode(struct msgb *msg, const struct gprs_llc_pdu_decoded *pdu) { uint8_t *addr = msgb_put(msg, 1); uint8_t *ctrl = NULL; @@ -275,7 +270,7 @@ crc_len = msg->tail - addr; if (~pdu->flags & OSMO_GPRS_LLC_PDU_F_PROT_MODE) crc_len = OSMO_MIN(crc_len, UI_HDR_LEN + N202); - fcs = osmo_gprs_llc_fcs(addr, crc_len); + fcs = gprs_llc_fcs(addr, crc_len); msgb_put_u8(msg, fcs & 0xff); msgb_put_u8(msg, (fcs >> 8) & 0xff); @@ -284,11 +279,11 @@ return 0; } -int osmo_gprs_llc_pdu_decode(struct osmo_gprs_llc_pdu_decoded *pdu, - const uint8_t *data, size_t data_len) +int gprs_llc_pdu_decode(struct gprs_llc_pdu_decoded *pdu, + uint8_t *data, size_t data_len) { - const uint8_t *addr = &data[0]; - const uint8_t *ctrl = &data[1]; + uint8_t *addr = &data[0]; + uint8_t *ctrl = &data[1]; #define check_len(len, text) \ do { \ diff --git a/src/llc/llc_prim.c b/src/llc/llc_prim.c index 030494a..e789819 100644 --- a/src/llc/llc_prim.c +++ b/src/llc/llc_prim.c @@ -19,10 +19,18 @@ * */ +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> #include <osmocom/gprs/llc/llc.h> #include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> + +#define LLC_MSGB_HEADROOM 0 const struct value_string osmo_gprs_llc_prim_sap_names[] = { { OSMO_GPRS_LLC_SAP_LLGM, "LLGM" }, @@ -31,3 +39,174 @@ { OSMO_GPRS_LLC_SAP_BSSGP, "BSSGP" }, { 0, NULL } }; + +const char *osmo_gprs_llc_prim_name(const struct osmo_gprs_llc_prim *llc_prim) +{ + static char name_buf[256]; + const char *sap = osmo_gprs_llc_prim_sap_name(llc_prim->oph.sap); + const char *op = get_value_string(osmo_prim_op_names, llc_prim->oph.operation); + const char *type; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGM: + type = osmo_gprs_llc_llgmm_prim_type_name(llc_prim->oph.primitive); + break; + case OSMO_GPRS_LLC_SAP_LL: + type = osmo_gprs_llc_ll_prim_type_name(llc_prim->oph.primitive); + break; + case OSMO_GPRS_LLC_SAP_GRR: + type = osmo_gprs_llc_grr_prim_type_name(llc_prim->oph.primitive); + break; + case OSMO_GPRS_LLC_SAP_BSSGP: + type = osmo_gprs_llc_bssgp_prim_type_name(llc_prim->oph.primitive); + break; + default: + type = "unsupported-llc-sap"; + } + + snprintf(name_buf, sizeof(name_buf), "%s-%s.%s", sap, type, op); + return name_buf; +} + +static int llc_up_cb_dummy(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + LOGLLC(LOGL_INFO, "llc_up_cb_dummy(%s)\n", osmo_gprs_llc_prim_name(llc_prim)); + return 0; +} + +static int llc_down_cb_dummy(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + LOGLLC(LOGL_INFO, "llc_down_cb_dummy(%s)\n", osmo_gprs_llc_prim_name(llc_prim)); + return 0; +} + +/* Set callback used by LLC layer to push primitives to higher layers in protocol stack */ +void osmo_gprs_llc_prim_set_up_cb(osmo_gprs_llc_prim_up_cb up_cb, void *up_user_data) +{ + g_ctx->llc_up_cb = up_cb; + g_ctx->llc_up_cb_user_data = up_user_data; +} + +/* Set callback used by LLC layer to push primitives to lower layers in protocol stack */ +void osmo_gprs_llc_prim_set_down_cb(osmo_gprs_llc_prim_down_cb down_cb, void *down_user_data) +{ + g_ctx->llc_down_cb = down_cb; + g_ctx->llc_down_cb_user_data = down_user_data; +} + +/******************************** + * Primitive allocation: + ********************************/ + +/* allocate a msgb containing a struct osmo_gprs_llc_prim + optional l3 data */ +static struct msgb *gprs_llc_prim_msgb_alloc(unsigned int l3_len) +{ + const int headroom = LLC_MSGB_HEADROOM; + const int size = headroom + sizeof(struct osmo_gprs_llc_prim) + l3_len; + struct msgb *msg = msgb_alloc_headroom(size, headroom, "llc_prim"); + + if (!msg) + return NULL; + + msg->l1h = msgb_put(msg, sizeof(struct osmo_gprs_llc_prim)); + + return msg; +} + +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc(enum osmo_gprs_llc_prim_sap sap, unsigned int type, + enum osmo_prim_operation operation, + unsigned int l3_len) +{ + struct msgb *msg = gprs_llc_prim_msgb_alloc(l3_len); + struct osmo_gprs_llc_prim *llc_prim = msgb_llc_prim(msg); + + osmo_prim_init(&llc_prim->oph, sap, type, operation, msg); + return llc_prim; +} + +int gprs_llc_prim_handle_unsupported(struct osmo_gprs_llc_prim *llc_prim) +{ + LOGLLC(LOGL_ERROR, "Unsupported llc_prim! %s\n", osmo_gprs_llc_prim_name(llc_prim)); + msgb_free(llc_prim->oph.msg); + return -ENOTSUP; +} + +/******************************** + * Handling from/to upper layers: + ********************************/ + +int gprs_llc_prim_call_up_cb(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + if (g_ctx->llc_up_cb) + rc = g_ctx->llc_up_cb(llc_prim, g_ctx->llc_up_cb_user_data); + else + rc = llc_up_cb_dummy(llc_prim, g_ctx->llc_up_cb_user_data); + msgb_free(llc_prim->oph.msg); + return rc; +} + +/* LLC higher layers push LLC primitive down to LLC layer: */ +int osmo_gprs_llc_prim_upper_down(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + OSMO_ASSERT(g_ctx); + + LOGLLC(LOGL_INFO, "Rx from upper layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGM: + rc = gprs_llc_prim_llgmm_upper_down(llc_prim); + break; + case OSMO_GPRS_LLC_SAP_LL: + rc = gprs_llc_prim_ll_upper_down(llc_prim); + break; + default: + rc = gprs_llc_prim_handle_unsupported(llc_prim); + } + return rc; +} + +/******************************** + * Handling from/to lower layers: + ********************************/ + +int gprs_llc_prim_call_down_cb(struct osmo_gprs_llc_prim *llc_prim) +{ + int rc; + if (g_ctx->llc_down_cb) + rc = g_ctx->llc_down_cb(llc_prim, g_ctx->llc_down_cb_user_data); + else + rc = llc_down_cb_dummy(llc_prim, g_ctx->llc_down_cb_user_data); + msgb_free(llc_prim->oph.msg); + return rc; +} + +/* LLC lower layers push LLC primitive up to LLC layer: */ +int osmo_gprs_llc_prim_lower_up(struct osmo_gprs_llc_prim *llc_prim) +{ + OSMO_ASSERT(g_ctx); + OSMO_ASSERT(llc_prim); + struct msgb *msg = llc_prim->oph.msg; + int rc; + + LOGLLC(LOGL_INFO, "Rx from lower layers: %s\n", osmo_gprs_llc_prim_name(llc_prim)); + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_GRR: + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_MS); + rc = gprs_llc_prim_lower_up_grr(llc_prim); + break; + case OSMO_GPRS_LLC_SAP_BSSGP: + OSMO_ASSERT(g_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); + rc = gprs_llc_prim_lower_up_bssgp(llc_prim); + break; + default: + rc = -EINVAL; + } + + /* Special return value '1' means: do not free */ + if (rc != 1) + msgb_free(msg); + return rc; +} diff --git a/src/llc/llc_xid.c b/src/llc/llc_xid.c index 1aab3a5..deeeaa7 100644 --- a/src/llc/llc_xid.c +++ b/src/llc/llc_xid.c @@ -28,8 +28,9 @@ #include <osmocom/core/logging.h> #include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_private.h> -const struct value_string osmo_gprs_llc_xid_type_names[] = { +const struct value_string gprs_llc_xid_type_names[] = { { OSMO_GPRS_LLC_XID_T_VERSION, "LLC-Version" }, { OSMO_GPRS_LLC_XID_T_IOV_UI, "IOV-UI" }, { OSMO_GPRS_LLC_XID_T_IOV_I, "IOV-I" }, @@ -75,7 +76,7 @@ [OSMO_GPRS_LLC_XID_T_MAC_IOV_UI] = { .len = 4, .min = 0, .max = UINT32_MAX }, }; -bool osmo_gprs_llc_xid_field_is_valid(const struct osmo_gprs_llc_xid_field *field) +bool gprs_llc_xid_field_is_valid(const struct gprs_llc_xid_field *field) { if (field->type >= ARRAY_SIZE(gprs_llc_xid_desc)) { LOGLLC(LOGL_ERROR, @@ -86,6 +87,14 @@ if (gprs_llc_xid_desc[field->type].var_len) return true; + if (field->var.val_len > 0) { + LOGLLC(LOGL_ERROR, + "XID field %s unexpected var.val_len %u > 0, check your code!\n", + gprs_llc_xid_type_name(field->type), + field->var.val_len); + return false; + } + /* For mU and mD, the value range (9 .. 24320) also includes 0 */ if (gprs_llc_xid_desc[field->type].allow_zero && field->val == 0) return true; @@ -93,7 +102,7 @@ if (field->val < gprs_llc_xid_desc[field->type].min) { LOGLLC(LOGL_ERROR, "XID field %s value=%u < min=%u\n", - osmo_gprs_llc_xid_type_name(field->type), + gprs_llc_xid_type_name(field->type), field->val, gprs_llc_xid_desc[field->type].min); return false; } @@ -101,7 +110,7 @@ if (field->val > gprs_llc_xid_desc[field->type].max) { LOGLLC(LOGL_ERROR, "XID field %s value=%u > max=%u\n", - osmo_gprs_llc_xid_type_name(field->type), + gprs_llc_xid_type_name(field->type), field->val, gprs_llc_xid_desc[field->type].max); return false; } @@ -109,19 +118,24 @@ return true; } -int osmo_gprs_llc_xid_encode(struct msgb *msg, - const struct osmo_gprs_llc_xid_field *fields, +int gprs_llc_xid_encode(uint8_t *data, size_t data_len, + const struct gprs_llc_xid_field *fields, unsigned int num_fields) { + uint8_t *wptr = data; + OSMO_ASSERT(data); + for (unsigned int i = 0; i < num_fields; i++) { - const struct osmo_gprs_llc_xid_field *field = &fields[i]; + const struct gprs_llc_xid_field *field = &fields[i]; uint8_t *hdr, len; - if (!osmo_gprs_llc_xid_field_is_valid(field)) + if (!gprs_llc_xid_field_is_valid(field)) return -EINVAL; /* XID field type */ - hdr = msgb_put(msg, 1); + if (wptr - data >= data_len) + return -EINVAL; + hdr = wptr++; hdr[0] = (field->type & 0x1f) << 2; /* XID field length */ @@ -135,7 +149,9 @@ if (len < 4) { hdr[0] |= len; } else { - msgb_put(msg, 1); + if (wptr - data >= data_len) + return -EINVAL; + wptr++; hdr[0] |= (1 << 7); /* XL=1 */ hdr[0] |= (len >> 6) & 0x03; hdr[1] = (len << 2) & 0xff; @@ -143,17 +159,25 @@ /* XID field value (variable length) */ if (gprs_llc_xid_desc[field->type].var_len) { - memcpy(msgb_put(msg, len), field->var.val, len); + if (wptr + len - data > data_len) + return -EINVAL; + memcpy(wptr, field->var.val, len); + wptr += len; } else { + if (wptr + len - data > data_len) + return -EINVAL; switch (len) { case 1: - msgb_put_u8(msg, field->val); + *wptr = field->val; + wptr++; break; case 2: - osmo_store16be(field->val, msgb_put(msg, 2)); + osmo_store16be(field->val, wptr); + wptr += 2; break; case 4: - osmo_store32be(field->val, msgb_put(msg, 4)); + osmo_store32be(field->val, wptr); + wptr += 4; break; default: /* Shall not happen */ @@ -162,14 +186,15 @@ } } - return 0; + return wptr - data; } -int osmo_gprs_llc_xid_decode(struct osmo_gprs_llc_xid_field *fields, - unsigned int max_fields, - const uint8_t *data, size_t data_len) +/* returns number of decoded XID fields, negative on error. */ +int gprs_llc_xid_decode(struct gprs_llc_xid_field *fields, + unsigned int max_fields, + uint8_t *data, size_t data_len) { - const uint8_t *ptr = &data[0]; + uint8_t *ptr = &data[0]; unsigned int num_fields = 0; #define check_len(len, text) \ @@ -181,7 +206,7 @@ } while (0) while (data_len > 0) { - struct osmo_gprs_llc_xid_field *field = &fields[num_fields++]; + struct gprs_llc_xid_field *field = &fields[num_fields++]; uint8_t len; if (num_fields > max_fields) { @@ -222,7 +247,7 @@ if (len != gprs_llc_xid_desc[field->type].len) { LOGLLC(LOGL_NOTICE, "XID field %s has unusual length=%u (expected %u)\n", - osmo_gprs_llc_xid_type_name(field->type), + gprs_llc_xid_type_name(field->type), len, gprs_llc_xid_desc[field->type].len); } @@ -242,11 +267,11 @@ default: LOGLLC(LOGL_ERROR, "Failed to parse XID: unsupported field (%s) length=%u\n", - osmo_gprs_llc_xid_type_name(field->type), len); + gprs_llc_xid_type_name(field->type), len); return -EINVAL; } - if (!osmo_gprs_llc_xid_field_is_valid(field)) + if (!gprs_llc_xid_field_is_valid(field)) return -EINVAL; } @@ -257,3 +282,26 @@ return num_fields; } + +/* Return Deep copy of a xid_field array allocated using talloc ctx. */ +struct gprs_llc_xid_field *gprs_llc_xid_deepcopy(void *ctx, + const struct gprs_llc_xid_field *src_xid, + size_t src_xid_len) +{ + size_t bytes_len = sizeof(*src_xid) * src_xid_len; + struct gprs_llc_xid_field *dst_xid; + unsigned int i; + + dst_xid = (struct gprs_llc_xid_field *) talloc_size(ctx, bytes_len); + memcpy(dst_xid, src_xid, bytes_len); + + for (i = 0; i < src_xid_len; i++) { + uint8_t *val; + if (dst_xid[i].var.val_len == 0 || dst_xid[i].var.val == NULL) + continue; + val = talloc_size(dst_xid, dst_xid[i].var.val_len); + memcpy(val, dst_xid[i].var.val, dst_xid[i].var.val_len); + dst_xid[i].var.val = val; + } + return dst_xid; +} diff --git a/tests/llc/Makefile.am b/tests/llc/Makefile.am index 2c9d578..aa7e3e7 100644 --- a/tests/llc/Makefile.am +++ b/tests/llc/Makefile.am @@ -10,16 +10,39 @@ $(NULL) check_PROGRAMS = \ + llc_prim_test \ pdu_codec_test \ + xid_codec_test \ $(NULL) EXTRA_DIST = \ + llc_prim_test.err \ + llc_prim_test.ok \ pdu_codec_test.ok \ pdu_codec_test.err \ + xid_codec_test.ok \ + xid_codec_test.err \ + $(NULL) + +llc_prim_test_SOURCES = llc_prim_test.c +llc_prim_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(top_builddir)/src/llc/libosmo-gprs-llc.la \ $(NULL) pdu_codec_test_SOURCES = pdu_codec_test.c +# libosmo-gprs-llc.a is used below to access non-exported private symbols used in the test: pdu_codec_test_LDADD = \ $(LIBOSMOCORE_LIBS) \ - $(top_builddir)/src/llc/libosmo-gprs-llc.la \ + $(LIBOSMOGSM_LIBS) \ + $(top_builddir)/src/llc/.libs/libosmo-gprs-llc.a \ + $(NULL) + +xid_codec_test_SOURCES = xid_codec_test.c +# libosmo-gprs-llc.a is used below to access non-exported private symbols used in the test: +xid_codec_test_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(top_builddir)/src/llc/.libs/libosmo-gprs-llc.a \ $(NULL) diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c new file mode 100644 index 0000000..4630a4d --- /dev/null +++ b/tests/llc/llc_prim_test.c @@ -0,0 +1,227 @@ +/* llc_prim tests + * + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Pau espin Pedrol <pespin(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 <stdint.h> +#include <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/gprs/llc/llc_prim.h> + +static void *tall_ctx = NULL; + +/* stub to get reproducible output, since llme->iov_ui is printed: */ +int osmo_get_rand_id(uint8_t *out, size_t len) +{ + memset(out, 0x2b, len); + return 0; +} + +int test_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); + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGM: + printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); + break; + case OSMO_GPRS_LLC_SAP_LL: + printf("%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)); + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return 0; +} + +int test_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); + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_GRR: + printf("%s(): Rx %s l3=[%s]\n", __func__, pdu_name, osmo_hexdump(llc_prim->grr.ll_pdu, llc_prim->grr.ll_pdu_len)); + break; + case OSMO_GPRS_LLC_SAP_BSSGP: + printf("%s(): Rx %s TLLI=0x%08x l3=[%s]\n", __func__, pdu_name, + llc_prim->bssgp.tlli, osmo_hexdump(llc_prim->bssgp.ll_pdu, llc_prim->bssgp.ll_pdu_len)); + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return 0; +} + +static void test_llc_prim_ms(void) +{ + //struct osmo_gprs_llc_prim *llc_prim; + //uint32_t tlli = 0x11223344; + int rc; + + printf("==== %s() [start] ====\n", __func__); + + rc = osmo_gprs_llc_init(OSMO_GPRS_LLC_LOCATION_MS); + OSMO_ASSERT(rc == 0); + + osmo_gprs_llc_prim_set_up_cb(test_llc_prim_up_cb, NULL); + osmo_gprs_llc_prim_set_down_cb(test_llc_prim_down_cb, NULL); + + //llc_prim = osmo_gprs_llc_prim_alloc_llgm_reset_req(tlli); + //OSMO_ASSERT(llc_prim); + //rc = osmo_gprs_llc_prim_upper_down(llc_prim); + //OSMO_ASSERT(rc == 0); + + printf("==== %s() [end] ====\n", __func__); +} + +/** +MS-SGSN LLC (Mobile Station - Serving GPRS Support Node Logical Link Control) SAPI: GPRS Mobility Management + Address field SAPI: LLGMM + 0... .... = Protocol Discriminator_bit: OK + .0.. .... = Command/Response bit: DownLink/UpLink = Response/Command + .... 0001 = SAPI: GPRS Mobility Management (1) + Unconfirmed Information format - UI: UI format: 0x6, Spare bits: 0x0, N(U): 0, E bit: non encrypted frame, PM bit: FCS covers only the frame header and first N202 octets of the information field + 110. .... .... .... = UI format: 0x6 + ...0 0... .... .... = Spare bits: 0x0 + .... .000 0000 00.. = N(U): 0 + .... .... .... ..0. = E bit: non encrypted frame + .... .... .... ...0 = PM bit: FCS covers only the frame header and first N202 octets of the information field + FCS: 0xf218e2 (correct) +GSM A-I/F DTAP - Attach Request + Protocol Discriminator: GPRS mobility management messages (8) + DTAP GPRS Mobility Management Message Type: Attach Request (0x01) + MS Network Capability + Attach Type + Ciphering Key Sequence Number + DRX Parameter + Mobile Identity - IMSI (262420000000017) + Routing Area Identification - Old routing area identification - RAI: 262-42-27780-68 + MS Radio Access Capability +*/ +static uint8_t pdu_llc_gmm_att_req[] = { + 0x01, 0xc0, 0x00, 0x08, 0x01, 0x01, 0xd5, 0x71, 0x00, 0x00, 0x08, 0x29, 0x26, + 0x24, 0x00, 0x00, 0x00, 0x00, 0x71, 0x62, 0xf2, 0x24, 0x6c, 0x84, 0x44, 0x04, + 0x11, 0xe5, 0x10, 0x00, 0xe2, 0x18, 0xf2 +}; + +/* +GSM A-I/F DTAP - Identity Request + Protocol Discriminator: GPRS mobility management messages (8) + DTAP GPRS Mobility Management Message Type: Identity Request (0x15) + Identity Type 2 + Force to Standby +*/ +static uint8_t pdu_gmm_id_req[] = { 0x08, 0x15, 0x02 }; + +static void test_llc_prim_sgsn(void) +{ + struct osmo_gprs_llc_prim *llc_prim; + const uint32_t tlli = 0xe1c5d364; + int rc; + struct gsm0808_cell_id cell_id = { + .id_discr = CELL_IDENT_LAC_AND_CI, + .id = { + .lac_and_ci = { + .lac = 0x0304, + .ci = 0x9876, + }, + }, + }; + + printf("==== %s() [start] ====\n", __func__); + + rc = osmo_gprs_llc_init(OSMO_GPRS_LLC_LOCATION_SGSN); + OSMO_ASSERT(rc == 0); + + osmo_gprs_llc_prim_set_up_cb(test_llc_prim_up_cb, NULL); + osmo_gprs_llc_prim_set_down_cb(test_llc_prim_down_cb, NULL); + + /* Rx LLC-GMM-Attach-Req at SGSN from MS: */ + llc_prim = osmo_gprs_llc_prim_alloc_bssgp_ul_unitdata_ind(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); + llc_prim->bssgp.ul_unitdata_ind.cell_id = cell_id; + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_lower_up(llc_prim); + OSMO_ASSERT(rc == 0); + + /* SGSN wants to submit GMM Id Req: */ + llc_prim = osmo_gprs_llc_prim_alloc_ll_unitdata_req(tlli, OSMO_GPRS_LLC_SAPI_GMM, (uint8_t *)pdu_gmm_id_req, sizeof(pdu_gmm_id_req)); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + llc_prim = osmo_gprs_llc_prim_alloc_llgm_assign_req(tlli); + OSMO_ASSERT(llc_prim); + llc_prim->llgmm.assign_req.tlli_new = tlli; + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + llc_prim = osmo_gprs_llc_prim_alloc_llgm_reset_req(tlli); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + char xid_l3_pars[] = "xid-l3-dummy-buffer"; + llc_prim = osmo_gprs_llc_prim_alloc_ll_xid_req(tlli, OSMO_GPRS_LLC_SAPI_SNDCP3, (uint8_t *)xid_l3_pars, sizeof(xid_l3_pars)); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + char sndcp_data[] = "some-sndcp-data"; + llc_prim = osmo_gprs_llc_prim_alloc_ll_unitdata_req(tlli, OSMO_GPRS_LLC_SAPI_SNDCP3, (uint8_t *)sndcp_data, sizeof(sndcp_data)); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + printf("==== %s() [end] ====\n", __func__); +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:"); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + test_llc_prim_ms(); + test_llc_prim_sgsn(); + + talloc_free(tall_ctx); +} diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err new file mode 100644 index 0000000..5bc0481 --- /dev/null +++ b/tests/llc/llc_prim_test.err @@ -0,0 +1,13 @@ +DLGLOBAL INFO Rx from lower layers: BSSGP-UL-UNITDATA.indication +DLGLOBAL DEBUG Rx BSSGP-UL-UNITDATA.indication: SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 +DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLC RX: unknown TLLI 0xe1c5d364, creating LLME on the fly +DLGLOBAL DEBUG LLE(ffffffff/e1c5d364,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 +DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request +DLGLOBAL INFO Rx from upper layers: LLGM-ASSIGN.request +DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364 => e1c5d364) +DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364 => e1c5d364) +DLGLOBAL INFO Rx from upper layers: LLGM-RESET.request +DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM-RESET.request +DLGLOBAL INFO Rx from upper layers: LL-XID.request +DLGLOBAL NOTICE LLE(e1c5d364/e1c5d364,SNDCP3){UNASSIGNED} Sending XID type L3-Params (30 bytes) request to MS... +DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request diff --git a/tests/llc/llc_prim_test.ok b/tests/llc/llc_prim_test.ok new file mode 100644 index 0000000..3193fed --- /dev/null +++ b/tests/llc/llc_prim_test.ok @@ -0,0 +1,9 @@ +==== test_llc_prim_ms() [start] ==== +==== test_llc_prim_ms() [end] ==== +==== test_llc_prim_sgsn() [start] ==== +test_llc_prim_up_cb(): Rx LL-UNITDATA.indication TLLI=0xe1c5d364 SAPI=GMM l3=[08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 11 e5 10 00 ] +test_llc_prim_down_cb(): Rx BSSGP-DL-UNITDATA.request TLLI=0xe1c5d364 l3=[41 c0 01 08 15 02 de 8e 9a ] +test_llc_prim_down_cb(): Rx BSSGP-DL-UNITDATA.request TLLI=0xe1c5d364 l3=[41 fb 30 84 10 2b 2b 2b 2b c7 82 c2 ] +test_llc_prim_down_cb(): Rx BSSGP-DL-UNITDATA.request TLLI=0xe1c5d364 l3=[43 fb 01 00 16 01 f4 1a 05 df ac 50 78 69 64 2d 6c 33 2d 64 75 6d 6d 79 2d 62 75 66 66 65 72 00 3c dd fe ] +test_llc_prim_down_cb(): Rx BSSGP-DL-UNITDATA.request TLLI=0xe1c5d364 l3=[43 c0 01 73 6f 6d 65 2d 73 6e 64 63 70 2d 64 61 74 61 00 8b cc cf ] +==== test_llc_prim_sgsn() [end] ==== diff --git a/tests/llc/pdu_codec_test.c b/tests/llc/pdu_codec_test.c index d1169a7..943d2e2 100644 --- a/tests/llc/pdu_codec_test.c +++ b/tests/llc/pdu_codec_test.c @@ -23,6 +23,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_private.h> static void *tall_ctx = NULL; @@ -45,7 +46,7 @@ OSMO_ASSERT(msg != NULL); for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { - struct osmo_gprs_llc_pdu_decoded hdr = { 0 }; + struct gprs_llc_pdu_decoded hdr = { 0 }; uint8_t pdu[256]; size_t pdu_len; int rc; @@ -56,9 +57,9 @@ pdu_len = strlen(testData[i]) / 2; OSMO_ASSERT(rc == pdu_len); - rc = osmo_gprs_llc_pdu_decode(&hdr, &pdu[0], pdu_len); - printf(" osmo_gprs_llc_pdu_decode() returns %d\n", rc); - printf(" osmo_gprs_llc_pdu_hdr_dump(): %s\n", osmo_gprs_llc_pdu_hdr_dump(&hdr)); + rc = gprs_llc_pdu_decode(&hdr, &pdu[0], pdu_len); + printf(" gprs_llc_pdu_decode() returns %d\n", rc); + printf(" gprs_llc_pdu_hdr_dump(): %s\n", gprs_llc_pdu_hdr_dump(&hdr)); if (hdr.data_len > 0) { printf(" hdr.data[] (len=%zu): %s\n", hdr.data_len, osmo_hexdump_nospc(hdr.data, hdr.data_len)); @@ -67,9 +68,9 @@ printf("%s(): encoding decoded testData[%u]\n", __func__, i); msgb_reset(msg); - rc = osmo_gprs_llc_pdu_encode(msg, &hdr); - printf(" osmo_gprs_llc_pdu_encode() returns %d\n", rc); - printf(" osmo_gprs_llc_pdu_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); + rc = gprs_llc_pdu_encode(msg, &hdr); + printf(" gprs_llc_pdu_encode() returns %d\n", rc); + printf(" gprs_llc_pdu_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); printf(" memcmp() returns %d\n", memcmp(&pdu, msg->data, pdu_len)); } @@ -77,109 +78,6 @@ printf("\n"); } -static void print_xid_fields(const struct osmo_gprs_llc_xid_field *fields, - unsigned int num_fields) -{ - for (unsigned int i = 0; i < num_fields; i++) { - const struct osmo_gprs_llc_xid_field *field = &fields[i]; - - printf(" field[%02d]: type=0x%02x (%s)", - i, field->type, osmo_gprs_llc_xid_type_name(field->type)); - if (field->type == OSMO_GPRS_LLC_XID_T_L3_PAR) { - printf(" data[] (len=%u): %s\n", field->var.val_len, - osmo_hexdump_nospc(field->var.val, field->var.val_len)); - } else { - printf(" val=%u\n", field->val); - } - } -} - -static void test_xid_dec_enc(void) -{ - static const char * const testData[] = { - /* TODO: more test vectors */ - "25401602082c", - "16020825402c", - "01001601f41a05df", - "01001605f01a05f0ac18112233445566", - "01001601f41a02081e00002200002908", - }; - - struct msgb *msg = msgb_alloc(1024, "LLC-XID"); - OSMO_ASSERT(msg != NULL); - - for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { - struct osmo_gprs_llc_xid_field fields[16] = { 0 }; - uint8_t xid[256]; - size_t xid_len; - int rc; - - printf("%s(): decoding testData[%u] = %s\n", __func__, i, testData[i]); - - rc = osmo_hexparse(testData[i], &xid[0], sizeof(xid)); - xid_len = strlen(testData[i]) / 2; - OSMO_ASSERT(rc == xid_len); - - rc = osmo_gprs_llc_xid_decode(fields, ARRAY_SIZE(fields), - &xid[0], xid_len); - printf(" osmo_gprs_llc_xid_decode() returns %d\n", rc); - - if (rc > 0) - print_xid_fields(&fields[0], rc); - else - continue; - - printf("%s(): encoding decoded testData[%u]\n", __func__, i); - - msgb_reset(msg); - rc = osmo_gprs_llc_xid_encode(msg, fields, rc); - printf(" osmo_gprs_llc_xid_encode() returns %d\n", rc); - printf(" osmo_gprs_llc_xid_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); - printf(" memcmp() returns %d\n", memcmp(&xid, msg->data, xid_len)); - } - - msgb_free(msg); - printf("\n"); -} - -static void test_xid_enc_dec(void) -{ - struct osmo_gprs_llc_xid_field dec_fields[16] = { 0 }; - int rc; - - const uint8_t l3_params[] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 }; - const struct osmo_gprs_llc_xid_field test_fields[] = { - { .type = OSMO_GPRS_LLC_XID_T_VERSION, .val = 0 }, - { .type = OSMO_GPRS_LLC_XID_T_T200, .val = 4095 }, - { .type = OSMO_GPRS_LLC_XID_T_N200, .val = 10 }, - { .type = OSMO_GPRS_LLC_XID_T_IOV_I, .val = 0x42424242 }, - { .type = OSMO_GPRS_LLC_XID_T_IOV_UI, .val = 0xdeadbeef }, - { .type = OSMO_GPRS_LLC_XID_T_L3_PAR, - .var = { .val_len = sizeof(l3_params), .val = &l3_params[0] } }, - { .type = OSMO_GPRS_LLC_XID_T_RESET }, - }; - - struct msgb *msg = msgb_alloc(1024, "LLC-XID"); - OSMO_ASSERT(msg != NULL); - - printf("%s(): encoding hand-crafted testData\n", __func__); - - rc = osmo_gprs_llc_xid_encode(msg, &test_fields[0], ARRAY_SIZE(test_fields)); - printf(" osmo_gprs_llc_xid_encode() returns %d\n", rc); - printf(" osmo_gprs_llc_xid_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); - - printf("%s(): decoding encoded hand-crafted testData\n", __func__); - - rc = osmo_gprs_llc_xid_decode(&dec_fields[0], ARRAY_SIZE(dec_fields), - msg->data, msg->len); - printf(" osmo_gprs_llc_xid_decode() returns %d\n", rc); - if (rc > 0) - print_xid_fields(&dec_fields[0], rc); - - msgb_free(msg); - printf("\n"); -} - static const struct log_info_cat test_log_categories[] = { }; static const struct log_info test_log_info = { .cat = test_log_categories, @@ -200,8 +98,6 @@ log_set_use_color(osmo_stderr_target, 0); test_pdu_dec_enc(); - test_xid_dec_enc(); - test_xid_enc_dec(); talloc_free(tall_ctx); } diff --git a/tests/llc/pdu_codec_test.ok b/tests/llc/pdu_codec_test.ok index 664768a..f18c343 100644 --- a/tests/llc/pdu_codec_test.ok +++ b/tests/llc/pdu_codec_test.ok @@ -1,103 +1,40 @@ test_pdu_dec_enc(): decoding testData[0] = 01c010080509afe633 - osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=4 FCS=33e6af + gprs_llc_pdu_decode() returns 0 + gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=4 FCS=33e6af hdr.data[] (len=3): 080509 test_pdu_dec_enc(): encoding decoded testData[0] - osmo_gprs_llc_pdu_encode() returns 0 - osmo_gprs_llc_pdu_encode(): 01c010080509afe633 + gprs_llc_pdu_encode() returns 0 + gprs_llc_pdu_encode(): 01c010080509afe633 memcmp() returns 0 test_pdu_dec_enc(): decoding testData[1] = 41c001081502de8e9a - osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=1 PM=1 E=0 IP=0 N(U)=0 FCS=9a8ede + gprs_llc_pdu_decode() returns 0 + gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), UI func=UI C/R=1 PM=1 E=0 IP=0 N(U)=0 FCS=9a8ede hdr.data[] (len=3): 081502 test_pdu_dec_enc(): encoding decoded testData[1] - osmo_gprs_llc_pdu_encode() returns 0 - osmo_gprs_llc_pdu_encode(): 41c001081502de8e9a + gprs_llc_pdu_encode() returns 0 + gprs_llc_pdu_encode(): 41c001081502de8e9a memcmp() returns 0 test_pdu_dec_enc(): decoding testData[2] = 01e01ca2b3 - osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), U func=NULL C/R=0 P/F=0 FCS=b3a21c + gprs_llc_pdu_decode() returns 0 + gprs_llc_pdu_hdr_dump(): SAPI=1 (GMM), U func=NULL C/R=0 P/F=0 FCS=b3a21c test_pdu_dec_enc(): encoding decoded testData[2] - osmo_gprs_llc_pdu_encode() returns 0 - osmo_gprs_llc_pdu_encode(): 01e01ca2b3 + gprs_llc_pdu_encode() returns 0 + gprs_llc_pdu_encode(): 01e01ca2b3 memcmp() returns 0 test_pdu_dec_enc(): decoding testData[3] = 43fb01001601f41a05df8c7c4e - osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=1 P/F=1 FCS=4e7c8c + gprs_llc_pdu_decode() returns 0 + gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=1 P/F=1 FCS=4e7c8c hdr.data[] (len=8): 01001601f41a05df test_pdu_dec_enc(): encoding decoded testData[3] - osmo_gprs_llc_pdu_encode() returns 0 - osmo_gprs_llc_pdu_encode(): 43fb01001601f41a05df8c7c4e + gprs_llc_pdu_encode() returns 0 + gprs_llc_pdu_encode(): 43fb01001601f41a05df8c7c4e memcmp() returns 0 test_pdu_dec_enc(): decoding testData[4] = 03fb1604d216f984 - osmo_gprs_llc_pdu_decode() returns 0 - osmo_gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=0 P/F=1 FCS=84f916 + gprs_llc_pdu_decode() returns 0 + gprs_llc_pdu_hdr_dump(): SAPI=3 (SNDCP3), U func=XID C/R=0 P/F=1 FCS=84f916 hdr.data[] (len=3): 1604d2 test_pdu_dec_enc(): encoding decoded testData[4] - osmo_gprs_llc_pdu_encode() returns 0 - osmo_gprs_llc_pdu_encode(): 03fb1604d216f984 + gprs_llc_pdu_encode() returns 0 + gprs_llc_pdu_encode(): 03fb1604d216f984 memcmp() returns 0 -test_xid_dec_enc(): decoding testData[0] = 25401602082c - osmo_gprs_llc_xid_decode() returns 3 - field[00]: type=0x09 (kD) val=64 - field[01]: type=0x05 (N201-U) val=520 - field[02]: type=0x0b (L3-Params) data[] (len=0): -test_xid_dec_enc(): encoding decoded testData[0] - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 25401602082c - memcmp() returns 0 -test_xid_dec_enc(): decoding testData[1] = 16020825402c - osmo_gprs_llc_xid_decode() returns 3 - field[00]: type=0x05 (N201-U) val=520 - field[01]: type=0x09 (kD) val=64 - field[02]: type=0x0b (L3-Params) data[] (len=0): -test_xid_dec_enc(): encoding decoded testData[1] - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 16020825402c - memcmp() returns 0 -test_xid_dec_enc(): decoding testData[2] = 01001601f41a05df - osmo_gprs_llc_xid_decode() returns 3 - field[00]: type=0x00 (LLC-Version) val=0 - field[01]: type=0x05 (N201-U) val=500 - field[02]: type=0x06 (N201-I) val=1503 -test_xid_dec_enc(): encoding decoded testData[2] - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 01001601f41a05df - memcmp() returns 0 -test_xid_dec_enc(): decoding testData[3] = 01001605f01a05f0ac18112233445566 - osmo_gprs_llc_xid_decode() returns 4 - field[00]: type=0x00 (LLC-Version) val=0 - field[01]: type=0x05 (N201-U) val=1520 - field[02]: type=0x06 (N201-I) val=1520 - field[03]: type=0x0b (L3-Params) data[] (len=6): 112233445566 -test_xid_dec_enc(): encoding decoded testData[3] - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 01001605f01a05f0ac18112233445566 - memcmp() returns 0 -test_xid_dec_enc(): decoding testData[4] = 01001601f41a02081e00002200002908 - osmo_gprs_llc_xid_decode() returns 6 - field[00]: type=0x00 (LLC-Version) val=0 - field[01]: type=0x05 (N201-U) val=500 - field[02]: type=0x06 (N201-I) val=520 - field[03]: type=0x07 (mD) val=0 - field[04]: type=0x08 (mU) val=0 - field[05]: type=0x0a (kU) val=8 -test_xid_dec_enc(): encoding decoded testData[4] - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 01001601f41a02081e00002200002908 - memcmp() returns 0 - -test_xid_enc_dec(): encoding hand-crafted testData - osmo_gprs_llc_xid_encode() returns 0 - osmo_gprs_llc_xid_encode(): 01000e0fff110a8810424242428410deadbeefac1811223344556630 -test_xid_enc_dec(): decoding encoded hand-crafted testData - osmo_gprs_llc_xid_decode() returns 7 - field[00]: type=0x00 (LLC-Version) val=0 - field[01]: type=0x03 (T200) val=4095 - field[02]: type=0x04 (N200) val=10 - field[03]: type=0x02 (IOV-I) val=1111638594 - field[04]: type=0x01 (IOV-UI) val=3735928559 - field[05]: type=0x0b (L3-Params) data[] (len=6): 112233445566 - field[06]: type=0x0c (Reset) val=0 - diff --git a/tests/llc/xid_codec_test.c b/tests/llc/xid_codec_test.c new file mode 100644 index 0000000..c2adb2b --- /dev/null +++ b/tests/llc/xid_codec_test.c @@ -0,0 +1,161 @@ +/* LLC XID codec tests + * + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(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 <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_private.h> + +static void *tall_ctx = NULL; + +static void print_xid_fields(const struct gprs_llc_xid_field *fields, + unsigned int num_fields) +{ + for (unsigned int i = 0; i < num_fields; i++) { + const struct gprs_llc_xid_field *field = &fields[i]; + + printf(" field[%02d]: type=0x%02x (%s)", + i, field->type, gprs_llc_xid_type_name(field->type)); + if (field->type == OSMO_GPRS_LLC_XID_T_L3_PAR) { + printf(" data[] (len=%u): %s\n", field->var.val_len, + osmo_hexdump_nospc(field->var.val, field->var.val_len)); + } else { + printf(" val=%u\n", field->val); + } + } +} + +static void test_xid_dec_enc(void) +{ + static const char * const testData[] = { + /* TODO: more test vectors */ + "25401602082c", + "16020825402c", + "01001601f41a05df", + "01001605f01a05f0ac18112233445566", + "01001601f41a02081e00002200002908", + }; + + struct msgb *msg = msgb_alloc(1024, "LLC-XID"); + OSMO_ASSERT(msg != NULL); + + for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { + struct gprs_llc_xid_field fields[16] = { 0 }; + uint8_t xid[256]; + size_t xid_len; + int rc; + + printf("%s(): decoding testData[%u] = %s\n", __func__, i, testData[i]); + + rc = osmo_hexparse(testData[i], &xid[0], sizeof(xid)); + xid_len = strlen(testData[i]) / 2; + OSMO_ASSERT(rc == xid_len); + + rc = gprs_llc_xid_decode(fields, ARRAY_SIZE(fields), + &xid[0], xid_len); + printf(" gprs_llc_xid_decode() returns %d\n", rc); + + if (rc > 0) + print_xid_fields(&fields[0], rc); + else + continue; + + printf("%s(): encoding decoded testData[%u]\n", __func__, i); + + msgb_reset(msg); + rc = gprs_llc_xid_encode(msgb_data(msg), msgb_tailroom(msg), fields, rc); + printf(" gprs_llc_xid_encode() returns %d\n", rc); + if (rc < 0) + continue; + msgb_put(msg, rc); + printf(" gprs_llc_xid_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); + printf(" memcmp() returns %d\n", memcmp(&xid, msg->data, xid_len)); + } + + msgb_free(msg); + printf("\n"); +} + +static void test_xid_enc_dec(void) +{ + struct gprs_llc_xid_field dec_fields[16] = { 0 }; + int rc; + + uint8_t l3_params[] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 }; + const struct gprs_llc_xid_field test_fields[] = { + { .type = OSMO_GPRS_LLC_XID_T_VERSION, .val = 0 }, + { .type = OSMO_GPRS_LLC_XID_T_T200, .val = 4095 }, + { .type = OSMO_GPRS_LLC_XID_T_N200, .val = 10 }, + { .type = OSMO_GPRS_LLC_XID_T_IOV_I, .val = 0x42424242 }, + { .type = OSMO_GPRS_LLC_XID_T_IOV_UI, .val = 0xdeadbeef }, + { .type = OSMO_GPRS_LLC_XID_T_L3_PAR, + .var = { .val_len = sizeof(l3_params), .val = &l3_params[0] } }, + { .type = OSMO_GPRS_LLC_XID_T_RESET }, + }; + + struct msgb *msg = msgb_alloc(1024, "LLC-XID"); + OSMO_ASSERT(msg != NULL); + + printf("%s(): encoding hand-crafted testData\n", __func__); + + rc = gprs_llc_xid_encode(msgb_data(msg), msgb_tailroom(msg), &test_fields[0], ARRAY_SIZE(test_fields)); + printf(" gprs_llc_xid_encode() returns %d\n", rc); + OSMO_ASSERT(rc > 0); + msgb_put(msg, rc); + printf(" gprs_llc_xid_encode(): %s\n", osmo_hexdump_nospc(msg->data, msg->len)); + + printf("%s(): decoding encoded hand-crafted testData\n", __func__); + + rc = gprs_llc_xid_decode(&dec_fields[0], ARRAY_SIZE(dec_fields), + msg->data, msg->len); + printf(" gprs_llc_xid_decode() returns %d\n", rc); + if (rc > 0) + print_xid_fields(&dec_fields[0], rc); + + msgb_free(msg); + printf("\n"); +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:"); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + test_xid_dec_enc(); + test_xid_enc_dec(); + + talloc_free(tall_ctx); +} diff --git a/tests/llc/xid_codec_test.err b/tests/llc/xid_codec_test.err new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/llc/xid_codec_test.err diff --git a/tests/llc/xid_codec_test.ok b/tests/llc/xid_codec_test.ok new file mode 100644 index 0000000..dcb9ee8 --- /dev/null +++ b/tests/llc/xid_codec_test.ok @@ -0,0 +1,63 @@ +test_xid_dec_enc(): decoding testData[0] = 25401602082c + gprs_llc_xid_decode() returns 3 + field[00]: type=0x09 (kD) val=64 + field[01]: type=0x05 (N201-U) val=520 + field[02]: type=0x0b (L3-Params) data[] (len=0): +test_xid_dec_enc(): encoding decoded testData[0] + gprs_llc_xid_encode() returns 6 + gprs_llc_xid_encode(): 25401602082c + memcmp() returns 0 +test_xid_dec_enc(): decoding testData[1] = 16020825402c + gprs_llc_xid_decode() returns 3 + field[00]: type=0x05 (N201-U) val=520 + field[01]: type=0x09 (kD) val=64 + field[02]: type=0x0b (L3-Params) data[] (len=0): +test_xid_dec_enc(): encoding decoded testData[1] + gprs_llc_xid_encode() returns 6 + gprs_llc_xid_encode(): 16020825402c + memcmp() returns 0 +test_xid_dec_enc(): decoding testData[2] = 01001601f41a05df + gprs_llc_xid_decode() returns 3 + field[00]: type=0x00 (LLC-Version) val=0 + field[01]: type=0x05 (N201-U) val=500 + field[02]: type=0x06 (N201-I) val=1503 +test_xid_dec_enc(): encoding decoded testData[2] + gprs_llc_xid_encode() returns 8 + gprs_llc_xid_encode(): 01001601f41a05df + memcmp() returns 0 +test_xid_dec_enc(): decoding testData[3] = 01001605f01a05f0ac18112233445566 + gprs_llc_xid_decode() returns 4 + field[00]: type=0x00 (LLC-Version) val=0 + field[01]: type=0x05 (N201-U) val=1520 + field[02]: type=0x06 (N201-I) val=1520 + field[03]: type=0x0b (L3-Params) data[] (len=6): 112233445566 +test_xid_dec_enc(): encoding decoded testData[3] + gprs_llc_xid_encode() returns 16 + gprs_llc_xid_encode(): 01001605f01a05f0ac18112233445566 + memcmp() returns 0 +test_xid_dec_enc(): decoding testData[4] = 01001601f41a02081e00002200002908 + gprs_llc_xid_decode() returns 6 + field[00]: type=0x00 (LLC-Version) val=0 + field[01]: type=0x05 (N201-U) val=500 + field[02]: type=0x06 (N201-I) val=520 + field[03]: type=0x07 (mD) val=0 + field[04]: type=0x08 (mU) val=0 + field[05]: type=0x0a (kU) val=8 +test_xid_dec_enc(): encoding decoded testData[4] + gprs_llc_xid_encode() returns 16 + gprs_llc_xid_encode(): 01001601f41a02081e00002200002908 + memcmp() returns 0 + +test_xid_enc_dec(): encoding hand-crafted testData + gprs_llc_xid_encode() returns 28 + gprs_llc_xid_encode(): 01000e0fff110a8810424242428410deadbeefac1811223344556630 +test_xid_enc_dec(): decoding encoded hand-crafted testData + gprs_llc_xid_decode() returns 7 + field[00]: type=0x00 (LLC-Version) val=0 + field[01]: type=0x03 (T200) val=4095 + field[02]: type=0x04 (N200) val=10 + field[03]: type=0x02 (IOV-I) val=1111638594 + field[04]: type=0x01 (IOV-UI) val=3735928559 + field[05]: type=0x0b (L3-Params) data[] (len=6): 112233445566 + field[06]: type=0x0c (Reset) val=0 + diff --git a/tests/testsuite.at b/tests/testsuite.at index de69bf4..70a5c72 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,6 +1,13 @@ AT_INIT AT_BANNER([Regression tests]) +AT_SETUP([llc/llc_prim]) +AT_KEYWORDS([llc llc_prim]) +cat $abs_srcdir/llc/llc_prim_test.ok > expout +cat $abs_srcdir/llc/llc_prim_test.err > experr +AT_CHECK([$abs_top_builddir/tests/llc/llc_prim_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([llc/pdu_codec]) AT_KEYWORDS([llc pdu codec]) cat $abs_srcdir/llc/pdu_codec_test.ok > expout @@ -8,6 +15,13 @@ AT_CHECK([$abs_top_builddir/tests/llc/pdu_codec_test], [0], [expout], [experr]) AT_CLEANUP +AT_SETUP([llc/xid_codec]) +AT_KEYWORDS([llc xid codec]) +cat $abs_srcdir/llc/xid_codec_test.ok > expout +cat $abs_srcdir/llc/xid_codec_test.err > experr +AT_CHECK([$abs_top_builddir/tests/llc/xid_codec_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([rlcmac/ts_44_018]) AT_KEYWORDS([rlcmac ts_44_018]) cat $abs_srcdir/rlcmac/ts_44_018_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I588eb576b2703262f4ab9566ec362920d8390cfd Gerrit-Change-Number: 30489 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: fix typo: OSMO_GPRS_LLC_SAPI_SNDCP{12->11}

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30731 ) Change subject: llc: fix typo: OSMO_GPRS_LLC_SAPI_SNDCP{12->11} ...................................................................... llc: fix typo: OSMO_GPRS_LLC_SAPI_SNDCP{12->11} Change-Id: Icee190d0e20044d3808a8b1beb237a987a795d8e Related: OS#5502 --- M include/osmocom/gprs/llc/llc.h M src/llc/llc_pdu.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index e27fb8a..ff12884 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -16,7 +16,7 @@ OSMO_GPRS_LLC_SAPI_SMS = 7, OSMO_GPRS_LLC_SAPI_TOM8 = 8, OSMO_GPRS_LLC_SAPI_SNDCP9 = 9, - OSMO_GPRS_LLC_SAPI_SNDCP12 = 11, + OSMO_GPRS_LLC_SAPI_SNDCP11 = 11, }; extern const struct value_string osmo_gprs_llc_sapi_names[]; diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 5430377..6f0a17f 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -43,7 +43,7 @@ { OSMO_GPRS_LLC_SAPI_SMS, "SMS" }, { OSMO_GPRS_LLC_SAPI_TOM8, "TOM8" }, { OSMO_GPRS_LLC_SAPI_SNDCP9, "SNDCP9" }, - { OSMO_GPRS_LLC_SAPI_SNDCP12, "SNDCP12" }, + { OSMO_GPRS_LLC_SAPI_SNDCP11, "SNDCP11" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icee190d0e20044d3808a8b1beb237a987a795d8e Gerrit-Change-Number: 30731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: libosmo-gprs-llc.pc.in: add 'Requires.private: talloc'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30732 ) Change subject: llc: libosmo-gprs-llc.pc.in: add 'Requires.private: talloc' ...................................................................... llc: libosmo-gprs-llc.pc.in: add 'Requires.private: talloc' This is needed for the follow-up patch [1]. Change-Id: Ie8ba61b124585e55accdaf2713b72e3ace78772f Related: [1] I588eb576b2703262f4ab9566ec362920d8390cfd Related: OS#5502 --- M libosmo-gprs-llc.pc.in 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/libosmo-gprs-llc.pc.in b/libosmo-gprs-llc.pc.in index 8a1ae95..25a6509 100644 --- a/libosmo-gprs-llc.pc.in +++ b/libosmo-gprs-llc.pc.in @@ -7,5 +7,6 @@ Description: C Utility Library Version: @VERSION@ Requires: libosmocore +Requires.private: talloc Libs: -L${libdir} -losmo-gprs-llc Cflags: -I${includedir}/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie8ba61b124585e55accdaf2713b72e3ace78772f Gerrit-Change-Number: 30732 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add libosmogsm dependency

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30733 ) Change subject: llc: add libosmogsm dependency ...................................................................... llc: add libosmogsm dependency libosmogsm is needed for the follow-up patch [1]. Change-Id: Iee45fb87905ea29df02a48003396bde27e6c550c Related: [1] I588eb576b2703262f4ab9566ec362920d8390cfd Related: OS#5502 --- M configure.ac M contrib/libosmo-gprs.spec.in M libosmo-gprs-llc.pc.in M src/llc/Makefile.am M tests/llc/Makefile.am 5 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved Objections: msuraev: I would prefer this is not merged as is diff --git a/configure.ac b/configure.ac index 1ebd185..9ceb679 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/libosmo-gprs.spec.in b/contrib/libosmo-gprs.spec.in index 9c27c2d..b560769 100644 --- a/contrib/libosmo-gprs.spec.in +++ b/contrib/libosmo-gprs.spec.in @@ -11,6 +11,7 @@ BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(libosmocore) >= 1.7.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.7.0 BuildRequires: pkgconfig(talloc) %description diff --git a/libosmo-gprs-llc.pc.in b/libosmo-gprs-llc.pc.in index 25a6509..7502d95 100644 --- a/libosmo-gprs-llc.pc.in +++ b/libosmo-gprs-llc.pc.in @@ -6,7 +6,7 @@ Name: Osmocom [E]GPRS LLC (Logical Link Control) Library Description: C Utility Library Version: @VERSION@ -Requires: libosmocore +Requires: libosmocore, libosmogsm Requires.private: talloc Libs: -L${libdir} -losmo-gprs-llc Cflags: -I${includedir}/ diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 6c0e680..c25841e 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -11,10 +11,12 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ $(NULL) AM_LDFLAGS = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(NULL) lib_LTLIBRARIES = \ @@ -36,4 +38,5 @@ libosmo_gprs_llc_la_LIBADD = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(NULL) diff --git a/tests/llc/Makefile.am b/tests/llc/Makefile.am index 0079964..2c9d578 100644 --- a/tests/llc/Makefile.am +++ b/tests/llc/Makefile.am @@ -1,6 +1,7 @@ AM_CFLAGS = \ -Wall \ $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ -I$(top_srcdir)/include/ \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iee45fb87905ea29df02a48003396bde27e6c550c Gerrit-Change-Number: 30733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: split up enum osmo_gprs_llc_prim_type

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30735 ) Change subject: llc: split up enum osmo_gprs_llc_prim_type ...................................................................... llc: split up enum osmo_gprs_llc_prim_type Change-Id: Ic5b7a2fb8d028a6e2031fb805189be4e92d80b9f Related: OS#5502 --- M include/osmocom/gprs/llc/llc_prim.h 1 file changed, 36 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index dc5f097..a26c1c5 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -24,31 +24,42 @@ /* 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 { - /* 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, ... */ + +/* TS 04.65 Section 7.2.1 GMM - LLME primitives */ +enum osmo_gprs_llc_llgmm_prim_type { + 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 */ +}; + +/* TS 04.65 Section 7.2.2 "Layer 3 - LLE primitives" */ +enum osmo_gprs_llc_ll_prim_type { + 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 */ +}; + +/* TS 04.65 Section 7.2.3 "LLE - RLC/MAC primitives" (MS side) */ +enum osmo_gprs_llc_grr_prim_type { + 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 */ +}; + +/* TS 04.65 Section 7.2.4 "LLE - BSSGP primitives" (SGSN side) */ +enum osmo_gprs_llc_bssgp_prim_type { + OSMO_GPRS_LLC_BSSGP_DL_UNITDATA, /* Req: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ + OSMO_GPRS_LLC_BSSGP_UL_UNITDATA, /* Ind: TLLI, LL-PDU, Cell Id, edirect attempt, IMSI, V(U) for redirect, ... */ }; /* Parameters for OSMO_GPRS_LLC_LLGMM_* prims */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic5b7a2fb8d028a6e2031fb805189be4e92d80b9f Gerrit-Change-Number: 30735 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add enum osmo_gprs_llc_{location,prim_sap}

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30734 ) Change subject: llc: add enum osmo_gprs_llc_{location,prim_sap} ...................................................................... llc: add enum osmo_gprs_llc_{location,prim_sap} Change-Id: I5606c0b41196f25adbc00cfdce9927daaed9a901 Related: OS#5502 --- M include/osmocom/gprs/llc/llc.h M include/osmocom/gprs/llc/llc_prim.h M src/llc/Makefile.am A src/llc/llc_prim.c 4 files changed, 56 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index ff12884..0f0ab83 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -7,6 +7,13 @@ #include <osmocom/core/msgb.h> +/* Section 7.1.2 LLC layer service primitives */ +enum osmo_gprs_llc_location { + OSMO_GPRS_LLC_LOCATION_UNSET, + OSMO_GPRS_LLC_LOCATION_MS, + OSMO_GPRS_LLC_LOCATION_SGSN, +}; + /* Section 6.2.3 Service Access Point Identifier (SAPI) */ enum osmo_gprs_llc_sapi { OSMO_GPRS_LLC_SAPI_GMM = 1, diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index f58c5fa..dc5f097 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -6,6 +6,21 @@ #include <stddef.h> #include <osmocom/core/prim.h> +#include <osmocom/core/utils.h> + +/* Section 7.1.0 */ +enum osmo_gprs_llc_prim_sap { + OSMO_GPRS_LLC_SAP_LLGM, + OSMO_GPRS_LLC_SAP_LL, + OSMO_GPRS_LLC_SAP_GRR, + OSMO_GPRS_LLC_SAP_BSSGP, +}; + +extern const struct value_string osmo_gprs_llc_prim_sap_names[]; +static inline const char *osmo_gprs_llc_prim_sap_name(enum osmo_gprs_llc_prim_sap val) +{ + return get_value_string(osmo_gprs_llc_prim_sap_names, val); +} /* 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 */ diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index c25841e..317b855 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -26,6 +26,7 @@ libosmo_gprs_llc_la_SOURCES = \ crc24.c \ llc_pdu.c \ + llc_prim.c \ llc_xid.c \ misc.c \ $(NULL) diff --git a/src/llc/llc_prim.c b/src/llc/llc_prim.c new file mode 100644 index 0000000..030494a --- /dev/null +++ b/src/llc/llc_prim.c @@ -0,0 +1,33 @@ +/* GPRS LLC protocol primitive implementation as per 3GPP TS 44.064 */ +/* + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> + +#include <osmocom/gprs/llc/llc.h> +#include <osmocom/gprs/llc/llc_prim.h> + +const struct value_string osmo_gprs_llc_prim_sap_names[] = { + { OSMO_GPRS_LLC_SAP_LLGM, "LLGM" }, + { OSMO_GPRS_LLC_SAP_LL, "LL" }, + { OSMO_GPRS_LLC_SAP_GRR, "GRR" }, + { OSMO_GPRS_LLC_SAP_BSSGP, "BSSGP" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I5606c0b41196f25adbc00cfdce9927daaed9a901 Gerrit-Change-Number: 30734 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in libosmo-gprs[master]: llc: rework logging, add LOGLLC macro

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 ) Change subject: llc: rework logging, add LOGLLC macro ...................................................................... llc: rework logging, add LOGLLC macro Change-Id: I8ad3267f890a21b6c935b36b256b00bd0a4da8d6 Related: OS#5502 --- M include/osmocom/gprs/llc/llc.h M src/llc/llc_pdu.c M src/llc/llc_xid.c M src/llc/misc.c 4 files changed, 46 insertions(+), 36 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 0f0ab83..8ae403a 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -184,4 +184,14 @@ const struct osmo_gprs_llc_xid_field *fields, unsigned int num_fields); -void osmo_gprs_llc_set_log_cat(int cat); +enum osmo_gprs_llc_log_cat { + OSMO_GPRS_LLC_LOGC_LLC, + _OSMO_GPRS_LLC_LOGC_MAX, +}; + +void osmo_gprs_llc_set_log_cat(enum osmo_gprs_llc_log_cat logc, int logc_num); + +/* TODO: move to llc_private.h */ +extern int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX]; + +#define LOGLLC(lvl, fmt, args...) LOGP(g_llc_log_cat[OSMO_GPRS_LLC_LOGC_LLC], lvl, fmt, ## args) diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 6f0a17f..c031098 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -253,8 +253,7 @@ ctrl[0] |= GPRS_LLC_U_XID; break; default: - LOGP(g_log_cat, LOGL_ERROR, - "Unknown UI func=0x%02x\n", pdu->func); + LOGLLC(LOGL_ERROR, "Unknown UI func=0x%02x\n", pdu->func); return -EINVAL; } break; @@ -268,8 +267,7 @@ /* 5.5a Message Authentication Code (MAC) field */ if (pdu->flags & OSMO_GPRS_LLC_PDU_F_MAC_PRES) { /* TODO: calculate MAC (see 3GPP TS 43.020) */ - LOGP(g_log_cat, LOGL_ERROR, - "Message Authentication Code (MAC) is not implemented\n"); + LOGLLC(LOGL_ERROR, "Message Authentication Code (MAC) is not implemented\n"); return -ENOTSUP; } @@ -295,7 +293,7 @@ #define check_len(len, text) \ do { \ if (data_len < (len)) { \ - LOGP(g_log_cat, LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \ + LOGLLC(LOGL_ERROR, "Failed to parse LLC PDU: %s\n", text); \ return -EINVAL; \ } \ } while (0) @@ -316,7 +314,7 @@ /* 6.2.1 Protocol Discriminator bit (PD): shall be 0 */ if (*addr & 0x80) { - LOGP(g_log_cat, LOGL_ERROR, "Protocol Discriminator shall be 0\n"); + LOGLLC(LOGL_ERROR, "Protocol Discriminator shall be 0\n"); return -EINVAL; } @@ -336,7 +334,7 @@ case 0x0c: case 0x0d: case 0x0f: - LOGP(g_log_cat, LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi); + LOGLLC(LOGL_ERROR, "Unknown SAPI=%u\n", pdu->sapi); return -EINVAL; } @@ -485,7 +483,7 @@ pdu->data_len = data_len; break; default: - LOGP(g_log_cat, LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f); + LOGLLC(LOGL_ERROR, "Unknown U func=0x%02x\n", ctrl[0] & 0x0f); return -ENOTSUP; } } diff --git a/src/llc/llc_xid.c b/src/llc/llc_xid.c index a787e1a..1aab3a5 100644 --- a/src/llc/llc_xid.c +++ b/src/llc/llc_xid.c @@ -29,8 +29,6 @@ #include <osmocom/gprs/llc/llc.h> -extern int g_log_cat; - const struct value_string osmo_gprs_llc_xid_type_names[] = { { OSMO_GPRS_LLC_XID_T_VERSION, "LLC-Version" }, { OSMO_GPRS_LLC_XID_T_IOV_UI, "IOV-UI" }, @@ -80,8 +78,8 @@ bool osmo_gprs_llc_xid_field_is_valid(const struct osmo_gprs_llc_xid_field *field) { if (field->type >= ARRAY_SIZE(gprs_llc_xid_desc)) { - LOGP(g_log_cat, LOGL_ERROR, - "Unknown XID field type 0x%02x\n", field->type); + LOGLLC(LOGL_ERROR, + "Unknown XID field type 0x%02x\n", field->type); return false; } @@ -93,18 +91,18 @@ return true; if (field->val < gprs_llc_xid_desc[field->type].min) { - LOGP(g_log_cat, LOGL_ERROR, - "XID field %s value=%u < min=%u\n", - osmo_gprs_llc_xid_type_name(field->type), - field->val, gprs_llc_xid_desc[field->type].min); + LOGLLC(LOGL_ERROR, + "XID field %s value=%u < min=%u\n", + osmo_gprs_llc_xid_type_name(field->type), + field->val, gprs_llc_xid_desc[field->type].min); return false; } if (field->val > gprs_llc_xid_desc[field->type].max) { - LOGP(g_log_cat, LOGL_ERROR, - "XID field %s value=%u > max=%u\n", - osmo_gprs_llc_xid_type_name(field->type), - field->val, gprs_llc_xid_desc[field->type].max); + LOGLLC(LOGL_ERROR, + "XID field %s value=%u > max=%u\n", + osmo_gprs_llc_xid_type_name(field->type), + field->val, gprs_llc_xid_desc[field->type].max); return false; } @@ -177,7 +175,7 @@ #define check_len(len, text) \ do { \ if (data_len < (len)) { \ - LOGP(g_log_cat, LOGL_ERROR, "Failed to parse XID: %s\n", text); \ + LOGLLC(LOGL_ERROR, "Failed to parse XID: %s\n", text); \ return -EINVAL; \ } \ } while (0) @@ -187,8 +185,8 @@ uint8_t len; if (num_fields > max_fields) { - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: too many fields\n"); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: too many fields\n"); return -ENOMEM; } @@ -198,8 +196,8 @@ /* XID field type */ field->type = (*ptr >> 2) & 0x1f; if (field->type >= ARRAY_SIZE(gprs_llc_xid_desc)) { - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: unknown field type 0x%02x\n", field->type); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: unknown field type 0x%02x\n", field->type); return -EINVAL; } @@ -222,10 +220,10 @@ field->var.val_len = len; } else { if (len != gprs_llc_xid_desc[field->type].len) { - LOGP(g_log_cat, LOGL_NOTICE, - "XID field %s has unusual length=%u (expected %u)\n", - osmo_gprs_llc_xid_type_name(field->type), - len, gprs_llc_xid_desc[field->type].len); + LOGLLC(LOGL_NOTICE, + "XID field %s has unusual length=%u (expected %u)\n", + osmo_gprs_llc_xid_type_name(field->type), + len, gprs_llc_xid_desc[field->type].len); } switch (len) { @@ -242,9 +240,9 @@ field->val = osmo_load32be(ptr); break; default: - LOGP(g_log_cat, LOGL_ERROR, - "Failed to parse XID: unsupported field (%s) length=%u\n", - osmo_gprs_llc_xid_type_name(field->type), len); + LOGLLC(LOGL_ERROR, + "Failed to parse XID: unsupported field (%s) length=%u\n", + osmo_gprs_llc_xid_type_name(field->type), len); return -EINVAL; } diff --git a/src/llc/misc.c b/src/llc/misc.c index 06e2a6c..defe13d 100644 --- a/src/llc/misc.c +++ b/src/llc/misc.c @@ -16,10 +16,14 @@ */ #include <osmocom/core/logging.h> +#include <osmocom/gprs/llc/llc.h> -int g_log_cat = DLGLOBAL; +int g_llc_log_cat[_OSMO_GPRS_LLC_LOGC_MAX] = { + [0 ... _OSMO_GPRS_LLC_LOGC_MAX - 1] = DLGLOBAL +}; -void osmo_gprs_llc_set_log_cat(int cat) +void osmo_gprs_llc_set_log_cat(enum osmo_gprs_llc_log_cat logc, int logc_num) { - g_log_cat = cat; + OSMO_ASSERT(logc < _OSMO_GPRS_LLC_LOGC_MAX); + g_llc_log_cat[logc] = logc_num; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8ad3267f890a21b6c935b36b256b00bd0a4da8d6 Gerrit-Change-Number: 30736 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2024

2023

2022

gerrit-log December 2022