<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12946">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add define for dummy burst string<br><br>Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0<br>---<br>M src/gprs_rlcmac.cpp<br>M src/gprs_rlcmac.h<br>M src/tbf.cpp<br>M src/tbf_ul.cpp<br>M tests/rlcmac/RLCMACTest.cpp<br>M tests/types/TypesTest.cpp<br>6 files changed, 15 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12946/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp</span><br><span>index da5c541..5a223c1 100644</span><br><span>--- a/src/gprs_rlcmac.cpp</span><br><span>+++ b/src/gprs_rlcmac.cpp</span><br><span>@@ -33,7 +33,7 @@</span><br><span> {</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] Paging Request (CCCH)\n");</span><br><span> bitvec *paging_request = bitvec_alloc(23, tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(paging_request, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(paging_request, DUMMY_VEC);</span><br><span> int plen = Encoding::write_paging_request(paging_request, ptmsi, ptmsi_len);</span><br><span> pcu_l1if_tx_pch(paging_request, plen, (char *)imsi);</span><br><span> bitvec_free(paging_request);</span><br><span>diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h</span><br><span>index 8ff3c90..7a3a7af 100644</span><br><span>--- a/src/gprs_rlcmac.h</span><br><span>+++ b/src/gprs_rlcmac.h</span><br><span>@@ -40,6 +40,7 @@</span><br><span> */</span><br><span> //#define DEBUG_DL_ASS_IDLE</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define DUMMY_VEC "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b"</span><br><span> </span><br><span> struct gprs_rlcmac_tbf;</span><br><span> struct gprs_rlcmac_bts;</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 6792d08..233ae91 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -1270,8 +1270,7 @@</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(ass_vec,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span> LOGPTBF(new_dl_tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH)\n");</span><br><span> RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);</span><br><span> Encoding::write_packet_downlink_assignment(mac_control_block,</span><br><span>@@ -1310,8 +1309,7 @@</span><br><span> </span><br><span> bitvec *packet_access_rej = bitvec_alloc(23, tall_pcu_ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(packet_access_rej,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(packet_access_rej, DUMMY_VEC);</span><br><span> </span><br><span> Encoding::write_packet_access_reject(</span><br><span> packet_access_rej, tlli());</span><br><span>@@ -1368,8 +1366,7 @@</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(ass_vec,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span> Encoding::write_packet_uplink_assignment(bts_data(), ass_vec, m_tfi,</span><br><span> (direction == GPRS_RLCMAC_DL_TBF), tlli(),</span><br><span> is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 02f4ddb..7937f8b 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -151,8 +151,7 @@</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(ack_vec,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(ack_vec, DUMMY_VEC);</span><br><span> Encoding::write_packet_uplink_ack(bts_data(), ack_vec, this, final, rrbp);</span><br><span> bitvec_pack(ack_vec, msgb_put(msg, 23));</span><br><span> bitvec_free(ack_vec);</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp</span><br><span>index 3de4fac..88b24af 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.cpp</span><br><span>+++ b/tests/rlcmac/RLCMACTest.cpp</span><br><span>@@ -24,7 +24,8 @@</span><br><span> #include <cstdlib></span><br><span> #include <cstring></span><br><span> #include "csn1.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsm_rlcmac.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_rlcmac.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern "C" {</span><br><span> extern const struct log_info gprs_log_info;</span><br><span> #include "pcu_vty.h"</span><br><span>@@ -86,7 +87,7 @@</span><br><span> void testRlcMacDownlink(void *test_ctx)</span><br><span> {</span><br><span> struct bitvec *resultVector = bitvec_alloc(23, test_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(resultVector, DUMMY_VEC);</span><br><span> </span><br><span> std::string testData[] = {</span><br><span> "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment</span><br><span>@@ -141,7 +142,7 @@</span><br><span> {</span><br><span> cout << "vector1 == vector2 : FALSE" << endl;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(resultVector, DUMMY_VEC);</span><br><span> bitvec_free(vector);</span><br><span> free(data);</span><br><span> }</span><br><span>@@ -153,7 +154,7 @@</span><br><span> void testRlcMacUplink(void *test_ctx)</span><br><span> {</span><br><span> struct bitvec *resultVector = bitvec_alloc(23, test_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(resultVector, DUMMY_VEC);</span><br><span> </span><br><span> std::string testData[] = {</span><br><span> "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block</span><br><span>@@ -204,7 +205,7 @@</span><br><span> {</span><br><span> cout << "vector1 == vector2 : FALSE" << endl;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(resultVector, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(resultVector, DUMMY_VEC);</span><br><span> bitvec_free(vector);</span><br><span> free(data);</span><br><span> }</span><br><span>diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp</span><br><span>index 1bc911f..5a6338f 100644</span><br><span>--- a/tests/types/TypesTest.cpp</span><br><span>+++ b/tests/types/TypesTest.cpp</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include "gprs_debug.h"</span><br><span> #include "encoding.h"</span><br><span> #include "decoding.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_rlcmac.h></span><br><span> </span><br><span> extern "C" {</span><br><span> #include <osmocom/core/application.h></span><br><span>@@ -435,8 +436,7 @@</span><br><span> uint8_t plen;</span><br><span> bitvec *immediate_assignment_rej = bitvec_alloc(22, tall_pcu_ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(immediate_assignment_rej,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(immediate_assignment_rej, DUMMY_VEC);</span><br><span> plen = Encoding::write_immediate_assignment_reject(</span><br><span> immediate_assignment_rej, 112, 100,</span><br><span> GSM_L1_BURST_TYPE_ACCESS_1);</span><br><span>@@ -450,8 +450,7 @@</span><br><span> /* Extended RA value */</span><br><span> OSMO_ASSERT(immediate_assignment_rej->data[19] == 0xc0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(immediate_assignment_rej,</span><br><span style="color: hsl(0, 100%, 40%);">- "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(immediate_assignment_rej, DUMMY_VEC);</span><br><span> </span><br><span> plen = Encoding::write_immediate_assignment_reject(</span><br><span> immediate_assignment_rej, 112, 100,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12946">change 12946</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12946"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I464920b3d6d47bb1c797a4ce06230f005a2e06a0 </div>
<div style="display:none"> Gerrit-Change-Number: 12946 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>