<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19021">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ms: Small clean ups in IMSI storage related code<br><br>Change-Id: I987af0d33b79302c037d062c9d1c828a0e027147<br>---<br>M src/gprs_ms.cpp<br>M src/gprs_ms.h<br>2 files changed, 5 insertions(+), 4 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/21/19021/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_ms.cpp b/src/gprs_ms.cpp</span><br><span>index 1ec8eda..341826c 100644</span><br><span>--- a/src/gprs_ms.cpp</span><br><span>+++ b/src/gprs_ms.cpp</span><br><span>@@ -120,7 +120,7 @@</span><br><span> </span><br><span>        LOGP(DRLCMAC, LOGL_INFO, "Creating MS object, TLLI = 0x%08x\n", tlli);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    m_imsi[0] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        m_imsi[0] = '\0';</span><br><span>    memset(&m_timer, 0, sizeof(m_timer));</span><br><span>    m_timer.cb = GprsMs::timeout;</span><br><span>        m_llc_queue.init();</span><br><span>@@ -463,8 +463,7 @@</span><br><span>            "Modifying MS object, TLLI = 0x%08x, IMSI '%s' -> '%s'\n",</span><br><span>              tlli(), m_imsi, imsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      strncpy(m_imsi, imsi, sizeof(m_imsi));</span><br><span style="color: hsl(0, 100%, 40%);">-  m_imsi[sizeof(m_imsi) - 1] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_strlcpy(m_imsi, imsi, sizeof(m_imsi));</span><br><span> }</span><br><span> </span><br><span> void GprsMs::set_ta(uint8_t ta_)</span><br><span>diff --git a/src/gprs_ms.h b/src/gprs_ms.h</span><br><span>index f7b5c36..1e5a155 100644</span><br><span>--- a/src/gprs_ms.h</span><br><span>+++ b/src/gprs_ms.h</span><br><span>@@ -32,6 +32,8 @@</span><br><span>        #include <osmocom/core/timer.h></span><br><span>        #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ #include <osmocom/gsm/protocol/gsm_23_003.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         #include "coding_scheme.h"</span><br><span> }</span><br><span> </span><br><span>@@ -159,7 +161,7 @@</span><br><span>  uint32_t m_new_dl_tlli;</span><br><span> </span><br><span>  /* store IMSI for look-up and PCH retransmission */</span><br><span style="color: hsl(0, 100%, 40%);">-     char m_imsi[16];</span><br><span style="color: hsl(120, 100%, 40%);">+      char m_imsi[OSMO_IMSI_BUF_SIZE];</span><br><span>     uint8_t m_ta;</span><br><span>        uint8_t m_ms_class;</span><br><span>  uint8_t m_egprs_ms_class;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19021">change 19021</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/+/19021"/><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: I987af0d33b79302c037d062c9d1c828a0e027147 </div>
<div style="display:none"> Gerrit-Change-Number: 19021 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>