<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13575">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add OSMO_IMSI_BUF_SIZE<br><br>Various places in our code base figure out how many chars they need to safely<br>store an IMSI. An IMSI can have a checksum digit, which is not reflected by<br>GSM23003_IMSI_MAX_DIGITS. And we usually need a terminating \0.<br><br>Instead of having a magic +2 repeated every so often, rather define<br>OSMO_IMSI_BUF_SIZE to contain both checksum digit and nul char, and have the<br>explanatory comment with it here in libosmocore.<br><br>Change-Id: Id11ada4c96b79f7f0ad58185ab7dbf24622fb770<br>---<br>M include/osmocom/gsm/gsup.h<br>M include/osmocom/gsm/protocol/gsm_23_003.h<br>2 files changed, 4 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h</span><br><span>index 29ea11a..9a583aa 100644</span><br><span>--- a/include/osmocom/gsm/gsup.h</span><br><span>+++ b/include/osmocom/gsm/gsup.h</span><br><span>@@ -232,7 +232,7 @@</span><br><span> /*! parsed/decoded GSUP protocol message */</span><br><span> struct osmo_gsup_message {</span><br><span>       enum osmo_gsup_message_type     message_type;</span><br><span style="color: hsl(0, 100%, 40%);">-   char                            imsi[GSM23003_IMSI_MAX_DIGITS+2];</span><br><span style="color: hsl(120, 100%, 40%);">+     char                            imsi[OSMO_IMSI_BUF_SIZE];</span><br><span>    enum gsm48_gmm_cause            cause;</span><br><span>       enum osmo_gsup_cancel_type      cancel_type;</span><br><span>         int                             pdp_info_compl;</span><br><span>diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h</span><br><span>index babd0f4..be1b157 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_23_003.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_23_003.h</span><br><span>@@ -5,6 +5,9 @@</span><br><span> /* Chapter 2.2 */</span><br><span> #define GSM23003_IMSI_MAX_DIGITS     15</span><br><span> #define GSM23003_IMSI_MIN_DIGITS  6</span><br><span style="color: hsl(120, 100%, 40%);">+/*! The char[] buffer size to completely contain an IMSI including the optional checksum digit as well as the</span><br><span style="color: hsl(120, 100%, 40%);">+ * terminating nul character. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_IMSI_BUF_SIZE (GSM23003_IMSI_MAX_DIGITS+2)</span><br><span> /* Chapter 2.4 */</span><br><span> #define GSM23003_TMSI_NUM_BYTES             4</span><br><span> /* Chapter 2.5 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13575">change 13575</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/13575"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id11ada4c96b79f7f0ad58185ab7dbf24622fb770 </div>
<div style="display:none"> Gerrit-Change-Number: 13575 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>