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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_09_11.c: introduce counter for active sessions<br><br>Change-Id: Ia17e7c747fffb5267d3ca5bc4193c1be4a57ef3a<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/gsm_09_11.c<br>M src/libmsc/osmo_msc.c<br>3 files changed, 11 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 3af619d..c79adde 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -276,6 +276,7 @@</span><br><span> </span><br><span>       struct rate_ctr_group *msc_ctrs;</span><br><span>     struct osmo_counter *active_calls;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct osmo_counter *active_nc_ss;</span><br><span> </span><br><span>       /* layer 4 */</span><br><span>        struct mncc_sock_state *mncc_state;</span><br><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index 2c5afb3..9b0a9e4 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -107,6 +107,9 @@</span><br><span>                       return -ENOMEM;</span><br><span>              }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+         /* Count active NC SS/USSD sessions */</span><br><span style="color: hsl(120, 100%, 40%);">+                osmo_counter_inc(conn->network->active_nc_ss);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>               trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS);</span><br><span>                trans->dlci = OMSC_LINKID_CB(msg);</span><br><span>                cm_service_request_concludes(conn, msg);</span><br><span>@@ -300,6 +303,9 @@</span><br><span>               return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Count active NC SS/USSD sessions */</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_counter_inc(net->active_nc_ss);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    /* Assign transaction ID */</span><br><span>  tid = trans_assign_trans_id(trans->net,</span><br><span>           trans->vsub, GSM48_PDISC_NC_SS, 0);</span><br><span>@@ -365,6 +371,9 @@</span><br><span>          */</span><br><span>  if (trans->ss.msg != NULL)</span><br><span>                msgb_free(trans->ss.msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        /* One session less */</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_counter_dec(trans->net->active_nc_ss);</span><br><span> }</span><br><span> </span><br><span> int gsm0911_gsup_handler(struct vlr_subscr *vsub,</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index 62a449f..a6618c0 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -67,6 +67,7 @@</span><br><span>                 return NULL;</span><br><span>         }</span><br><span>    net->active_calls = osmo_counter_alloc("msc.active_calls");</span><br><span style="color: hsl(120, 100%, 40%);">+      net->active_nc_ss = osmo_counter_alloc("msc.active_nc_ss");</span><br><span> </span><br><span>         net->mncc_recv = mncc_recv;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9745">change 9745</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/9745"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia17e7c747fffb5267d3ca5bc4193c1be4a57ef3a </div>
<div style="display:none"> Gerrit-Change-Number: 9745 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Chemeris <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>