<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13762">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gb_proxy: cosmetic: Use 'bool' in data structures where applicable<br><br>If we ever only use 0/1 in an 'int', we should have used 'bool'.<br><br>Change-Id: I63876f52d5de87e4c99d92669270fd1f487e217c<br>---<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gprs/gb_proxy.c<br>M src/gprs/gb_proxy_patch.c<br>M src/gprs/gb_proxy_tlli.c<br>M src/gprs/gb_proxy_vty.c<br>5 files changed, 36 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h</span><br><span>index a3e1a02..1e8fb25 100644</span><br><span>--- a/include/osmocom/sgsn/gb_proxy.h</span><br><span>+++ b/include/osmocom/sgsn/gb_proxy.h</span><br><span>@@ -10,6 +10,7 @@</span><br><span> </span><br><span> #include <sys/types.h></span><br><span> #include <regex.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span> </span><br><span> #define GBPROXY_INIT_VU_GEN_TX 256</span><br><span> </span><br><span>@@ -83,7 +84,7 @@</span><br><span> };</span><br><span> </span><br><span> struct gbproxy_match {</span><br><span style="color: hsl(0, 100%, 40%);">- int enable; /* is this match enabled? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enable; /* is this match enabled? */</span><br><span> char *re_str; /* regular expression (for IMSI) in string format */</span><br><span> regex_t re_comp; /* compiled regular expression (for IMSI) */</span><br><span> };</span><br><span>@@ -119,11 +120,11 @@</span><br><span> uint32_t stored_msgs_max_len;</span><br><span> </span><br><span> /* Should the P-TMSI be patched on the fly (required for 2-SGSN config) */</span><br><span style="color: hsl(0, 100%, 40%);">- int patch_ptmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool patch_ptmsi;</span><br><span> /* Should the IMSI be acquired by the proxy (required for 2-SGSN config) */</span><br><span style="color: hsl(0, 100%, 40%);">- int acquire_imsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool acquire_imsi;</span><br><span> /* Should we route subscribers to two different SGSNs? */</span><br><span style="color: hsl(0, 100%, 40%);">- int route_to_sgsn2;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool route_to_sgsn2;</span><br><span> /* NSEI of the second SGSN */</span><br><span> uint16_t nsip_sgsn2_nsei;</span><br><span> /* should we keep a cache of per-subscriber state even after de-registration? */</span><br><span>@@ -154,7 +155,7 @@</span><br><span> </span><br><span> /* BVCI used for Point-to-Point to this peer */</span><br><span> uint16_t bvci;</span><br><span style="color: hsl(0, 100%, 40%);">- int blocked;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool blocked;</span><br><span> </span><br><span> /* Routeing Area that this peer is part of (raw 04.08 encoding) */</span><br><span> uint8_t ra[6];</span><br><span>@@ -175,9 +176,9 @@</span><br><span> /* newly-assigned TLLI (e.g. during P-TMSI allocation procedure) */</span><br><span> uint32_t assigned;</span><br><span> /* has the BSS side validated (confirmed) the new TLLI? */</span><br><span style="color: hsl(0, 100%, 40%);">- int bss_validated;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bss_validated;</span><br><span> /* has the SGSN side validated (confirmed) the new TLLI? */</span><br><span style="color: hsl(0, 100%, 40%);">- int net_validated;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool net_validated;</span><br><span> /* NOTE: once both are validated, we set current = assigned and assigned = 0 */</span><br><span> </span><br><span> /* The P-TMSI for this subscriber */</span><br><span>@@ -204,7 +205,7 @@</span><br><span> size_t imsi_len;</span><br><span> </span><br><span> /* is the IMSI acquisition still pending? */</span><br><span style="color: hsl(0, 100%, 40%);">- int imsi_acq_pending;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool imsi_acq_pending;</span><br><span> </span><br><span> /* queue of stored UL messages (until IMSI acquisition completes and we can</span><br><span> * determine which of the SGSNs we should route this to */</span><br><span>@@ -215,10 +216,10 @@</span><br><span> unsigned vu_gen_tx_bss;</span><br><span> </span><br><span> /* is this subscriber deregistered (TLLI invalidated)? */</span><br><span style="color: hsl(0, 100%, 40%);">- int is_deregistered;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_deregistered;</span><br><span> </span><br><span> /* does this link match either the (2-SGSN) routing or the patching rule? */</span><br><span style="color: hsl(0, 100%, 40%);">- int is_matching[GBPROX_MATCH_LAST];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_matching[GBPROX_MATCH_LAST];</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c</span><br><span>index 0b5758a..3da7bfd 100644</span><br><span>--- a/src/gprs/gb_proxy.c</span><br><span>+++ b/src/gprs/gb_proxy.c</span><br><span>@@ -310,7 +310,7 @@</span><br><span> in_progress = 1;</span><br><span> </span><br><span> gbproxy_link_info_discard_messages(link_info);</span><br><span style="color: hsl(0, 100%, 40%);">- link_info->imsi_acq_pending = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->imsi_acq_pending = false;</span><br><span> </span><br><span> return in_progress;</span><br><span> }</span><br><span>@@ -531,7 +531,7 @@</span><br><span> * implementation relies on the MS doing proper retransmissions</span><br><span> * of the triggering message instead */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- link_info->imsi_acq_pending = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->imsi_acq_pending = true;</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -836,11 +836,11 @@</span><br><span> </span><br><span> switch (pdu_type) {</span><br><span> case BSSGP_PDUT_BVC_BLOCK_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- peer->blocked = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ peer->blocked = true;</span><br><span> rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_BLOCKED]);</span><br><span> break;</span><br><span> case BSSGP_PDUT_BVC_UNBLOCK_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- peer->blocked = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ peer->blocked = false;</span><br><span> rate_ctr_inc(&peer->ctrg->ctr[GBPROX_PEER_CTR_UNBLOCKED]);</span><br><span> break;</span><br><span> default:</span><br><span>diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c</span><br><span>index 251bb67..6235b04 100644</span><br><span>--- a/src/gprs/gb_proxy_patch.c</span><br><span>+++ b/src/gprs/gb_proxy_patch.c</span><br><span>@@ -398,7 +398,7 @@</span><br><span> {</span><br><span> if (match->enable) {</span><br><span> regfree(&match->re_comp);</span><br><span style="color: hsl(0, 100%, 40%);">- match->enable = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ match->enable = false;</span><br><span> }</span><br><span> talloc_free(match->re_str);</span><br><span> match->re_str = NULL;</span><br><span>@@ -419,7 +419,7 @@</span><br><span> REG_EXTENDED | REG_NOSUB | REG_ICASE);</span><br><span> </span><br><span> if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- match->enable = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ match->enable = true;</span><br><span> match->re_str = talloc_strdup(tall_sgsn_ctx, filter);</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/gprs/gb_proxy_tlli.c b/src/gprs/gb_proxy_tlli.c</span><br><span>index 0c027d5..4e21ede 100644</span><br><span>--- a/src/gprs/gb_proxy_tlli.c</span><br><span>+++ b/src/gprs/gb_proxy_tlli.c</span><br><span>@@ -284,8 +284,8 @@</span><br><span> </span><br><span> /* Remember assigned TLLI */</span><br><span> tlli_state->assigned = new_tlli;</span><br><span style="color: hsl(0, 100%, 40%);">- tlli_state->bss_validated = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- tlli_state->net_validated = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli_state->bss_validated = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli_state->net_validated = false;</span><br><span> }</span><br><span> </span><br><span> uint32_t gbproxy_map_tlli(uint32_t other_tlli,</span><br><span>@@ -325,9 +325,9 @@</span><br><span> </span><br><span> /* See GSM 04.08, 4.7.1.5 */</span><br><span> if (to_bss)</span><br><span style="color: hsl(0, 100%, 40%);">- tlli_state->net_validated = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli_state->net_validated = true;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- tlli_state->bss_validated = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli_state->bss_validated = true;</span><br><span> </span><br><span> if (!tlli_state->bss_validated || !tlli_state->net_validated)</span><br><span> return;</span><br><span>@@ -367,7 +367,7 @@</span><br><span> link_info->sgsn_tlli.current = 0;</span><br><span> link_info->sgsn_tlli.assigned = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- link_info->is_deregistered = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->is_deregistered = true;</span><br><span> </span><br><span> gbproxy_reset_link(link_info);</span><br><span> </span><br><span>@@ -424,7 +424,7 @@</span><br><span> &peer->cfg->matches[match_id],</span><br><span> parse_ctx->imsi, parse_ctx->imsi_len);</span><br><span> if (imsi_matches >= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- link_info->is_matching[match_id] = imsi_matches;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->is_matching[match_id] = imsi_matches ? true : false;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -498,7 +498,7 @@</span><br><span> if (!link_info)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- link_info->is_deregistered = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->is_deregistered = false;</span><br><span> </span><br><span> return link_info;</span><br><span> }</span><br><span>@@ -577,7 +577,7 @@</span><br><span> peer, parse_ctx->imsi, parse_ctx->imsi_len);</span><br><span> </span><br><span> if (link_info)</span><br><span style="color: hsl(0, 100%, 40%);">- link_info->is_deregistered = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_info->is_deregistered = false;</span><br><span> </span><br><span> return link_info;</span><br><span> }</span><br><span>diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c</span><br><span>index 52c39fd..5c4f454 100644</span><br><span>--- a/src/gprs/gb_proxy_vty.c</span><br><span>+++ b/src/gprs/gb_proxy_vty.c</span><br><span>@@ -241,7 +241,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->acquire_imsi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->acquire_imsi = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -256,7 +256,7 @@</span><br><span> for (match_id = 0; match_id < ARRAY_SIZE(g_cfg->matches); ++match_id)</span><br><span> gbproxy_clear_patch_filter(&g_cfg->matches[match_id]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->acquire_imsi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->acquire_imsi = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -329,7 +329,7 @@</span><br><span> "patch-ptmsi",</span><br><span> GBPROXY_PATCH_PTMSI_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->patch_ptmsi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->patch_ptmsi = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -339,7 +339,7 @@</span><br><span> "no patch-ptmsi",</span><br><span> NO_STR GBPROXY_PATCH_PTMSI_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->patch_ptmsi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->patch_ptmsi = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -355,7 +355,7 @@</span><br><span> "acquire-imsi",</span><br><span> GBPROXY_ACQUIRE_IMSI_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->acquire_imsi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->acquire_imsi = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -365,7 +365,7 @@</span><br><span> "no acquire-imsi",</span><br><span> NO_STR GBPROXY_ACQUIRE_IMSI_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->acquire_imsi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->acquire_imsi = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -387,10 +387,10 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->route_to_sgsn2 = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->route_to_sgsn2 = true;</span><br><span> g_cfg->nsip_sgsn2_nsei = nsei;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->patch_ptmsi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->patch_ptmsi = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -400,10 +400,10 @@</span><br><span> "no secondary-sgsn",</span><br><span> NO_STR GBPROXY_SECOND_SGSN_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->route_to_sgsn2 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->route_to_sgsn2 = false;</span><br><span> g_cfg->nsip_sgsn2_nsei = 0xFFFF;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->patch_ptmsi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->patch_ptmsi = false;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -849,7 +849,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->acquire_imsi = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->acquire_imsi = true;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13762">change 13762</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/13762"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I63876f52d5de87e4c99d92669270fd1f487e217c </div>
<div style="display:none"> Gerrit-Change-Number: 13762 </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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>