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

Change in osmo-tetra[master]: added brackets; fprintf was erroneously not guarded by if statement

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28593 ) Change subject: added brackets; fprintf was erroneously not guarded by if statement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I2e8c365ee261bde998a69f0f3531dfe6f3ec49c7 Gerrit-Change-Number: 28593 Gerrit-PatchSet: 1 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, 13 Jul 2022 17:38:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: Created tuntap.h to allow for proper use of tun_alloc in tetra_llc.c

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28592 ) Change subject: Created tuntap.h to allow for proper use of tun_alloc in tetra_llc.c ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/tuntap.h: https://gerrit.osmocom.org/c/osmo-tetra/+/28592/comment/c568e643_e01c59ef PS1, Line 1: #ifndef TUNTAP_H I think "#pragma once" should be used for all code developed in the last decade, but it's not critical if you don't want to change it. We can always clean that up later. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: If920c15e4dafb48d5df70ce20532ecb19bd01ee3 Gerrit-Change-Number: 28592 Gerrit-PatchSet: 1 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, 13 Jul 2022 17:37:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: ensure zero termination of tun device name

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28591 ) Change subject: ensure zero termination of tun device name ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: ignoring the linter, the legacy code unfortunately dosn't follow coding style in all places. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4b783c6b98ddfb30a4ca4532ef8cffa8e5f3a12f Gerrit-Change-Number: 28591 Gerrit-PatchSet: 1 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, 13 Jul 2022 17:36:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: fixed out of bounds write to pdu_sync buffer

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28596 ) Change subject: fixed out of bounds write to pdu_sync buffer ...................................................................... fixed out of bounds write to pdu_sync buffer Change-Id: I414bf2d61dc1cb37d30dc84b401a75b918116bbb --- M src/conv_enc_test.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/96/28596/1 diff --git a/src/conv_enc_test.c b/src/conv_enc_test.c index 303ef31..150a564 100644 --- a/src/conv_enc_test.c +++ b/src/conv_enc_test.c @@ -335,12 +335,12 @@ srand(time(NULL)); for (i = 0; i < 100; i++) { uint32_t r = rand(); - osmo_pbit2ubit(pdu_sync, (uint8_t *) &r, 32); - osmo_pbit2ubit(pdu_sync+32, (uint8_t *)&r, 60-32); + *((uint32_t *)pdu_sync) = r; + *((uint32_t *)(pdu_sync+4)) = r; //build_sb(); - osmo_pbit2ubit(pdu_schf, (uint8_t *) &r, 32); - osmo_pbit2ubit(pdu_schf+32, (uint8_t *)&r, 60-32); + *((uint32_t *)pdu_schf) = r; + *((uint32_t *)(pdu_schf+4)) = r; build_ndb_schf(); } #endif -- 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: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: moved variable declaration to prevent compiler warnings

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28597 ) Change subject: moved variable declaration to prevent compiler warnings ...................................................................... moved variable declaration to prevent compiler warnings Change-Id: If9a83589b220ae7d937ef75c79de57be11858cd1 --- M src/conv_enc_test.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/97/28597/1 diff --git a/src/conv_enc_test.c b/src/conv_enc_test.c index 150a564..f056755 100644 --- a/src/conv_enc_test.c +++ b/src/conv_enc_test.c @@ -306,8 +306,7 @@ int main(int argc, char **argv) { - int err, i; - uint16_t out; + int i; uint32_t ret; /* first: run some subsystem tests */ @@ -317,6 +316,8 @@ tetra_rm3014_init(); #if 0 + int err; + uint16_t out; ret = tetra_rm3014_compute(0x1001); printf("RM3014: 0x%08x\n", ret); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: If9a83589b220ae7d937ef75c79de57be11858cd1 Gerrit-Change-Number: 28597 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: added brackets; fprintf was erroneously not guarded by if statement

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28593 ) Change subject: added brackets; fprintf was erroneously not guarded by if statement ...................................................................... added brackets; fprintf was erroneously not guarded by if statement Change-Id: I2e8c365ee261bde998a69f0f3531dfe6f3ec49c7 --- M src/tetra_llc.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/93/28593/1 diff --git a/src/tetra_llc.c b/src/tetra_llc.c index 045b8df..42ec288 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -92,9 +92,10 @@ msg->l3h = msg->data; rx_tl_sdu(msg, msgb_l3len(msg)); - if (tun_fd < 0) + if (tun_fd < 0) { tun_fd = tun_alloc("tun0"); fprintf(stderr, "tun_fd=%d\n", tun_fd); + } if (tun_fd >= 0) { uint8_t buf[4096]; int len = osmo_ubit2pbit(buf, msg->l3h+3+4+4+4+4, msgb_l3len(msg)-3-4-4-4-4); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I2e8c365ee261bde998a69f0f3531dfe6f3ec49c7 Gerrit-Change-Number: 28593 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: Added missing return value

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28594 ) Change subject: Added missing return value ...................................................................... Added missing return value Change-Id: I53d0e75c14933fae30257f8a4cc76df0f3bcd642 --- M src/tetra_llc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/94/28594/1 diff --git a/src/tetra_llc.c b/src/tetra_llc.c index 42ec288..893673e 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -105,6 +105,7 @@ llist_del(&dqe->list); talloc_free(msg); talloc_free(dqe); + return 0; } /* Receive TM-SDU (MAC SDU == LLC PDU) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I53d0e75c14933fae30257f8a4cc76df0f3bcd642 Gerrit-Change-Number: 28594 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: added missing switch statements to suppress compiler warnings

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28595 ) Change subject: added missing switch statements to suppress compiler warnings ...................................................................... added missing switch statements to suppress compiler warnings Change-Id: I02f7b1875e5501f6977638130c8c5b8c8634fe4e --- M src/phy/tetra_burst.c M src/tetra_llc.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/95/28595/1 diff --git a/src/phy/tetra_burst.c b/src/phy/tetra_burst.c index 5bede06..c791ee0 100644 --- a/src/phy/tetra_burst.c +++ b/src/phy/tetra_burst.c @@ -371,5 +371,9 @@ 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); break; + case TETRA_TRAIN_NORM_3: + case TETRA_TRAIN_EXT: + /* uplink training sequences, should not be encountered, ignore */ + break; } } diff --git a/src/tetra_llc.c b/src/tetra_llc.c index 893673e..e0d5cab 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -150,6 +150,12 @@ /* check if the fragment is complete and hand it off*/ tllc_defrag_out(&g_llcs, &lpp); break; + + case TLLC_PDUT_DEC_UNKNOWN: + case TLLC_PDUT_DEC_ALX_ACK: + case TLLC_PDUT_DEC_ALX_RNR: + /* fixme: unhandled types */ + break; } if (lpp.tl_sdu && lpp.ss == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I02f7b1875e5501f6977638130c8c5b8c8634fe4e Gerrit-Change-Number: 28595 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: ensure zero termination of tun device name

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28591 ) Change subject: ensure zero termination of tun device name ...................................................................... ensure zero termination of tun device name Change-Id: I4b783c6b98ddfb30a4ca4532ef8cffa8e5f3a12f --- M src/tuntap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/91/28591/1 diff --git a/src/tuntap.c b/src/tuntap.c index 8109067..6ae16c7 100644 --- a/src/tuntap.c +++ b/src/tuntap.c @@ -29,7 +29,7 @@ */ ifr.ifr_flags = IFF_TUN|IFF_NO_PI; if( *dev ) - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + snprintf(ifr.ifr_name, IFNAMSIZ, "%s", dev); if( (err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ){ close(fd); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4b783c6b98ddfb30a4ca4532ef8cffa8e5f3a12f Gerrit-Change-Number: 28591 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-tetra[master]: Created tuntap.h to allow for proper use of tun_alloc in tetra_llc.c

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28592 ) Change subject: Created tuntap.h to allow for proper use of tun_alloc in tetra_llc.c ...................................................................... Created tuntap.h to allow for proper use of tun_alloc in tetra_llc.c Change-Id: If920c15e4dafb48d5df70ce20532ecb19bd01ee3 --- M src/tetra_llc.c A src/tuntap.h 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/92/28592/1 diff --git a/src/tetra_llc.c b/src/tetra_llc.c index 432f5a7..045b8df 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -28,6 +28,7 @@ #include <osmocom/core/bits.h> #include "tetra_llc_pdu.h" +#include "tuntap.h" static int tun_fd = -1; diff --git a/src/tuntap.h b/src/tuntap.h new file mode 100644 index 0000000..728002b --- /dev/null +++ b/src/tuntap.h @@ -0,0 +1,6 @@ +#ifndef TUNTAP_H +#define TUNTAP_H + +int tun_alloc(char *dev); + +#endif -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: If920c15e4dafb48d5df70ce20532ecb19bd01ee3 Gerrit-Change-Number: 28592 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022