<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14129">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smscb: Allow transmit of SCHEDULE and DEFAULT SMSCB<br><br>Change-Id: Iad41d24c87d091b8eb144544802d44def925ca70<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 19 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 88c845b..61060e2 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -4533,14 +4533,19 @@</span><br><span> </span><br><span> </span><br><span> DEFUN(smscb_cmd, smscb_cmd_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "bts <0-255> smscb-command <1-4> HEXSTRING",</span><br><span style="color: hsl(120, 100%, 40%);">+    "bts <0-255> smscb-command (normal|schedule|default) <1-4> HEXSTRING",</span><br><span>         "BTS related commands\n" BTS_NR_STR</span><br><span style="color: hsl(0, 100%, 40%);">-   "SMS Cell Broadcast\n" "Last Valid Block\n"</span><br><span style="color: hsl(120, 100%, 40%);">+       "SMS Cell Broadcast\n"</span><br><span style="color: hsl(120, 100%, 40%);">+      "Normal (one-shot) SMSCB Message; sent once over Abis+Um\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Schedule (one-shot) SMSCB Messag; sent once over Abis+Um\n"</span><br><span style="color: hsl(120, 100%, 40%);">+        "Default (repeating) SMSCB Message; sent once over Abis, unlimited ovrer Um\n"</span><br><span style="color: hsl(120, 100%, 40%);">+      "Last Valid Block\n"</span><br><span>       "Hex Encoded SMSCB message (up to 88 octets)\n")</span><br><span> {</span><br><span>      struct gsm_bts *bts;</span><br><span>         int bts_nr = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-     int last_block = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+       const char *type_str = argv[1];</span><br><span style="color: hsl(120, 100%, 40%);">+       int last_block = atoi(argv[2]);</span><br><span>      struct rsl_ie_cb_cmd_type cb_cmd;</span><br><span>    uint8_t buf[88];</span><br><span>     int rc;</span><br><span>@@ -4554,7 +4559,7 @@</span><br><span>              vty_out(vty, "%% BTS %d doesn't have a CBCH%s", bts_nr, VTY_NEWLINE);</span><br><span>          return CMD_WARNING;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       rc = osmo_hexparse(argv[2], buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+        rc = osmo_hexparse(argv[3], buf, sizeof(buf));</span><br><span>       if (rc < 0 || rc > sizeof(buf)) {</span><br><span>              vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span>            return CMD_WARNING;</span><br><span>@@ -4562,7 +4567,16 @@</span><br><span> </span><br><span>     cb_cmd.spare = 0;</span><br><span>    cb_cmd.def_bcast = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-   cb_cmd.command = RSL_CB_CMD_TYPE_NORMAL;</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!strcmp(type_str, "normal"))</span><br><span style="color: hsl(120, 100%, 40%);">+            cb_cmd.command = RSL_CB_CMD_TYPE_NORMAL;</span><br><span style="color: hsl(120, 100%, 40%);">+      else if (!strcmp(type_str, "schedule"))</span><br><span style="color: hsl(120, 100%, 40%);">+             cb_cmd.command = RSL_CB_CMD_TYPE_SCHEDULE;</span><br><span style="color: hsl(120, 100%, 40%);">+    else if (!strcmp(type_str, "default"))</span><br><span style="color: hsl(120, 100%, 40%);">+              cb_cmd.command = RSL_CB_CMD_TYPE_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+     else {</span><br><span style="color: hsl(120, 100%, 40%);">+                vty_out(vty, "Error parsing type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+          return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        switch (last_block) {</span><br><span>        case 1:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14129">change 14129</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/14129"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iad41d24c87d091b8eb144544802d44def925ca70 </div>
<div style="display:none"> Gerrit-Change-Number: 14129 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>