<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10577">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: mute "COMPLETE_LAYER_3 not permitted"<br><br>For networks without Authentication, the conn is already accepted when<br>SUBSCR_CONN_E_COMPLETE_LAYER_3 is emitted. Mute that misleading error message.<br>All is actually fine.<br><br>Adjust expected test logs.<br><br>Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402<br>---<br>M src/libmsc/subscr_conn.c<br>M tests/msc_vlr/msc_vlr_test_no_authen.err<br>M tests/msc_vlr/msc_vlr_test_reject_concurrency.err<br>M tests/msc_vlr/msc_vlr_test_ss.err<br>4 files changed, 8 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/10577/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c</span><br><span>index c1d0e11..2040e36 100644</span><br><span>--- a/src/libmsc/subscr_conn.c</span><br><span>+++ b/src/libmsc/subscr_conn.c</span><br><span>@@ -218,6 +218,12 @@</span><br><span> static void subscr_conn_fsm_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SUBSCR_CONN_E_COMPLETE_LAYER_3:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* When Authentication is off, we may already be in the Accepted state when the code</span><br><span style="color: hsl(120, 100%, 40%);">+ * evaluates the Compl L3. Simply ignore. This just cosmetically mutes the error log</span><br><span style="color: hsl(120, 100%, 40%);">+ * about the useless event. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case SUBSCR_CONN_E_COMMUNICATING:</span><br><span> osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_COMMUNICATING, 0, 0);</span><br><span> return;</span><br><span>@@ -363,7 +369,8 @@</span><br><span> [SUBSCR_CONN_S_ACCEPTED] = {</span><br><span> .name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED),</span><br><span> /* allow everything to release for any odd behavior */</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(SUBSCR_CONN_E_COMMUNICATING) |</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(SUBSCR_CONN_E_COMPLETE_LAYER_3) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(SUBSCR_CONN_E_COMMUNICATING) |</span><br><span> S(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED) |</span><br><span> S(SUBSCR_CONN_E_ACCEPTED) |</span><br><span> S(SUBSCR_CONN_E_MO_CLOSE) |</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>index 0a36094..f2453af 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>@@ -155,7 +155,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -238,7 +237,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 4</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</span><br><span>@@ -516,7 +514,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -599,7 +596,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 4</span><br><span> DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</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 39199ef..84436d3 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>@@ -702,7 +702,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -900,7 +899,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -1101,7 +1099,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -1309,7 +1306,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 4</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</span><br><span>@@ -1537,7 +1533,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 4</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</span><br><span>@@ -1785,7 +1780,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 4</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>index 338b5aa..7255e7d 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>@@ -148,7 +148,6 @@</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)</span><br><span> cm_service_result_sent == 1</span><br><span> msc_subscr_conn_is_accepted() == true</span><br><span>@@ -384,7 +383,6 @@</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: NCSS</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 3</span><br><span> DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3</span><br><span style="color: hsl(0, 100%, 40%);">-DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted</span><br><span> DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x40: trans_nc_ss)</span><br><span> dtap_tx_confirmed == 1</span><br><span> paging_stopped == 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10577">change 10577</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/10577"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 </div>
<div style="display:none"> Gerrit-Change-Number: 10577 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>