Change in ...osmo-msc[master]: libmsc/gsm_09_11.c: fix: return trans from establish_nc_ss_trans()

laforge gerrit-no-reply at
Sat Jun 15 08:51:08 UTC 2019

laforge has submitted this change and it was merged. ( )

Change subject: libmsc/gsm_09_11.c: fix: return trans from establish_nc_ss_trans()

libmsc/gsm_09_11.c: fix: return trans from establish_nc_ss_trans()

It is expected that establish_nc_ss_trans() returns an allocated
transaction in successful case, or NULL in case of error. The
function assumes two scenarios:

  - the subscriber already has an active RAN connection,
  - RAN connection needs to be established (Paging).

In the first case, a pointer to the transaction is returned as
expected, but in case of Paging, NULL has always been returned,
even if there were no errors. Let's fix this.

Change-Id: I9dcee64dd0b435ef29630c223132b81724701f93
M src/libmsc/gsm_09_11.c
M tests/msc_vlr/msc_vlr_test_ss.err
2 files changed, 2 insertions(+), 2 deletions(-)

  Jenkins Builder: Verified
  laforge: Looks good to me, approved

diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c
index 3de933c..39b9711 100644
--- a/src/libmsc/gsm_09_11.c
+++ b/src/libmsc/gsm_09_11.c
@@ -409,7 +409,7 @@
 	msgb_tlv_put(trans->ss.msg, GSM0480_IE_FACILITY,
 		gsup_msg->ss_info_len, gsup_msg->ss_info);
-	return NULL;
+	return trans;
 /* NC SS specific transaction release.
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index 976b263..1199cf1 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -375,7 +375,7 @@
   paging request (SIGNALLING_HIGH_PRIO) to IMSI-901700000004620:MSISDN-46071 on GERAN-A
   strcmp(paging_expecting_imsi, vsub->imsi) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + Paging: now used by 5 (attached,_test_ss_ussd_no,gsm0911_gsup_rx,NCSS,Paging)
-<-- GSUP rx OSMO_GSUP_MSGT_PROC_SS_REQUEST: vlr_gsupc_read_cb() returns -22
+<-- GSUP rx OSMO_GSUP_MSGT_PROC_SS_REQUEST: vlr_gsupc_read_cb() returns 0
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - _test_ss_ussd_no: now used by 4 (attached,gsm0911_gsup_rx,NCSS,Paging)
   paging_sent == 1

To view, visit
To unsubscribe, or for help writing mail filters, visit

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9dcee64dd0b435ef29630c223132b81724701f93
Gerrit-Change-Number: 14461
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <>

More information about the gerrit-log mailing list