cosmetic: mute "COMPLETE_LAYER_3 not permitted"
For networks without Authentication, the conn is already accepted when SUBSCR_CONN_E_COMPLETE_LAYER_3 is emitted. Mute that misleading error message. All is actually fine. Adjust expected test logs. Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402
This commit is contained in:
parent
c36e61e3dc
commit
36115c9d9a
|
@ -218,6 +218,12 @@ static void subscr_conn_fsm_accepted_enter(struct osmo_fsm_inst *fi, uint32_t pr
|
||||||
static void subscr_conn_fsm_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
static void subscr_conn_fsm_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data)
|
||||||
{
|
{
|
||||||
switch (event) {
|
switch (event) {
|
||||||
|
case SUBSCR_CONN_E_COMPLETE_LAYER_3:
|
||||||
|
/* When Authentication is off, we may already be in the Accepted state when the code
|
||||||
|
* evaluates the Compl L3. Simply ignore. This just cosmetically mutes the error log
|
||||||
|
* about the useless event. */
|
||||||
|
return;
|
||||||
|
|
||||||
case SUBSCR_CONN_E_COMMUNICATING:
|
case SUBSCR_CONN_E_COMMUNICATING:
|
||||||
osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_COMMUNICATING, 0, 0);
|
osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_COMMUNICATING, 0, 0);
|
||||||
return;
|
return;
|
||||||
|
@ -363,7 +369,8 @@ static const struct osmo_fsm_state subscr_conn_fsm_states[] = {
|
||||||
[SUBSCR_CONN_S_ACCEPTED] = {
|
[SUBSCR_CONN_S_ACCEPTED] = {
|
||||||
.name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED),
|
.name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED),
|
||||||
/* allow everything to release for any odd behavior */
|
/* allow everything to release for any odd behavior */
|
||||||
.in_event_mask = S(SUBSCR_CONN_E_COMMUNICATING) |
|
.in_event_mask = S(SUBSCR_CONN_E_COMPLETE_LAYER_3) |
|
||||||
|
S(SUBSCR_CONN_E_COMMUNICATING) |
|
||||||
S(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED) |
|
S(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED) |
|
||||||
S(SUBSCR_CONN_E_ACCEPTED) |
|
S(SUBSCR_CONN_E_ACCEPTED) |
|
||||||
S(SUBSCR_CONN_E_MO_CLOSE) |
|
S(SUBSCR_CONN_E_MO_CLOSE) |
|
||||||
|
|
|
@ -155,7 +155,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -238,7 +237,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SU
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
@ -516,7 +514,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -599,7 +596,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CO
|
||||||
DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
||||||
DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
|
|
@ -702,7 +702,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -900,7 +899,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -1101,7 +1099,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -1309,7 +1306,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SU
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
@ -1537,7 +1533,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SU
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
@ -1785,7 +1780,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SU
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
DREF VLR subscr MSISDN:46071 usage decreases to: 4
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
|
|
@ -148,7 +148,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to
|
||||||
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
|
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
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
DREF VLR subscr MSISDN:46071 usage decreases to: 2
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
|
||||||
cm_service_result_sent == 1
|
cm_service_result_sent == 1
|
||||||
msc_subscr_conn_is_accepted() == true
|
msc_subscr_conn_is_accepted() == true
|
||||||
|
@ -384,7 +383,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SU
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: NCSS
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: NCSS
|
||||||
DREF VLR subscr MSISDN:46071 usage decreases to: 3
|
DREF VLR subscr MSISDN:46071 usage decreases to: 3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3
|
||||||
DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted
|
|
||||||
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x40: trans_nc_ss)
|
DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x40: trans_nc_ss)
|
||||||
dtap_tx_confirmed == 1
|
dtap_tx_confirmed == 1
|
||||||
paging_stopped == 1
|
paging_stopped == 1
|
||||||
|
|
Loading…
Reference in New Issue