<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19552">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: introduce and use GPRS_CHECK_ENABLED() macro<br><br>Change-Id: I39907a569e80344fc73596bea32a1b474ec720e0<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 21 insertions(+), 48 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 fc4ebd6..16935d3 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -2916,6 +2916,15 @@</span><br><span> </span><br><span> #define GPRS_TEXT "GPRS Packet Network\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define GPRS_CHECK_ENABLED(bts) \</span><br><span style="color: hsl(120, 100%, 40%);">+ do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.mode == BTS_GPRS_NONE) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% GPRS is not enabled on BTS %u%s", \</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, 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 style="color: hsl(120, 100%, 40%);">+ } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_bts_prs_bvci, cfg_bts_gprs_bvci_cmd,</span><br><span> "gprs cell bvci <2-65535>",</span><br><span> GPRS_TEXT</span><br><span>@@ -2926,10 +2935,7 @@</span><br><span> /* ETSI TS 101 343: values 0 and 1 are reserved for signalling and PTM */</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.cell.bvci = atoi(argv[0]);</span><br><span> </span><br><span>@@ -2944,10 +2950,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.nse.nsei = atoi(argv[0]);</span><br><span> </span><br><span>@@ -2966,10 +2969,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> int idx = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.nsvc[idx].nsvci = atoi(argv[1]);</span><br><span> </span><br><span>@@ -2987,10 +2987,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> int idx = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.nsvc[idx].local_port = atoi(argv[1]);</span><br><span> </span><br><span>@@ -3008,10 +3005,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> int idx = atoi(argv[0]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.nsvc[idx].remote_port = atoi(argv[1]);</span><br><span> </span><br><span>@@ -3029,10 +3023,7 @@</span><br><span> int idx = atoi(argv[0]);</span><br><span> struct in_addr ia;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> inet_aton(argv[1], &ia);</span><br><span> bts->gprs.nsvc[idx].remote_ip = ntohl(ia.s_addr);</span><br><span>@@ -3062,10 +3053,7 @@</span><br><span> int idx = get_string_value(gprs_ns_timer_strs, argv[0]);</span><br><span> int val = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> if (idx < 0 || idx >= ARRAY_SIZE(bts->gprs.nse.timer))</span><br><span> return CMD_WARNING;</span><br><span>@@ -3099,10 +3087,7 @@</span><br><span> int idx = get_string_value(gprs_bssgp_cfg_strs, argv[0]);</span><br><span> int val = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> if (idx < 0 || idx >= ARRAY_SIZE(bts->gprs.cell.timer))</span><br><span> return CMD_WARNING;</span><br><span>@@ -3121,10 +3106,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.rac = atoi(argv[0]);</span><br><span> </span><br><span>@@ -3138,10 +3120,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.ctrl_ack_type_use_block = false;</span><br><span> </span><br><span>@@ -3155,10 +3134,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.ctrl_ack_type_use_block = true;</span><br><span> </span><br><span>@@ -3175,10 +3151,7 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% GPRS not enabled on BTS %u%s", bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span> bts->gprs.net_ctrl_ord = atoi(argv[0] + 2);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19552">change 19552</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-bsc/+/19552"/><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-Change-Id: I39907a569e80344fc73596bea32a1b474ec720e0 </div>
<div style="display:none"> Gerrit-Change-Number: 19552 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>