diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-20 15:12:23 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-28 19:26:43 +0100 |
commit | dbb25132d737ca7d483f1195057c851836e9afdd (patch) | |
tree | 93cbb74695bd72cb04e5fb6dff64e5f51b797bc3 /tests | |
parent | c4fce1425e19d604c199c895e227dc2519110456 (diff) |
gsm0408_test: check for new mnc_3_digits flag
Note that on the input side, the 3-digits flag may be left false when the MNC
is >99 anyway. On the decoded side, the flag is set accurately.
Change-Id: I89765613d8c5bd939a6957f7443ac88475f1b93c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gsm0408/gsm0408_test.c | 5 | ||||
-rw-r--r-- | tests/gsm0408/gsm0408_test.ok | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index a0e740aa..9e552ab9 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -132,7 +132,7 @@ static int test_bearer_cap() static inline void dump_ra(const struct gprs_ra_id *raid) { - printf("%03u-%02u-%u-%u\n", raid->mcc, raid->mnc, raid->lac, raid->rac); + printf("%s%s\n", osmo_rai_name(raid), raid->mnc_3_digits ? " (3-digit MNC)" : ""); } static inline void check_ra(const struct gprs_ra_id *raid) @@ -153,7 +153,8 @@ static inline void check_ra(const struct gprs_ra_id *raid) printf("MCC+MNC in BCD: %s\n", osmo_hexdump(ra.digits, sizeof(ra.digits))); dump_ra(&raid0); printf("RA test..."); - if (raid->mnc != raid0.mnc || raid->mcc != raid0.mcc || raid->lac != raid0.lac || raid->rac != raid0.rac) + if (raid->mnc != raid0.mnc || raid->mcc != raid0.mcc || raid->lac != raid0.lac || raid->rac != raid0.rac + || (raid->mnc_3_digits || raid->mnc > 99) != raid0.mnc_3_digits) printf("FAIL\n"); else printf("passed\n"); diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 7612c12f..cc567636 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -5,7 +5,7 @@ Simple IMSI encoding test....passed: [10] 17 08 99 10 07 00 00 00 64 02 Constructed RA: 077-121-666-5 MCC+MNC in BCD: 70 17 21 -077-121-666-5 +077-121-666-5 (3-digit MNC) RA test...passed Constructed RA: 084-98-11-89 @@ -20,7 +20,7 @@ RA test...passed Constructed RA: 999-999-65535-255 MCC+MNC in BCD: 99 99 99 -999-999-65535-255 +999-999-65535-255 (3-digit MNC) RA test...passed - gsm48_generate_lai() from 077-121-666-0 Encoded 70 17 21 02 9a |