osmith submitted this change.

View Change

Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified
SMS: fix bogus error for SMS over SG from MME

OsmoMSC accepts SMS over the SG interface from the MME and can
successfully send them. Fix that the following error gets logged along
with every SMS from SG:

MO SMS without prior CM Service Request (gsm_04_11.c:1127)

Fixes: OS#6207
Change-Id: Id3f9c6c20e6d4d4275ca16fb17b0822a7d70e0a0
---
M src/libmsc/gsm_04_11.c
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 530ef17..fb04b45 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -1123,10 +1123,15 @@

osmo_fsm_inst_dispatch(msc_a->c.fi, MSC_A_EV_TRANSACTION_ACCEPTED, trans);
if (mo) {
- if (!osmo_use_count_by(&msc_a->use_count, MSC_A_USE_CM_SERVICE_SMS))
- LOG_TRANS(trans, LOGL_ERROR, "MO SMS without prior CM Service Request\n");
- else
+ if (!osmo_use_count_by(&msc_a->use_count, MSC_A_USE_CM_SERVICE_SMS)) {
+ if (vsub->attached_via_ran == OSMO_RAT_EUTRAN_SGS) {
+ /* SMS over the SG interface from MME (OS#6207) */
+ } else {
+ LOG_TRANS(trans, LOGL_ERROR, "MO SMS without prior CM Service Request\n");
+ }
+ } else {
msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SMS);
+ }
}

/* If we're re-using the existing LU connection, drop the LU token.

To view, visit change 43625. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Id3f9c6c20e6d4d4275ca16fb17b0822a7d70e0a0
Gerrit-Change-Number: 43625
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>