subject:"\[PATCH\] libosmocore\[master\]\: gsm0408_test\: test new gsm48_\{decode, generate\}

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

2018-02-28 Thread Neels Hofmeyr

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6661

to look at the new patch set (#7).

gsm0408_test: test new gsm48_{decode,generate}_lai2() functions

Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
---
M tests/gsm0408/gsm0408_test.c
M tests/gsm0408/gsm0408_test.ok
2 files changed, 50 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/6661/7

diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 9e552ab..479b371 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -187,6 +187,39 @@
printf("  FAIL\n");
 }
 
+static inline void dump_lai(const struct osmo_location_area_id *lai)
+{
+   printf("%s%s\n", osmo_lai_name(lai), lai->plmn.mnc_3_digits ? " 
(3-digit MNC)" : "");
+}
+
+static inline void check_lai2(const struct gprs_ra_id *raid)
+{
+   struct gsm48_loc_area_id lai = {};
+   struct osmo_location_area_id decoded = {};
+   struct osmo_location_area_id laid = {
+   .plmn = {
+   .mcc = raid->mcc,
+   .mnc = raid->mnc,
+   .mnc_3_digits = raid->mnc_3_digits,
+   },
+   .lac = raid->lac,
+   };
+
+   printf("- gsm48_generate_lai2() from "); dump_lai();
+
+   gsm48_generate_lai2(, );
+   printf("  Encoded %s\n", osmo_hexdump((unsigned char*), 
sizeof(lai)));
+   gsm48_decode_lai2(, );
+   printf("  gsm48_decode_lai2() gives  "); dump_lai();
+   if (decoded.plmn.mcc == laid.plmn.mcc
+   && decoded.plmn.mnc == laid.plmn.mnc
+   && decoded.lac == laid.lac
+   && decoded.plmn.mnc_3_digits == (laid.plmn.mnc_3_digits || 
laid.plmn.mnc > 99))
+   printf("  passed\n");
+   else
+   printf("  FAIL\n");
+}
+
 static struct gprs_ra_id test_ra_cap_items[] = {
{
.mcc = 77,
@@ -228,6 +261,7 @@
 
for (i = 0; i < ARRAY_SIZE(test_ra_cap_items); i++) {
check_lai(_ra_cap_items[i]);
+   check_lai2(_ra_cap_items[i]);
}
 }
 
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index cc56763..a0e2c23 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -26,15 +26,31 @@
   Encoded 70 17 21 02 9a 
   gsm48_decode_lai() gives  077-121-666-0
   passed
+- gsm48_generate_lai2() from 077-121-666
+  Encoded 70 17 21 02 9a 
+  gsm48_decode_lai2() gives  077-121-666 (3-digit MNC)
+  passed
 - gsm48_generate_lai() from 084-98-11-0
   Encoded 80 f4 89 00 0b 
   gsm48_decode_lai() gives  084-98-11-0
+  passed
+- gsm48_generate_lai2() from 084-98-11
+  Encoded 80 f4 89 00 0b 
+  gsm48_decode_lai2() gives  084-98-11
   passed
 - gsm48_generate_lai() from 000-00-0-0
   Encoded 00 f0 00 00 00 
   gsm48_decode_lai() gives  000-00-0-0
   passed
+- gsm48_generate_lai2() from 000-00-0
+  Encoded 00 f0 00 00 00 
+  gsm48_decode_lai2() gives  000-00-0
+  passed
 - gsm48_generate_lai() from 999-999-65535-0
   Encoded 99 99 99 ff ff 
   gsm48_decode_lai() gives  999-999-65535-0
   passed
+- gsm48_generate_lai2() from 999-999-65535
+  Encoded 99 99 99 ff ff 
+  gsm48_decode_lai2() gives  999-999-65535 (3-digit MNC)
+  passed

-- 
To view, visit https://gerrit.osmocom.org/6661
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
Gerrit-PatchSet: 7
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

2018-02-26 Thread Neels Hofmeyr

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/6661

to look at the new patch set (#5).

gsm0408_test: test new gsm48_{decode,generate}_lai2() functions

Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
---
M tests/gsm0408/gsm0408_test.c
M tests/gsm0408/gsm0408_test.ok
2 files changed, 50 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/6661/5

diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 9e552ab..4b22c3e 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -187,6 +187,39 @@
printf("  FAIL\n");
 }
 
+static inline void dump_lai(const struct osmo_location_area_id *lai)
+{
+   printf("%s%s\n", osmo_lai_name(lai), lai->plmn.mnc_3_digits ? " 
(3-digit MNC)" : "");
+}
+
+static inline void check_lai2(const struct gprs_ra_id *raid)
+{
+   struct gsm48_loc_area_id lai = {};
+   struct osmo_location_area_id decoded = {};
+   struct osmo_location_area_id laid = {
+   .plmn = {
+   .mcc = raid->mcc,
+   .mnc = raid->mnc,
+   .mnc_3_digits = raid->mnc_3_digits,
+   },
+   .lac = raid->lac,
+   };
+
+   printf("- osmo_generate_lai() from "); dump_lai();
+
+   osmo_generate_lai(, );
+   printf("  Encoded %s\n", osmo_hexdump((unsigned char*), 
sizeof(lai)));
+   osmo_decode_lai(, );
+   printf("  osmo_decode_lai() gives  "); dump_lai();
+   if (decoded.plmn.mcc == laid.plmn.mcc
+   && decoded.plmn.mnc == laid.plmn.mnc
+   && decoded.lac == laid.lac
+   && decoded.plmn.mnc_3_digits == (laid.plmn.mnc_3_digits || 
laid.plmn.mnc > 99))
+   printf("  passed\n");
+   else
+   printf("  FAIL\n");
+}
+
 static struct gprs_ra_id test_ra_cap_items[] = {
{
.mcc = 77,
@@ -228,6 +261,7 @@
 
for (i = 0; i < ARRAY_SIZE(test_ra_cap_items); i++) {
check_lai(_ra_cap_items[i]);
+   check_lai2(_ra_cap_items[i]);
}
 }
 
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index cc56763..58fe297 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -26,15 +26,31 @@
   Encoded 70 17 21 02 9a 
   gsm48_decode_lai() gives  077-121-666-0
   passed
+- osmo_generate_lai() from 077-121-666
+  Encoded 70 17 21 02 9a 
+  osmo_decode_lai() gives  077-121-666 (3-digit MNC)
+  passed
 - gsm48_generate_lai() from 084-98-11-0
   Encoded 80 f4 89 00 0b 
   gsm48_decode_lai() gives  084-98-11-0
+  passed
+- osmo_generate_lai() from 084-98-11
+  Encoded 80 f4 89 00 0b 
+  osmo_decode_lai() gives  084-98-11
   passed
 - gsm48_generate_lai() from 000-00-0-0
   Encoded 00 f0 00 00 00 
   gsm48_decode_lai() gives  000-00-0-0
   passed
+- osmo_generate_lai() from 000-00-0
+  Encoded 00 f0 00 00 00 
+  osmo_decode_lai() gives  000-00-0
+  passed
 - gsm48_generate_lai() from 999-999-65535-0
   Encoded 99 99 99 ff ff 
   gsm48_decode_lai() gives  999-999-65535-0
   passed
+- osmo_generate_lai() from 999-999-65535
+  Encoded 99 99 99 ff ff 
+  osmo_decode_lai() gives  999-999-65535 (3-digit MNC)
+  passed

-- 
To view, visit https://gerrit.osmocom.org/6661
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
Gerrit-PatchSet: 5
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

2018-02-21 Thread Neels Hofmeyr


gsm0408_test: test new gsm48_{decode,generate}_lai2() functions

Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
---
M tests/gsm0408/gsm0408_test.c
M tests/gsm0408/gsm0408_test.ok
2 files changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/6661/2

diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 9e552ab..c40c643 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -187,6 +187,34 @@
printf("  FAIL\n");
 }
 
+static inline void check_lai2(const struct gprs_ra_id *raid)
+{
+   int rc;
+   struct gsm48_loc_area_id lai = {};
+   struct gprs_ra_id decoded = {};
+   struct gprs_ra_id _laid = *raid;
+   struct gprs_ra_id *laid = &_laid;
+   laid->rac = 0;
+
+   printf("- gsm48_generate_lai2() from "); dump_ra(laid);
+
+   gsm48_generate_lai2(, laid->mcc, laid->mnc, laid->mnc_3_digits, 
laid->lac);
+   printf("  Encoded %s\n", osmo_hexdump((unsigned char*), 
sizeof(lai)));
+   rc = gsm48_decode_lai2(, , , 
_3_digits, );
+   if (rc) {
+   printf("  gsm48_decode_lai2() returned %d --> FAIL\n", rc);
+   return;
+   }
+   printf("  gsm48_decode_lai2() gives  "); dump_ra();
+   if (decoded.mcc == laid->mcc
+   && decoded.mnc == laid->mnc
+   && decoded.lac == laid->lac
+   && decoded.mnc_3_digits == (laid->mnc_3_digits || laid->mnc > 99))
+   printf("  passed\n");
+   else
+   printf("  FAIL\n");
+}
+
 static struct gprs_ra_id test_ra_cap_items[] = {
{
.mcc = 77,
@@ -228,6 +256,7 @@
 
for (i = 0; i < ARRAY_SIZE(test_ra_cap_items); i++) {
check_lai(_ra_cap_items[i]);
+   check_lai2(_ra_cap_items[i]);
}
 }
 
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index cc56763..be2a1de 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -26,15 +26,31 @@
   Encoded 70 17 21 02 9a 
   gsm48_decode_lai() gives  077-121-666-0
   passed
+- gsm48_generate_lai2() from 077-121-666-0
+  Encoded 70 17 21 02 9a 
+  gsm48_decode_lai2() gives  077-121-666-0 (3-digit MNC)
+  passed
 - gsm48_generate_lai() from 084-98-11-0
   Encoded 80 f4 89 00 0b 
   gsm48_decode_lai() gives  084-98-11-0
+  passed
+- gsm48_generate_lai2() from 084-98-11-0
+  Encoded 80 f4 89 00 0b 
+  gsm48_decode_lai2() gives  084-98-11-0
   passed
 - gsm48_generate_lai() from 000-00-0-0
   Encoded 00 f0 00 00 00 
   gsm48_decode_lai() gives  000-00-0-0
   passed
+- gsm48_generate_lai2() from 000-00-0-0
+  Encoded 00 f0 00 00 00 
+  gsm48_decode_lai2() gives  000-00-0-0
+  passed
 - gsm48_generate_lai() from 999-999-65535-0
   Encoded 99 99 99 ff ff 
   gsm48_decode_lai() gives  999-999-65535-0
   passed
+- gsm48_generate_lai2() from 999-999-65535-0
+  Encoded 99 99 99 ff ff 
+  gsm48_decode_lai2() gives  999-999-65535-0 (3-digit MNC)
+  passed

-- 
To view, visit https://gerrit.osmocom.org/6661
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

2018-02-21 Thread Neels Hofmeyr


Review at  https://gerrit.osmocom.org/6661

gsm0408_test: test new gsm48_{decode,generate}_lai2() functions

Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
---
M tests/gsm0408/gsm0408_test.c
M tests/gsm0408/gsm0408_test.ok
2 files changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/6661/1

diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index 9e552ab..c40c643 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -187,6 +187,34 @@
printf("  FAIL\n");
 }
 
+static inline void check_lai2(const struct gprs_ra_id *raid)
+{
+   int rc;
+   struct gsm48_loc_area_id lai = {};
+   struct gprs_ra_id decoded = {};
+   struct gprs_ra_id _laid = *raid;
+   struct gprs_ra_id *laid = &_laid;
+   laid->rac = 0;
+
+   printf("- gsm48_generate_lai2() from "); dump_ra(laid);
+
+   gsm48_generate_lai2(, laid->mcc, laid->mnc, laid->mnc_3_digits, 
laid->lac);
+   printf("  Encoded %s\n", osmo_hexdump((unsigned char*), 
sizeof(lai)));
+   rc = gsm48_decode_lai2(, , , 
_3_digits, );
+   if (rc) {
+   printf("  gsm48_decode_lai2() returned %d --> FAIL\n", rc);
+   return;
+   }
+   printf("  gsm48_decode_lai2() gives  "); dump_ra();
+   if (decoded.mcc == laid->mcc
+   && decoded.mnc == laid->mnc
+   && decoded.lac == laid->lac
+   && decoded.mnc_3_digits == (laid->mnc_3_digits || laid->mnc > 99))
+   printf("  passed\n");
+   else
+   printf("  FAIL\n");
+}
+
 static struct gprs_ra_id test_ra_cap_items[] = {
{
.mcc = 77,
@@ -228,6 +256,7 @@
 
for (i = 0; i < ARRAY_SIZE(test_ra_cap_items); i++) {
check_lai(_ra_cap_items[i]);
+   check_lai2(_ra_cap_items[i]);
}
 }
 
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index cc56763..be2a1de 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -26,15 +26,31 @@
   Encoded 70 17 21 02 9a 
   gsm48_decode_lai() gives  077-121-666-0
   passed
+- gsm48_generate_lai2() from 077-121-666-0
+  Encoded 70 17 21 02 9a 
+  gsm48_decode_lai2() gives  077-121-666-0 (3-digit MNC)
+  passed
 - gsm48_generate_lai() from 084-98-11-0
   Encoded 80 f4 89 00 0b 
   gsm48_decode_lai() gives  084-98-11-0
+  passed
+- gsm48_generate_lai2() from 084-98-11-0
+  Encoded 80 f4 89 00 0b 
+  gsm48_decode_lai2() gives  084-98-11-0
   passed
 - gsm48_generate_lai() from 000-00-0-0
   Encoded 00 f0 00 00 00 
   gsm48_decode_lai() gives  000-00-0-0
   passed
+- gsm48_generate_lai2() from 000-00-0-0
+  Encoded 00 f0 00 00 00 
+  gsm48_decode_lai2() gives  000-00-0-0
+  passed
 - gsm48_generate_lai() from 999-999-65535-0
   Encoded 99 99 99 ff ff 
   gsm48_decode_lai() gives  999-999-65535-0
   passed
+- gsm48_generate_lai2() from 999-999-65535-0
+  Encoded 99 99 99 ff ff 
+  gsm48_decode_lai2() gives  999-999-65535-0 (3-digit MNC)
+  passed

-- 
To view, visit https://gerrit.osmocom.org/6661
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c8492b8055803d2857f1ef30aede088778b085b
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

[PATCH] libosmocore[master]: gsm0408_test: test new gsm48_{decode, generate}_lai2() functions

4 matches

Site Navigation

Mail list logo

Footer information