fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/40042?usp=email )
Change subject: SMS-over-GSUP: properly update MSC_CTR_SMS_RP_ERR_{MEM,OTHER} ......................................................................
SMS-over-GSUP: properly update MSC_CTR_SMS_RP_ERR_{MEM,OTHER}
These counters have not been updated in SMS-over-GSUP mode so far. Move the logic updating counters to the common code path. Take a chance to use rate_ctr_inc2().
Change-Id: I97b4699e5b2c44989368004a53e26ca5daaa7b14 Related: SYS#7323 --- M src/libmsc/gsm_04_11.c 1 file changed, 5 insertions(+), 2 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index d45f1ea..fad2f4b 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -918,6 +918,11 @@ LOG_TRANS(trans, LOGL_NOTICE, "RX SMS RP-ERROR, cause %d:%d (%s)\n", cause_len, cause, get_value_string(gsm411_rp_cause_strs, cause));
+ if (cause == GSM411_RP_CAUSE_MT_MEM_EXCEEDED) + rate_ctr_inc2(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_MEM); + else + rate_ctr_inc2(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_OTHER); + if (trans->net->sms_over_gsup) { /* Forward towards SMSC via GSUP */ uint8_t ui_len = 0; @@ -957,10 +962,8 @@ * to store this in our database and wait for a SMMA message */ /* FIXME */ send_signal(S_SMS_MEM_EXCEEDED, trans, sms, 0); - rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_MEM)); } else { send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0); - rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_OTHER)); }
sms_free(sms);