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

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by pespin

Attention is currently required from: neels, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31299 ) Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 14:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by pespin

Attention is currently required from: neels, laforge, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 14:00:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by pespin

Attention is currently required from: neels, laforge, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 3: (1 comment) File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/8e4ccf0d_d80ebc6a PS3, Line 1153: if (!as->fi) this needs to be removed ow that there's the assert. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 14:00:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by fixeria

Attention is currently required from: neels, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31299 ) Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 13:48:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by msuraev

Attention is currently required from: neels, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31299 ) Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... Patch Set 2: (5 comments) File src/core/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/31299/comment/fd122a3f_0ff517bc PS1, Line 1422: return -1; > agree […] Done https://gerrit.osmocom.org/c/libosmocore/+/31299/comment/048ac443_ab8f36f7 PS1, Line 1422: return -1; > agree […] Done https://gerrit.osmocom.org/c/libosmocore/+/31299/comment/00b05fd3_e7cee7bb PS1, Line 1396: sfd > This is not really a change: according to the manpage, in case of an error "a value of -1 shall be r […] Done https://gerrit.osmocom.org/c/libosmocore/+/31299/comment/ae7a277a_80609d90 PS1, Line 1420: sfd = rc; > If you keep the 'err' label, you can just do 'goto' here. Done File src/core/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/31299/comment/82464c85_3d902cbd PS2, Line 1401: close(sfd); > rather keep the 'goto err', instead of duplicating the exit-cleanup code Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 13:43:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by msuraev

Attention is currently required from: fixeria, msuraev. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31299 to look at the new patch set (#3). Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... socket: propagate error in osmo_sock_unix_init() to the caller Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f --- M src/core/socket.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/31299/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by msuraev

Attention is currently required from: neels, laforge, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 2: (1 comment) File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/ef864a3d_371ceee6 PS2, Line 1151: if (!as->fi) > indeed, we should change this into OSMO_ASSERT before merge. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 13:30:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by msuraev

Attention is currently required from: neels, pespin, msuraev. Hello Jenkins Builder, neels, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 to look at the new patch set (#3). Change subject: SS7: do not attempt transfer if AS is down ...................................................................... SS7: do not attempt transfer if AS is down The attempt to route message via AS which is down will fail anyway: let's make it explicit. Add osmo_ss7_as_down() and use it to check AS state before transferring the message. Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/osmo_ss7_hmrt.c 3 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/95/31295/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Implement Tx of DL ACK/NACK

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31328 ) Change subject: rlcmac: Implement Tx of DL ACK/NACK ...................................................................... rlcmac: Implement Tx of DL ACK/NACK Measurement related functionality is not yet implemented and hence the related fields cannot be filled in yet. Related: OS#5500 Change-Id: I6ae2df07929fb6c4733e87b18cebe75a6f24f520 --- M include/osmocom/gprs/rlcmac/rlcmac_enc.h M include/osmocom/gprs/rlcmac/tbf_dl.h M src/rlcmac/rlcmac_enc.c M src/rlcmac/sched.c M src/rlcmac/tbf_dl.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 7 files changed, 101 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/28/31328/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6ae2df07929fb6c4733e87b18cebe75a6f24f520 Gerrit-Change-Number: 31328 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Implement Tx of DL ACK/NACK

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31328 ) Change subject: rlcmac: Implement Tx of DL ACK/NACK ...................................................................... rlcmac: Implement Tx of DL ACK/NACK Measurement related functionality is not yet implemented and hence the related fields cannot be filled in yet. Related: OS#5500 Change-Id: I6ae2df07929fb6c4733e87b18cebe75a6f24f520 --- M include/osmocom/gprs/rlcmac/rlcmac_enc.h M include/osmocom/gprs/rlcmac/tbf_dl.h M src/rlcmac/rlcmac_enc.c M src/rlcmac/sched.c M src/rlcmac/tbf_dl.c 5 files changed, 99 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/28/31328/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_enc.h b/include/osmocom/gprs/rlcmac/rlcmac_enc.h index d091d53..1a0f586 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_enc.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_enc.h @@ -46,3 +46,5 @@ void gprs_rlcmac_enc_prepare_pkt_ul_dummy_block(RlcMacUplink_t *block, uint32_t tlli); void gprs_rlcmac_enc_prepare_pkt_resource_req(RlcMacUplink_t *block, struct gprs_rlcmac_ul_tbf *ul_tbf, enum gprs_rlcmac_access_type acc_type); + +void gprs_rlcmac_enc_prepare_pkt_downlink_ack_nack(RlcMacUplink_t *block, const struct gprs_rlcmac_dl_tbf *dl_tbf); diff --git a/include/osmocom/gprs/rlcmac/tbf_dl.h b/include/osmocom/gprs/rlcmac/tbf_dl.h index facae81..f398c0a 100644 --- a/include/osmocom/gprs/rlcmac/tbf_dl.h +++ b/include/osmocom/gprs/rlcmac/tbf_dl.h @@ -40,6 +40,8 @@ int gprs_rlcmac_dl_tbf_configure_l1ctl(struct gprs_rlcmac_dl_tbf *dl_tbf); +struct msgb *gprs_rlcmac_dl_tbf_create_pkt_dl_ack_nack(const struct gprs_rlcmac_dl_tbf *dl_tbf); + int gprs_rlcmac_dl_tbf_rcv_data_block(struct gprs_rlcmac_dl_tbf *dl_tbf, const struct gprs_rlcmac_rlc_data_info *rlc, uint8_t *data, uint32_t fn, uint8_t ts_nr); diff --git a/src/rlcmac/rlcmac_enc.c b/src/rlcmac/rlcmac_enc.c index e1ea990..1f1ebc3 100644 --- a/src/rlcmac/rlcmac_enc.c +++ b/src/rlcmac/rlcmac_enc.c @@ -24,6 +24,8 @@ #include <osmocom/gprs/rlcmac/csn1_defs.h> #include <osmocom/gprs/rlcmac/rlcmac_enc.h> #include <osmocom/gprs/rlcmac/gre.h> +#include <osmocom/gprs/rlcmac/tbf_dl.h> +#include <osmocom/gprs/rlcmac/rlc_window_dl.h> #include <osmocom/gprs/rlcmac/tbf_ul.h> int gprs_rlcmac_rlc_write_ul_data_header(const struct gprs_rlcmac_rlc_data_info *rlc, uint8_t *data) @@ -352,3 +354,59 @@ req->Exist_AdditionsR99 = 0; /* TODO: no req->AdditionsR99 yet */ } + +static void gprs_rlcmac_enc_prepare_pkt_ack_nack_desc_gprs(Ack_Nack_Description_t *ack_desc, const struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + struct bitvec bv = { + .data = &ack_desc->RECEIVED_BLOCK_BITMAP[0], + .data_len = sizeof(ack_desc->RECEIVED_BLOCK_BITMAP), + }; + char rbb[65]; + + gprs_rlcmac_rlc_dl_window_update_rbb(dl_tbf->dlw, rbb); + rbb[64] = 0; + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "- V(N): \"%s\" R=Received I=Invalid\n", rbb); + + ack_desc->FINAL_ACK_INDICATION = (gprs_rlcmac_tbf_dl_state(dl_tbf) == GPRS_RLCMAC_TBF_DL_ST_FINISHED); + ack_desc->STARTING_SEQUENCE_NUMBER = gprs_rlcmac_rlc_dl_window_ssn(dl_tbf->dlw); + for (int i = 0; i < 64; i++) { + /* Set bit at the appropriate position (see 3GPP TS 44.060 9.1.8.1) */ + bool is_ack = (rbb[i] == 'R'); + bitvec_set_bit(&bv, is_ack == 1 ? ONE : ZERO); + } +} + +/* Channel Quality Report struct, TS 44.060 Table 11.2.6. */ +static void gprs_rlcmac_enc_prepare_channel_quality_report(Channel_Quality_Report_t *cqr, const struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + /* TODO: fill cqr from info stored probably in the gre object. */ +} + +void gprs_rlcmac_enc_prepare_pkt_downlink_ack_nack(RlcMacUplink_t *block, const struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + Packet_Downlink_Ack_Nack_t *ack = &block->u.Packet_Downlink_Ack_Nack; + struct gprs_rlcmac_entity *gre = dl_tbf->tbf.gre; + + memset(block, 0, sizeof(*block)); + ack->MESSAGE_TYPE = OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST; + ack->PayloadType = GPRS_RLCMAC_PT_CONTROL_BLOCK; + ack->R = 0; /* MS sent channel request message once */ + + ack->DOWNLINK_TFI = dl_tbf->cur_alloc.dl_tfi; + gprs_rlcmac_enc_prepare_pkt_ack_nack_desc_gprs(&ack->Ack_Nack_Description, dl_tbf); + + /* Channel Request Description */ + if (gre->ul_tbf && gprs_rlcmac_tbf_ul_ass_pending(gre->ul_tbf)) { + Channel_Request_Description_t *chan_req = &ack->Channel_Request_Description; + ack->Exist_Channel_Request_Description = 1; + chan_req->PEAK_THROUGHPUT_CLASS = 0; /* TODO */ + chan_req->RADIO_PRIORITY = 0; /* TODO */ + chan_req->RLC_MODE = GPRS_RLCMAC_RLC_MODE_ACKNOWLEDGED; + chan_req->LLC_PDU_TYPE = GPRS_RLCMAC_LLC_PDU_TYPE_ACKNOWLEDGED; + chan_req->RLC_OCTET_COUNT = 0; /* TODO */ + } else { + ack->Exist_Channel_Request_Description = 0; + } + + gprs_rlcmac_enc_prepare_channel_quality_report(&ack->Channel_Quality_Report, dl_tbf); +} diff --git a/src/rlcmac/sched.c b/src/rlcmac/sched.c index f229b7a..6a31f83 100644 --- a/src/rlcmac/sched.c +++ b/src/rlcmac/sched.c @@ -150,7 +150,7 @@ if (tbfs->poll_dl_ack_final_ack) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx DL ACK/NACK FinalAck=1\n", bi->ts, bi->fn, bi->usf); - msg = NULL; /* TODO: generate DL ACK/NACK ctrl block */ + msg = gprs_rlcmac_dl_tbf_create_pkt_dl_ack_nack(tbfs->poll_dl_ack_final_ack); if (msg) return msg; } @@ -167,7 +167,7 @@ if (tbfs->poll_dl_ack) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx DL ACK/NACK\n", bi->ts, bi->fn, bi->usf); - msg = NULL; /* TODO: generate DL ACK/NACK ctrl block */ + msg = gprs_rlcmac_dl_tbf_create_pkt_dl_ack_nack(tbfs->poll_dl_ack); if (msg) return msg; } diff --git a/src/rlcmac/tbf_dl.c b/src/rlcmac/tbf_dl.c index da9b871..49f8187 100644 --- a/src/rlcmac/tbf_dl.c +++ b/src/rlcmac/tbf_dl.c @@ -24,6 +24,7 @@ #include <osmocom/gprs/rlcmac/gre.h> #include <osmocom/gprs/rlcmac/rlc_window_dl.h> #include <osmocom/gprs/rlcmac/rlcmac_dec.h> +#include <osmocom/gprs/rlcmac/rlcmac_enc.h> #include <osmocom/gprs/rlcmac/pdch_ul_controller.h> struct gprs_rlcmac_dl_tbf *gprs_rlcmac_dl_tbf_alloc(struct gprs_rlcmac_entity *gre) @@ -105,6 +106,40 @@ return gprs_rlcmac_prim_call_down_cb(rlcmac_prim); } +struct msgb *gprs_rlcmac_dl_tbf_create_pkt_dl_ack_nack(const struct gprs_rlcmac_dl_tbf *dl_tbf) +{ + struct msgb *msg; + struct bitvec bv; + RlcMacUplink_t ul_block; + int rc; + + OSMO_ASSERT(dl_tbf); + + msg = msgb_alloc(GSM_MACBLOCK_LEN, "pkt_dl_ack_nack"); + if (!msg) + return NULL; + + /* Initialize a bit vector that uses allocated msgb as the data buffer. */ + bv = (struct bitvec){ + .data = msgb_put(msg, GSM_MACBLOCK_LEN), + .data_len = GSM_MACBLOCK_LEN, + }; + bitvec_unhex(&bv, GPRS_RLCMAC_DUMMY_VEC); + + gprs_rlcmac_enc_prepare_pkt_downlink_ack_nack(&ul_block, dl_tbf); + rc = osmo_gprs_rlcmac_encode_uplink(&bv, &ul_block); + if (rc < 0) { + LOGPTBFDL(dl_tbf, LOGL_ERROR, "Encoding of Packet Downlink ACK/NACK failed (%d)\n", rc); + goto free_ret; + } + + return msg; + +free_ret: + msgb_free(msg); + return NULL; +} + /* * Store received block data in LLC message(s) and forward to SGSN * if complete. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6ae2df07929fb6c4733e87b18cebe75a6f24f520 Gerrit-Change-Number: 31328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023