June 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: fix record PCUIF_pch_dt
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 ) Change subject: PCUIF_Types: fix record PCUIF_pch_dt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I011eb2496b1422c49736b227dfa1e2a2d6096d67 Gerrit-Change-Number: 33417 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:27:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-pcu[master]: tbf_ul_fsm: Delay moving ul_tbf to FLOW
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33416 ) Change subject: tbf_ul_fsm: Delay moving ul_tbf to FLOW ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48babd70ca44f11110240cbcfbab43d0e3a0fb59 Gerrit-Change-Number: 33416 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:27:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: tbf_ul: Avoid processing rx UL bocks for UL TBFs in RELEASING state
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33415 ) Change subject: tbf_ul: Avoid processing rx UL bocks for UL TBFs in RELEASING state ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/tbf_ul.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/33415/comment/b2edac25_8fb92f2a PS1, Line 264: requested may _have_ requested? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1da9b665b9ed83a644ea798008d456d6298b7460 Gerrit-Change-Number: 33415 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:27:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Add bsic
by laforge 25 Jun '23

25 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32766 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: Add bsic ...................................................................... ctrl: Add bsic Change-Id: I5c941770924e5373733c3a3939671fab518f7a58 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index f9623c4..98b79c6 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -248,6 +248,7 @@ /* BTS related commands below */ CTRL_CMD_DEFINE_RANGE(bts_lac, "location-area-code", struct gsm_bts, location_area_code, 0, 65535); CTRL_CMD_DEFINE_RANGE(bts_ci, "cell-identity", struct gsm_bts, cell_identity, 0, 65535); +CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63); static int set_bts_apply_config(struct ctrl_cmd *cmd, void *data) { @@ -1045,6 +1046,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_loc); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_lac); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_ci); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_bsic); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_apply_config); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_power_ctrl_defs); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5c941770924e5373733c3a3939671fab518f7a58 Gerrit-Change-Number: 32766 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: ctrl: Add setting SI5 neighbor list
by laforge 25 Jun '23

25 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32761 ) Change subject: ctrl: Add setting SI5 neighbor list ...................................................................... ctrl: Add setting SI5 neighbor list Change-Id: I1bab242cdbd0d7b39636d69027bf75794a5d5ba7 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 60 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 9d338aa..f9623c4 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -568,10 +568,8 @@ return 0; } -static int set_bts_neighbor_list_add_del(struct ctrl_cmd *cmd, void *data, bool add) +static int set_bts_neighbor_list_add_del(struct ctrl_cmd *cmd, void *data, bool add, struct bitvec *neigh_list) { - struct gsm_bts *bts = cmd->node; - struct bitvec *bv = &bts->si_common.neigh_list; int arfcn_int; uint16_t arfcn; enum gsm_band unused; @@ -582,20 +580,15 @@ } arfcn = (uint16_t) arfcn_int; - if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { - cmd->reply = "Neighbor list not in manual mode"; - return CTRL_CMD_ERROR; - } - if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { cmd->reply = "Invalid arfcn detected"; return CTRL_CMD_ERROR; } if (add) - bitvec_set_bit_pos(bv, arfcn, 1); + bitvec_set_bit_pos(neigh_list, arfcn, 1); else - bitvec_set_bit_pos(bv, arfcn, 0); + bitvec_set_bit_pos(neigh_list, arfcn, 0); cmd->reply = "OK"; return CTRL_CMD_REPLY; @@ -608,7 +601,12 @@ static int set_bts_neighbor_list_add(struct ctrl_cmd *cmd, void *data) { - return set_bts_neighbor_list_add_del(cmd, data, true); + struct gsm_bts *bts = cmd->node; + if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { + cmd->reply = "Neighbor list not in manual mode"; + return CTRL_CMD_ERROR; + } + return set_bts_neighbor_list_add_del(cmd, data, true, &bts->si_common.neigh_list); } CTRL_CMD_DEFINE_WO(bts_neighbor_list_add, "neighbor-list add"); @@ -620,11 +618,50 @@ static int set_bts_neighbor_list_del(struct ctrl_cmd *cmd, void *data) { - return set_bts_neighbor_list_add_del(cmd, data, false); + struct gsm_bts *bts = cmd->node; + if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { + cmd->reply = "Neighbor list not in manual mode"; + return CTRL_CMD_ERROR; + } + return set_bts_neighbor_list_add_del(cmd, data, false, &bts->si_common.neigh_list); } CTRL_CMD_DEFINE_WO(bts_neighbor_list_del, "neighbor-list del"); +static int verify_bts_neighbor_list_si5_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_bts_neighbor_list_add_del(cmd, value, _data); +} + +static int set_bts_neighbor_list_si5_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + if (bts->neigh_list_manual_mode != NL_MODE_MANUAL_SI5SEP) { + cmd->reply = "Neighbor list not in manual mode with separate SI5"; + return CTRL_CMD_ERROR; + } + return set_bts_neighbor_list_add_del(cmd, data, true, &bts->si_common.si5_neigh_list); +} + +CTRL_CMD_DEFINE_WO(bts_neighbor_list_si5_add, "neighbor-list si5-add"); + +static int verify_bts_neighbor_list_si5_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_bts_neighbor_list_add_del(cmd, value, _data); +} + +static int set_bts_neighbor_list_si5_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + if (bts->neigh_list_manual_mode != NL_MODE_MANUAL_SI5SEP) { + cmd->reply = "Neighbor list not in manual mode with separate SI5"; + return CTRL_CMD_ERROR; + } + return set_bts_neighbor_list_add_del(cmd, data, false, &bts->si_common.si5_neigh_list); +} + +CTRL_CMD_DEFINE_WO(bts_neighbor_list_si5_del, "neighbor-list si5-del"); + static int verify_bts_neighbor_list_mode(struct ctrl_cmd *cmd, const char *value, void *_data) { if (!strcmp(value, "automatic")) @@ -1022,6 +1059,8 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si5); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_add); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si5_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si5_del); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_mode); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_earfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_uarfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1bab242cdbd0d7b39636d69027bf75794a5d5ba7 Gerrit-Change-Number: 32761 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: ctrl: Add setting SI5 neighbor list
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: pespin, matanp, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32761 ) Change subject: ctrl: Add setting SI5 neighbor list ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1bab242cdbd0d7b39636d69027bf75794a5d5ba7 Gerrit-Change-Number: 32761 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Attention: daniel <daniel(a)totalueberwachung.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:26:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: gitignore: add arm-poky-linux-gnueabi-libtool
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33412 ) Change subject: gitignore: add arm-poky-linux-gnueabi-libtool ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0fe4f96175ee94eb0a131c425bbeb110f1d55402 Gerrit-Change-Number: 33412 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:25:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gsm: add gsm0502_fn2ccch_block()
by laforge 25 Jun '23

25 Jun '23

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33402 ) Change subject: gsm: add gsm0502_fn2ccch_block() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Gerrit-Change-Number: 33402 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 25 Jun 2023 06:25:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: tests: Add new, data-driven OTA tests
by laforge 25 Jun '23

25 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33348 ) Change subject: tests: Add new, data-driven OTA tests ...................................................................... tests: Add new, data-driven OTA tests Rather than writing one test class with associated method for each OTA algorithm / test, let's do this in a data-driven way, where new test cases just have to provide test data, while the code iterates over it. Change-Id: I8789a21fa5a4793bdabd468adc9fee3b6e633c25 --- M tests/test_ota.py 1 file changed, 151 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/test_ota.py b/tests/test_ota.py index c58a69d..7de5cff 100644 --- a/tests/test_ota.py +++ b/tests/test_ota.py @@ -2,6 +2,7 @@ import unittest from pySim.utils import h2b, b2h +from pySim.sms import SMS_SUBMIT, SMS_DELIVER, AddressField from pySim.ota import * # pre-defined SPI values for use in test cases below @@ -35,6 +36,9 @@ 'por': 'por_required' } +###################################################################### +# old-style code-driven test (lots of code copy+paste) +###################################################################### class Test_SMS_AES128(unittest.TestCase): tar = h2b('B00011') @@ -146,3 +150,136 @@ spi['rc_cc_ds'] = 'no_rc_cc_ds' r = self.dialect.encode_cmd(self.od, self.tar, spi, h2b('00a40000023f00')) self.assertEqual(b2h(r), '0d00193535b0000000000000000000a40000023f00') + + + +###################################################################### +# new-style data-driven tests +###################################################################### + +# SJA5 SAMPLE cards provisioned by execute_ipr.py +OTA_KEYSET_SJA5_SAMPLES = OtaKeyset(algo_crypt='triple_des_cbc2', kic_idx=3, + algo_auth='triple_des_cbc2', kid_idx=3, + kic=h2b('300102030405060708090a0b0c0d0e0f'), + kid=h2b('301102030405060708090a0b0c0d0e0f')) + +OTA_KEYSET_SJA5_AES128 = OtaKeyset(algo_crypt='aes_cbc', kic_idx=2, + algo_auth='aes_cmac', kid_idx=2, + kic=h2b('200102030405060708090a0b0c0d0e0f'), + kid=h2b('201102030405060708090a0b0c0d0e0f')) + +class OtaTestCase(unittest.TestCase): + def __init__(self, methodName='runTest', **kwargs): + super().__init__(methodName, **kwargs) + # RAM: B00000 + # SIM RFM: B00010 + # USIM RFM: B00011 + self.tar = h2b('B00011') + +class SmsOtaTestCase(OtaTestCase): + # Array describing the input/output data for the tests. We use the + # unittest subTests context manager to iterate over the entries of + # this testdatasets list. This is much more productive than + # manually writing one class per test. + testdatasets = [ + { + 'name': '3DES-SJA5-CIPHERED-CC', + 'ota_keyset': OTA_KEYSET_SJA5_SAMPLES, + 'spi': SPI_CC_POR_CIPHERED_CC, + 'request': { + 'apdu': b'\x00\xa4\x00\x04\x02\x3f\x00', + 'encoded_cmd': '00201506193535b00011ae733256918d050b87c94fbfe12e4dc402f262c41cf67f2f', + 'encoded_tpdu': '400881214365877ff6227052000000000302700000201506193535b00011ae733256918d050b87c94fbfe12e4dc402f262c41cf67f2f', + }, + 'response': { + 'encoded_resp': '027100001c12b000118bb989492c632529326a2f4681feb37c825bc9021c9f6d0b', + 'response_status': 'por_ok', + 'number_of_commands': 1, + 'last_status_word': '6132', + 'last_response_data': '', + } + }, { + 'name': '3DES-SJA5-UNCIPHERED-CC', + 'ota_keyset': OTA_KEYSET_SJA5_SAMPLES, + 'spi': SPI_CC_POR_UNCIPHERED_CC, + 'request': { + 'apdu': b'\x00\xa4\x00\x04\x02\x3f\x00', + 'encoded_cmd': '00201506093535b00011c49ac91ab8159ba5b83a54fb6385e0a5e31694f8b215fafc', + 'encoded_tpdu': '400881214365877ff6227052000000000302700000201506093535b00011c49ac91ab8159ba5b83a54fb6385e0a5e31694f8b215fafc', + }, + 'response': { + 'encoded_resp': '027100001612b0001100000000000000b5bcd6353a421fae016132', + 'response_status': 'por_ok', + 'number_of_commands': 1, + 'last_status_word': '6132', + 'last_response_data': '', + } + }, { + 'name': '3DES-SJA5-UNCIPHERED-NOCC', + 'ota_keyset': OTA_KEYSET_SJA5_SAMPLES, + 'spi': SPI_CC_POR_UNCIPHERED_NOCC, + 'request': { + 'apdu': b'\x00\xa4\x00\x04\x02\x3f\x00', + 'encoded_cmd': '00201506013535b000113190be334900f52b025f3f7eddfe868e96ebf310023b7769', + 'encoded_tpdu': '400881214365877ff6227052000000000302700000201506013535b000113190be334900f52b025f3f7eddfe868e96ebf310023b7769', + }, + 'response': { + 'encoded_resp': '027100000e0ab0001100000000000000016132', + 'response_status': 'por_ok', + 'number_of_commands': 1, + 'last_status_word': '6132', + 'last_response_data': '', + } + }, { + 'name': 'AES128-SJA5-CIPHERED-CC', + 'ota_keyset': OTA_KEYSET_SJA5_AES128, + 'spi': SPI_CC_POR_CIPHERED_CC, + 'request': { + 'apdu': b'\x00\xa4\x00\x04\x02\x3f\x00', + 'encoded_cmd': '00281506192222b00011e87cceebb2d93083011ce294f93fc4d8de80da1abae8c37ca3e72ec4432e5058', + 'encoded_tpdu': '400881214365877ff6227052000000000302700000281506192222b00011e87cceebb2d93083011ce294f93fc4d8de80da1abae8c37ca3e72ec4432e5058', + }, + 'response': { + 'encoded_resp': '027100002412b00011ebc6b497e2cad7aedf36ace0e3a29b38853f0fe9ccde81913be5702b73abce1f', + 'response_status': 'por_ok', + 'number_of_commands': 1, + 'last_status_word': '6132', + 'last_response_data': '', + } + }, + # TODO: AES192 + # TODO: AES256 + ] + + def __init__(self, methodName='runTest', **kwargs): + super().__init__(methodName, **kwargs) + self.dialect = OtaDialectSms() + self.da = AddressField('12345678', 'unknown', 'isdn_e164') + + def test_encode_cmd(self): + for t in SmsOtaTestCase.testdatasets: + with self.subTest(name=t['name']): + kset = t['ota_keyset'] + outp = self.dialect.encode_cmd(kset, self.tar, t['spi'], apdu=t['request']['apdu']) + #print("result: %s" % b2h(outp)) + self.assertEqual(b2h(outp), t['request']['encoded_cmd']) + + with_udh = b'\x02\x70\x00' + outp + #print("with_udh: %s" % b2h(with_udh)) + + tpdu = SMS_DELIVER(tp_udhi=True, tp_oa=self.da, tp_pid=0x7F, tp_dcs=0xF6, + tp_scts=h2b('22705200000000'), tp_udl=3, tp_ud=with_udh) + #print("TPDU: %s" % tpdu) + #print("tpdu: %s" % b2h(tpdu.toBytes())) + self.assertEqual(b2h(tpdu.toBytes()), t['request']['encoded_tpdu']) + + def test_decode_resp(self): + for t in SmsOtaTestCase.testdatasets: + with self.subTest(name=t['name']): + kset = t['ota_keyset'] + r, d = self.dialect.decode_resp(kset, t['spi'], t['response']['encoded_resp']) + #print("RESP: %s / %s" % (r, d)) + self.assertEqual(r.response_status, t['response']['response_status']) + self.assertEqual(d.number_of_commands, t['response']['number_of_commands']) + self.assertEqual(d.last_status_word, t['response']['last_status_word']) + self.assertEqual(d.last_response_data, t['response']['last_response_data']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8789a21fa5a4793bdabd468adc9fee3b6e633c25 Gerrit-Change-Number: 33348 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[L] Change in pysim[master]: Add support for encoding/decoding SMS in TPDU and SMPP format
by laforge 25 Jun '23

25 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33347 ) Change subject: Add support for encoding/decoding SMS in TPDU and SMPP format ...................................................................... Add support for encoding/decoding SMS in TPDU and SMPP format This is important when talking OTA with a SIM. Change-Id: I0d95e62c1e7183a7851d1fe38df0f5133830cb1f --- M pySim/sms.py M requirements.txt M setup.py A tests/test_sms.py 4 files changed, 472 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/sms.py b/pySim/sms.py index a281213..a15bbcb 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -18,20 +18,25 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import typing -from construct import Int8ub, Bytes -from construct import Struct, Tell, this, RepeatUntil +import abc +from bidict import bidict +from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger, Flag +from construct import Struct, Enum, Tell, BitStruct, this, Padding +from construct import Prefixed, GreedyRange, GreedyBytes +from pySim.construct import HexAdapter, BcdAdapter, TonNpi from pySim.utils import Hexstr, h2b, b2h +from smpp.pdu import pdu_types, operations + BytesOrHex = typing.Union[Hexstr, bytes] class UserDataHeader: # a single IE in the user data header - ie_c = Struct('offset'/Tell, 'iei'/Int8ub, 'length'/Int8ub, 'data'/Bytes(this.length)) + ie_c = Struct('iei'/Int8ub, 'length'/Int8ub, 'value'/Bytes(this.length)) # parser for the full UDH: Length octet followed by sequence of IEs - _construct = Struct('udhl'/Int8ub, - # FIXME: somehow the below lambda is not working, we always only get the first IE? - 'ies'/RepeatUntil(lambda obj,lst,ctx: ctx._io.tell() > 1+this.udhl, ie_c)) + _construct = Struct('ies'/Prefixed(Int8ub, GreedyRange(ie_c)), + 'data'/GreedyBytes) def __init__(self, ies=[]): self.ies = ies @@ -50,4 +55,346 @@ if isinstance(inb, str): inb = h2b(inb) res = cls._construct.parse(inb) - return cls(res['ies']), inb[1+res['udhl']:] + return cls(res['ies']), res['data'] + + def toBytes(self) -> bytes: + return self._construct.build({'ies':self.ies, 'data':b''}) + + +def smpp_dcs_is_8bit(dcs: pdu_types.DataCoding) -> bool: + """Determine if the given SMPP data coding scheme is 8-bit or not.""" + if dcs == pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, + pdu_types.DataCodingDefault.OCTET_UNSPECIFIED): + return True + if dcs == pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, + pdu_types.DataCodingDefault.OCTET_UNSPECIFIED_COMMON): + return True + if dcs.scheme == pdu_types.DataCodingScheme.GSM_MESSAGE_CLASS and dcs.schemeData['msgCoding'] == pdu_types.DataCodingGsmMsgCoding.DATA_8BIT: + return True + else: + return False + +def ensure_smpp_is_8bit(dcs: pdu_types.DataCoding): + """Assert if given SMPP data coding scheme is not 8-bit.""" + if not smpp_dcs_is_8bit(dcs): + raise ValueError('We only support 8bit coded SMS for now') + +class AddressField: + """Representation of an address field as used in SMS T-PDU.""" + _construct = Struct('addr_len'/Int8ub, + 'type_of_addr'/TonNpi, + 'digits'/BcdAdapter(Bytes(this.addr_len//2 + this.addr_len%2)), + 'tell'/Tell) + smpp_map_npi = bidict({ + 'UNKNOWN': 'unknown', + 'ISDN': 'isdn_e164', + 'DATA': 'data_x121', + 'TELEX': 'telex_f69', + 'LAND_MOBILE': 'sc_specific6', + 'NATIONAL': 'national', + 'PRIVATE': 'private', + 'ERMES': 'ermes', + }) + smpp_map_ton = bidict({ + 'UNKNOWN': 'unknown', + 'INTERNATIONAL': 'international', + 'NATIONAL': 'national', + 'NETWORK_SPECIFIC': 'network_specific', + 'SUBSCRIBER_NUMBER': 'short_code', + 'ALPHANUMERIC': 'alphanumeric', + 'ABBREVIATED': 'abbreviated', + }) + + + def __init__(self, digits, ton='unknown', npi='unknown'): + self.ton = ton + self.npi = npi + self.digits = digits + + def __str__(self): + return 'AddressField(TON=%s, NPI=%s, %s)' % (self.ton, self.npi, self.digits) + + @classmethod + def fromBytes(cls, inb: BytesOrHex) -> typing.Tuple['AddressField', bytes]: + """Construct an AddressField instance from the binary T-PDU address format.""" + if isinstance(inb, str): + inb = h2b(inb) + res = cls._construct.parse(inb) + #print("size: %s" % cls._construct.sizeof()) + ton = res['type_of_addr']['type_of_number'] + npi = res['type_of_addr']['numbering_plan_id'] + # return resulting instance + remainder bytes + return cls(res['digits'][:res['addr_len']], ton, npi), inb[res['tell']:] + + @classmethod + def fromSmpp(cls, addr, ton, npi) -> 'AddressField': + """Construct an AddressField from {source,dest}_addr_{,ton,npi} attributes of smpp.pdu.""" + # return the resulting instance + return cls(addr.decode('ascii'), AddressField.smpp_map_ton[ton.name], AddressField.smpp_map_npi[npi.name]) + + def toSmpp(self): + """Return smpp.pdo.*.source,dest}_addr_{,ton,npi} attributes for given AddressField.""" + return (self.digits, self.smpp_map_ton.inverse[self.ton], self.smpp_map_npi.inverse[self.npi]) + + def toBytes(self) -> bytes: + """Encode the AddressField into the binary representation as used in T-PDU.""" + num_digits = len(self.digits) + if num_digits % 2: + self.digits += 'f' + d = { + 'addr_len': num_digits, + 'type_of_addr': { + 'ext': True, + 'type_of_number': self.ton, + 'numbering_plan_id': self.npi, + }, + 'digits': self.digits, + } + return self._construct.build(d) + + +class SMS_TPDU(abc.ABC): + """Base class for a SMS T-PDU.""" + def __init__(self, **kwargs): + self.tp_mti = kwargs.get('tp_mti', None) + self.tp_rp = kwargs.get('tp_rp', False) + self.tp_udhi = kwargs.get('tp_udhi', False) + self.tp_pid = kwargs.get('tp_pid', None) + self.tp_dcs = kwargs.get('tp_dcs', None) + self.tp_udl = kwargs.get('tp_udl', None) + self.tp_ud = kwargs.get('tp_ud', None) + + + +class SMS_DELIVER(SMS_TPDU): + """Representation of a SMS-DELIVER T-PDU. This is the Network to MS/UE (downlink) direction.""" + flags_construct = BitStruct('tp_rp'/Flag, 'tp_udhi'/Flag, 'tp_rp'/Flag, 'tp_sri'/Flag, + Padding(1), 'tp_mms'/Flag, 'tp_mti'/BitsInteger(2)) + def __init__(self, **kwargs): + kwargs['tp_mti'] = 0 + super().__init__(**kwargs) + self.tp_lp = kwargs.get('tp_lp', False) + self.tp_mms = kwargs.get('tp_mms', False) + self.tp_oa = kwargs.get('tp_oa', None) + self.tp_scts = kwargs.get('tp_scts', None) + self.tp_sri = kwargs.get('tp_sri', False) + + def __repr__(self): + return '%s(MTI=%s, MMS=%s, LP=%s, RP=%s, UDHI=%s, SRI=%s, OA=%s, PID=%2x, DCS=%x, SCTS=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_mms, self.tp_lp, self.tp_rp, self.tp_udhi, self.tp_sri, self.tp_oa, self.tp_pid, self.tp_dcs, self.tp_scts, self.tp_udl, self.tp_ud) + + @classmethod + def fromBytes(cls, inb: BytesOrHex) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the binary encoded format as used in T-PDU.""" + if isinstance(inb, str): + inb = h2b(inb) + flags = inb[0] + d = SMS_DELIVER.flags_construct.parse(inb) + oa, remainder = AddressField.fromBytes(inb[1:]) + d['tp_oa'] = oa + offset = 0 + d['tp_pid'] = remainder[offset] + offset += 1 + d['tp_dcs'] = remainder[offset] + offset += 1 + # TODO: further decode + d['tp_scts'] = remainder[offset:offset+7] + offset += 7 + d['tp_udl'] = remainder[offset] + offset += 1 + d['tp_ud'] = remainder[offset:] + return cls(**d) + + def toBytes(self) -> bytes: + """Encode a SMS_DELIVER instance to the binary encoded format as used in T-PDU.""" + outb = bytearray() + d = { + 'tp_mti': self.tp_mti, 'tp_mms': self.tp_mms, 'tp_lp': self.tp_lp, + 'tp_rp': self.tp_rp, 'tp_udhi': self.tp_udhi, 'tp_sri': self.tp_sri, + } + flags = SMS_DELIVER.flags_construct.build(d) + outb.extend(flags) + outb.extend(self.tp_oa.toBytes()) + outb.append(self.tp_pid) + outb.append(self.tp_dcs) + outb.extend(self.tp_scts) + outb.append(self.tp_udl) + outb.extend(self.tp_ud) + + return outb + + @classmethod + def fromSmpp(cls, smpp_pdu) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the deliver format used by smpp.pdu.""" + if smpp_pdu.id == pdu_types.CommandId.submit_sm: + return cls.fromSmppSubmit(smpp_pdu) + else: + raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) + + @classmethod + def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the submit format used by smpp.pdu.""" + ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) + tp_oa = AddressField.fromSmpp(smpp_pdu.params['source_addr'], + smpp_pdu.params['source_addr_ton'], + smpp_pdu.params['source_addr_npi']) + tp_ud = smpp_pdu.params['short_message'] + d = { + 'tp_lp': False, + 'tp_mms': False, + 'tp_oa': tp_oa, + 'tp_scts': h2b('22705200000000'), # FIXME + 'tp_sri': False, + 'tp_rp': False, + 'tp_udhi': pdu_types.EsmClassGsmFeatures.UDHI_INDICATOR_SET in smpp_pdu.params['esm_class'].gsmFeatures, + 'tp_pid': smpp_pdu.params['protocol_id'], + 'tp_dcs': 0xF6, # we only deal with binary SMS here + 'tp_udl': len(tp_ud), + 'tp_ud': tp_ud, + } + return cls(**d) + + + +class SMS_SUBMIT(SMS_TPDU): + """Representation of a SMS-SUBMIT T-PDU. This is the MS/UE -> network (uplink) direction.""" + flags_construct = BitStruct('tp_srr'/Flag, 'tp_udhi'/Flag, 'tp_rp'/Flag, + 'tp_vpf'/Enum(BitsInteger(2), none=0, relative=2, enhanced=1, absolute=3), + 'tp_rd'/Flag, 'tp_mti'/BitsInteger(2)) + def __init__(self, **kwargs): + kwargs['tp_mti'] = 1 + super().__init__(**kwargs) + self.tp_rd = kwargs.get('tp_rd', False) + self.tp_vpf = kwargs.get('tp_vpf', 'none') + self.tp_srr = kwargs.get('tp_srr', False) + self.tp_mr = kwargs.get('tp_mr', None) + self.tp_da = kwargs.get('tp_da', None) + self.tp_vp = kwargs.get('tp_vp', None) + + def __repr__(self): + return '%s(MTI=%s, RD=%s, VPF=%u, RP=%s, UDHI=%s, SRR=%s, DA=%s, PID=%2x, DCS=%x, VP=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_rd, self.tp_vpf, self.tp_rp, self.tp_udhi, self.tp_srr, self.tp_da, self.tp_pid, self.tp_dcs, self.tp_vp, self.tp_udl, self.tp_ud) + + @classmethod + def fromBytes(cls, inb:BytesOrHex) -> 'SMS_SUBMIT': + """Construct a SMS_SUBMIT instance from the binary encoded format as used in T-PDU.""" + offset = 0 + if isinstance(inb, str): + inb = h2b(inb) + d = SMS_SUBMIT.flags_construct.parse(inb) + offset += 1 + d['tp_mr']= inb[offset] + offset += 1 + da, remainder = AddressField.fromBytes(inb[2:]) + d['tp_da'] = da + + offset = 0 + d['tp_pid'] = remainder[offset] + offset += 1 + d['tp_dcs'] = remainder[offset] + offset += 1 + if d['tp_vpf'] == 'none': + pass + elif d['tp_vpf'] == 'relative': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+1] + offset += 1 + elif d['tp_vpf'] == 'enhanced': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+7] + offset += 7 + pass + elif d['tp_vpf'] == 'absolute': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+7] + offset += 7 + pass + else: + raise ValueError('Invalid VPF: %s' % d['tp_vpf']) + d['tp_udl'] = remainder[offset] + offset += 1 + d['tp_ud'] = remainder[offset:] + return cls(**d) + + def toBytes(self) -> bytes: + """Encode a SMS_SUBMIT instance to the binary encoded format as used in T-PDU.""" + outb = bytearray() + d = { + 'tp_mti': self.tp_mti, 'tp_rd': self.tp_rd, 'tp_vpf': self.tp_vpf, + 'tp_rp': self.tp_rp, 'tp_udhi': self.tp_udhi, 'tp_srr': self.tp_srr, + } + flags = SMS_SUBMIT.flags_construct.build(d) + outb.extend(flags) + outb.append(self.tp_mr) + outb.extend(self.tp_da.toBytes()) + outb.append(self.tp_pid) + outb.append(self.tp_dcs) + if self.tp_vpf != 'none': + outb.extend(self.tp_vp) + outb.append(self.tp_udl) + outb.extend(self.tp_ud) + return outb + + @classmethod + def fromSmpp(cls, smpp_pdu) -> 'SMS_SUBMIT': + """Construct a SMS_SUBMIT instance from the format used by smpp.pdu.""" + if smpp_pdu.id == pdu_types.CommandId.submit_sm: + return cls.fromSmppSubmit(smpp_pdu) + else: + raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) + + @classmethod + def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_SUBMIT': + """Construct a SMS_SUBMIT instance from the submit format used by smpp.pdu.""" + ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) + tp_da = AddressField.fromSmpp(smpp_pdu.params['destination_addr'], + smpp_pdu.params['dest_addr_ton'], + smpp_pdu.params['dest_addr_npi']) + tp_ud = smpp_pdu.params['short_message'] + #vp_smpp = smpp_pdu.params['validity_period'] + #if not vp_smpp: + # vpf = 'none' + d = { + 'tp_rd': True if smpp_pdu.params['replace_if_present_flag'].name == 'REPLACE' else False, + 'tp_vpf': None, # vpf, + 'tp_rp': False, # related to ['registered_delivery'] ? + 'tp_udhi': pdu_types.EsmClassGsmFeatures.UDHI_INDICATOR_SET in smpp_pdu.params['esm_class'].gsmFeatures, + 'tp_srr': True if smpp_pdu.params['registered_delivery'] else False, + 'tp_mr': 0, # FIXME: sm_default_msg_id ? + 'tp_da': tp_da, + 'tp_pid': smpp_pdu.params['protocol_id'], + 'tp_dcs': 0xF6, # FIXME: we only deal with binary SMS here + 'tp_vp': None, # FIXME: implement VPF conversion + 'tp_udl': len(tp_ud), + 'tp_ud': tp_ud, + } + return cls(**d) + + def toSmpp(self) -> pdu_types.PDU: + """Translate a SMS_SUBMIT instance to a smpp.pdu.operations.SubmitSM instance.""" + esm_class = pdu_types.EsmClass(pdu_types.EsmClassMode.DEFAULT, pdu_types.EsmClassType.DEFAULT) + reg_del = pdu_types.RegisteredDelivery(pdu_types.RegisteredDeliveryReceipt.NO_SMSC_DELIVERY_RECEIPT_REQUESTED) + if self.tp_rp: + repl_if = pdu_types.ReplaceIfPresentFlag.REPLACE + else: + repl_if = pdu_types.ReplaceIfPresentFlag.DO_NOT_REPLACE + # we only deal with binary SMS here: + if self.tp_dcs != 0xF6: + raise ValueError('Unsupported DCS: We only support DCS=0xF6 for now') + dc = pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, pdu_types.DataCodingDefault.OCTET_UNSPECIFIED) + (daddr, ton, npi) = self.tp_da.toSmpp() + return operations.SubmitSM(service_type='', + source_addr_ton=pdu_types.AddrTon.ALPHANUMERIC, + source_addr_npi=pdu_types.AddrNpi.UNKNOWN, + source_addr='simcard', + dest_addr_ton=ton, + dest_addr_npi=npi, + destination_addr=daddr, + esm_class=esm_class, + protocol_id=self.tp_pid, + priority_flag=pdu_types.PriorityFlag.LEVEL_0, + #schedule_delivery_time, + #validity_period, + registered_delivery=reg_del, + replace_if_present_flag=repl_if, + data_coding=dc, + #sm_default_msg_id, + short_message=self.tp_ud) diff --git a/requirements.txt b/requirements.txt index b12cb4d..4332b66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ colorlog pycryptodomex packaging +git+https://github.com/hologram-io/smpp.pdu diff --git a/setup.py b/setup.py index d4fb15f..5678c55 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ "colorlog", "pycryptodomex", "packaging", + "smpp.pdu @ git+https://github.com/hologram-io/smpp.pdu", ], scripts=[ 'pySim-prog.py', diff --git a/tests/test_sms.py b/tests/test_sms.py new file mode 100644 index 0000000..8355224 --- /dev/null +++ b/tests/test_sms.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python3 + +import unittest +from pySim.utils import h2b, b2h +from pySim.sms import * + +class Test_SMS_UDH(unittest.TestCase): + def test_single_ie(self): + udh, tail = UserDataHeader.fromBytes('027100') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + self.assertEqual(tail, b'') + + def test_single_ie_tail(self): + udh, tail = UserDataHeader.fromBytes('027100abcdef') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + self.assertEqual(tail, b'\xab\xcd\xef') + + def test_single_ie_value(self): + udh, tail = UserDataHeader.fromBytes('03710110') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 1) + self.assertEqual(ie.value, b'\x10') + self.assertEqual(tail, b'') + + def test_two_ie_data_tail(self): + udh, tail = UserDataHeader.fromBytes('0571007001ffabcd') + self.assertEqual(len(udh.ies), 2) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + ie = udh.ies[1] + self.assertEqual(ie.iei, 0x70) + self.assertEqual(ie.length, 1) + self.assertEqual(ie.value, b'\xff') + self.assertEqual(tail, b'\xab\xcd') + + def test_toBytes(self): + indata = h2b('0571007001ff') + udh, tail = UserDataHeader.fromBytes(indata) + encoded = udh.toBytes() + self.assertEqual(encoded, indata) + +class Test_AddressField(unittest.TestCase): + def test_fromBytes(self): + encoded = h2b('0480214399') + af, trailer = AddressField.fromBytes(encoded) + self.assertEqual(trailer, b'\x99') + self.assertEqual(af.ton, 'unknown') + self.assertEqual(af.npi, 'unknown') + self.assertEqual(af.digits, '1234') + + def test_fromBytes_odd(self): + af, trailer = AddressField.fromBytes('038021f399') + self.assertEqual(trailer, b'\x99') + self.assertEqual(af.ton, 'unknown') + self.assertEqual(af.npi, 'unknown') + self.assertEqual(af.digits, '123') + + def test_toBytes(self): + encoded = h2b('04802143') + af, trailer = AddressField.fromBytes(encoded) + self.assertEqual(af.toBytes(), encoded) + + def test_toBytes_odd(self): + af = AddressField('12345', 'international', 'isdn_e164') + encoded = af.toBytes() + self.assertEqual(encoded, h2b('05912143f5')) + + +class Test_SUBMIT(unittest.TestCase): + def test_fromBytes(self): + s = SMS_SUBMIT.fromBytes('550d0b911614261771f000f5a78c0b050423f423f40003010201424547494e3a56434152440d0a56455253494f4e3a322e310d0a4e3a4d650d0a54454c3b505245463b43454c4c3b564f4943453a2b36313431363237313137300d0a54454c3b484f4d453b564f4943453a2b36313339353337303437310d0a54454c3b574f524b3b564f4943453a2b36313339363734373031350d0a454e443a') + self.assertEqual(s.tp_mti, 1) + self.assertEqual(s.tp_rd, True) + self.assertEqual(s.tp_vpf, 'relative') + self.assertEqual(s.tp_rp, False) + self.assertEqual(s.tp_udhi, True) + self.assertEqual(s.tp_srr, False) + self.assertEqual(s.tp_pid, 0) + self.assertEqual(s.tp_dcs, 0xf5) + self.assertEqual(s.tp_udl, 140) + +class Test_DELIVER(unittest.TestCase): + def test_fromBytes(self): + d = SMS_DELIVER.fromBytes('0408D0E5759A0E7FF6907090307513000824010101BB400101') + self.assertEqual(d.tp_mti, 0) + self.assertEqual(d.tp_mms, True) + self.assertEqual(d.tp_lp, False) + self.assertEqual(d.tp_rp, False) + self.assertEqual(d.tp_udhi, False) + self.assertEqual(d.tp_sri, False) + self.assertEqual(d.tp_pid, 0x7f) + self.assertEqual(d.tp_dcs, 0xf6) + self.assertEqual(d.tp_udl, 8) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0d95e62c1e7183a7851d1fe38df0f5133830cb1f Gerrit-Change-Number: 33347 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0