Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

2018-09-17 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10986 )

Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..

msc_vlr_tests: cosmetically tweak perm algo printing

In the msc_vlr_tests, instead of printing the algo IDs, rather print the
corresponding A5/n name, for clarity.

Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
---
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_tests.c
2 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved



diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 71e34a8..6a00669 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -68,7 +68,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -238,7 +238,7 @@
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -376,7 +376,7 @@
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -571,7 +571,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -778,7 +778,7 @@
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -916,7 +916,7 @@
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set 
Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -,7 +,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1352,7 +1352,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=1
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1582,7 +1582,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 

Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

2018-09-17 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10986 )

Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10986
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
Gerrit-Change-Number: 10986
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 10:33:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

2018-09-16 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10986 )

Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10986
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
Gerrit-Change-Number: 10986
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 17 Sep 2018 05:31:58 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-msc[master]: msc_vlr_tests: cosmetically tweak perm algo printing

2018-09-16 Thread Neels Hofmeyr
Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/10986


Change subject: msc_vlr_tests: cosmetically tweak perm algo printing
..

msc_vlr_tests: cosmetically tweak perm algo printing

In the msc_vlr_tests, instead of printing the algo IDs, rather print the
corresponding A5/n name, for clarity.

Change-Id: Ic00f1e54490650bcb40170647b8ffd52ede23fd3
---
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_tests.c
2 files changed, 13 insertions(+), 13 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/86/10986/1

diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err 
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 71e34a8..6a00669 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -68,7 +68,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -238,7 +238,7 @@
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR 
Process_Access_Request_VLR(CM_SERVICE_REQ:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -376,7 +376,7 @@
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR 
Process_Access_Request_VLR(PAGING_RESP:90170004620){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -571,7 +571,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -778,7 +778,7 @@
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 07fa7502e07e1c00
 DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -916,7 +916,7 @@
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: Set 
Ciphering Mode
 DMM -> CIPHER MODE COMMAND MSISDN:46071
 - sending Ciphering Mode Command for MSISDN:46071: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: e2b234f807886400
 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_WAIT_AUTH}: 
state_chg to PR_ARQ_S_WAIT_CIPH
 DREF MSISDN:46071: MSC conn use - dtap == 0 (0x0: )
@@ -,7 +,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1352,7 +1352,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=1
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1582,7 +1582,7 @@
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode
 DMM -> CIPHER MODE COMMAND IMSI:90170004620
 - sending Ciphering Mode Command for IMSI:90170004620: include_imeisv=0
-- ...perm algo: 2
+- ...perm algo: A5/1
 - ...key: 61855fb81fc2a800
 DVLR vlr_lu_fsm(LU:90170004620){VLR_ULA_S_WAIT_AUTH}: state_chg to 
VLR_ULA_S_WAIT_CIPH
 DREF IMSI:90170004620: MSC conn use - dtap == 0 (0x0: )
@@ -1856,7