<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/17016">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM<br><br>Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66<br>---<br>M src/libmsc/gsm_04_08.c<br>M tests/msc_vlr/msc_vlr_test_reject_concurrency.err<br>2 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index df48bcb..d612e40 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1153,13 +1153,13 @@</span><br><span> struct vlr_subscr *vsub;</span><br><span> </span><br><span> if (msc_a_is_establishing_auth_ciph(msc_a)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR,</span><br><span> "Ignoring Paging Response, conn already busy establishing authenticity\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> if (msc_a_is_accepted(msc_a)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MSC_A_CAT(msc_a, DMM, LOGL_ERROR, "Ignoring Paging Response, conn already established\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "Ignoring Paging Response, conn already established\n");</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -1184,7 +1184,7 @@</span><br><span> * msc_vlr_subscr_assoc() to already have been called and completed. Has an error occurred? */</span><br><span> vsub = msc_a_vsub(msc_a);</span><br><span> if (!vsub) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_MSC_A(msc_a, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_MSC_A_CAT(msc_a, DRR, LOGL_ERROR, "subscriber not allowed to do a Paging Response\n");</span><br><span> msc_a_put(msc_a, MSC_A_USE_PAGING_RESPONSE);</span><br><span> return -EIO;</span><br><span> }</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err</span><br><span>index 3de18bf..8953c1d 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err</span><br><span>@@ -529,7 +529,7 @@</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: + rx_from_ms: now used by 2 (lu,rx_from_ms)</span><br><span> DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP</span><br><span style="color: hsl(0, 100%, 40%);">-DMM msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity</span><br><span style="color: hsl(120, 100%, 40%);">+DRR msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ignoring Paging Response, conn already busy establishing authenticity</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> lu_result_sent == 0</span><br><span> llist_count(&msub_list) == 1</span><br><span>@@ -1270,7 +1270,7 @@</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_sms,rx_from_ms)</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP</span><br><span style="color: hsl(0, 100%, 40%);">-DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established</span><br><span style="color: hsl(120, 100%, 40%);">+DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_sms)</span><br><span> llist_count(&msub_list) == 1</span><br><span> </span><br><span>@@ -2154,7 +2154,7 @@</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (sms,rx_from_ms)</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: RR GSM48_MT_RR_PAG_RESP</span><br><span style="color: hsl(0, 100%, 40%);">-DMM msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established</span><br><span style="color: hsl(120, 100%, 40%);">+DRR msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Ignoring Paging Response, conn already established</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (sms)</span><br><span> - MS replies with CP-ACK for received SMS</span><br><span> MSC <--GERAN-A-- MS: SMS:0x04</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/17016">change 17016</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/c/osmo-msc/+/17016"/><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-Change-Id: I006c2b4c684dc6b96e98dbb82063a0aa37e33c66 </div>
<div style="display:none"> Gerrit-Change-Number: 17016 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>