<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9467">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile/sms: Make it optional to store the SMS on disk<br><br>Disable storing the SMS on disk. This is useful when scripting mobile.<br>Keep the default of attempting to store it to disk.<br><br>Change-Id: I6353447343d98ebaa5e12ab63f995750f81c8500<br>---<br>M src/host/layer23/include/osmocom/bb/mobile/settings.h<br>M src/host/layer23/src/mobile/gsm411_sms.c<br>M src/host/layer23/src/mobile/settings.c<br>M src/host/layer23/src/mobile/vty_interface.c<br>4 files changed, 37 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/9467/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>index a1bce06..4e5d5a1 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h</span><br><span>@@ -21,6 +21,7 @@</span><br><span> </span><br><span> /* SMS */</span><br><span> char sms_sca[22];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool store_sms;</span><br><span> </span><br><span> /* test card simulator settings */</span><br><span> char test_imsi[16];</span><br><span>diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>index fe13ba1..623ba53 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>@@ -177,8 +177,8 @@</span><br><span> * receive SMS</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* now here comes our SMS */</span><br><span style="color: hsl(0, 100%, 40%);">-static int gsm340_rx_sms_deliver(struct osmocom_ms *ms, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+/* store the SMS to disk */</span><br><span style="color: hsl(120, 100%, 40%);">+static int sms_store(struct osmocom_ms *ms, struct msgb *msg,</span><br><span> struct gsm_sms *gsms)</span><br><span> {</span><br><span> const char osmocomsms[] = ".osmocom/bb/sms.txt";</span><br><span>@@ -187,8 +187,6 @@</span><br><span> char vty_text[sizeof(gsms->text)], *p;</span><br><span> FILE *fp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mobile_prim_ntfy_sms_new(ms, gsms);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* remove linefeeds and show at VTY */</span><br><span> strcpy(vty_text, gsms->text);</span><br><span> for (p = vty_text; *p; p++) {</span><br><span>@@ -222,6 +220,16 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* now here comes our SMS */</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsm340_rx_sms_deliver(struct osmocom_ms *ms, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_sms *gsms)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile_prim_ntfy_sms_new(ms, gsms);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ms->settings.store_sms)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return sms_store(ms, msg, gsms);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* process an incoming TPDU (called from RP-DATA)</span><br><span> * return value > 0: RP CAUSE for ERROR; < 0: silent error; 0 = success */</span><br><span> static int gsm340_rx_tpdu(struct gsm_trans *trans, struct msgb *msg, uint8_t msg_ref)</span><br><span>diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c</span><br><span>index f1c0cfc..7370b0a 100644</span><br><span>--- a/src/host/layer23/src/mobile/settings.c</span><br><span>+++ b/src/host/layer23/src/mobile/settings.c</span><br><span>@@ -92,6 +92,8 @@</span><br><span> </span><br><span> set->any_timeout = MOB_C7_DEFLT_ANY_TIMEOUT;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ set->store_sms = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INIT_LLIST_HEAD(&set->abbrev);</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>index f8ecb28..ec1216f 100644</span><br><span>--- a/src/host/layer23/src/mobile/vty_interface.c</span><br><span>+++ b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>@@ -1766,6 +1766,26 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ms_no_sms_store, cfg_ms_no_sms_store_cmd, "no sms-store",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Store SMS in the home directory")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmocom_ms *ms = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_settings *set = &ms->settings;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ set->store_sms = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</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%);">+DEFUN(cfg_ms_sms_store, cfg_ms_sms_store_cmd, "sms-store",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Store SMS in the home directory")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmocom_ms *ms = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_settings *set = &ms->settings;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ set->store_sms = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_no_cw, cfg_ms_no_cw_cmd, "no call-waiting",</span><br><span> NO_STR "Disallow waiting calls")</span><br><span> {</span><br><span>@@ -2909,6 +2929,8 @@</span><br><span> install_element(MS_NODE, &cfg_ms_neighbour_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_no_neighbour_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_any_timeout_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MS_NODE, &cfg_ms_sms_store_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MS_NODE, &cfg_ms_no_sms_store_cmd);</span><br><span> install_element(MS_NODE, &cfg_ms_support_cmd);</span><br><span> install_node(&support_node, config_write_dummy);</span><br><span> install_element(SUPPORT_NODE, &cfg_ms_sup_dtmf_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9467">change 9467</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/9467"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6353447343d98ebaa5e12ab63f995750f81c8500 </div>
<div style="display:none"> Gerrit-Change-Number: 9467 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>