<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15633">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Log AGCH and PCH blocks using GSMTAP<br><br>Change-Id: I4d62f98801af1b0a290d3dd35bd213ccf3151035<br>---<br>M src/bts.h<br>M src/pcu_l1_if.cpp<br>M src/pcu_vty.c<br>3 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 4ffe433..c2cc316 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -58,6 +58,8 @@</span><br><span>        PCU_GSMTAP_C_DL_DATA_GPRS       = 3,    /* downlink GPRS data blocks */</span><br><span>      PCU_GSMTAP_C_DL_DATA_EGPRS      = 4,    /* downlink EGPRS data blocks */</span><br><span>     PCU_GSMTAP_C_DL_PTCCH           = 5,    /* downlink PTCCH blocks */</span><br><span style="color: hsl(120, 100%, 40%);">+   PCU_GSMTAP_C_DL_AGCH            = 6,    /* downlink AGCH blocks */</span><br><span style="color: hsl(120, 100%, 40%);">+    PCU_GSMTAP_C_DL_PCH             = 7,    /* downlink PCH blocks */</span><br><span> </span><br><span>        PCU_GSMTAP_C_UL_UNKNOWN         = 15,   /* unknown or undecodable uplink blocks */</span><br><span>   PCU_GSMTAP_C_UL_DUMMY           = 16,   /* uplink dummy blocks */</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 8901ce6..ac04663 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -207,16 +207,22 @@</span><br><span> </span><br><span> void pcu_l1if_tx_agch(bitvec * block, int plen)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+        struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span>       uint8_t data[23]; /* prefix PLEN */</span><br><span>  </span><br><span>     /* FIXME: why does OpenBTS has no PLEN and no fill in message? */</span><br><span>    bitvec_pack(block, data + 1);</span><br><span>        data[0] = (plen << 2) | 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_AGCH))</span><br><span style="color: hsl(120, 100%, 40%);">+                gsmtap_send(bts->gsmtap, 0, 0, GSMTAP_CHANNEL_AGCH, 0, 0, 0, 0, data, 23);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      pcu_tx_data_req(0, 0, PCU_IF_SAPI_AGCH, 0, 0, 0, data, 23);</span><br><span> }</span><br><span> </span><br><span> void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span>       uint8_t data[3+1+23]; /* prefix PLEN */</span><br><span> </span><br><span>  /* paging group */</span><br><span>@@ -230,6 +236,10 @@</span><br><span>    OSMO_ASSERT(block->data_len <= sizeof(data) - (3+1));</span><br><span>  bitvec_pack(block, data + 3+1);</span><br><span>      data[3] = (plen << 2) | 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_PCH))</span><br><span style="color: hsl(120, 100%, 40%);">+         gsmtap_send(bts->gsmtap, 0, 0, GSMTAP_CHANNEL_PCH, 0, 0, 0, 0, data + 4, 23);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   pcu_tx_data_req(0, 0, PCU_IF_SAPI_PCH, 0, 0, 0, data, 23+3);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index a131dd2..23a42e7 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -28,6 +28,8 @@</span><br><span>   { PCU_GSMTAP_C_DL_DATA_GPRS,    "dl-data-gprs" },</span><br><span>  { PCU_GSMTAP_C_DL_DATA_EGPRS,   "dl-data-egprs" },</span><br><span>         { PCU_GSMTAP_C_DL_PTCCH,        "dl-ptcch" },</span><br><span style="color: hsl(120, 100%, 40%);">+       { PCU_GSMTAP_C_DL_AGCH,         "dl-agch" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { PCU_GSMTAP_C_DL_PCH,          "dl-pch" },</span><br><span> </span><br><span>    { PCU_GSMTAP_C_UL_UNKNOWN,      "ul-unknown" },</span><br><span>    { PCU_GSMTAP_C_UL_DUMMY,        "ul-dummy" },</span><br><span>@@ -46,6 +48,8 @@</span><br><span>  { PCU_GSMTAP_C_DL_DATA_GPRS,    "Downlink Data Blocks (GPRS)" },</span><br><span>   { PCU_GSMTAP_C_DL_DATA_EGPRS,   "Downlink Data Blocks (EGPRS)" },</span><br><span>  { PCU_GSMTAP_C_DL_PTCCH,        "Downlink PTCCH Blocks" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { PCU_GSMTAP_C_DL_AGCH,         "Downlink AGCH Blocks" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { PCU_GSMTAP_C_DL_PCH,          "Downlink PCH Blocks" },</span><br><span> </span><br><span>       { PCU_GSMTAP_C_UL_UNKNOWN,      "Unknown / Unparseable / Erroneous Downlink Blocks" },</span><br><span>     { PCU_GSMTAP_C_UL_DUMMY,        "Uplink Dummy Blocks" },</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15633">change 15633</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/c/osmo-pcu/+/15633"/><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-Change-Id: I4d62f98801af1b0a290d3dd35bd213ccf3151035 </div>
<div style="display:none"> Gerrit-Change-Number: 15633 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>