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

[S] Change in osmo-tetra[master]: fixed import warnings for stdbool on some gcc versions
by laforge 26 Jul '23

26 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33940 ) Change subject: fixed import warnings for stdbool on some gcc versions ...................................................................... fixed import warnings for stdbool on some gcc versions Change-Id: I979a95eae70d839e20434cc7f08c196c162671a8 --- M src/tetra_llc_pdu.c M src/tetra_llc_pdu.h 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tetra_llc_pdu.c b/src/tetra_llc_pdu.c index d4a1eb1..dbc30f9 100644 --- a/src/tetra_llc_pdu.c +++ b/src/tetra_llc_pdu.c @@ -24,6 +24,7 @@ #include <string.h> #include <stdio.h> #include <errno.h> +#include <stdbool.h> #include <osmocom/core/utils.h> diff --git a/src/tetra_llc_pdu.h b/src/tetra_llc_pdu.h index 9b33925..ac1ae19 100644 --- a/src/tetra_llc_pdu.h +++ b/src/tetra_llc_pdu.h @@ -1,6 +1,8 @@ #ifndef TETRA_LLC_PDU_H #define TETRA_LLC_PDU_H +#include <stdbool.h> + #include <osmocom/core/linuxlist.h> /* Table 21.1 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I979a95eae70d839e20434cc7f08c196c162671a8 Gerrit-Change-Number: 33940 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-tetra[master]: Added support for slot stealing
by laforge 26 Jul '23

26 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33942 ) Change subject: Added support for slot stealing ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I01a112e6e74f75401649d358b8f98c6248d2522b Gerrit-Change-Number: 33942 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Wed, 26 Jul 2023 18:54:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-tetra[master]: fixed import warnings for stdbool on some gcc versions
by laforge 26 Jul '23

26 Jul '23

Attention is currently required from: wbokslag, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33940 ) Change subject: fixed import warnings for stdbool on some gcc versions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I979a95eae70d839e20434cc7f08c196c162671a8 Gerrit-Change-Number: 33940 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jul 2023 18:54:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP
by pespin 26 Jul '23

26 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33951 ) Change subject: llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP ...................................................................... llc: Set proper SAPI when transmitting UNITDATA.req to GRR/BSSGP Change-Id: I962e25789849f89c532f5ede386fa029600d9901 --- M src/llc/llc.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/51/33951/1 diff --git a/src/llc/llc.c b/src/llc/llc.c index bcd33b5..d58b454 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -279,12 +279,14 @@ msgb_free(msg); return rc; } - if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + llc_prim->grr.unitdata_req.sapi = lle->sapi; } /* Send GRR-UNITDATA.req */ @@ -319,12 +321,14 @@ msgb_free(msg); return rc; } - if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + llc_prim->grr.unitdata_req.sapi = lle->sapi; } /* Send BSSGP-DL-UNITDATA.req (SGSN) / GRR-UNITDATA.req (MS) */ @@ -384,6 +388,7 @@ if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) { llc_prim->bssgp.ll_pdu = msgb_l3(msg); llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + llc_prim->bssgp.dl_unitdata_req.sapi = lle->sapi; } else { llc_prim->grr.ll_pdu = msgb_l3(msg); llc_prim->grr.ll_pdu_len = msgb_l3len(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I962e25789849f89c532f5ede386fa029600d9901 Gerrit-Change-Number: 33951 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-gprs[master]: sndcp: Update n201_u & n201_i indicatd by LLC layer
by pespin 26 Jul '23

26 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 to look at the new patch set (#3). Change subject: sndcp: Update n201_u & n201_i indicatd by LLC layer ...................................................................... sndcp: Update n201_u & n201_i indicatd by LLC layer Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b --- M include/osmocom/gprs/sndcp/sndcp_private.h M src/sndcp/sndcp.c M src/sndcp/sndcp_prim.c 3 files changed, 32 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/50/33950/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b Gerrit-Change-Number: 33950 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-gprs[master]: llc: Introduce function to log XID fields and use upon Rx/Tx
by pespin 26 Jul '23

26 Jul '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33947 to look at the new patch set (#3). Change subject: llc: Introduce function to log XID fields and use upon Rx/Tx ...................................................................... llc: Introduce function to log XID fields and use upon Rx/Tx Change-Id: I8c6b07305c0bcecb4e1681967884a3e62c813592 --- M include/osmocom/gprs/llc/llc_private.h M src/llc/llc.c M src/llc/llc_xid.c M tests/llc/llc_prim_test.err 4 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/47/33947/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8c6b07305c0bcecb4e1681967884a3e62c813592 Gerrit-Change-Number: 33947 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-gprs[master]: sndcp: Update n201_u & n201_i indicatd by LLC layer
by pespin 26 Jul '23

26 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 to look at the new patch set (#2). Change subject: sndcp: Update n201_u & n201_i indicatd by LLC layer ...................................................................... sndcp: Update n201_u & n201_i indicatd by LLC layer Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b --- M include/osmocom/gprs/sndcp/sndcp_private.h M src/sndcp/sndcp.c M src/sndcp/sndcp_prim.c 3 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/50/33950/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b Gerrit-Change-Number: 33950 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-gprs[master]: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes
by pespin 26 Jul '23

26 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 to look at the new patch set (#3). Change subject: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes ...................................................................... llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes Change-Id: I8135c5cef4df69a7c3a540050da0837bf2059df2 --- M src/llc/llc.c M src/llc/llc_ll.c 2 files changed, 40 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/33949/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8135c5cef4df69a7c3a540050da0837bf2059df2 Gerrit-Change-Number: 33949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-gprs[master]: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes
by pespin 26 Jul '23

26 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 to look at the new patch set (#2). Change subject: llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes ...................................................................... llc: Submit LL-XID-IND to L3 if N201-U or N201-I changes Change-Id: I8135c5cef4df69a7c3a540050da0837bf2059df2 --- M src/llc/llc.c M src/llc/llc_ll.c 2 files changed, 40 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/33949/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8135c5cef4df69a7c3a540050da0837bf2059df2 Gerrit-Change-Number: 33949 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-gprs[master]: sndcp: Update n201_u & n201_i indicatd by LLC layer
by pespin 26 Jul '23

26 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 ) Change subject: sndcp: Update n201_u & n201_i indicatd by LLC layer ...................................................................... sndcp: Update n201_u & n201_i indicatd by LLC layer Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b --- M include/osmocom/gprs/sndcp/sndcp_private.h M src/sndcp/sndcp.c M src/sndcp/sndcp_prim.c 3 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/50/33950/1 diff --git a/include/osmocom/gprs/sndcp/sndcp_private.h b/include/osmocom/gprs/sndcp/sndcp_private.h index 43ea7ca..52bd207 100644 --- a/include/osmocom/gprs/sndcp/sndcp_private.h +++ b/include/osmocom/gprs/sndcp/sndcp_private.h @@ -220,8 +220,12 @@ int gprs_sndcp_sne_submit_snsm_activate_rsp(struct gprs_sndcp_entity *sne); int gprs_sndcp_sne_handle_llc_ll_unitdata_ind(struct gprs_sndcp_entity *sne, struct sndcp_common_hdr *sch, uint16_t len); -int gprs_sndcp_snme_handle_llc_ll_xid_ind(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, uint8_t *l3params, unsigned int l3params_len); -int gprs_sndcp_snme_handle_llc_ll_xid_cnf(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, uint8_t *l3params, unsigned int l3params_len); +int gprs_sndcp_snme_handle_llc_ll_xid_ind(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, + uint16_t n201_u, uint16_t n201_i, + uint8_t *l3params, unsigned int l3params_len); +int gprs_sndcp_snme_handle_llc_ll_xid_cnf(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, + uint16_t n201_u, uint16_t n201_i, + uint8_t *l3params, unsigned int l3params_len); int gprs_sndcp_sne_handle_sn_unitdata_req(struct gprs_sndcp_entity *sne, uint8_t *npdu, unsigned int npdu_len); int gprs_sndcp_sne_handle_sn_xid_req(struct gprs_sndcp_entity *sne, const struct osmo_gprs_sndcp_prim *sndcp_prim); int gprs_sndcp_sne_handle_sn_xid_rsp(struct gprs_sndcp_entity *sne, const struct osmo_gprs_sndcp_prim *sndcp_prim); diff --git a/src/sndcp/sndcp.c b/src/sndcp/sndcp.c index 4b54be3..5decfac 100644 --- a/src/sndcp/sndcp.c +++ b/src/sndcp/sndcp.c @@ -979,7 +979,9 @@ } /* 5.1.2.10 SN-XID.indication */ -int gprs_sndcp_snme_handle_llc_ll_xid_ind(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, uint8_t *l3params, unsigned int l3params_len) +int gprs_sndcp_snme_handle_llc_ll_xid_ind(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, + uint16_t n201_u, uint16_t n201_i, + uint8_t *l3params, unsigned int l3params_len) { int rc; int compclass; @@ -1005,10 +1007,15 @@ return -EINVAL; } + sne->n201_u = n201_u; + sne->n201_i = n201_i; + /* Some phones send zero byte length SNDCP frames * and do require a confirmation response. */ if (l3params_len == 0) { - /* TODO: send empty (len=0) SN-XID.response? */ + /* TS 44.065 6.8: "If the SNDCP entity receives an LL-XID.indication without + * an SNDCP XID block, it shall not respond with the LL-XID.response primitive." + */ return 0; } @@ -1057,7 +1064,9 @@ /* 5.1.2.12 SN-XID.confirm * (See also: TS 144 065, Section 6.8 XID parameter negotiation) */ -int gprs_sndcp_snme_handle_llc_ll_xid_cnf(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, uint8_t *l3params, unsigned int l3params_len) +int gprs_sndcp_snme_handle_llc_ll_xid_cnf(struct gprs_sndcp_mgmt_entity *snme, uint32_t sapi, + uint16_t n201_u, uint16_t n201_i, + uint8_t *l3params, unsigned int l3params_len) { /* Note: This function handles an incoming SNDCP-XID confirmation. * Since the confirmation fields may lack important parameters we @@ -1092,6 +1101,9 @@ return -EINVAL; } + sne->n201_u = n201_u; + sne->n201_i = n201_i; + if (sne->l3xid_req && sne->l3xid_req_len > 0) { /* Parse SNDCP-CID XID-Field */ comp_fields_req = gprs_sndcp_parse_xid(NULL, sne, sne->l3xid_req, sne->l3xid_req_len, NULL); diff --git a/src/sndcp/sndcp_prim.c b/src/sndcp/sndcp_prim.c index 80dff8f..e371416 100644 --- a/src/sndcp/sndcp_prim.c +++ b/src/sndcp/sndcp_prim.c @@ -514,6 +514,7 @@ } rc = gprs_sndcp_snme_handle_llc_ll_xid_ind(snme, llc_prim->ll.sapi, + llc_prim->ll.xid.n201_u, llc_prim->ll.xid.n201_i, llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); return rc; } @@ -532,6 +533,7 @@ } rc = gprs_sndcp_snme_handle_llc_ll_xid_cnf(snme, llc_prim->ll.sapi, + llc_prim->ll.xid.n201_u, llc_prim->ll.xid.n201_i, llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7429701ae49c2a694dcad3e3d5ec639ab9927f5b Gerrit-Change-Number: 33950 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0