lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

August 2022

  • 3 participants
  • 2402 discussions
Change in osmo-bsc[master]: BSSMAP: make sure we don't try to reset non-existent entity
by pespin 02 Aug '22

02 Aug '22
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 ) Change subject: BSSMAP: make sure we don't try to reset non-existent entity ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: I think this is not the proper fix. The caller should avoid doing this in first place if that pointer is NULL. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 12:36:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-cbc[master]: cbsp/sbcap: Set link fsm id with peer's name
by pespin 02 Aug '22

02 Aug '22
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28886 ) Change subject: cbsp/sbcap: Set link fsm id with peer's name ...................................................................... cbsp/sbcap: Set link fsm id with peer's name Otherwise the id is left unset. Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 564e134..564df3f 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -41,6 +41,7 @@ struct cbc_cbsp_link *cbc_cbsp_link_alloc(struct cbc_cbsp_mgr *cbc, struct cbc_peer *peer) { struct cbc_cbsp_link *link; + char *name; link = talloc_zero(cbc, struct cbc_cbsp_link); OSMO_ASSERT(link); @@ -48,12 +49,15 @@ link->peer = peer; link->is_client = (peer->link_mode == CBC_PEER_LINK_MODE_CLIENT); - link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); + name = talloc_strdup(link, peer->name); + osmo_identifier_sanitize_buf(name, NULL, '_'); + link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, name); if (!link->fi) { LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); talloc_free(link); return NULL; } + talloc_free(name); llist_add_tail(&link->list, &cbc->links); return link; diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 9af842f..3f5d792 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -46,6 +46,7 @@ struct cbc_sbcap_link *cbc_sbcap_link_alloc(struct cbc_sbcap_mgr *cbc, struct cbc_peer *peer) { struct cbc_sbcap_link *link; + char *name; link = talloc_zero(cbc, struct cbc_sbcap_link); OSMO_ASSERT(link); @@ -53,12 +54,15 @@ link->peer = peer; link->is_client = (peer->link_mode == CBC_PEER_LINK_MODE_CLIENT); - link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); + name = talloc_strdup(link, peer->name); + osmo_identifier_sanitize_buf(name, NULL, '_'); + link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, name); if (!link->fi) { LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); talloc_free(link); return NULL; } + talloc_free(name); llist_add_tail(&link->list, &cbc->links); return link; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb Gerrit-Change-Number: 28886 Gerrit-PatchSet: 2 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 0
0 0
Change in osmo-cbc[master]: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link
by pespin 02 Aug '22

02 Aug '22
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28887 ) Change subject: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link ...................................................................... cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link This way upper layers know right away that the message could not be transmitted to that peer. Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4 --- M src/cbsp_link.c M src/sbcap_link.c 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 564df3f..2c31455 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -331,6 +331,11 @@ get_value_string(cbsp_msg_type_names, cbsp->msg_type)); talloc_free(cbsp); return -ENOLINK; + } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) { + LOGPCC(link, LOGL_NOTICE, "Cannot transmit %s: reconnecting\n", + get_value_string(cbsp_msg_type_names, cbsp->msg_type)); + talloc_free(cbsp); + return -ENOTCONN; } LOGPCC(link, LOGL_INFO, "Transmitting %s\n", diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 3f5d792..f8d8a09 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -398,6 +398,11 @@ sbcap_pdu_get_name(pdu)); rc = -ENOLINK; goto ret_free; + } else if (link->is_client && !osmo_stream_cli_is_connected(link->cli_conn)) { + LOGPSBCAPC(link, LOGL_NOTICE, "Cannot transmit msg %s: reconnecting\n", + sbcap_pdu_get_name(pdu)); + rc = -ENOTCONN; + goto ret_free; } LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4 Gerrit-Change-Number: 28887 Gerrit-PatchSet: 2 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 0
0 0
Change in osmo-cbc[master]: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link
by pespin 02 Aug '22

02 Aug '22
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28887 ) Change subject: cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1d2285d18ee064fd78191765e8cb833bf5ee08a4 Gerrit-Change-Number: 28887 Gerrit-PatchSet: 2 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-Comment-Date: Tue, 02 Aug 2022 12:33:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in osmo-bsc[master]: BSSMAP: make sure we don't try to reset non-existent entity
by msuraev 02 Aug '22

02 Aug '22
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 ) Change subject: BSSMAP: make sure we don't try to reset non-existent entity ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 02 Aug 2022 12:17:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
1 0
0 0
Change in osmo-cbc[master]: cbsp/sbcap: Set link fsm id with peer's name
by fixeria 02 Aug '22

02 Aug '22
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28886 ) Change subject: cbsp/sbcap: Set link fsm id with peer's name ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/cbsp_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28886/comment/86b2e57b_dab761eb PS1, Line 51: peer->name > Good point, I need to sanitize the string beforehand, thanks. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8a6850293cbe01c66e4fb545d646d63743ddaecb Gerrit-Change-Number: 28886 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 12:14:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-tetra[master]: Improved parsing in macpdu_decode_resource
by wbokslag 02 Aug '22

02 Aug '22
Attention is currently required from: dexter. wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28850 ) Change subject: Improved parsing in macpdu_decode_resource ...................................................................... Patch Set 2: (1 comment) File src/tetra_mac_pdu.c: https://gerrit.osmocom.org/c/osmo-tetra/+/28850/comment/42cd7584_14f4031f PS1, Line 245: > stray tab, emacs? laforge gave me some pointers on how to use the linter locally, hopefully I can prevent such issues in the future. Issue is amended -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3 Gerrit-Change-Number: 28850 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 11:27:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-tetra[master]: fixed out of bounds write to pdu_sync buffer
by wbokslag 02 Aug '22

02 Aug '22
wbokslag has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28596 ) Change subject: fixed out of bounds write to pdu_sync buffer ...................................................................... Patch Set 2: (1 comment) File src/conv_enc_test.c: https://gerrit.osmocom.org/c/osmo-tetra/+/28596/comment/629541fa_5b932491 PS1, Line 338: *((uint32_t *)pdu_sync) = r; > are we sure pdu_sync is always aligned and the type-cast is safe even on architectures that don't do […] Although the pdu_sync buffer will almost certainly be at least dword-aligned, I took your recommendation and the code now uses osmo_store32le. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I414bf2d61dc1cb37d30dc84b401a75b918116bbb Gerrit-Change-Number: 28596 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 02 Aug 2022 11:26:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment
1 0
0 0
Change in osmo-tetra[master]: keep track of which block of a downlink burst is being processed
by wbokslag 02 Aug '22

02 Aug '22
wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28891 ) Change subject: keep track of which block of a downlink burst is being processed ...................................................................... keep track of which block of a downlink burst is being processed tp_sap_udata_ind now accepts a parameter designating from which block (first or second) of the downlink burst the bits originate (not applicable for all downlink burst types). In some cases, the upper mac needs this information, see ETSI EN 300 392-7 clause 6.4.1 Change-Id: I5ff316a773906328e19c3530b09d7412f9c731ec --- M src/conv_enc_test.c M src/lower_mac/tetra_lower_mac.c M src/phy/tetra_burst.c M src/phy/tetra_burst.h M src/tetra_prim.h 5 files changed, 19 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/91/28891/1 diff --git a/src/conv_enc_test.c b/src/conv_enc_test.c index aa921fa..c5924ce 100644 --- a/src/conv_enc_test.c +++ b/src/conv_enc_test.c @@ -45,7 +45,7 @@ static unsigned int num_crc_err; /* incoming TP-SAP UNITDATA.ind from PHY into lower MAC */ -void tp_sap_udata_ind(enum tp_sap_data_type type, const uint8_t *bits, unsigned int len, void *priv) +void tp_sap_udata_ind(enum tp_sap_data_type type, int blk_num, const uint8_t *bits, unsigned int len, void *priv) { } diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index d6f9e41..ca1b72e 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -53,7 +53,7 @@ static const struct tetra_blk_param tetra_blk_param[] = { [TPSAP_T_SB1] = { .name = "SB1", - .type345_bits = 120, + .type345_bits = 120, .type2_bits = 80, .type1_bits = 60, .interleave_a = 11, @@ -138,7 +138,7 @@ } /* incoming TP-SAP UNITDATA.ind from PHY into lower MAC */ -void tp_sap_udata_ind(enum tp_sap_data_type type, const uint8_t *bits, unsigned int len, void *priv) +void tp_sap_udata_ind(enum tp_sap_data_type type, int blk_num, const uint8_t *bits, unsigned int len, void *priv) { /* various intermediary buffers */ uint8_t type4[512]; @@ -216,7 +216,6 @@ /* Write it */ fwrite(block, sizeof(int16_t), 690, f); - fclose(f); /* Write used ssi */ @@ -260,6 +259,9 @@ osmo_ubit_dump(type2, tbp->type1_bits)); } + /* Set whether BLK1 or BLK2 in downlink burst (or 0 if not applicable) */ + tup->blk_num = blk_num; + msg->l1h = msgb_put(msg, tbp->type1_bits); memcpy(msg->l1h, type2, tbp->type1_bits); diff --git a/src/phy/tetra_burst.c b/src/phy/tetra_burst.c index c791ee0..80a438a 100644 --- a/src/phy/tetra_burst.c +++ b/src/phy/tetra_burst.c @@ -347,18 +347,18 @@ case TETRA_TRAIN_SYNC: /* Split SB1, SB2 and Broadcast Block */ /* send three parts of the burst via TP-SAP into lower MAC */ - tp_sap_udata_ind(TPSAP_T_SB1, burst+SB_BLK1_OFFSET, SB_BLK1_BITS, priv); - tp_sap_udata_ind(TPSAP_T_BBK, burst+SB_BBK_OFFSET, SB_BBK_BITS, priv); - tp_sap_udata_ind(TPSAP_T_SB2, burst+SB_BLK2_OFFSET, SB_BLK2_BITS, priv); + tp_sap_udata_ind(TPSAP_T_SB1, BLK_1, burst+SB_BLK1_OFFSET, SB_BLK1_BITS, priv); + tp_sap_udata_ind(TPSAP_T_BBK, 0, burst+SB_BBK_OFFSET, SB_BBK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_SB2, BLK_2, burst+SB_BLK2_OFFSET, SB_BLK2_BITS, priv); break; case TETRA_TRAIN_NORM_2: /* re-combine the broadcast block */ memcpy(bbk_buf, burst+NDB_BBK1_OFFSET, NDB_BBK1_BITS); memcpy(bbk_buf+NDB_BBK1_BITS, burst+NDB_BBK2_OFFSET, NDB_BBK2_BITS); /* send three parts of the burst via TP-SAP into lower MAC */ - tp_sap_udata_ind(TPSAP_T_BBK, bbk_buf, NDB_BBK_BITS, priv); - tp_sap_udata_ind(TPSAP_T_NDB, burst+NDB_BLK1_OFFSET, NDB_BLK_BITS, priv); - tp_sap_udata_ind(TPSAP_T_NDB, burst+NDB_BLK2_OFFSET, NDB_BLK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_BBK, 0, bbk_buf, NDB_BBK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_NDB, BLK_1, burst+NDB_BLK1_OFFSET, NDB_BLK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_NDB, BLK_2, burst+NDB_BLK2_OFFSET, NDB_BLK_BITS, priv); break; case TETRA_TRAIN_NORM_1: /* re-combine the broadcast block */ @@ -368,8 +368,8 @@ memcpy(ndbf_buf, burst+NDB_BLK1_OFFSET, NDB_BLK_BITS); memcpy(ndbf_buf+NDB_BLK_BITS, burst+NDB_BLK2_OFFSET, NDB_BLK_BITS); /* send two parts of the burst via TP-SAP into lower MAC */ - tp_sap_udata_ind(TPSAP_T_BBK, bbk_buf, NDB_BBK_BITS, priv); - tp_sap_udata_ind(TPSAP_T_SCH_F, ndbf_buf, 2*NDB_BLK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_BBK, 0, bbk_buf, NDB_BBK_BITS, priv); + tp_sap_udata_ind(TPSAP_T_SCH_F, 0, ndbf_buf, 2*NDB_BLK_BITS, priv); break; case TETRA_TRAIN_NORM_3: case TETRA_TRAIN_EXT: diff --git a/src/phy/tetra_burst.h b/src/phy/tetra_burst.h index 8feb09c..0230c88 100644 --- a/src/phy/tetra_burst.h +++ b/src/phy/tetra_burst.h @@ -3,6 +3,9 @@ #include <stdint.h> +#define BLK_1 1 +#define BLK_2 2 + enum tp_sap_data_type { TPSAP_T_SB1, TPSAP_T_SB2, @@ -12,7 +15,7 @@ TPSAP_T_SCH_F, }; -extern void tp_sap_udata_ind(enum tp_sap_data_type type, const uint8_t *bits, unsigned int len, void *priv); +extern void tp_sap_udata_ind(enum tp_sap_data_type type, int blk_num, const uint8_t *bits, unsigned int len, void *priv); /* 9.4.4.2.6 Synchronization continuous downlink burst */ int build_sync_c_d_burst(uint8_t *buf, const uint8_t *sb, const uint8_t *bb, const uint8_t *bkn); diff --git a/src/tetra_prim.h b/src/tetra_prim.h index 8913187..918abd7 100644 --- a/src/tetra_prim.h +++ b/src/tetra_prim.h @@ -28,6 +28,7 @@ int crc_ok; /* was the CRC verified OK? */ uint32_t scrambling_code; /* which scrambling code was used */ struct tetra_tdma_time tdma_time;/* TDMA timestamp */ + int blk_num; /* Indicates whether BLK1 or BLK2 in the downlink burst */ //uint8_t mac_block[412]; /* maximum num of bits in a non-QAM chan */ }; -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I5ff316a773906328e19c3530b09d7412f9c731ec Gerrit-Change-Number: 28891 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange
1 0
0 0
Change in osmo-tetra[master]: Improved parsing in macpdu_decode_resource
by wbokslag 02 Aug '22

02 Aug '22
Attention is currently required from: wbokslag. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850 to look at the new patch set (#2). Change subject: Improved parsing in macpdu_decode_resource ...................................................................... Improved parsing in macpdu_decode_resource fill_bits and grant_position bits are now parsed and stored in the tetra_resrc_decoded struct A flag is_encrypted is set to to true if resource was not encrypted or if the calling function states that the frame has been decrypted successfully before passing it to tetra_resrc_decoded. Lastly, the channel_alloc element is only parsed if the frame is unencrypted. Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3 --- M src/tetra_mac_pdu.c M src/tetra_mac_pdu.h M src/tetra_upper_mac.c 3 files changed, 17 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/50/28850/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I6c85c93b70a34e01fd1a96a863f0e113be6424d3 Gerrit-Change-Number: 28850 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newpatchset
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 223
  • 224
  • 225
  • 226
  • 227
  • 228
  • 229
  • ...
  • 241
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.