This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgMax has submitted this change and it was merged. ( https://gerrit.osmocom.org/12946 ) Change subject: Add define for dummy burst string ...................................................................... Add define for dummy burst string Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0 --- M src/gprs_rlcmac.cpp M src/gprs_rlcmac.h M src/tbf.cpp M src/tbf_ul.cpp M tests/rlcmac/RLCMACTest.cpp M tests/types/TypesTest.cpp 6 files changed, 15 insertions(+), 17 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp index da5c541..5a223c1 100644 --- a/src/gprs_rlcmac.cpp +++ b/src/gprs_rlcmac.cpp @@ -33,7 +33,7 @@ { LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n"); bitvec *paging_request = bitvec_alloc(23, tall_pcu_ctx); - bitvec_unhex(paging_request, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(paging_request, DUMMY_VEC); int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len); pcu_l1if_tx_pch(paging_request, plen, (char *)imsi); bitvec_free(paging_request); diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 8ff3c90..7a3a7af 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -40,6 +40,7 @@ */ //#define DEBUG_DL_ASS_IDLE +#define DUMMY_VEC "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b" struct gprs_rlcmac_tbf; struct gprs_rlcmac_bts; diff --git a/src/tbf.cpp b/src/tbf.cpp index 6792d08..233ae91 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -1270,8 +1270,7 @@ msgb_free(msg); return NULL; } - bitvec_unhex(ass_vec, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(ass_vec, DUMMY_VEC); LOGPTBF(new_dl_tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH)\n"); RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t); Encoding::write_packet_downlink_assignment(mac_control_block, @@ -1310,8 +1309,7 @@ bitvec *packet_access_rej = bitvec_alloc(23, tall_pcu_ctx); - bitvec_unhex(packet_access_rej, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(packet_access_rej, DUMMY_VEC); Encoding::write_packet_access_reject( packet_access_rej, tlli()); @@ -1368,8 +1366,7 @@ msgb_free(msg); return NULL; } - bitvec_unhex(ass_vec, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(ass_vec, DUMMY_VEC); Encoding::write_packet_uplink_assignment(bts_data(), ass_vec, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), tlli(), is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha, diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 02f4ddb..7937f8b 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -151,8 +151,7 @@ msgb_free(msg); return NULL; } - bitvec_unhex(ack_vec, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(ack_vec, DUMMY_VEC); Encoding::write_packet_uplink_ack(bts_data(), ack_vec, this, final, rrbp); bitvec_pack(ack_vec, msgb_put(msg, 23)); bitvec_free(ack_vec); diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 3de4fac..bf7a605 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -25,6 +25,8 @@ #include <cstring> #include "csn1.h" #include "gsm_rlcmac.h" +#include "gprs_rlcmac.h" + extern "C" { extern const struct log_info gprs_log_info; #include "pcu_vty.h" @@ -86,7 +88,7 @@ void testRlcMacDownlink(void *test_ctx) { struct bitvec *resultVector = bitvec_alloc(23, test_ctx); - bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(resultVector, DUMMY_VEC); std::string testData[] = { "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment @@ -141,7 +143,7 @@ { cout << "vector1 == vector2 : FALSE" << endl; } - bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); free(data); } @@ -153,7 +155,7 @@ void testRlcMacUplink(void *test_ctx) { struct bitvec *resultVector = bitvec_alloc(23, test_ctx); - bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(resultVector, DUMMY_VEC); std::string testData[] = { "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block @@ -204,7 +206,7 @@ { cout << "vector1 == vector2 : FALSE" << endl; } - bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(resultVector, DUMMY_VEC); bitvec_free(vector); free(data); } diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 1bc911f..90d3981 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -25,6 +25,7 @@ #include "gprs_debug.h" #include "encoding.h" #include "decoding.h" +#include "gprs_rlcmac.h" extern "C" { #include <osmocom/core/application.h> @@ -435,8 +436,7 @@ uint8_t plen; bitvec *immediate_assignment_rej = bitvec_alloc(22, tall_pcu_ctx); - bitvec_unhex(immediate_assignment_rej, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(immediate_assignment_rej, DUMMY_VEC); plen = Encoding::write_immediate_assignment_reject( immediate_assignment_rej, 112, 100, GSM_L1_BURST_TYPE_ACCESS_1); @@ -450,8 +450,7 @@ /* Extended RA value */ OSMO_ASSERT(immediate_assignment_rej->data[19] == 0xc0); - bitvec_unhex(immediate_assignment_rej, - "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"); + bitvec_unhex(immediate_assignment_rej, DUMMY_VEC); plen = Encoding::write_immediate_assignment_reject( immediate_assignment_rej, 112, 100, -- To view, visit https://gerrit.osmocom.org/12946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0 Gerrit-Change-Number: 12946 Gerrit-PatchSet: 4 Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-CC: Vadim Yanitskiy <axilirator at gmail.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190220/5b69584e/attachment.htm>