<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14237">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rest_octets: Implement actual SI6 rest octets encoding<br><br>There's very little sense behind introducing a function into<br>libosmogsm which doesn't implement 90% of the spec. Let's allow<br>the caller to provide the various optional bits of information to<br>the encoder, rather than generating mostly static SI6 rest octets.<br><br>Change-Id: Id75005a0c4a02ce7f809692d58b3bd226bc582b2<br>---<br>M include/osmocom/gsm/gsm48_rest_octets.h<br>M src/gsm/gsm48_rest_octets.c<br>2 files changed, 75 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/14237/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>index bc5023a..7163672 100644</span><br><span>--- a/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>+++ b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>@@ -20,7 +20,44 @@</span><br><span> size_t *e_offset);</span><br><span> int osmo_gsm48_rest_octets_si2ter_encode(uint8_t *data);</span><br><span> int osmo_gsm48_rest_octets_si2bis_encode(uint8_t *data);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsm48_si_pch_nch_info {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool present;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool paging_channel_restructuring;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t nln_sacch;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool call_priority_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t call_priority;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool nln_status_sacch;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsm48_si_vbs_vgcs_options {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool present;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool inband_notifications;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool inband_pagings;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsm48_si_dtm_support {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rac;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_lapdm;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsm48_si_gprs_ms_txpwr_max_ccch {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool present;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t max_txpwr;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsm48_si6_ro_info {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_pch_nch_info pch_nch_info;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_vbs_vgcs_options vbs_vgcs_options;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_dtm_support dtm_support;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool band_indicator_1900;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_gprs_ms_txpwr_max_ccch gprs_ms_txpwr_max_ccch;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MBMS: not supported in Osmocom */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* AMR config (group channel): not supported in Osmocom */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, const struct osmo_gsm48_si6_ro_info *in);</span><br><span> </span><br><span> struct osmo_gsm48_si_selection_params {</span><br><span> uint16_t penalty_time:5,</span><br><span>diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c</span><br><span>index d5c93fe..c1e4b30 100644</span><br><span>--- a/src/gsm/gsm48_rest_octets.c</span><br><span>+++ b/src/gsm/gsm48_rest_octets.c</span><br><span>@@ -687,7 +687,7 @@</span><br><span> { L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > }</span><br><span> <implicit spare >;</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, bool is1800_net)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, const struct osmo_gsm48_si6_ro_info *in)</span><br><span> {</span><br><span> struct bitvec bv;</span><br><span> </span><br><span>@@ -695,19 +695,43 @@</span><br><span> bv.data = data;</span><br><span> bv.data_len = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* no PCH/NCH info */</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(0, 100%, 40%);">- /* no VBS/VGCS options */</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(0, 100%, 40%);">- /* no DTM_support */</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(0, 100%, 40%);">- /* band indicator */</span><br><span style="color: hsl(0, 100%, 40%);">- if (is1800_net)</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->pch_nch_info.present) {</span><br><span> bitvec_set_bit(&bv, H);</span><br><span style="color: hsl(0, 100%, 40%);">- /* no GPRS_MS_TXPWR_MAX_CCH */</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, !!in->pch_nch_info.paging_channel_restructuring);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_uint(&bv, in->pch_nch_info.nln_sacch, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->pch_nch_info.call_priority_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_uint(&bv, in->pch_nch_info.call_priority, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, !!in->pch_nch_info.nln_status_sacch);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->vbs_vgcs_options.present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, H);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, !!in->vbs_vgcs_options.inband_notifications);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, !!in->vbs_vgcs_options.inband_pagings);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->dtm_support.present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, H);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_uint(&bv, in->dtm_support.rac, 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_uint(&bv, in->dtm_support.max_lapdm, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->band_indicator_1900)</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, H);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, L);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (in->gprs_ms_txpwr_max_ccch.present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, H);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_uint(&bv, in->gprs_ms_txpwr_max_ccch.max_txpwr, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit(&bv, L);</span><br><span> </span><br><span> bitvec_spare_padding(&bv, (bv.data_len * 8) - 1);</span><br><span> return bv.data_len;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14237">change 14237</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/14237"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id75005a0c4a02ce7f809692d58b3bd226bc582b2 </div>
<div style="display:none"> Gerrit-Change-Number: 14237 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>