Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#2). Change subject: gsm23003: add osmo_imei_str_valid() .. gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 5 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/2 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 ) Change subject: gsm23003: add osmo_imei_str_valid() .. Patch Set 2: Updated: support 15 digit version with checksum (and verify the checksum with the Luhn algorithm), add test cases. https://en.wikipedia.org/wiki/Luhn_algorithm -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 14 Jan 2019 11:18:23 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#3). Change subject: gsm23003: add osmo_imei_str_valid() .. gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 5 files changed, 97 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/3 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
Hello Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12524 to look at the new patch set (#4). Change subject: gsm23003: add osmo_imei_str_valid() .. gsm23003: add osmo_imei_str_valid() Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14 digit version to check IMEIs before writing them to the DB. Place the Luhn checksum code in a dedicated osmo_luhn() function, so it can be used elsewhere. Related: OS#2541 Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 --- M include/osmocom/core/utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M src/utils.c M tests/gsm23003/gsm23003_test.c M tests/gsm23003/gsm23003_test.ok 7 files changed, 107 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/12524/4 -- To view, visit https://gerrit.osmocom.org/12524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 Gerrit-Change-Number: 12524 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12524 )
Change subject: gsm23003: add osmo_imei_str_valid()
..
Patch Set 3:
(2 comments)
https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c
File src/gsm/gsm23003.c:
https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c@83
PS3, Line 83: bool
> I think it may be interesting to the caller *why* it failed validation. […]
This would be inconsistent with osmo_msisdn_str_valid() and
osmo_imsi_str_valid() above, which return booleans. Should I implement it
regardless of that?
https://gerrit.osmocom.org/#/c/12524/3/src/gsm/gsm23003.c@93
PS3, Line 93: /* Verify Luhn algorithm (see Wikipedia)
:* digit id (i) | 00 01 02 03 04 05 06 07 08 09 10 11 12 13 CHK
:* double| x x x x x x x
:* do not double | x x x x x x x
: */
:
: /* Double every second digit and add it to sum */
: for (i = 1; i < 14; i += 2) {
: int check = 2 * (imei[i] - '0');
: if (check > 9)
: check -= 9;
: sum += check;
: }
> the IMEI checksumming function should definitely be a separate function, as
> it may be useful in othe […]
Done
--
To view, visit https://gerrit.osmocom.org/12524
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61
Gerrit-Change-Number: 12524
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: osmith
Gerrit-Comment-Date: Mon, 14 Jan 2019 14:06:27 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in libosmocore[master]: gsm23003: add osmo_imei_str_valid()
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/12524 )
Change subject: gsm23003: add osmo_imei_str_valid()
..
gsm23003: add osmo_imei_str_valid()
Verify 14 digit and 15 digit IMEI strings. OsmoHLR will use the 14
digit version to check IMEIs before writing them to the DB.
Place the Luhn checksum code in a dedicated osmo_luhn() function, so
it can be used elsewhere.
Related: OS#2541
Change-Id: Id2d2a3a93b033bafc74c62e15297034bf4aafe61
---
M include/osmocom/core/utils.h
M include/osmocom/gsm/gsm23003.h
M src/gsm/gsm23003.c
M src/gsm/libosmogsm.map
M src/utils.c
M tests/gsm23003/gsm23003_test.c
M tests/gsm23003/gsm23003_test.ok
7 files changed, 107 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 04f2fb4..987080e 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -140,4 +140,6 @@
uint32_t osmo_isqrt32(uint32_t x);
+const char osmo_luhn(const char* in, int in_len);
+
/*! @} */
diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h
index 2f380ae..b5c8dcd 100644
--- a/include/osmocom/gsm/gsm23003.h
+++ b/include/osmocom/gsm/gsm23003.h
@@ -93,6 +93,7 @@
bool osmo_imsi_str_valid(const char *imsi);
bool osmo_msisdn_str_valid(const char *msisdn);
+bool osmo_imei_str_valid(const char *imei, bool with_15th_digit);
const char *osmo_mcc_name(uint16_t mcc);
const char *osmo_mnc_name(uint16_t mnc, bool mnc_3_digits);
diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c
index 4fdad48..1d9cefe 100644
--- a/src/gsm/gsm23003.c
+++ b/src/gsm/gsm23003.c
@@ -31,6 +31,7 @@
#include
#include
+#include
static bool is_n_digits(const char *str, int min_digits, int max_digits)
{
@@ -71,6 +72,23 @@
return is_n_digits(msisdn, 1, 15);
}
+/*! Determine whether the given IMEI is valid according to 3GPP TS 23.003,
+ * Section 6.2.1. It consists of 14 digits, the 15th check digit is not
+ * intended for digital transmission.
+ * \param imei IMEI digits in ASCII string representation.
+ * \param with_15th_digit when true, expect the 15th digit to be present and
+ *verify it.
+ * \returns true when the IMEI is valid, false for invalid characters or number
+ * of digits.
+ */
+bool osmo_imei_str_valid(const char *imei, bool with_15th_digit)
+{
+ if (with_15th_digit)
+ return is_n_digits(imei, 15, 15) && osmo_luhn(imei, 14) ==
imei[14];
+ else
+ return is_n_digits(imei, 14, 14);
+}
+
/*! Return MCC string as standardized 3-digit with leading zeros.
* \param[in] mcc MCC value.
* \returns string in static buffer.
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index a903787..331c3f0 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -551,6 +551,7 @@
osmo_imsi_str_valid;
osmo_msisdn_str_valid;
+osmo_imei_str_valid;
osmo_mncc_stringify;
osmo_mncc_names;
diff --git a/src/utils.c b/src/utils.c
index 35d70ac..d1da4fa 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -765,4 +765,35 @@
return buf;
}
+/*! Calculate the Luhn checksum (as used for IMEIs).
+ * \param[in] in Input digits in ASCII string representation.
+ * \param[in] in_len Count of digits to use for the input (14 for IMEI).
+ * \returns checksum char (e.g. '3'); negative on error
+ */
+const char osmo_luhn(const char* in, int in_len)
+{
+ int i, sum = 0;
+
+ /* All input must be numbers */
+ for (i = 0; i < in_len; i++) {
+ if (!isdigit(in[i]))
+ return -EINVAL;
+ }
+
+ /* Double every second digit and add it to sum */
+ for (i = in_len - 1; i >= 0; i -= 2) {
+ int dbl = (in[i] - '0') * 2;
+ if (dbl > 9)
+ dbl -= 9;
+ sum += dbl;
+ }
+
+ /* Add other digits to sum */
+ for (i = in_len - 2; i >= 0; i -= 2)
+ sum += in[i] - '0';
+
+ /* Final checksum */
+ return (sum * 9) % 10 + '0';
+}
+
/*! @} */
diff --git a/tests/gsm23003/gsm23003_test.c b/tests/gsm23003/gsm23003_test.c
index 79965cf..eac5a11 100644
--- a/tests/gsm23003/gsm23003_test.c
+++ b/tests/gsm23003/gsm23003_test.c
@@ -118,6 +118,47 @@
return pass;
}
+static struct {
+ bool with_15th_digit;
+ const char *imei;
+ bool expect_ok;
+} test_imeis[] = {
+ /* without 15th digit */
+ {false, "12345678901234", true},
+ {false, "1234567890123", false},
+ {false, "123456789012345", false},
+
+ /* with 15th digit: valid */
+ {true, "357613004448485", true},
+ {true, "357805023984447", true},
+ {true, "352936001349777", true},
+
Change in osmo-hlr[master]: Add IMEI column to subscriber table
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#2). Change subject: Add IMEI column to subscriber table .. Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_id() and db_subscr_get_by_imei(). The new functions are used in db_test. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. A follow-up commit will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 212 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/2 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: osmith
Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR
Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#10). Change subject: VLR: send CHECK-IMEI to EIR/HLR .. VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 922 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/10 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Optionally store IMEI in subscriber table
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#3). Change subject: Optionally store IMEI in subscriber table .. Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty M tests/test_subscriber.vty 5 files changed, 52 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/3 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Add IMEI column to subscriber table
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#3). Change subject: Add IMEI column to subscriber table .. Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_id() and db_subscr_get_by_imei(). The new functions are used in db_test. This change requires a HLR DB schema update. Existing databases won't be upgraded automatically. However, osmo-hlr will refuse to operate with databases which are not upgraded. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. A follow-up commit will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 212 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/3 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#4). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "show subscriber", and allow showing subscribers by their IMEI with: "show subscriber imei ..." Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 19 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/4 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Optionally store IMEI in subscriber table
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#4). Change subject: Optionally store IMEI in subscriber table .. Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/4 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: osmith
Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR
Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#11). Change subject: VLR: send CHECK-IMEI to EIR/HLR .. VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 918 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/11 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db*
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12565 Change subject: gitignore: add tests/hlr_vty_test.db* .. gitignore: add tests/hlr_vty_test.db* Ignore files generated from the VTY test. Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/65/12565/1 diff --git a/.gitignore b/.gitignore index c08a612..0397e35 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ tests/gsup_server/gsup_server_test tests/gsup/gsup_test tests/db/db_test +tests/hlr_vty_test.db* # manuals doc/manuals/*.html -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-hlr[master]: Optionally store IMEI in subscriber table
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#5). Change subject: Optionally store IMEI in subscriber table .. Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/5 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Add IMEI column to subscriber table
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#4). Change subject: Add IMEI column to subscriber table .. Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_imsi() and db_subscr_get_by_imei(). The new functions are used in db_test, and in follow-up commits [1], [2]. Upgrade DB schema to version 2. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. Follow-up commit [1] will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. [1] change-id I09274ecbed64224f7ae305e09ede773931da2a57 "Optionally store IMEI in subscriber table" [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 186 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/4 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi()
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12566 Change subject: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() .. Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() Properly note that NULL can only be passed as msisdn, not imsi in that function. Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 --- M src/db_hlr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/66/12566/1 diff --git a/src/db_hlr.c b/src/db_hlr.c index c97cd82..2569477 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -141,8 +141,8 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. - * \param[in] msisdn ASCII string of MSISDN digits. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] msisdn ASCII string of MSISDN digits, or NULL to remove the MSISDN. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. */ -- To view, visit https://gerrit.osmocom.org/12566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 Gerrit-Change-Number: 12566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-hlr[master]: Add IMEI column to subscriber table
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table .. Patch Set 3: (4 comments) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG@15 PS3, Line 15: to operate with databases which are not upgraded. > (would suffice to just say "upgrade the db schema to version N", no need to > explain the general upgr […] Done https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG@28 PS3, Line 28: specification. > also mention that the subscr_get_by_imei() is used by commit "VTY: Integrate > IMEI" with change-id. […] Done. Just to make clear, this is also used with "ASSERT_SEL(imei,..." in db_test.c. https://gerrit.osmocom.org/#/c/12525/3/src/db.h File src/db.h: https://gerrit.osmocom.org/#/c/12525/3/src/db.h@76 PS3, Line 76: charimei[32]; > GSM23003_IMEI_NUM_DIGITS + 1 Done https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/3/src/db_hlr.c@392 PS3, Line 392: * \param[in] imei ASCII string of identifier digits, or NULL to remove the IMEI. > test passing NULL as arg to remove IMEI; then also the remainder of the > expected test output would b […] Good idea, done. -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 13:34:33 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: Optionally store IMEI in subscriber table
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12526 ) Change subject: Optionally store IMEI in subscriber table .. Patch Set 5: (3 comments) https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr.c@442 PS4, Line 442: msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP Check_IMEI response"); > if the subscriber doesn't exist, we should respond with an error. […] Agreed, all suggestions implemented. update_imei() is gone now, as it would only wrap db_update_imei_by_imsi() (no need to resolve the ID first). https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c@75 PS4, Line 75: vty_out(vty, " store-imei%s", VTY_NEWLINE); > looks like too much indent. […] Right, it should only be one space. Fixed, and extended one of the VTY tests to print this out. https://gerrit.osmocom.org/#/c/12526/4/src/hlr_vty.c@313 PS4, Line 313: " Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1').") > wording: maybe rather "Note that an MSC does not necessarily send Check IMEI > requests (for OsmoMSC, […] I went with store-imei/no store-imei and changed the wording as suggested. -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 15 Jan 2019 13:38:48 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-gsm-manuals[master]: common: extend glossary.adoc
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12567 Change subject: common: extend glossary.adoc .. common: extend glossary.adoc Add EIR, IMEISV, LU, PVLR, SS, TS and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/1 diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 74973b3..dd6a76f 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -85,6 +85,8 @@ GPRS; introduces 8PSK EGPRS:: Enhanced GPRS; the part of EDGE relating to GPRS services +EIR:: + Equipment Identity Register ESME:: External SMS Entity; an external application interfacing with a SMSC over SMPP @@ -128,7 +130,9 @@ IE:: Information Element IMEI:: - International Mobile Equipment Identity; unique identifier for the mobile phone + International Mobile Equipment Identity; 14-digit unique identifier for the mobile phone plus a check digit (total digits: 15) +IMEISV:: + IMEI software version; 14-digit unique identifier for the mobile phone plus two software version digits (total digits: 16) IMSI:: International Mobile Subscriber Identity; 15-digit unique identifier for the subscriber/SIM; starts with MCC/MNC of issuing operator @@ -147,6 +151,8 @@ 44.064_ <<3gpp-ts-44-064>>) Location Area:: Location Area; a geographic area containing multiple BTS +LU:: + Location Update M2PA:: MTP2 Peer-to-Peer Adaptation; a SIGTRAN Variant (_RFC 4165_ <>) M2UA:: @@ -234,6 +240,8 @@ PUK:: PIN Unblocking Code; used to unblock a blocked PIN (after too many wrong PIN attempts) +PVLR:: + Proxy Visitor Location Register RAC:: Routing Area Code; 16bit identifier for a Routing Area within a Location Area RACH:: @@ -284,6 +292,8 @@ Short Message Service Center; store-and-forward relay for short messages SS7:: Signaling System No. 7; Classic digital telephony signaling system +SS:: + Supplementary Services SSH:: Secure Shell; _IETF RFC 4250_ <> to 4254 SSN:: @@ -306,6 +316,8 @@ Trivial File Transfer Protocol; (_IETF RFC 1350_ <>) TRX:: Transceiver; element of a BTS serving a single carrier +TS:: + Technical Specification u-Boot:: Boot loader used in various embedded systems UBI:: @@ -328,6 +340,8 @@ Voltage Controlled, Temperature Compensated Crystal Oscillator; a precision oscillator, superior to a classic crystal oscillator, but inferior to an OCXO +VLR:: + Visitor Location Register VPLMN:: Visited PLMN; the network in which the subscriber is currently registered; may differ from HPLMN when on roaming -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR
Hello Stefan Sperling, Vadim Yanitskiy, Pau Espin Pedrol, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12478 to look at the new patch set (#12). Change subject: VLR: send CHECK-IMEI to EIR/HLR .. VLR: send CHECK-IMEI to EIR/HLR When check-imei-req is enabled in the VTY config, do not accept IMEIs sent by the ME directly anymore. Send the IMEI to the EIR/HLR and wait for its ACK or NACK. OsmoHLR also accepts all IMEIs at this point, but this allows to optionally store the IMEI in the HLR DB. Depends: Ib240474b0c3c603ba840cf26babb38a44dfc9364 (osmo-hlr) Related: OS#3733 Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 --- M include/osmocom/msc/vlr.h M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 10 files changed, 918 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/78/12478/12 -- To view, visit https://gerrit.osmocom.org/12478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 )
Change subject: VLR: send CHECK-IMEI to EIR/HLR
..
Patch Set 11:
(1 comment)
https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c
File src/libvlr/vlr.c:
https://gerrit.osmocom.org/#/c/12478/11/src/libvlr/vlr.c@664
PS11, Line 664: {0}
> Do we really need to zero-init this array?
We don't, as gsm48_encode_bcd_number() doesn't read from this buffer before
writing to it. I've verified this with valgrind just to be sure. The {0} is
removed now, thanks for pointing it out!
--
To view, visit https://gerrit.osmocom.org/12478
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: Ife868ed71c36cdd02638072abebf61fc949080a7
Gerrit-Change-Number: 12478
Gerrit-PatchSet: 11
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: Stefan Sperling
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: osmith
Gerrit-Comment-Date: Wed, 16 Jan 2019 10:36:39 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-msc[master]: VLR: send CHECK-IMEI to EIR/HLR
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12478 ) Change subject: VLR: send CHECK-IMEI to EIR/HLR .. Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12478 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: Ife868ed71c36cdd02638072abebf61fc949080a7 Gerrit-Change-Number: 12478 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 10:42:51 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db*
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* .. Patch Set 1: > Hmm, I see, if the make step fails, the removal is skipped. Maybe rather fix > that. I don't think we should change that. If the test fails, it's nice to be able to look into the database the test created. -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:37:17 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-hlr[master]: Optionally store IMEI in subscriber table
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12526 to look at the new patch set (#6). Change subject: Optionally store IMEI in subscriber table .. Optionally store IMEI in subscriber table Add VTY config option "store-imei". When it is set, store the IMEI sent from the VLR with CHECK-IMEI in the database. Related: OS#2541 Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 --- M src/hlr.c M src/hlr.h M src/hlr_vty.c M tests/test_nodes.vty 4 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/26/12526/6 -- To view, visit https://gerrit.osmocom.org/12526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09274ecbed64224f7ae305e09ede773931da2a57 Gerrit-Change-Number: 12526 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Add IMEI column to subscriber table
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12525 to look at the new patch set (#5). Change subject: Add IMEI column to subscriber table .. Add IMEI column to subscriber table Extend the database scheme, add imei to the hlr_subscriber struct and create db_subscr_update_imei_by_imsi() and db_subscr_get_by_imei(). The new functions are used in db_test, and in follow-up commits [1], [2]. Upgrade DB schema to version 2. SQLite can only insert new columns at the end of the table, so this happens when upgrading the database. In new databases, the column is placed after the IMEISV column (where it makes more sense in my opinion). This should not have any effect, as we never rely on the order of the columns in the tables. Follow-up commit [1] will make use of this column to save the IMEI as received from the MSC/VLR with the Check-IMEI Procedure. It was decided to use Check-IMEI instead of the recent Automatic Device Detection Procedure (which would send the IMEISV) in OS#3733, because with Check-IMEI we don't need to rely on very recent releases of the specification. [1] change-id I09274ecbed64224f7ae305e09ede773931da2a57 "Optionally store IMEI in subscriber table" [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Depends: Id2d2a3a93b033bafc74c62e15297034bf4aafe61 (libosmocore) Related: OS#2541 Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d --- M sql/hlr.sql M src/db.c M src/db.h M src/db_hlr.c M tests/db/db_test.c M tests/db/db_test.err 6 files changed, 203 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/25/12525/5 -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#6). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 119 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/6 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty File tests/test_subscriber.vty: https://gerrit.osmocom.org/#/c/12527/5/tests/test_subscriber.vty@34 PS5, Line 34: % No subscriber for msisdn = '12345' > actually you should also add tests for the imei selector, basically > copy-pasting "all" of those pres […] Done -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:38:33 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: Add IMEI column to subscriber table
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12525 ) Change subject: Add IMEI column to subscriber table .. Patch Set 5: (2 comments) https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12525/3//COMMIT_MSG@28 PS3, Line 28: [2] change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 > yes, but the unit test could easily just SEL by imsi again right https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c File src/db_hlr.c: https://gerrit.osmocom.org/#/c/12525/4/src/db_hlr.c@426 PS4, Line 426: LOGP(DAUC, LOGL_ERROR, "Update IMEI for subscriber IMSI='%s': SQL modified %d rows (expected 1)\n", > Argh hm, there's one thing I so far completely missed in this: would SQLite > return 0 if the IMEI is […] Oh, I've missed that too! Now that you say it, I ran into this with MySQL once: getting 0 rows modified instead of 1 when updating with the same data. But we got lucky here, SQLite does not behave this way (see the added test). -- To view, visit https://gerrit.osmocom.org/12525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If232c80bea35d5c6864b889ae92d477eeaa3f45d Gerrit-Change-Number: 12525 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 16 Jan 2019 14:38:58 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: gitignore: add tests/hlr_vty_test.db*
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12565 ) Change subject: gitignore: add tests/hlr_vty_test.db* .. gitignore: add tests/hlr_vty_test.db* Ignore files generated from the VTY test. Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Max: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c08a612..0397e35 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ tests/gsup_server/gsup_server_test tests/gsup/gsup_test tests/db/db_test +tests/hlr_vty_test.db* # manuals doc/manuals/*.html -- To view, visit https://gerrit.osmocom.org/12565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8f55f655fd6694ac9db7e6280670d16fad61ee72 Gerrit-Change-Number: 12565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi()
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12566 ) Change subject: Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() .. Cosmetic: fix arg desc of db_subscr_update_msisdn_by_imsi() Properly note that NULL can only be passed as msisdn, not imsi in that function. Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 --- M src/db_hlr.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/db_hlr.c b/src/db_hlr.c index c97cd82..2569477 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -141,8 +141,8 @@ /*! Set a subscriber's MSISDN in the HLR database. * \param[in,out] dbc database context. - * \param[in] imsi ASCII string of IMSI digits, or NULL to remove the MSISDN. - * \param[in] msisdn ASCII string of MSISDN digits. + * \param[in] imsi ASCII string of IMSI digits + * \param[in] msisdn ASCII string of MSISDN digits, or NULL to remove the MSISDN. * \returns 0 on success, -EINVAL in case of invalid MSISDN string, -EIO on * database failure, -ENOENT if no such subscriber exists. */ -- To view, visit https://gerrit.osmocom.org/12566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I19b6ad0cf6e9a4bfa9bffa447ebfc7bd1bcac361 Gerrit-Change-Number: 12566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#7). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/7 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/6/src/hlr_vty_subscr.c@150 PS6, Line 150: imei_buf[14] = '\0'; > Maybe use osmo_strlcpy() in here? Oh, right. Fixed in the next patch along with the typo you found, thanks! -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 09:15:41 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-gsm-manuals[master]: common: extend glossary.adoc
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12567 to look at the new patch set (#2). Change subject: common: extend glossary.adoc .. common: extend glossary.adoc Add EIR, IMEISV, LU, SS, TS and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/2 -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr
Change in osmo-gsm-manuals[master]: common: extend glossary.adoc
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc .. Patch Set 1: (2 comments) Updated. https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc@89 PS1, Line 89: Equipment Identity Register > "Core network element that stores and manages IMEI numbers"? (does it do > something else?) That sounds accurate. https://en.wikipedia.org/wiki/Network_switching_subsystem#Equipment_identity_register_(EIR) https://gerrit.osmocom.org/#/c/12567/1/common/chapters/glossary.adoc@244 PS1, Line 244: Proxy Visitor Location Register > first time I hear of that, what does it do? I found it in osmo-msc.git/src/libvlr/vlr_lu_fsm.c; it is not spelled out or described there, and git blame points to the big "Add libvlr implementation" commit with no further description of what PVLR is. With online research I figured, that it probably means Proxy Visitor Location Register. But researching further, it seems to be "Previous VLR" as noted in Figure 4.1.2.7 (sheet 1 of 1): Process Send_Identification_PVLR of TS 23.012. I'll remove this from the patch. -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 09:46:24 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: docs: running: same argument order as osmo-hlr -h
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12605 Change subject: docs: running: same argument order as osmo-hlr -h .. docs: running: same argument order as osmo-hlr -h Change the Synopsis and Options sections of the Running OsmoHLR chapter to list the arguments in the same order as osmo-hlr. This makes it easier to compare, which options are already documented, and which ones are missing. A follow-up commit will document the missing -U/--db-upgrade option. Change-Id: If866124e9cfb43c6986d458712961713541e03b6 --- M doc/manuals/chapters/running.adoc 1 file changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/05/12605/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 5f24746..d20c907 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,24 +5,27 @@ === SYNOPSIS -*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] === OPTIONS +// Keep the order the same as in osmo-hlr --help! + *-h, --help*:: Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-hlr.cfg` in the current + working directory. +*-l, --database 'DATABASE'*:: + Specify the file name of the SQLite3 database to use as HLR/AUC + storage *-d, --debug 'DBGMASK','DBGLEVELS'*:: Set the log subsystems and levels for logging to stderr. This has mostly been superseded by VTY-based logging configuration, see <> for further information. *-D, --daemonize*:: Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-hlr.cfg` in the current - working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> @@ -35,9 +38,8 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as HLR/AUC - storage +*-V, --version*:: + Print the compile-time version number of the OsmoBTS program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If866124e9cfb43c6986d458712961713541e03b6 Gerrit-Change-Number: 12605 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-hlr[master]: docs: running: document --db-upgrade
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12606 Change subject: docs: running: document --db-upgrade .. docs: running: document --db-upgrade Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/12606/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d20c907..a2e122a 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,7 +5,7 @@ === SYNOPSIS -*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-U] [-V] === OPTIONS @@ -38,6 +38,11 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. +*-U, --db-upgrade*:: + Allow HLR database schema upgrades. If OsmoHLR was updated and + requires a newer database schema, it will refuse to start unless + this option is specified. The updated database can not be + downgraded, make backups as necessary. *-V, --version*:: Print the compile-time version number of the OsmoBTS program -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/7/src/hlr_vty_subscr.c@62 PS7, Line 62: IMEI > I don't know, are there any benefits of storing IMEI without the checksum in > the DB Yes: this allows searching via VTY for the IMEI, even if the checksum digit is not known. The MS does not send the checksum digit to the MSC (it gets replaced with 0), and the MSC does not send it to the HLR either. So at least when we are debugging something (possibly looking at a saved pcap file without the original IMEI available), we might run into the situation where the last digit is not always known. > but maybe we should at least print the full IMEI with 15th digit (i.e. > pre-calculate it)? That makes sense, I'll update the patch. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Thu, 17 Jan 2019 11:39:40 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#8). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/8 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-msc[master]: SMS: remove code duplication in transaction init
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12578 ) Change subject: SMS: remove code duplication in transaction init .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12578 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: I3563e11bebb58e656592df2ff7db96f41deaf735 Gerrit-Change-Number: 12578 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 17 Jan 2019 11:56:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: docs: running: document --db-upgrade
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12606 to look at the new patch set (#2). Change subject: docs: running: document --db-upgrade .. docs: running: document --db-upgrade Related: OS#3759 Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/12606/2 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr
Change in osmo-hlr[master]: docs: running: s/OsmoBTS/OsmoHLR
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12607 Change subject: docs: running: s/OsmoBTS/OsmoHLR .. docs: running: s/OsmoBTS/OsmoHLR Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 --- M doc/manuals/chapters/running.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/07/12607/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index d20c907..ad89974 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -39,7 +39,7 @@ been deprecated by VTY based logging configuration, see <> for more information. *-V, --version*:: - Print the compile-time version number of the OsmoBTS program + Print the compile-time version number of the OsmoHLR program === Bootstrap the Database -- To view, visit https://gerrit.osmocom.org/12607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e1c8460dbe0a9b7dca8d2291a5e6c5406180e7 Gerrit-Change-Number: 12607 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-gsm-manuals[master]: common: extend glossary.adoc
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12567 to look at the new patch set (#3). Change subject: common: extend glossary.adoc .. common: extend glossary.adoc Add EIR, IMEISV, LU, SS, TS, USSD, and VLR, clarify the difference between IMEI and IMEISV. Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 --- M common/chapters/glossary.adoc 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/12567/3 -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte
Change in osmo-gsm-manuals[master]: common: extend glossary.adoc
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12567 ) Change subject: common: extend glossary.adoc .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc File common/chapters/glossary.adoc: https://gerrit.osmocom.org/#/c/12567/2/common/chapters/glossary.adoc@298 PS2, Line 298: Supplementary Services; textual dialog between subscriber and core : network, e.g. '*#100#' -> 'Your extension is 1234' > actually, your example is USSD, which is only one part of non-call-related > SS, which again are only […] Updated the description of SS and added USSD. -- To view, visit https://gerrit.osmocom.org/12567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I054a8599a78eb5e62ab7af914875e1c8a992af71 Gerrit-Change-Number: 12567 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 21 Jan 2019 14:12:06 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: Sync with libosmocore function rename
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: Sync with libosmocore function rename .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12663 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: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:03:40 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: Sync with libosmocore function rename
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12663 ) Change subject: Sync with libosmocore function rename .. Patch Set 1: (Consider mentioning the libosmocore Change-Id If1e851ac605c8d2fde3da565b0bd674ea6350c2e in the commit message) -- To view, visit https://gerrit.osmocom.org/12663 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: I1d4675e0c907b2f92f2ec79b02356391a6d72aa8 Gerrit-Change-Number: 12663 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:04:32 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in openbsc[master]: Sync with libosmocore function rename
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12664 ) Change subject: Sync with libosmocore function rename .. Patch Set 1: Code-Review+1 (Consider mentioning the libosmocore Change-Id If1e851ac605c8d2fde3da565b0bd674ea6350c2e in the commit message) -- To view, visit https://gerrit.osmocom.org/12664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5 Gerrit-Change-Number: 12664 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 15:05:54 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12666 Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS .. gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/12666/1 diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index ee697ff..65ac328 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,6 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) +/* IMEI without Luhn checksum */ +#define GSM23003_IMEI_NUM_NO_CHK_DIGITS(GSM23003_IMEI_TAC_NUM_DIGITS + \ +GSM23003_IMEI_SNR_NUM_DIGITS) /* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ #define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_NO_CHK_DIGITS .. Patch Set 1: This will be used to make the magic numbers go away here: https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/8/src/hlr_vty_subscr.c -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 21 Jan 2019 15:40:18 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 8: (3 comments) https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c File src/hlr_vty_subscr.c: https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c@136 PS8, Line 136: char imei_buf[15]; > use the constant, what was that, GSM23003_IMEI_MAX_LEN? add + 1 for the '\0'? There is GSM23003_IMEISV_NUM_DIGITS = 15. What we need is something like GSM23003_IMEI_NUM_NO_CHK_DIGITS = 14, added it here: https://gerrit.osmocom.org/#/c/libosmocore/+/12666/ (please review) ...then I can write imei_buf[GSM23003_IMEI_NUM_NO_CHK_DIGITS + 1] and it is obvious what it means. https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c@149 PS8, Line 149: osmo_strlcpy(imei_buf, id, 15); > the 15 refers to the sizeof() the target buffer; IMHO this should either be > sizeof() or some OSMO_MI […] Well, I had used strncpy before: https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/6/src/hlr_vty_subscr.c@150 I'll go with osmo_strlcpy and a more explicit comment. https://gerrit.osmocom.org/#/c/12527/8/src/hlr_vty_subscr.c@151 PS8, Line 151: } > what if the digit is present and invalid? It tries to query the IMEI with db_subscr_get_by_imei(), which will tell the user that it is invalid: OsmoHLR# subscriber imei 35761300444848 show ID: 1 IMSI: 123456789023000 MSISDN: none IMEI: 357613004448485 OsmoHLR# subscriber imei 357613004448484 show % No subscriber for imei = '357613004448484' I don't think we need to optimize here and make it not query the database, or give out another error message. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:47:24 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmocore[master]: ipa_ccm_idtag_parse*: Fix reported length value
osmith has posted comments on this change. ( https://gerrit.osmocom.org/10216 ) Change subject: ipa_ccm_idtag_parse*: Fix reported length value .. Patch Set 3: Code-Review+1 Looks good. @Max: there's an unanswered question from Neels. -- To view, visit https://gerrit.osmocom.org/10216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I435aaa33605bd48635715a2c81aa2d231c1abf51 Gerrit-Change-Number: 10216 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:43:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 8: > generally I wonder whether we should just always drop that luhn check digit > and only handle 14 digit IMEIs. Would that simplify anything? I would rather keep it, it seems to be an useful feature to me and it is already implemented and working. I'll create a new patch that addresses the points you mentioned, thanks for the review. -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 15:49:47 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#9). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/9 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 ) Change subject: VTY: integrate IMEI .. Patch Set 9: (the build will fail now, because it depends on https://gerrit.osmocom.org/#/c/libosmocore/+/12666/ now) -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max Gerrit-Comment-Date: Mon, 21 Jan 2019 16:02:35 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK
Hello Vadim Yanitskiy, Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12666 to look at the new patch set (#2). Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK .. gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/12666/2 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK .. gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK Add new define for the 14 digit IMEI without the Luhn checksum, as it is used in OsmoHLR. Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 --- M include/osmocom/gsm/protocol/gsm_23_003.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/include/osmocom/gsm/protocol/gsm_23_003.h b/include/osmocom/gsm/protocol/gsm_23_003.h index ee697ff..babd0f4 100644 --- a/include/osmocom/gsm/protocol/gsm_23_003.h +++ b/include/osmocom/gsm/protocol/gsm_23_003.h @@ -24,6 +24,9 @@ GSM23003_IMEI_SNR_NUM_DIGITS + 1) #define GSM23003_IMEISV_NUM_DIGITS (GSM23003_IMEI_TAC_NUM_DIGITS + \ GSM23003_IMEI_SNR_NUM_DIGITS + 2) +/* IMEI without Luhn checksum */ +#define GSM23003_IMEI_NUM_DIGITS_NO_CHK(GSM23003_IMEI_TAC_NUM_DIGITS + \ +GSM23003_IMEI_SNR_NUM_DIGITS) /* Chapter 19.2 "epc.mnc000.mcc000.3gppnetwork.org" */ #define GSM23003_HOME_NETWORK_DOMAIN_LEN 33 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith
Change in libosmocore[master]: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12666 ) Change subject: gsm_23_003.h: add GSM23003_IMEI_NUM_DIGITS_NO_CHK .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/12666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I02b54cf01a674a1911c5c897fbec02240f88b521 Gerrit-Change-Number: 12666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 21 Jan 2019 16:34:48 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#10). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 117 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/10 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 10 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-bsc[master]: LCLS: use libosmocore function to add status
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status .. Patch Set 4: Code-Review-1 (1 comment) Looks good, except for the indentation. https://gerrit.osmocom.org/#/c/12486/4/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/#/c/12486/4/src/osmo-bsc/assignment_fsm.c@181 PS4, Line 181: addr_local_p, sc_ptr, NULL, lcls_get_status(conn)); The indentation is not consistent, missing space before chosen_channel, and lchan->encr.alg_id. -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 10:13:42 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#11). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty 3 files changed, 136 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/11 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 11 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 )
Change subject: VTY: integrate IMEI
..
Patch Set 11:
(8 comments)
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c
File src/hlr_vty_subscr.c:
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@62
PS10, Line 62: vty_out(vty, "IMEI: %s%c%s", subscr->imei,
osmo_luhn(subscr->imei, 14), VTY_NEWLINE);
> if the IMEI in the db were too short, we will feed -EINVAL into "%c". […]
Is this necessary? This can only happen if the user modified the SQL db file
directly without osmo-hlr. Because we are *always* checking the length, before
writing into it (see db_hlr.c using osmo_imei_str_valid()). I don't think we
are assuming that the user may change the database directly anywhere else.
With that being said, I could add a check like the following if you prefer:
if (*subscr->imei) {
char checksum = osmo_luhn(subscr->imei, 14);
if (checksum == -EINVAL)
vty_out(vty, "IMEI: %s (INVALID LENGTH!)%s", subscr->imei,
VTY_NEWLINE);
else
vty_out(vty, "IMEI: %s%c%s", subscr->imei, checksum,
VTY_NEWLINE);
}
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@150
PS10, Line 150: vty_out(vty, "%% Checksum validated and
stripped for search: imei = '%s'%s", id,
> (I was going to complain about the checksum-digit-present-but-invalid case,
> but saw the vty test for […]
Like that? ;)
https://gerrit.osmocom.org/#/c/osmo-hlr/+/12527/8/src/hlr_vty_subscr.c@151
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@167
PS10, Line 167: "Identify subscriber by MSISDN (phone number)\n" \
> here you say "14 digits" but above you explicitly allow 15. Maybe cut out the
> "(14 ... […]
Oh, that's a left over. Thanks, fixed!
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@176
PS10, Line 176: #define SUBSCR_UPDATE_HELP SUBSCR_HELP "Set or update
subscriber data\n"
> IIUC this string is used only once, so could drop the #define? […]
Done
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@547
PS10, Line 547: imei = imei_buf;
> osmocom coding style is […]
Done
https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty
File tests/test_subscriber.vty:
https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty@50
PS10, Line 50: OsmoHLR# show subscriber imei 357613004448485
> so, the user entered "...485" and is told "no ...48". […]
Okay, it says now (right checksum, no entry in DB):
OsmoHLR# show subscriber imei 357613004448485
% Checksum validated and stripped for search: imei = '35761300444848'
% No subscriber for imei = '35761300444848'
and (wrong checksum):
OsmoHLR# show subscriber imei 357613004448484
% No subscriber for imei = '357613004448484'
and (right checksum, with entry in DB):
OsmoHLR# show subscriber imei 357613004448485
% Checksum validated and stripped for search: imei = '35761300444848'
ID: 1
IMSI: 123456789023000
MSISDN: none
IMEI: 357613004448485
https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty@401
PS10, Line 401:
> (BTW, the 'subscriber foo show' ordering was a mistake by me. […]
OK, changed to "show subscriber foo" ordering.
https://gerrit.osmocom.org/#/c/12527/10/tests/test_subscriber.vty@407
PS10, Line 407:
> also have a valid checksum case plz […]
Done
--
To view, visit https://gerrit.osmocom.org/12527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30
Gerrit-Change-Number: 12527
Gerrit-PatchSet: 11
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: osmith
Gerrit-CC: Max
Gerrit-Comment-Date: Tue, 22 Jan 2019 12:42:53 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-hlr[master]: VTY tests: fill DB before running test
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12680 Change subject: VTY tests: fill DB before running test .. VTY tests: fill DB before running test Create a test_subscriber.vty.sql file with a dummy entry that has the ID 100. All entries created in test_subscriber.vty have an ID > 100 now. This will be used in follow-up commit [1] to create a database entry with an invalid IMEI value to test the related error handling code path (that entry could not be created through the VTY). [1]: change-id I1af7b573ca2a1cb22497052665012d9c1acf3b30 "VTY: integrate IMEI" Related: OS#3733 Change-Id: I48a3a503d7ca96798e2d5f70429b5fc36393420e --- M tests/Makefile.am M tests/test_subscriber.vty A tests/test_subscriber.vty.sql 3 files changed, 65 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/80/12680/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index e07749c..4da8ab1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,6 +56,8 @@ # make vty-test U=-u vty-test: -rm -f $(VTY_TEST_DB) + sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql + sqlite3 $(VTY_TEST_DB) < $(srcdir)/test_subscriber.vty.sql osmo_verify_transcript_vty.py -v \ -n OsmoHLR -p 4258 \ -r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \ diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index 8677c9b..d310eb3 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -29,15 +29,15 @@ OsmoHLR# subscriber imsi 123456789023000 show % No subscriber for imsi = '123456789023000' -OsmoHLR# subscriber id 1 show -% No subscriber for id = '1' +OsmoHLR# subscriber id 101 show +% No subscriber for id = '101' OsmoHLR# subscriber msisdn 12345 show % No subscriber for msisdn = '12345' OsmoHLR# show subscriber imsi 123456789023000 % No subscriber for imsi = '123456789023000' -OsmoHLR# show subscriber id 1 -% No subscriber for id = '1' +OsmoHLR# show subscriber id 101 +% No subscriber for id = '101' OsmoHLR# show subscriber msisdn 12345 % No subscriber for msisdn = '12345' @@ -50,16 +50,16 @@ OsmoHLR# subscriber imsi 123456789023000 create % Created subscriber 123456789023000 -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: none -OsmoHLR# subscriber id 1 show -ID: 1 +OsmoHLR# subscriber id 101 show +ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber msisdn 12345 show @@ -69,15 +69,15 @@ % Updated subscriber IMSI='123456789023000' to MSISDN='12345' OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 12345 -OsmoHLR# subscriber id 1 show -ID: 1 +OsmoHLR# subscriber id 101 show +ID: 101 IMSI: 123456789023000 MSISDN: 12345 OsmoHLR# subscriber msisdn 12345 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 12345 @@ -91,26 +91,26 @@ OsmoHLR# subscriber msisdn 423 show % No subscriber for msisdn = '423' OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: none OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 % Updated subscriber IMSI='123456789023000' to MSISDN='423' OsmoHLR# subscriber msisdn 423 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423 -OsmoHLR# subscriber id 1 show -ID: 1 +OsmoHLR# subscriber id 101 show +ID: 101 IMSI: 123456789023000 MSISDN: 423 OsmoHLR# subscriber msisdn 423 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423 @@ -141,7 +141,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g xor ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: XOR @@ -149,39 +149,39 @@ OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee OsmoHLR# subscriber imsi 123456789023000 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber id 1 show -ID: 1 +OsmoHLR# subscriber id 101 show +ID: 101 IMSI: 123456789023000 MSISDN: 423 2G auth: COMP128v1 KI=beefedcafefaceacedaddeddecadefee OsmoHLR# subscriber msisdn 423 show -ID: 1 +ID: 101 IMSI: 123456789023000 MSISDN: 423
Change in osmo-hlr[master]: VTY: integrate IMEI
Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12527 to look at the new patch set (#12). Change subject: VTY: integrate IMEI .. VTY: integrate IMEI Display the IMEI in "subscriber ... show", allow showing and modifying subscribers by their IMEI with: "subscriber imei ...". For debug purposes (and to have proper VTY tests), make it possible to change the IMEI with "subscriber ... update imei". IMEIs are saved in the database without the 15th checksum number. When the checksum gets passed, verify it and cut it off. Related: OS#2541 Depends: I02b54cf01a674a1911c5c897fbec02240f88b521 (libosmocore) Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 --- M src/hlr_vty_subscr.c M tests/test_nodes.vty M tests/test_subscriber.vty M tests/test_subscriber.vty.sql 4 files changed, 152 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/12527/12 -- To view, visit https://gerrit.osmocom.org/12527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30 Gerrit-Change-Number: 12527 Gerrit-PatchSet: 12 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-CC: Max
Change in osmo-hlr[master]: VTY: integrate IMEI
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12527 )
Change subject: VTY: integrate IMEI
..
Patch Set 12:
(1 comment)
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c
File src/hlr_vty_subscr.c:
https://gerrit.osmocom.org/#/c/12527/10/src/hlr_vty_subscr.c@62
PS10, Line 62: if (*subscr->imei) {
> Is this necessary? This can only happen if the user modified the SQL db file
> directly without osmo-h […]
As discussed in the chat, the check above is implemented now - together with a
test case.
--
To view, visit https://gerrit.osmocom.org/12527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1af7b573ca2a1cb22497052665012d9c1acf3b30
Gerrit-Change-Number: 12527
Gerrit-PatchSet: 12
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Vadim Yanitskiy
Gerrit-Reviewer: osmith
Gerrit-CC: Max
Gerrit-Comment-Date: Tue, 22 Jan 2019 14:06:03 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No
Change in osmo-bsc[master]: LCLS: use libosmocore function to add status
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12486 ) Change subject: LCLS: use libosmocore function to add status .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6916928391667cd9c345becf00e7c8561846c295 Gerrit-Change-Number: 12486 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 14:11:21 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: docs: running: document --db-upgrade
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 22 Jan 2019 14:41:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-hlr[master]: docs: running: document --db-upgrade
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12606 ) Change subject: docs: running: document --db-upgrade .. docs: running: document --db-upgrade Related: OS#3759 Change-Id: I641fd258091974662d9f63697aea103eaf151d09 --- M doc/manuals/chapters/running.adoc 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: osmith: Verified Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index ad89974..ff75c7f 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,7 +5,7 @@ === SYNOPSIS -*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-V] +*osmo-hlr* [-h] [-c 'CONFIGFILE'] [-l 'DATABASE'] [-d 'DBGMASK'] [-D] [-s] [-T] [-e 'LOGLEVEL'] [-U] [-V] === OPTIONS @@ -38,6 +38,11 @@ Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. +*-U, --db-upgrade*:: + Allow HLR database schema upgrades. If OsmoHLR was updated and + requires a newer database schema, it will refuse to start unless + this option is specified. The updated database can not be + downgraded, make backups as necessary. *-V, --version*:: Print the compile-time version number of the OsmoHLR program -- To view, visit https://gerrit.osmocom.org/12606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I641fd258091974662d9f63697aea103eaf151d09 Gerrit-Change-Number: 12606 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12690 Change subject: jenkins-common.sh: exit if image fails to build .. jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index f3d6c61..4289d0b 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -7,7 +7,7 @@ # Trigger image build (cache will be used when up-to-date) if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" - make -C "../$i" + make -C "../$i" || exit 1 fi # Detect missing images (build skipped/failure) -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#2). Change subject: jenkins-common.sh: exit if image fails to build .. jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/2 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build .. Patch Set 2: > why is the entire script not executed within "set -e" to exit on any errors > of all commands? This script is sourced by the various jenkins.sh scripts. The jenkins.sh scripts can not simply have "set -e", because they need to clean up the Docker containers that run in the background (so if they exit half way during the scripts, these are not cleaned up). -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 15:31:14 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#3). Change subject: jenkins-common.sh: exit if image fails to build .. jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/3 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith
Change in osmo-msc[master]: Log transaction allocation errors as such
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Log transaction allocation errors as such .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12615/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12615/1//COMMIT_MSG@7 PS1, Line 7: Log transaction allocation errors as such How about: "Various logging fixes" as title and writing the "Log transaction allocation errors as such." line into the description below? -- To view, visit https://gerrit.osmocom.org/12615 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: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 16:47:28 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: VLR: use msgb_eq_data_print() for comparison
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12571 ) Change subject: VLR: use msgb_eq_data_print() for comparison .. Patch Set 2: Code-Review+1 Change looks good to me. I find this useful, and I can't see how having a multiline string logged here would be an issue. As Max said, it is only logged in case of error anyway. The code does look cleaner to me in the new version. Old output: Mismatch! Expected: 1401080971004026f0280102 New output: DLGLOBAL __wrap_osmo_gsup_client_send() L0 data mismatch: expected 14 01 08 09 71 00 00 00 40 26 f0 28 01 02 !! msgb 04 01 08 09 71 00 00 00 40 26 f0 28 01 02 -- To view, visit https://gerrit.osmocom.org/12571 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: If9771c973f2bc55580f4c146bdbeeb1609d56786 Gerrit-Change-Number: 12571 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:15:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libusrp[master]: Add config for git-review
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Kévin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:19:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libusrp[master]: Add config for git-review
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12691 ) Change subject: Add config for git-review .. Patch Set 1: I didn't know about git-review yet, nice! https://docs.openstack.org/infra/git-review/usage.html -- To view, visit https://gerrit.osmocom.org/12691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29617f080af81921e4ee0f7a53eaae5ba2e3c30b Gerrit-Change-Number: 12691 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Kévin Redon Gerrit-Reviewer: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:22:03 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: Various logging fixes
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12615 ) Change subject: Various logging fixes .. Patch Set 2: Code-Review+2 (giving +2 as Vadim already gave +1) -- To view, visit https://gerrit.osmocom.org/12615 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: I617be8793b9416ccd49022c72f7d93df7f4fb4d9 Gerrit-Change-Number: 12615 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 24 Jan 2019 17:58:20 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12693
Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master
..
ttcn3-bts-test-latest: use osmocom-bb-host-master
Do not try to run a osmocom-bb-host-latest docker image, which does not
exist as we are not tagging release versions for osmocom-bb (yet).
This was done right in the docker_images_require call at the top
already (which is why it did not try to build such a "-latest" image),
but then the script tried to use the "-latest" images anyway (instead
of hardcoding "-master").
Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc
---
M ttcn3-bts-test/jenkins.sh
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/93/12693/1
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 3632ae6..96616d9 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -50,7 +50,7 @@
--network $NET_NAME --ip 172.18.9.21 \
-v $VOL_BASE_DIR/fake_trx:/data \
--name ${BUILD_TAG}-fake_trx -d \
- $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
+ $REPO_USER/osmocom-bb-host-master \
/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \
--log-file-name /data/fake_trx.log \
--log-file-level DEBUG \
@@ -62,7 +62,7 @@
--network $NET_NAME --ip 172.18.9.22 \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-trxcon -d \
- $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
+ $REPO_USER/osmocom-bb-host-master \
/usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
--
To view, visit https://gerrit.osmocom.org/12693
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc
Gerrit-Change-Number: 12693
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master
Hello Stefan Sperling, daniel, Max, Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12693 to look at the new patch set (#2). Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master .. ttcn3-bts-test-latest: use osmocom-bb-host-master Do not try to run a osmocom-bb-host-latest docker image, which does not exist as we are not tagging release versions for osmocom-bb (yet). This was done right in the docker_images_require call at the top already (which is why it did not try to build such a "-latest" image), but then the script tried to use the "-latest" images anyway (instead of hardcoding "-master"). Related: OS#3767 Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc --- M ttcn3-bts-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/12693/2 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
Hello daniel, Max, Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12690 to look at the new patch set (#4). Change subject: jenkins-common.sh: exit if image fails to build .. jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Related: OS#3767 Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/12690/4 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 10:49:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: jenkins-common.sh: exit if image fails to build
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12690 ) Change subject: jenkins-common.sh: exit if image fails to build .. jenkins-common.sh: exit if image fails to build docker_images_require() must fail when a new image can not be built, even if an old image already exists. We have this situation in a lot of the -latest tests right now, which makes it harder to find the actual error. Note that we can't simply use #!/bin/sh -e in all the jenkins.sh scripts that source jenkins_common.sh, because they must be able to clean up the docker containers on failure. So they can't abort somewhere in the middle of the scripts. We could rewrite them to do the clean up in a trap, but this should be done in a separate commit. Related: OS#3767 Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 --- M jenkins-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index f3d6c61..0dbe8b0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -7,10 +7,10 @@ # Trigger image build (cache will be used when up-to-date) if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" - make -C "../$i" + make -C "../$i" || exit 1 fi - # Detect missing images (build skipped/failure) + # Detect missing images (build skipped) if ! docker_image_exists "$i"; then echo "ERROR: missing image: $i" exit 1 -- To view, visit https://gerrit.osmocom.org/12690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7039089457b62b8798a79c5efd62bd91622986d3 Gerrit-Change-Number: 12690 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith
Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master .. Patch Set 2: > we could simply tag the "-master" container also as "-latest". The question > is one of semantics. Does the suffix state what is the content? Or does it > state for what kind of tests it is used? I would say it states the content and I don't see any benefit in tagging the same container for -latest. It might even be confusing. -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 10:50:28 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12694
Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/
..
ttcn3-*-test: don't hardcode /usr/local/bin/
Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh.
This caused the *-latest tests to fail, as they have the Osmocom
binaries in /usr/bin instead of /usr/local/bin.
Adjust Dockerfiles where the default run command was different from the
hardcoded run command in jenkins.sh (e.g. missing config file
parameters).
Related: OS#367
Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666
---
M osmo-bsc-master/Dockerfile
M osmo-sip-latest/Dockerfile
M osmo-sip-master/Dockerfile
M ttcn3-bscnat-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
9 files changed, 11 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/94/12694/1
diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 5c76688..7afab23 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -42,6 +42,6 @@
COPY osmo-bsc.cfg /data/osmo-bsc.cfg
WORKDIR/data
-CMD["/usr/local/bin/osmo-bsc"]
+CMD["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"]
#EXPOSE
diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile
index a468c9f..bce5566 100644
--- a/osmo-sip-latest/Dockerfile
+++ b/osmo-sip-latest/Dockerfile
@@ -27,6 +27,6 @@
COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg
WORKDIR/data
-CMD["/usr/bin/osmo-sip-connector"]
+CMD["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]
#EXPOSE
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile
index e69cbc7..6adab56 100644
--- a/osmo-sip-master/Dockerfile
+++ b/osmo-sip-master/Dockerfile
@@ -46,6 +46,6 @@
COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg
WORKDIR/data
-CMD["/usr/local/bin/osmo-sip-connector"]
+CMD["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]
#EXPOSE
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index 0287097..df45b0a 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -23,7 +23,7 @@
--network $NET_NAME --ip 172.18.11.20 \
-v $VOL_BASE_DIR/bscnat:/data \
--name ${BUILD_TAG}-bscnat -d \
- $REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat
-c /data/osmo-bsc-nat.cfg
+ $REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c
/data/osmo-bsc-nat.cfg
echo Starting container with BSCNAT testsuite
docker run --rm \
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 96616d9..4cca7cb 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -33,8 +33,7 @@
--network $NET_NAME --ip 172.18.9.11 \
-v $VOL_BASE_DIR/bsc:/data \
--name ${BUILD_TAG}-bsc -d \
- $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \
- /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg
+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX
echo Starting container with BTS
docker run --rm \
@@ -43,7 +42,7 @@
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-bts -d \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
- /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c
/data/osmo-bts.cfg -i 172.18.9.10
+ /usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i
172.18.9.10
echo Starting container with fake_trx
docker run --rm \
@@ -63,7 +62,7 @@
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-trxcon -d \
$REPO_USER/osmocom-bb-host-master \
- /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
+ trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
echo Starting container with BTS testsuite
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 89669eb..512dd2c 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -21,8 +21,7 @@
--network $NET_NAME --ip 172.18.10.20 \
-v $VOL_BASE_DIR/hlr:/data \
--name ${BUILD_TAG}-hlr -d \
- $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \
- /usr/local/bin/osmo-hlr
+ $REPO_USER/osmo-hlr-$IMAGE_SUFFIX
echo Starting container with HLR testsuite
docker run --rm \
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 82ec483..975b068 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -37,8 +37,7 @@
Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/12693 )
Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master
..
ttcn3-bts-test-latest: use osmocom-bb-host-master
Do not try to run a osmocom-bb-host-latest docker image, which does not
exist as we are not tagging release versions for osmocom-bb (yet).
This was done right in the docker_images_require call at the top
already (which is why it did not try to build such a "-latest" image),
but then the script tried to use the "-latest" images anyway (instead
of hardcoding "-master").
Related: OS#3767
Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc
---
M ttcn3-bts-test/jenkins.sh
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
osmith: Verified
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 3632ae6..96616d9 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -50,7 +50,7 @@
--network $NET_NAME --ip 172.18.9.21 \
-v $VOL_BASE_DIR/fake_trx:/data \
--name ${BUILD_TAG}-fake_trx -d \
- $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
+ $REPO_USER/osmocom-bb-host-master \
/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \
--log-file-name /data/fake_trx.log \
--log-file-level DEBUG \
@@ -62,7 +62,7 @@
--network $NET_NAME --ip 172.18.9.22 \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-trxcon -d \
- $REPO_USER/osmocom-bb-host-$IMAGE_SUFFIX \
+ $REPO_USER/osmocom-bb-host-master \
/usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
--
To view, visit https://gerrit.osmocom.org/12693
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc
Gerrit-Change-Number: 12693
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Stefan Sperling
Gerrit-Reviewer: daniel
Gerrit-Reviewer: osmith
Change in docker-playground[master]: ttcn3-bts-test-latest: use osmocom-bb-host-master
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12693 ) Change subject: ttcn3-bts-test-latest: use osmocom-bb-host-master .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/12693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib743f09c71d93bf4c4ad947ef62b37de6b2d7ecc Gerrit-Change-Number: 12693 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 13:04:53 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12695 Change subject: osmo-*/Dockerfile: fix default run command .. osmo-*/Dockerfile: fix default run command Adjust Dockerfiles where the default run command was different from the hardcoded run command in jenkins.sh (e.g. missing config file parameters). A follow-up commit will remove the hardcoded jenkins.sh command, so it works with both *-master and *-latest images (they have different paths to the binaries). Related: OS#3767 Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb --- M osmo-bsc-master/Dockerfile M osmo-sip-latest/Dockerfile M osmo-sip-master/Dockerfile 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/12695/1 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5c76688..7afab23 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -42,6 +42,6 @@ COPY osmo-bsc.cfg /data/osmo-bsc.cfg WORKDIR/data -CMD["/usr/local/bin/osmo-bsc"] +CMD["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] #EXPOSE diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile index a468c9f..bce5566 100644 --- a/osmo-sip-latest/Dockerfile +++ b/osmo-sip-latest/Dockerfile @@ -27,6 +27,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR/data -CMD["/usr/bin/osmo-sip-connector"] +CMD["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index e69cbc7..6adab56 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -46,6 +46,6 @@ COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg WORKDIR/data -CMD["/usr/local/bin/osmo-sip-connector"] +CMD["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"] #EXPOSE -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ .. ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Related: OS#3767 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 6 files changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/2 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Harald Welte
Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG@9 PS1, Line 9: Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh. : This caused the *-latest tests to fail, as they have the Osmocom : binaries in /usr/bin instead of /usr/local/bin. : : Adjust Dockerfiles where the default run command was different from the : hardcoded run command in jenkins.sh (e.g. missing config file : parameters). > how are those two seemingly unrelated topics connected to each other? > Shouldn't this be two commits? They are connected, because after removing the hardcoded command from jenkins.sh, it will fall back to the default command in Dockerfile. But you are right, these are two logical changes, made a second commit. https://gerrit.osmocom.org/#/c/12694/1//COMMIT_MSG@17 PS1, Line 17: Related: OS#367 > probably missing a digit, it's long ago since we had three-digit issue > numbers... Oh right, fixed! -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 Jan 2019 13:23:00 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: Use transaction-specific debug macro
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c@a117 PS2, Line 117: Why is this log message gone and not replaced with a DEBUGTRANS()? -- To view, visit https://gerrit.osmocom.org/12579 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: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 14:04:27 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-msc[master]: Use transaction-specific debug macro
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12579 ) Change subject: Use transaction-specific debug macro .. Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c File src/libmsc/transaction.c: https://gerrit.osmocom.org/#/c/12579/2/src/libmsc/transaction.c@a117 PS2, Line 117: > For the reason described in commit log. Not sure how else to explain this. I see. I was missing where this is calling the other allocation code, that prints the message, but it is clear from the testsuite output that this happens. -- To view, visit https://gerrit.osmocom.org/12579 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: I82ad7d2f53c123ad656e8f23432f770ab1d5937e Gerrit-Change-Number: 12579 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 25 Jan 2019 15:31:25 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in docker-playground[master]: osmo-*/Dockerfile: fix default run command
osmith has abandoned this change. ( https://gerrit.osmocom.org/12695 ) Change subject: osmo-*/Dockerfile: fix default run command .. Abandoned > We can get rid of both '/usr/bin/' and '/usr/local/bin/' prefixes in all > Dockerfile's, and then, in the next patch, relay on default RUN command where > possible. What do you think? Thanks for the idea and review (you are right with -c and -M). Honestly, I think this generates more complicated patches than necessary. The easiest solution seems to be just changing the commands in jenkins.sh not to use the absolute paths, and abandon this patch. -- To view, visit https://gerrit.osmocom.org/12695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I60096406e08641cc3aaab0f77d7491df39475feb Gerrit-Change-Number: 12695 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Vadim Yanitskiy
Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12707
Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg
..
ttcn3-sip-test/jenkins.sh: remove invalid -M arg
osmo-sip-connector does not have a -M argument, it was probably
confused with osmo-msc's -M, --mncc-sock-path argument.
osmo-sip-connector printed out the following when started with -M, but
otherwise functioned normally. Because it was started with Docker in
background, the message did not get written to the build log.
osmo-sip-connector: invalid option -- 'M'
Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7
---
M ttcn3-sip-test/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/07/12707/1
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index f70943c..a918269 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -27,7 +27,7 @@
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-sip-connector -d \
$REPO_USER/osmo-sip-$IMAGE_SUFFIX \
- osmo-sip-connector -M /data/unix/mncc
+ osmo-sip-connector
echo Starting container with SIP testsuite
docker run --rm \
--
To view, visit https://gerrit.osmocom.org/12707
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7
Gerrit-Change-Number: 12707
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/
osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ .. ttcn3-*-test: don't hardcode /usr/local/bin/ Remove hardcoded /usr/local/bin/ paths from jenkins.sh. This caused the *-latest tests to fail, as they have the Osmocom binaries in /usr/bin instead of /usr/local/bin. Related: OS#3767 Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 --- M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh 6 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/3 -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte
Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12694 ) Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/ .. Patch Set 3: (2 comments) New simple and clean patch that just removes /usr/local/bin. https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/#/c/12694/2/ttcn3-bts-test/jenkins.sh@a37 PS2, Line 37: > whay are we removing the config file argument, if this commit is fixing the > /usr/local/bin path?!? I had assumed that it would be cleaner to remove the entire run command here, and use the default run command specified in Dockerfile instead. That's why I had deleted the whole line (including the config parameter). But I've realized that the cleanest way to do this is just remove /usr/local/bin from each command in jenkins.sh and modify nothing else. So I've pushed a new patch version, please take another look. https://gerrit.osmocom.org/#/c/12694/3/ttcn3-sip-test/jenkins.sh File ttcn3-sip-test/jenkins.sh: https://gerrit.osmocom.org/#/c/12694/3/ttcn3-sip-test/jenkins.sh@30 PS3, Line 30: -M /data/unix/mncc Vadim noted that -M is invalid for osmo-sip-connector in a related patch, so I've fixed it here: https://gerrit.osmocom.org/#/c/docker-playground/+/12707/ -- To view, visit https://gerrit.osmocom.org/12694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 Gerrit-Change-Number: 12694 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 13:04:47 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-ci[master]: ttcn3-bsc-test-sccplite-latest: enable job
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12708 Change subject: ttcn3-bsc-test-sccplite-latest: enable job .. ttcn3-bsc-test-sccplite-latest: enable job This job does not get stuck anymore since the latest Osmocom release. Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc --- M jobs/ttcn3-testsuites.yml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/08/12708/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ba0ce2a..cd7aaa9 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -36,8 +36,7 @@ - nplab-m3ua-test-latest - nplab-sua-test-latest - ttcn3-bsc-test-latest - - ttcn3-bsc-test-sccplite-latest: - disabled: true + - ttcn3-bsc-test-sccplite-latest - ttcn3-bts-test-latest - ttcn3-ggsn-test-latest - ttcn3-hlr-test-latest -- To view, visit https://gerrit.osmocom.org/12708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87aeb52832b4ce0fbec96d2cff9dd04da0c11fc Gerrit-Change-Number: 12708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-ci[master]: ttcn3: block latest jobs while master is running
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12709
Change subject: ttcn3: block latest jobs while master is running
..
ttcn3: block latest jobs while master is running
Jenkins job builder does not support string replacing in variables,
so the only way to make each ttcn3-foo-test-latest job get blocked by
their ttcn3-foo-test counterpart was specifying them each time.
Related: OS#3767
Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5
---
M jobs/ttcn3-testsuites.yml
1 file changed, 25 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/09/12709/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index cd7aaa9..b7a3fd0 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -4,6 +4,8 @@
concurrent: false
disabled: false
timer: "@midnight"
+# Block *-latest for all master jobs (without suffix)
+blocking: "^{job-name}.*"
jobs:
- "{job-name}"
# Folders from docker-playground.git
@@ -33,17 +35,28 @@
timer: 00 07 * * *
# latest stable
- - nplab-m3ua-test-latest
- - nplab-sua-test-latest
- - ttcn3-bsc-test-latest
- - ttcn3-bsc-test-sccplite-latest
- - ttcn3-bts-test-latest
- - ttcn3-ggsn-test-latest
- - ttcn3-hlr-test-latest
- - ttcn3-mgw-test-latest
- - ttcn3-msc-test-latest
- - ttcn3-sgsn-test-latest
- - ttcn3-sip-test-latest
+ - nplab-m3ua-test-latest:
+ blocking: "^nplab-m3ua-test.*"
+ - nplab-sua-test-latest:
+ blocking: "^nplab-sua-test.*"
+ - ttcn3-bsc-test-latest:
+ blocking: "^ttcn3-bsc-test.*"
+ - ttcn3-bsc-test-sccplite-latest:
+ blocking: "^ttcn3-bsc-test-sccplite.*"
+ - ttcn3-bts-test-latest:
+ blocking: "^ttcn3-bts-test.*"
+ - ttcn3-ggsn-test-latest:
+ blocking: "^ttcn3-ggsn-test.*"
+ - ttcn3-hlr-test-latest:
+ blocking: "^ttcn3-hlr-test.*"
+ - ttcn3-mgw-test-latest:
+ blocking: "^ttcn3-mgw-test.*"
+ - ttcn3-msc-test-latest:
+ blocking: "^ttcn3-msc-test.*"
+ - ttcn3-sgsn-test-latest:
+ blocking: "^ttcn3-sgsn-test.*"
+ - ttcn3-sip-test-latest:
+ blocking: "^ttcn3-sip-test.*"
- job-template:
name: '{job-name}'
project-type: freestyle
@@ -107,7 +120,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - "^{job-name}.*"
+ - "{obj:blocking}"
- build-discarder:
days-to-keep: 30
num-to-keep: 120
--
To view, visit https://gerrit.osmocom.org/12709
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I124286d4b996e79a7b77603c7b59473b016c3bd5
Gerrit-Change-Number: 12709
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in osmo-sysmon[master]: Drop unused parameter
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12705 ) Change subject: Drop unused parameter .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17c2fed4049e1c83307feda001aefc006dfbe6a3 Gerrit-Change-Number: 12705 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 Jan 2019 14:56:13 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in docker-playground[master]: ttcn3-sip-test/jenkins.sh: remove invalid -M arg
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12707 ) Change subject: ttcn3-sip-test/jenkins.sh: remove invalid -M arg .. Patch Set 1: > This -M probably was here for a reason - to use particular path for MNCC > socket. The -M argument works for osmo-msc, but osmo-sip-connector does not have such an argument: https://git.osmocom.org/osmo-sip-connector/tree/src/main.c?id=336add4990191011ec6b8f621593e24b2ad5e324#n98 > Do you have to change corresponding .cfg file as well to get the right path > or it's already updated? osmo-sip-connector.cfg has the real socket path: https://git.osmocom.org/docker-playground/tree/osmo-sip-master/osmo-sip-connector.cfg#n3 https://git.osmocom.org/docker-playground/tree/osmo-sip-latest/osmo-sip-connector.cfg#n3 -- To view, visit https://gerrit.osmocom.org/12707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee983a8aafe8cade67b76927721fc26e5af966d7 Gerrit-Change-Number: 12707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 28 Jan 2019 15:04:14 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-sysmon[master]: ctrl: log host/port on errors
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12318 ) Change subject: ctrl: log host/port on errors .. Patch Set 5: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c File src/simple_ctrl.c: https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c@40 PS4, Line 40: #define CTRL_ERR(cfg, fmt, args...) fprintf(stderr, "CTRL %s:%u error: " fmt, cfg->remote_host, cfg->remote_port, ##args) This line is longer than 120 characters, which is the max allowed length defined here: https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards https://gerrit.osmocom.org/#/c/12318/4/src/simple_ctrl.c@103 PS4, Line 103: struct ctrl_cfg *cfg; Pau asked in your other path: > Do we really need a pointer allocated by talloc here? and an alloc function? > just to have 2 strings and one int, all this seems overengineered to me. https://gerrit.osmocom.org/#/c/osmo-sysmon/+/12316/2/src/osysmon_ctrl.c@41 Then you changed it to "struct ctrl_cfg cfg;". So shouldn't it be the same here for consistency? -- To view, visit https://gerrit.osmocom.org/12318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf Gerrit-Change-Number: 12318 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 28 Jan 2019 15:21:56 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-sysmon[master]: ctrl: separate config structure
osmith has posted comments on this change. ( https://gerrit.osmocom.org/12316 ) Change subject: ctrl: separate config structure .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce Gerrit-Change-Number: 12316 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Stefan Sperling Gerrit-Comment-Date: Mon, 28 Jan 2019 15:22:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
