February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: jobs/gerrit-verifications: build ttcn3 in docker

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27205 ) Change subject: jobs/gerrit-verifications: build ttcn3 in docker ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a667255bb55a945b4c6279d711142aa252c6996 Gerrit-Change-Number: 27205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Feb 2022 14:57:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr_test: increase test coverage for oe / bwe conversation

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/27211 ) Change subject: amr_test: increase test coverage for oe / bwe conversation ...................................................................... amr_test: increase test coverage for oe / bwe conversation The functions that convert between octet-aligned and bandwith-efficient AMR format have good coverage on the octet-aligned side, but the bandwith-efficient side has a very little number of sample packets. Lets add some more sample packets to increase coverage. Related: SYS#5834 Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 --- M tests/amr/amr_test.c M tests/amr/amr_test.ok 2 files changed, 131 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/11/27211/1 diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 3d0d917..69ba723 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -29,6 +29,7 @@ "703c22f979890338540179209572624a0f8535871c2f7039cbf926b7e4425b6ef0", "703c2e671f3b1b0810412d5adae61e2b2a319885c6ced4e909b4eeaa2ea0f0cd80", "703cf8fc77356c948141686cda34d35220db719e36a359d86b64420dc64b563850", + "703c3eec9c37dfb201c093c57a1235a02af55ccc22f1c9593a6e058c368b4d7f50", "60344e300c0e6251342c2ae51fd8a698a945488d16c98922726f3e50", "60341fc722c7880328a9c280030bc9755c3ef519f80000295323e000", "60342c338655c00008efba03592419adf62478a79278b3e2d68ab0f0", @@ -47,7 +48,7 @@ "0004f89d67f1160935bde1996840", "0004633cc7f0630439ffe0000000", "0004eb81fc0758973b9edc782550", - "a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc", /* sample with invalid FT */ + "a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc", /* sample with invalid FT, will be detected as bandwith-efficient */ "END", }; @@ -55,10 +56,20 @@ char *bwe_amr_samples[] = { "f4495c7cda8f80", "f44aaa6c969780", + "7449c1e32c6780", + "74400000000380", + "703c493323b0bf68028086d15a00", + "703c59171697c53c01801fb6aa80", + "703c55029bb2e23a0020172e8b00", + "703c48f52442f08884a8050b8500", + "7038000000000000000000000000", + "7151434e01292c40c4735e4412204077", + "714eadbe13ac4694f4726f71985d64cd", "f3d09c20e32da600c025a72e0a9b360386e40f87e19282094adc1a11e397d1d4", "f3d39a49a09e7a802852e297e8c9246aadf5a45928bfc27177fed8404d97d3b8", "f3c2155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0", "f3c381bc7061c9f8507f6029de6115c16e5fa470c243b21b6e35dbb48bd84c00", + "73c901b7a2004be7f85284b6ab7142acfe6872b1ae1c107d0588b551de7be650", "a7bfc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03f", /* sample with invalid FT */ "END", }; diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index c9cde1f..02e36d9 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -24,132 +24,139 @@ rc: 32 Sample No.: 3 + octet aligned: 703c3eec9c37dfb201c093c57a1235a02af55ccc22f1c9593a6e058c368b4d7f50 + 011100000011110000111110111011001001110000110111110111111011001000000001110000001001001111000101011110100001001000110101101000000010101011110101010111001100110000100010111100011100100101011001001110100110111000000101100011000011011010001011010011010111111101010000 + bw-efficient: 73cfbb270df7ec807024f15e848d680abd573308bc72564e9b81630da2d35fd4 + 0111001111001111101110110010011100001101111101111110110010000000011100000010010011110001010111101000010010001101011010000000101010111101010101110011001100001000101111000111001001010110010011101001101110000001011000110000110110100010110100110101111111010100 + rc: 32 + +Sample No.: 4 octet aligned: 60344e300c0e6251342c2ae51fd8a698a945488d16c98922726f3e50 01100000001101000100111000110000000011000000111001100010010100010011010000101100001010101110010100011111110110001010011010011000101010010100010101001000100011010001011011001001100010010010001001110010011011110011111001010000 bw-efficient: 63538c030398944d0b0ab947f629a62a51522345b262489c9bcf94 011000110101001110001100000000110000001110011000100101000100110100001011000010101011100101000111111101100010100110100110001010100101000101010010001000110100010110110010011000100100100010011100100110111100111110010100 rc: 27 -Sample No.: 4 +Sample No.: 5 octet aligned: 60341fc722c7880328a9c280030bc9755c3ef519f80000295323e000 01100000001101000001111111000111001000101100011110001000000000110010100010101001110000101000000000000011000010111100100101110101010111000011111011110101000110011111100000000000000000000010100101010011001000111110000000000000 bw-efficient: 6347f1c8b1e200ca2a70a000c2f25d570fbd467e00000a54c8f800 011000110100011111110001110010001011000111100010000000001100101000101010011100001010000000000000110000101111001001011101010101110000111110111101010001100111111000000000000000000000101001010100110010001111100000000000 rc: 27 -Sample No.: 5 +Sample No.: 6 octet aligned: 60342c338655c00008efba03592419adf62478a79278b3e2d68ab0f0 01100000001101000010110000110011100001100101010111000000000000000000100011101111101110100000001101011001001001000001100110101101111101100010010001111000101001111001001001111000101100111110001011010110100010101011000011110000 bw-efficient: 634b0ce1957000023bee80d649066b7d891e29e49e2cf8b5a2ac3c 011000110100101100001100111000011001010101110000000000000000001000111011111011101000000011010110010010010000011001101011011111011000100100011110001010011110010010011110001011001111100010110101101000101010110000111100 rc: 27 -Sample No.: 6 +Sample No.: 7 octet aligned: 502c98ab841e491ff7a1a555016a32a3c7f913210630 01010000001011001001100010101011100001000001111001001001000111111111011110100001101001010101010100000001011010100011001010100011110001111111100100010011001000010000011000110000 bw-efficient: 52e62ae1079247fde86955405a8ca8f1fe44c8418c00 01010010111001100010101011100001000001111001001001000111111111011110100001101001010101010100000001011010100011001010100011110001111111100100010011001000010000011000110000000000 rc: 22 -Sample No.: 7 +Sample No.: 8 octet aligned: 502cc5459a0d200e7097c4dfe86ec8d27f1756d776f0 01010000001011001100010101000101100110100000110100100000000011100111000010010111110001001101111111101000011011101100100011010010011111110001011101010110110101110111011011110000 bw-efficient: 52f151668348039c25f137fa1bb2349fc5d5b5ddbc00 01010010111100010101000101100110100000110100100000000011100111000010010111110001001101111111101000011011101100100011010010011111110001011101010110110101110111011011110000000000 rc: 22 -Sample No.: 8 +Sample No.: 9 octet aligned: 502c42b332081813d7e916e7aa5e80d7fde812b8c080 01010000001011000100001010110011001100100000100000011000000100111101011111101001000101101110011110101010010111101000000011010111111111011110100000010010101110001100000010000000 bw-efficient: 52d0accc820604f5fa45b9ea97a035ff7a04ae302000 01010010110100001010110011001100100000100000011000000100111101011111101001000101101110011110101010010111101000000011010111111111011110100000010010101110001100000010000000000000 rc: 22 -Sample No.: 9 +Sample No.: 10 octet aligned: 40240343e959c79bacd20c77501054880a718db200 010000000010010000000011010000111110100101011001110001111001101110101100110100100000110001110111010100000001000001010100100010000000101001110001100011011011001000000000 bw-efficient: 4240d0fa5671e6eb34831dd4041522029c636c80 0100001001000000110100001111101001010110011100011110011011101011001101001000001100011101110101000000010000010101001000100000001010011100011000110110110010000000 rc: 20 -Sample No.: 10 +Sample No.: 11 octet aligned: 4024172c53401e39115ceecd12606df5689bdd0ca0 010000000010010000010111001011000101001101000000000111100011100100010001010111001110111011001101000100100110000001101101111101010110100010011011110111010000110010100000 bw-efficient: 4245cb14d0078e44573bb344981b7d5a26f74328 0100001001000101110010110001010011010000000001111000111001000100010101110011101110110011010001001001100000011011011111010101101000100110111101110100001100101000 rc: 20 -Sample No.: 11 +Sample No.: 12 octet aligned: 4024f871cf48801ec427f0fc3f7318898622062200 010000000010010011111000011100011100111101001000100000000001111011000100001001111111000011111100001111110111001100011000100010011000011000100010000001100010001000000000 bw-efficient: 427e1c73d22007b109fc3f0fdcc6226188818880 0100001001111110000111000111001111010010001000000000011110110001000010011111110000111111000011111101110011000110001000100110000110001000100000011000100010000000 rc: 20 -Sample No.: 12 +Sample No.: 13 octet aligned: 20141fd4c02667c742b164aef659ffe708 0010000000010100000111111101010011000000001001100110011111000111010000101011000101100100101011101111011001011001111111111110011100001000 bw-efficient: 2147f5300999f1d0ac592bbd967ff9c2 00100001010001111111010100110000000010011001100111110001110100001010110001011001001010111011110110010110011111111111100111000010 rc: 16 -Sample No.: 13 +Sample No.: 14 octet aligned: 2014197e10ead7b250bccbbf3b81887c64 0010000000010100000110010111111000010000111010101101011110110010010100001011110011001011101111110011101110000001100010000111110001100100 bw-efficient: 21465f843ab5ec942f32efcee0621f19 00100001010001100101111110000100001110101011010111101100100101000010111100110010111011111100111011100000011000100001111100011001 rc: 16 -Sample No.: 14 +Sample No.: 15 octet aligned: 2014e959f35fdfe5e9667ffbc088818088 0010000000010100111010010101100111110011010111111101111111100101111010010110011001111111111110111100000010001000100000011000000010001000 bw-efficient: 217a567cd7f7f97a599ffef022206022 00100001011110100101011001111100110101111111011111111001011110100101100110011111111111101111000000100010001000000110000000100010 rc: 16 -Sample No.: 15 +Sample No.: 16 octet aligned: 100c4e9ba850e30d5d53d04de41e7c 000100000000110001001110100110111010100001010000111000110000110101011101010100111101000001001101111001000001111001111100 bw-efficient: 10d3a6ea1438c35754f41379079f00 000100001101001110100110111010100001010000111000110000110101011101010100111101000001001101111001000001111001111100000000 rc: 15 -Sample No.: 16 +Sample No.: 17 octet aligned: 100c6c18e7b7fff53aeb055e7d1c54 000100000000110001101100000110001110011110110111111111111111010100111010111010110000010101011110011111010001110001010100 bw-efficient: 10db0639edfffd4ebac1579f471500 000100001101101100000110001110011110110111111111111111010100111010111010110000010101011110011111010001110001010100000000 rc: 15 -Sample No.: 17 +Sample No.: 18 octet aligned: 100c1fb967f7f1fdf547bf2e61c060 000100000000110000011111101110010110011111110111111100011111110111110101010001111011111100101110011000011100000001100000 bw-efficient: 10c7ee59fdfc7f7d51efcb98701800 000100001100011111101110010110011111110111111100011111110111110101010001111011111100101110011000011100000001100000000000 rc: 15 -Sample No.: 18 +Sample No.: 19 octet aligned: 0004f89d67f1160935bde1996840 0000000000000100111110001001110101100111111100010001011000001001001101011011110111100001100110010110100001000000 bw-efficient: 007e2759fc45824d6f78665a1000 0000000001111110001001110101100111111100010001011000001001001101011011110111100001100110010110100001000000000000 rc: 14 -Sample No.: 19 +Sample No.: 20 octet aligned: 0004633cc7f0630439ffe0000000 0000000000000100011000110011110011000111111100000110001100000100001110011111111111100000000000000000000000000000 bw-efficient: 0058cf31fc18c10e7ff800000000 0000000001011000110011110011000111111100000110001100000100001110011111111111100000000000000000000000000000000000 rc: 14 -Sample No.: 20 +Sample No.: 21 octet aligned: 0004eb81fc0758973b9edc782550 0000000000000100111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000 bw-efficient: 007ae07f01d625cee7b71e095400 0000000001111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000000000 rc: 14 -Sample No.: 21 +Sample No.: 22 octet aligned: a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc 101000000111100011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111100 bw-efficient: @@ -174,34 +181,104 @@ rc: 7 Sample No.: 2 + bw-efficient: 7449c1e32c6780 + 01110100010010011100000111100011001011000110011110000000 + octet aligned: 704427078cb19c + 01110000010001000010011100000111100011001011000110011100 + rc: 7 + +Sample No.: 3 + bw-efficient: 74400000000380 + 01110100010000000000000000000000000000000000001110000000 + octet aligned: 7044000000000c + 01110000010001000000000000000000000000000000000000001100 + rc: 7 + +Sample No.: 4 + bw-efficient: 703c493323b0bf68028086d15a00 + 0111000000111100010010010011001100100011101100001011111101101000000000101000000010000110110100010101101000000000 + octet aligned: 7000f124cc8ec2fda00a021b4568 + 0111000000000000111100010010010011001100100011101100001011111101101000000000101000000010000110110100010101101000 + rc: 14 + +Sample No.: 5 + bw-efficient: 703c59171697c53c01801fb6aa80 + 0111000000111100010110010001011100010110100101111100010100111100000000011000000000011111101101101010101010000000 + octet aligned: 7000f1645c5a5f14f006007edaa8 + 0111000000000000111100010110010001011100010110100101111100010100111100000000011000000000011111101101101010101000 + rc: 14 + +Sample No.: 6 + bw-efficient: 703c55029bb2e23a0020172e8b00 + 0111000000111100010101010000001010011011101100101110001000111010000000000010000000010111001011101000101100000000 + octet aligned: 7000f1540a6ecb88e800805cba2c + 0111000000000000111100010101010000001010011011101100101110001000111010000000000010000000010111001011101000101100 + rc: 14 + +Sample No.: 7 + bw-efficient: 703c48f52442f08884a8050b8500 + 0111000000111100010010001111010100100100010000101111000010001000100001001010100000000101000010111000010100000000 + octet aligned: 7000f123d4910bc22212a0142e14 + 0111000000000000111100010010001111010100100100010000101111000010001000100001001010100000000101000010111000010100 + rc: 14 + +Sample No.: 8 + bw-efficient: 7038000000000000000000000000 + 0111000000111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + octet aligned: 7000e00000000000000000000000 + 0111000000000000111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + rc: 14 + +Sample No.: 9 + bw-efficient: 7151434e01292c40c4735e4412204077 + 01110001010100010100001101001110000000010010100100101100010000001100010001110011010111100100010000010010001000000100000001110111 + octet aligned: 7014450d3804a4b10311cd7910488101dc + 0111000000010100010001010000110100111000000001001010010010110001000000110001000111001101011110010001000001001000100000010000000111011100 + rc: 17 + +Sample No.: 10 + bw-efficient: 714eadbe13ac4694f4726f71985d64cd + 01110001010011101010110110111110000100111010110001000110100101001111010001110010011011110111000110011000010111010110010011001101 + octet aligned: 70143ab6f84eb11a53d1c9bdc661759334 + 0111000000010100001110101011011011111000010011101011000100011010010100111101000111001001101111011100011001100001011101011001001100110100 + rc: 17 + +Sample No.: 11 bw-efficient: f3d09c20e32da600c025a72e0a9b360386e40f87e19282094adc1a11e397d1d4 1111001111010000100111000010000011100011001011011010011000000000110000000010010110100111001011100000101010011011001101100000001110000110111001000000111110000111111000011001001010000010000010010100101011011100000110100001000111100011100101111101000111010100 octet aligned: f03c4270838cb6980300969cb82a6cd80e1b903e1f864a08252b7068478e5f4750 111100000011110001000010011100001000001110001100101101101001100000000011000000001001011010011100101110000010101001101100110110000000111000011011100100000011111000011111100001100100101000001000001001010010101101110000011010000100011110001110010111110100011101010000 rc: 33 -Sample No.: 3 +Sample No.: 12 bw-efficient: f3d39a49a09e7a802852e297e8c9246aadf5a45928bfc27177fed8404d97d3b8 1111001111010011100110100100100110100000100111100111101010000000001010000101001011100010100101111110100011001001001001000110101010101101111101011010010001011001001010001011111111000010011100010111011111111110110110000100000001001101100101111101001110111000 octet aligned: f03c4e69268279ea00a14b8a5fa32491aab7d69164a2ff09c5dffb6101365f4ee0 111100000011110001001110011010010010011010000010011110011110101000000000101000010100101110001010010111111010001100100100100100011010101010110111110101101001000101100100101000101111111100001001110001011101111111111011011000010000000100110110010111110100111011100000 rc: 33 -Sample No.: 4 +Sample No.: 13 bw-efficient: f3c2155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0 1111001111000010000101010101101101100101000100110001110001101000011010000010000001111001111110101011010010000001000010010001000100100000000000000000001110110011011000001010111000000100010001100000000000000000001001011111000100011110010100111001110111010000 octet aligned: f03c08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740 111100000011110000001000010101010110110110010100010011000111000110100001101000001000000111100111111010101101001000000100001001000100010010000000000000000000111011001101100000101011100000010001000110000000000000000000100101111100010001111001010011100111011101000000 rc: 33 -Sample No.: 5 +Sample No.: 14 bw-efficient: f3c381bc7061c9f8507f6029de6115c16e5fa470c243b21b6e35dbb48bd84c00 1111001111000011100000011011110001110000011000011100100111111000010100000111111101100000001010011101111001100001000101011100000101101110010111111010010001110000110000100100001110110010000110110110111000110101110110111011010010001011110110000100110000000000 octet aligned: f03c0e06f1c18727e141fd80a779845705b97e91c3090ec86db8d76ed22f613000 111100000011110000001110000001101111000111000001100001110010011111100001010000011111110110000000101001110111100110000100010101110000010110111001011111101001000111000011000010010000111011001000011011011011100011010111011011101101001000101111011000010011000000000000 rc: 33 -Sample No.: 6 +Sample No.: 15 + bw-efficient: 73c901b7a2004be7f85284b6ab7142acfe6872b1ae1c107d0588b551de7be650 + 0111001111001001000000011011011110100010000000000100101111100111111110000101001010000100101101101010101101110001010000101010110011111110011010000111001010110001101011100001110000010000011111010000010110001000101101010101000111011110011110111110011001010000 + octet aligned: 703c2406de88012f9fe14a12daadc50ab3f9a1cac6b87041f41622d54779ef9940 + 011100000011110000100100000001101101111010001000000000010010111110011111111000010100101000010010110110101010110111000101000010101011001111111001101000011100101011000110101110000111000001000001111101000001011000100010110101010100011101111001111011111001100101000000 + rc: 33 + +Sample No.: 16 bw-efficient: a7bfc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03f 1010011110111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111 octet aligned: @@ -213,25 +290,26 @@ Sample No.: 0... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 1... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 2... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes -Sample No.: 3... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes +Sample No.: 3... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 4... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes Sample No.: 5... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes -Sample No.: 6... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes +Sample No.: 6... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes Sample No.: 7... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes Sample No.: 8... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes -Sample No.: 9... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes +Sample No.: 9... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes Sample No.: 10... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes Sample No.: 11... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes -Sample No.: 12... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes +Sample No.: 12... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes Sample No.: 13... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes Sample No.: 14... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes -Sample No.: 15... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes +Sample No.: 15... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes Sample No.: 16... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes Sample No.: 17... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes -Sample No.: 18... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes +Sample No.: 18... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes Sample No.: 19... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes Sample No.: 20... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes -Sample No.: 21... skipping a sample with a wrong FT +Sample No.: 21... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes +Sample No.: 22... skipping a sample with a wrong FT Testing conversion from IuUP to bw-efficient and inverse: @@ -262,7 +340,8 @@ Sample No.: 18 ==>octet aligned Sample No.: 19 ==>octet aligned Sample No.: 20 ==>octet aligned -Sample No.: 21 ==>bandwith efficient +Sample No.: 21 ==>octet aligned +Sample No.: 22 ==>bandwith efficient Sample No.: 0 ==>bandwith efficient Sample No.: 1 ==>bandwith efficient Sample No.: 2 ==>bandwith efficient @@ -270,4 +349,14 @@ Sample No.: 4 ==>bandwith efficient Sample No.: 5 ==>bandwith efficient Sample No.: 6 ==>bandwith efficient +Sample No.: 7 ==>bandwith efficient +Sample No.: 8 ==>bandwith efficient +Sample No.: 9 ==>bandwith efficient +Sample No.: 10 ==>bandwith efficient +Sample No.: 11 ==>bandwith efficient +Sample No.: 12 ==>bandwith efficient +Sample No.: 13 ==>bandwith efficient +Sample No.: 14 ==>bandwith efficient +Sample No.: 15 ==>bandwith efficient +Sample No.: 16 ==>bandwith efficient OK: Test passed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/27211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: cosmetic: fix grammer in comment

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/27210 ) Change subject: amr: cosmetic: fix grammer in comment ...................................................................... amr: cosmetic: fix grammer in comment Change-Id: I01ad26986d925acdcdb3760f89b8a85dccdc3d5b --- M src/amr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/10/27210/1 diff --git a/src/amr.c b/src/amr.c index 7bc24f5..add4285 100644 --- a/src/amr.c +++ b/src/amr.c @@ -103,8 +103,8 @@ * mode normally relys on out of band methods that explicitly select * one of the two modes. (See also RFC 3267, chapter 3.8). However the * A interface in GSM does not provide ways to communicate which mode - * is used exactly used. The following functions uses some heuristics - * to check if an AMR payload is octet aligned or not. */ + * is exactly used. The following functions uses some heuristics to + * check if an AMR payload is octet aligned or not. */ struct amr_hdr *oa_hdr = (struct amr_hdr *)payload; unsigned int frame_len; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/27210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I01ad26986d925acdcdb3760f89b8a85dccdc3d5b Gerrit-Change-Number: 27210 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: export: Add FCP template to export

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27209 ) Change subject: pySim-shell: export: Add FCP template to export ...................................................................... pySim-shell: export: Add FCP template to export The FCP template provides us a lot of context, like the permissions of a given file. Let's make it part of the 'export' output, both in raw and in decoded form. Change-Id: I05f17bbebd7a9b3535204b821900851a5f66e88f Closes: OS#5457 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/27209/1 diff --git a/pySim-shell.py b/pySim-shell.py index 12f35fd..ad76ba0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -532,6 +532,8 @@ structure = self._cmd.rs.selected_file_structure() self._cmd.poutput("# structure: %s" % str(structure)) + self._cmd.poutput("# RAW FCP Template: %s" % str(self._cmd.rs.selected_file_fcp_hex)) + self._cmd.poutput("# Decoded FCP Template: %s" % str(self._cmd.rs.selected_file_fcp)) for f in df_path_list: self._cmd.poutput("select " + str(f)) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 8303a4b..f8b86c5 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1221,6 +1221,8 @@ self.card = card self.selected_file = self.mf # type: CardDF self.profile = profile + self.selected_file_fcp = None + self.selected_file_fcp_hex = None # make sure the class and selection control bytes, which are specified # by the card profile are used @@ -1464,7 +1466,8 @@ select_resp = f.decode_select_response(data) else: select_resp = self.probe_file(name, cmd_app) - # store the decoded FCP for later reference + # store the raw + decoded FCP for later reference + self.selected_file_fcp_hex = data self.selected_file_fcp = select_resp self._select_post(cmd_app) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I05f17bbebd7a9b3535204b821900851a5f66e88f Gerrit-Change-Number: 27209 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: docs/legcay.txt: Point to pySim-shell as replacement

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27208 ) Change subject: docs/legcay.txt: Point to pySim-shell as replacement ...................................................................... docs/legcay.txt: Point to pySim-shell as replacement Change-Id: I9ca6b9d8c35e23be2ec8752107bb7d1e4f6f9bc1 --- M docs/legacy.rst 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/27208/1 diff --git a/docs/legacy.rst b/docs/legacy.rst index ec3ddfc..d93358f 100644 --- a/docs/legacy.rst +++ b/docs/legacy.rst @@ -4,6 +4,9 @@ *legacy tools* are the classic ``pySim-prog`` and ``pySim-read`` programs that existed long before ``pySim-shell``. +These days, you should primarily use ``pySim-shell`` instead of these +legacy tools. + pySim-prog ---------- @@ -45,6 +48,11 @@ ``pySim-read`` allows you to read some data from a SIM card. It will only some files of the card, and will only read files accessible to a normal user (without any special authentication) +These days, you should use the ``export`` command of ``pySim-shell`` +instead. It performs a much more comprehensive export of all of the +[standard] files that can be found on the card. To get a human-readable +decode instead of the raw hex export, you can use ``export --json``. + Specifically, pySim-read will dump the following: * MF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9ca6b9d8c35e23be2ec8752107bb7d1e4f6f9bc1 Gerrit-Change-Number: 27208 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: README.md: Remove old usage examples, refer to user manual instead

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27207 ) Change subject: README.md: Remove old usage examples, refer to user manual instead ...................................................................... README.md: Remove old usage examples, refer to user manual instead We want people to use pySim-shell and should not mislead them by having usage examples of old tools in README.md. Also, all documentation should be in the manuals, let's try to have bits and pieces in various places. Change-Id: I8c07a2e0778ab95fb42be6074acb80874e681d20 --- M README.md 1 file changed, 20 insertions(+), 36 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 7f46085..5e1937e 100644 --- a/README.md +++ b/README.md @@ -93,46 +93,30 @@ <https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> -Usage Examples --------------- +Documentation +------------- - * Program customizable SIMs. Two modes are possible: +The pySim user manual can be built from this very source code by means +of sphinx (with sphinxcontrib-napoleon and sphinx-argparse). See the +Makefile in the 'docs' directory. - - one where you specify every parameter manually: -``` -./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -i <IMSI> -s <ICCID> -``` +A pre-rendered HTML user manual of the current pySim 'git master' is +available from <https://downloads.osmocom.org/docs/latest/pysim/> and +a downloadable PDF version is published at +<https://downloads.osmocom.org/docs/latest/osmopysim-usermanual.pdf>. - - one where they are generated from some minimal set: -``` -./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -z <random_string_of_choice> -j <card_num> -``` +A slightly dated video presentation about pySim-shell can be found at +<https://media.ccc.de/v/osmodevcall-20210409-laforge-pysim-shell>. -With ``<random_string_of_choice>`` and ``<card_num>``, the soft will generate -'predictable' IMSI and ICCID, so make sure you choose them so as not to -conflict with anyone. (for e.g. your name as ``<random_string_of_choice>`` and -0 1 2 ... for ``<card num>``). -You also need to enter some parameters to select the device: +pySim-shell vs. legacy tools +---------------------------- - -t TYPE : type of card (``supersim``, ``magicsim``, ``fakemagicsim`` or try ``auto``) - -d DEV : Serial port device (default ``/dev/ttyUSB0``) - -b BAUD : Baudrate (default 9600) +While you will find a lot of online resources still describing the use of +pySim-prog.py and pySim-read.py, those tools are considered legacy by +now and have by far been superseded by the much more capable +pySim-shell. We strongly encourage users to adopt pySim-shell, unless +they have very specific requirements like batch programming of large +quantities of cards, which is about the only remaining use case for the +legacy tools. - * Interact with SIMs from a python interactive shell (e.g. ipython): - -``` -from pySim.transport.serial import SerialSimLink -from pySim.commands import SimCardCommands - -sl = SerialSimLink(device='/dev/ttyUSB0', baudrate=9600) -sc = SimCardCommands(sl) - -sl.wait_for_card() - - # Print IMSI -print(sc.read_binary(['3f00', '7f20', '6f07'])) - - # Run A3/A8 -print(sc.run_gsm('00112233445566778899aabbccddeeff')) -``` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8c07a2e0778ab95fb42be6074acb80874e681d20 Gerrit-Change-Number: 27207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in pysim[master]: README.md: Remove old usage examples, refer to user manual instead

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27207 ) Change subject: README.md: Remove old usage examples, refer to user manual instead ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8c07a2e0778ab95fb42be6074acb80874e681d20 Gerrit-Change-Number: 27207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 15 Feb 2022 14:46:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: README.md: Remove old usage examples, refer to user manual instead

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27207 ) Change subject: README.md: Remove old usage examples, refer to user manual instead ...................................................................... README.md: Remove old usage examples, refer to user manual instead We want people to use pySim-shell and should not mislead them by having usage examples of old tools in README.md. Also, all documentation should be in the manuals, let's try to have bits and pieces in various places. Change-Id: I8c07a2e0778ab95fb42be6074acb80874e681d20 --- M README.md 1 file changed, 20 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/27207/1 diff --git a/README.md b/README.md index 7f46085..5e1937e 100644 --- a/README.md +++ b/README.md @@ -93,46 +93,30 @@ <https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> -Usage Examples --------------- +Documentation +------------- - * Program customizable SIMs. Two modes are possible: +The pySim user manual can be built from this very source code by means +of sphinx (with sphinxcontrib-napoleon and sphinx-argparse). See the +Makefile in the 'docs' directory. - - one where you specify every parameter manually: -``` -./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -i <IMSI> -s <ICCID> -``` +A pre-rendered HTML user manual of the current pySim 'git master' is +available from <https://downloads.osmocom.org/docs/latest/pysim/> and +a downloadable PDF version is published at +<https://downloads.osmocom.org/docs/latest/osmopysim-usermanual.pdf>. - - one where they are generated from some minimal set: -``` -./pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -z <random_string_of_choice> -j <card_num> -``` +A slightly dated video presentation about pySim-shell can be found at +<https://media.ccc.de/v/osmodevcall-20210409-laforge-pysim-shell>. -With ``<random_string_of_choice>`` and ``<card_num>``, the soft will generate -'predictable' IMSI and ICCID, so make sure you choose them so as not to -conflict with anyone. (for e.g. your name as ``<random_string_of_choice>`` and -0 1 2 ... for ``<card num>``). -You also need to enter some parameters to select the device: +pySim-shell vs. legacy tools +---------------------------- - -t TYPE : type of card (``supersim``, ``magicsim``, ``fakemagicsim`` or try ``auto``) - -d DEV : Serial port device (default ``/dev/ttyUSB0``) - -b BAUD : Baudrate (default 9600) +While you will find a lot of online resources still describing the use of +pySim-prog.py and pySim-read.py, those tools are considered legacy by +now and have by far been superseded by the much more capable +pySim-shell. We strongly encourage users to adopt pySim-shell, unless +they have very specific requirements like batch programming of large +quantities of cards, which is about the only remaining use case for the +legacy tools. - * Interact with SIMs from a python interactive shell (e.g. ipython): - -``` -from pySim.transport.serial import SerialSimLink -from pySim.commands import SimCardCommands - -sl = SerialSimLink(device='/dev/ttyUSB0', baudrate=9600) -sc = SimCardCommands(sl) - -sl.wait_for_card() - - # Print IMSI -print(sc.read_binary(['3f00', '7f20', '6f07'])) - - # Run A3/A8 -print(sc.run_gsm('00112233445566778899aabbccddeeff')) -``` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8c07a2e0778ab95fb42be6074acb80874e681d20 Gerrit-Change-Number: 27207 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: ansible/ttcn3: don't install titan/libfftranscode

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27206 ) Change subject: ansible/ttcn3: don't install titan/libfftranscode ...................................................................... ansible/ttcn3: don't install titan/libfftranscode With the last patch, the jenkins infrastructure will always run eclipse-titan in docker. Therefore do not install eclipse-titan and libfftranscode on jenkins nodes anymore. This avoids the problem that we couldn't upgrade libfftranscode with the existing ansible rules. libosmocore-utils is still being installed, as osmo-config-merge must be installed on the jenkins nodes. Closes: OS#5452 Change-Id: Ie46fe3dcb286a6258021fad9c35be10442544761 --- M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml 1 file changed, 1 insertion(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/27206/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index 5e15254..fc4fcc3 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -24,22 +24,9 @@ filename: obs_osmocom update_cache: yes -- name: install titan and libosmocore-utils +- name: install libosmocore-utils apt: name: - - eclipse-titan - libosmocore-utils update_cache: yes cache_valid_time: 3600 - -- name: Get DEB architecture - shell: dpkg --print-architecture - register: deb_architecture - -- name: Install libfftranscode0 - apt: - deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.3_{{deb_a… - -- name: Install libfftranscode-dev - apt: - deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.3_{{de… -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie46fe3dcb286a6258021fad9c35be10442544761 Gerrit-Change-Number: 27206 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-verifications: build ttcn3 in docker

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27205 ) Change subject: jobs/gerrit-verifications: build ttcn3 in docker ...................................................................... jobs/gerrit-verifications: build ttcn3 in docker Build the testsuites in the same docker container during gerrit verification, as it will be the case when building and running the testsuites in the various ttcn3-* jenkins jobs. This avoids the need to install eclipse-titan and libfftranscode on the jenkins nodes. Related: OS#5452 Change-Id: I6a667255bb55a945b4c6279d711142aa252c6996 --- M jobs/gerrit-verifications.yml 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/27205/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 84fe805..9481047 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -261,12 +261,20 @@ cmd: '{timeout_cmd} ./contrib/jenkins.sh' - osmo-ttcn3-hacks: - repos_url: 'https://gerrit.osmocom.org/{repos}' slave_axis: !!python/tuple [ttcn3] - concurrent: false cmd: | - set -e - make deps; make clean; make compile + docker run \ + --rm \ + -v "$PWD:/build" \ + "registry.osmocom.org/osmocom-build/debian-bullseye-titan" \ + {timeout_cmd} \ + sh -e -x -c " + useradd --uid=1000 build; + cd /build; + su build -c 'make deps'; + su build -c 'make clean'; + su build -c 'make compile'; + " jobs: - 'gerrit-{repos}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a667255bb55a945b4c6279d711142aa252c6996 Gerrit-Change-Number: 27205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022