OpenBSC August 2014

openbsc@lists.osmocom.org

10 participants
20 discussions

Pysim error: SW match failed
by Martin Nagy 16 Aug '25

16 Aug '25

Hi all, After buying a super Sim Kit (16 in 1) from China, I tried the reader (green PCB inside a blue transparent plastic case with a blue LED) and SIM (identified as a fakesupersim) with pysim tool. However i am getting the following error: /pySim-prog.py -n 26C3 -c 49 -x 262 -y 42 -z 1234 -j 1 -t auto Insert card now (or CTRL-C to cancel) Autodetected card type fakemagicsim Generated card parameters : > Name : 26C3 > SMSP : e1ffffffffffffffffffffffff058100945555ffffffffffff000000 > ICCID : 8949262427518313026 > MCC/MNC : 262/42 > IMSI : 262422461512085 > Ki : 7b74741a1ee14337ec23f9ab92a13648 > OPC : ccd867d60797d8d45354a51b3ef568ff Programming ... Traceback (most recent call last): File "./pySim-prog.py", line 530, in <module> card.program(cp) File "/home/nadicek/pysim/pysim/pySim/cards.py", line 231, in program self._scc.update_binary('6f30', hplmn + 'ff' * (tl-3)) File "/home/nadicek/pysim/pysim/pySim/commands.py", line 53, in update_binary return self._tp.send_apdu_checksw(pdu) File "/home/nadicek/pysim/pysim/pySim/transport/__init__.py", line 87, in send_apdu_checksw raise RuntimeError("SW match failed ! Expected %s and got %s." % (sw.lower(), rv[1])) RuntimeError: SW match failed ! Expected 9000 and got 9804. I checked mailing lists and haven’t found anybody who had similar problem with pysim. Also I have tried forcing different models of SIM, but nothing is working. Obviously I can remove this check from the script file (__init__.py in /pySim/transport), however somebody had a reason to put such condition there. I would like to ask if it is safe to remove that line of code and the purpose of that line of code. Thanks a lot and best regards Martin

3 3

Re: Help with sccp library
by mosbah abdelkader 07 Jul '25

07 Jul '25

> I don't understand. This callback will be called with data you need to write > to the network. In case of MTP Level3 you will need to wrap that around the > msgb you got. I means: is the interaction with mtp3 layer implemented (is sending sccp data by mtp3 implemented by the library?)? Also, what about the reception of data from mtp3 layer. is that implemented in the sccp lib. I am asking these questions because I see the code of mtp3 in the lib but no significant call is present in the sccp part of the lib. Thank you for your help.

4 3

[PATCH 0/4] core/conv: Fast Viterbi decoding
by Thomas Tsou 26 Apr '16

26 Apr '16

Hi all, This patch set adds to libosmocore an optimized Viterbi decodeer for architecture specific (Intel SSE) and non-specific cases. The implementation covers codes with constraint lengths of K=5 and K=7 and rates 1/4 to 3/4, which make up the majority of GSM use cases. Speedup from the current implementation is in the range of 5 to 20 depending on the processor and code type. API is unchanged. Tested on Haswell (i7-4770K) and Atom (D2550). Additional test codes from osmo-bts are included. Further tests for AWGN bit-error-rate and benchmarks can be found in the following repository. https://github.com/ttsou/osmo-conv-test Here are some examples. Bit error test for GPRS CS2 with SNR of 5 dB and 100000 bursts. $ ./conv_test -c 2 -e -r 5 -i 100000 ================================================= [+] Testing: GPRS CS2 [.] Specs: (N=2, K=5, non-recursive, flushed, not punctured) [.] Input length : ret = 290 exp = 290 -> OK [.] Output length : ret = 588 exp = 588 -> OK [.] BER tests: [..] Testing base: [..] Input BER.......................... 0.042443 [..] Output BER......................... 0.000006 [..] Output FER......................... 0.001350 (135) [..] Testing SIMD: [..] Input BER.......................... 0.042460 [..] Output BER......................... 0.000005 [..] Output FER......................... 0.001240 (124) Timed AFS benchmark with 8 threads and 100000 bursts per thread. $ ./conv_test -b -c 10 -j 8 -i 100000 ================================================= [+] Testing: GSM TCH/AFS 6.7 [.] Specs: (N=4, K=5, recursive, flushed, punctured) [.] Input length : ret = 140 exp = 140 -> OK [.] Output length : ret = 448 exp = 448 -> OK [.] Performance benchmark: [..] Encoding / Decoding 800000 bursts on 8 thread(s): [..] Testing base: [..] Elapsed time....................... 4.320001 secs [..] Rate............................... 25.925920 Mbps [..] Testing SIMD: [..] Elapsed time....................... 0.458272 secs [..] Rate............................... 244.396341 Mbps [..] Speedup............................ 9.426718 -TT

5 13

Final review of L1SAP ported to current maste
by Harald Welte 25 Mar '15

25 Mar '15

Dear all, the valuable L1SAP abstraction has been sitting out of master for too long time. It is a pity that this has taken so long. I've finally been able to put some time into osmo-bts again and reviewed the following patch series. It consists of mostly Andreas' work, interspersed with smaller patches/fixups that I introduced after the respective original patch from Andreas. I have started a sysmobts between all of the major steps in this patch series and did a short manual tests involving registration (LU) of two MS, mobile-to-mobile call and vty-to-mobile SMS. So far I couldn't see any problems. What has not been tested yet is the PCU interface as well as encryption support. I plan to do this later this week. I intend to merge the code after this current review cycle. Please take your time to have a look and provide feedback (if any), so we can get this over and work on new features again, rather than infrastrutural changes. I didn't yet rebase the osmo-bts-trx interface on top of the L1SAP, as I don't have a hardware setup for it, and I will leave it to the owners of such hardware to publish/push the respective code after L1SAP is merged. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

3 43

[PATCH] Add subscriber delete command
by Ruben Pollan 25 Sep '14

25 Sep '14

--- openbsc/include/openbsc/gsm_subscriber.h | 1 + openbsc/src/libbsc/gsm_subscriber_base.c | 2 +- openbsc/src/libmsc/vty_interface_layer3.c | 24 +++++++++++++++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 7aae4c3..120111b 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -101,6 +101,7 @@ int subscr_pending_kick(struct gsm_subscriber *subscr); char *subscr_name(struct gsm_subscriber *subscr); +void subscr_free(struct gsm_subscriber *subscr); int subscr_purge_inactive(struct gsm_network *net); void subscr_update_from_db(struct gsm_subscriber *subscr); void subscr_expire(struct gsm_network *net); diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libbsc/gsm_subscriber_base.c index 5e00443..2b31e95 100644 --- a/openbsc/src/libbsc/gsm_subscriber_base.c +++ b/openbsc/src/libbsc/gsm_subscriber_base.c @@ -66,7 +66,7 @@ struct gsm_subscriber *subscr_alloc(void) return s; } -static void subscr_free(struct gsm_subscriber *subscr) +void subscr_free(struct gsm_subscriber *subscr) { llist_del(&subscr->entry); talloc_free(subscr); diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 064eca9..6b53f65 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -465,7 +465,28 @@ DEFUN(subscriber_ussd_notify, return CMD_SUCCESS; } -DEFUN(ena_subscr_authorizde, +DEFUN(ena_subscr_delete, + ena_subscr_delete_cmd, + "subscriber " SUBSCR_TYPES " ID delete", + SUBSCR_HELP "Delete subscriber in HLR\n") +{ + struct gsm_network *gsmnet = gsmnet_from_vty(vty); + struct gsm_subscriber *subscr = + get_subscr_by_argv(gsmnet, argv[0], argv[1]); + + if (!subscr) { + vty_out(vty, "%% No subscriber found for %s %s%s", + argv[0], argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + db_subscriber_delete(subscr); + subscr_free(subscr); + + return CMD_SUCCESS; +} + +DEFUN(ena_subscr_authorized, ena_subscr_authorized_cmd, "subscriber " SUBSCR_TYPES " ID authorized (0|1)", SUBSCR_HELP "(De-)Authorize subscriber in HLR\n" @@ -982,6 +1003,7 @@ int bsc_vty_init_extra(void) install_element_ve(&show_stats_cmd); install_element_ve(&show_smsqueue_cmd); + install_element(ENABLE_NODE, &ena_subscr_delete_cmd); install_element(ENABLE_NODE, &ena_subscr_name_cmd); install_element(ENABLE_NODE, &ena_subscr_extension_cmd); install_element(ENABLE_NODE, &ena_subscr_authorized_cmd); -- 2.1.0

2 8

Can't build debian packages of libosmocore
by Ciaby 04 Sep '14

04 Sep '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 I'm having this problem with the latest code from git: root@boxie:~/gsm# git clone git://git.osmocom.org/libosmocore.git Cloning into 'libosmocore'... remote: Counting objects: 8770, done. remote: Compressing objects: 100% (4055/4055), done. remote: Total 8770 (delta 5642), reused 6765 (delta 4265) Receiving objects: 100% (8770/8770), 1.62 MiB | 142 KiB/s, done. Resolving deltas: 100% (5642/5642), done. root@boxie:~/gsm# cd libosmocore root@boxie:~/gsm/libosmocore# autoreconf -fi libtoolize: putting auxiliary files in `.'. libtoolize: copying file `./config.guess' libtoolize: copying file `./config.sub' libtoolize: copying file `./install-sh' libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' configure.ac:5: installing `./missing' src/Makefile.am: installing `./depcomp' root@boxie:~/gsm/libosmocore# dpkg-buildpackage dpkg-buildpackage: export CFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security dpkg-buildpackage: export CPPFLAGS from dpkg-buildflags (origin: vendor): -D_FORTIFY_SOURCE=2 dpkg-buildpackage: export CXXFLAGS from dpkg-buildflags (origin: vendor): -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security dpkg-buildpackage: export FFLAGS from dpkg-buildflags (origin: vendor): -g -O2 dpkg-buildpackage: export LDFLAGS from dpkg-buildflags (origin: vendor): -Wl,-Bsymbolic-functions -Wl,-z,relro dpkg-buildpackage: source package libosmocore dpkg-buildpackage: source version 0.7.0 dpkg-buildpackage: source changed by Harald Welte <laforge(a)gnumonks.org> dpkg-buildpackage: host architecture amd64 dpkg-source --before-build libosmocore [...] make[1]: Entering directory `/home/rhizomatica/gsm/libosmocore' sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install dh_install: usr/lib/libosmogsm.so.5.1.0 exists in debian/tmp but is not installed to anywhere dh_install: usr/lib/libosmogsm.so.5 exists in debian/tmp but is not installed to anywhere dh_install: usr/lib/libosmoctrl.so.0.0.0 exists in debian/tmp but is not installed to anywhere dh_install: usr/lib/libosmoctrl.so.0 exists in debian/tmp but is not installed to anywhere dh_install: missing files, aborting make[1]: *** [override_dh_install] Error 2 make[1]: Leaving directory `/home/rhizomatica/gsm/libosmocore' make: *** [binary] Error 2 dpkg-buildpackage: error: debian/rules binary gave error exit status 2 So, it looks like it's trying to build a libosmogsm6 package, but only libosmogsm5.1.0 gets built. I looked around, and the only reference I found is in src/gsm/Makefile.am, and it's correct (6:0:1). What am I doing wrong? :) Cheers Ciaby -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iF4EAREKAAYFAlQDgJkACgkQC30ZhxNccpF5EgD/TmeKcYFpr8O/XXA6RRS7zm10 boe6pxAd8XVku0bVdXsBAJ8zOiPhkTmXlrBc3Tdefrx+subagwnBV1RV4dbses4M =dqEo -----END PGP SIGNATURE-----

4 11

[PATCH] debian: fix build errors with libosmogsm and libosmoctrl
by Ciaby 31 Aug '14

31 Aug '14

libosmogsm: the transition from 5 to 6 wasn't done properly. Fixed version number. libosmoctrl: missing definition in debian/control and also missing libosmoctrl0.install. --- debian/control | 6 ++++++ debian/libosmoctrl0.install | 1 + debian/libosmogsm5.install | 1 - debian/libosmogsm6.install | 1 + src/gsm/Makefile.am | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 debian/libosmoctrl0.install delete mode 100644 debian/libosmogsm5.install create mode 100644 debian/libosmogsm6.install diff --git a/debian/control b/debian/control index 3204f0f..e81f7cf 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmo VTY library +Package: libosmoctrl0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo control library + Package: libosmocore-dev Section: libdevel Architecture: any diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install new file mode 100644 index 0000000..6b23be8 --- /dev/null +++ b/debian/libosmoctrl0.install @@ -0,0 +1 @@ +usr/lib/libosmoctrl*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm5.install deleted file mode 100644 index 12c9180..0000000 --- a/debian/libosmogsm5.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libosmogsm*.so.* diff --git a/debian/libosmogsm6.install b/debian/libosmogsm6.install new file mode 100644 index 0000000..12c9180 --- /dev/null +++ b/debian/libosmogsm6.install @@ -0,0 +1 @@ +usr/lib/libosmogsm*.so.* diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4207959..1e2d893 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=6:0:1 +LIBVERSION=6:0:0 AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include -- 1.7.9.5 --------------020605080303040703010001 Content-Type: application/octet-stream; name="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.pa"; filename*1="tch.sig" iF4EABEKAAYFAlQDjVQACgkQC30ZhxNccpEcUwD+PuSik47JmvVhLd7L74WaPo70JqqsK1MN zN8pgoPwYhEBAJXssWBprtwVxVGNVd0dcS7eEBQMF5By6ksG436tapcS --------------020605080303040703010001--

1 0

[PATCH] debian: fix build errors with libosmogsm and libosmoctrl
by Ciaby 31 Aug '14

31 Aug '14

libosmogsm: the transition from 5 to 6 wasn't done properly. Fixed version number. libosmoctrl: missing definition in debian/control and also missing libosmoctrl0.install. --- debian/control | 6 ++++++ debian/libosmoctrl0.install | 1 + debian/libosmogsm5.install | 1 - debian/libosmogsm6.install | 1 + src/gsm/Makefile.am | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 debian/libosmoctrl0.install delete mode 100644 debian/libosmogsm5.install create mode 100644 debian/libosmogsm6.install diff --git a/debian/control b/debian/control index 3204f0f..e81f7cf 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmo VTY library +Package: libosmoctrl0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo control library + Package: libosmocore-dev Section: libdevel Architecture: any diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install new file mode 100644 index 0000000..6b23be8 --- /dev/null +++ b/debian/libosmoctrl0.install @@ -0,0 +1 @@ +usr/lib/libosmoctrl*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm5.install deleted file mode 100644 index 12c9180..0000000 --- a/debian/libosmogsm5.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libosmogsm*.so.* diff --git a/debian/libosmogsm6.install b/debian/libosmogsm6.install new file mode 100644 index 0000000..12c9180 --- /dev/null +++ b/debian/libosmogsm6.install @@ -0,0 +1 @@ +usr/lib/libosmogsm*.so.* diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4207959..1e2d893 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=6:0:1 +LIBVERSION=6:0:0 AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include -- 1.7.9.5 --------------070700020400040502040808 Content-Type: application/octet-stream; name="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.pa"; filename*1="tch.sig" iF4EABEKAAYFAlQGAmEACgkQC30ZhxNccpHMZAEAuXAMQd3yavDff+y8bU0ZEWKORaplPlFS iEZ706MhotYA/ioKSXn35kmFyDFIv7Kdzcf5GmVDdwS8OwhCBJrJWv83 --------------070700020400040502040808--

1 0

[PATCH] debian: fix build errors with libosmogsm and libosmoctrl
by Ciaby 31 Aug '14

31 Aug '14

libosmogsm: the transition from 5 to 6 wasn't done properly. Fixed version number. libosmoctrl: missing definition in debian/control and also missing libosmoctrl0.install. --- debian/control | 6 ++++++ debian/libosmoctrl0.install | 1 + .../{libosmogsm5.install => libosmogsm6.install} | 0 src/gsm/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 debian/libosmoctrl0.install rename debian/{libosmogsm5.install => libosmogsm6.install} (100%) diff --git a/debian/control b/debian/control index 3204f0f..e81f7cf 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmo VTY library +Package: libosmoctrl0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo control library + Package: libosmocore-dev Section: libdevel Architecture: any diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install new file mode 100644 index 0000000..6b23be8 --- /dev/null +++ b/debian/libosmoctrl0.install @@ -0,0 +1 @@ +usr/lib/libosmoctrl*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm6.install similarity index 100% rename from debian/libosmogsm5.install rename to debian/libosmogsm6.install diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4207959..1e2d893 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=6:0:1 +LIBVERSION=6:0:0 AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include -- 1.7.9.5 --------------080008040908010200020003 Content-Type: application/octet-stream; name="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.pa"; filename*1="tch.sig" iF4EABEKAAYFAlQGBL8ACgkQC30ZhxNccpFrWQD/ZM1qKhGG0XYqxdU6adl3sub3NOTZk6XE DeprqaFLzGgA/R0FmlHzefNHPxRgZo0NnUNVamw65cfmhB1jGbnMMjH2 --------------080008040908010200020003--

1 0

[PATCH 1/8] l1sap: Port code to new ciphering handling
by Harald Welte 27 Aug '14

27 Aug '14

... introduced in 2cc37035d73191b71b9ba9c0d559a0da6a5f35e5 --- include/osmo-bts/l1sap.h | 2 ++ src/common/l1sap.c | 45 ++++++++++++++++++++++++++++++++---------- src/osmo-bts-sysmo/l1_if.c | 32 ------------------------------ src/osmo-bts-sysmo/l1_if.h | 3 --- tests/sysmobts/sysmobts_test.c | 10 +++++++--- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index dee430f..e76aca6 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -68,4 +68,6 @@ extern uint8_t gsmtap_sapi_acch; #define msgb_l1sap_prim(msg) ((struct osmo_phsap_prim *)(msg)->l1h) +int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len); #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 14dbde9..9c7a9c6 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -481,6 +481,39 @@ static void radio_link_timeout(struct gsm_lchan *lchan, int bad_frame) } } +static inline int check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len) +{ + uint8_t n_s; + + /* if this is the first valid message after enabling Rx + * decryption, we have to enable Tx encryption */ + if (lchan->ciph_state != LCHAN_CIPH_RX_CONF) + return 0; + + /* HACK: check if it's an I frame, in order to + * ignore some still buffered/queued UI frames received + * before decryption was enabled */ + if (data[0] != 0x01) + return 0; + + if ((data[1] & 0x01) != 0) + return 0; + + n_s = data[1] >> 5; + if (lchan->ciph_ns != n_s) + return 0; + + return 1; +} + +/* public helper for the test */ +int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len) +{ + return check_for_first_ciphrd(lchan, data, len); +} + /* DATA received from bts model */ static int l1sap_ph_data_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *data_ind) @@ -557,16 +590,8 @@ static int l1sap_ph_data_ind(struct gsm_bts_trx *trx, } else le = &lchan->lapdm_ch.lapdm_dcch; - /* if this is the first valid message after enabling Rx - * decryption, we have to enable Tx encryption */ - if (lchan->ciph_state == LCHAN_CIPH_RX_CONF) { - /* HACK: check if it's an I frame, in order to - * ignore some still buffered/queued UI frames received - * before decryption was enabled */ - if (data[0] == 0x01 && (data[1] & 0x01) == 0) { - l1sap_tx_ciph_req(trx, chan_nr, 1, 0); - } - } + if (check_for_first_ciphrd(lchan, data, len)) + l1sap_tx_ciph_req(lchan->ts->trx, chan_nr, 1, 0); /* SDCCH, SACCH and FACCH all go to LAPDm */ msgb_pull(msg, (msg->l2h - msg->data)); diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index b62a2a3..14efc2c 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -356,31 +356,6 @@ static int check_for_ciph_cmd(struct femtol1_hdl *fl1h, return 1; } -static inline void check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan) -{ - uint8_t n_s; - - /* if this is the first valid message after enabling Rx - * decryption, we have to enable Tx encryption */ - if (lchan->ciph_state != LCHAN_CIPH_RX_CONF) - return; - - /* HACK: check if it's an I frame, in order to - * ignore some still buffered/queued UI frames received - * before decryption was enabled */ - if (msgUnitParam->u8Buffer[0] != 0x01) - return; - if ((msgUnitParam->u8Buffer[1] & 0x01) != 0) - return; - n_s = msgUnitParam->u8Buffer[1] >> 5; - if (lchan->ciph_ns != n_s) - return; - lchan->ciph_state = LCHAN_CIPH_TXRX_REQ; - l1if_set_ciphering(fl1h, lchan, 1); -} - /* public helpers for the test */ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, struct msgb *msg, struct gsm_lchan *lchan) @@ -388,13 +363,6 @@ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, return check_for_ciph_cmd(fl1h, msg, lchan); } -void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan) -{ - return check_for_first_ciphrd(fl1h, msgUnitParam, lchan); -} - static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = { 0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 6f58e95..a425776 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -138,7 +138,4 @@ int l1if_rf_clock_info_correct(struct femtol1_hdl *fl1h); /* public helpers for test */ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, struct msgb *msg, struct gsm_lchan *lchan); -void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan); #endif /* _FEMTO_L1_H */ diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c index acbc09c..3ed78fd 100644 --- a/tests/sysmobts/sysmobts_test.c +++ b/tests/sysmobts/sysmobts_test.c @@ -18,6 +18,7 @@ */ #include <osmo-bts/bts.h> +#include <osmo-bts/l1sap.h> #include "femtobts.h" #include "l1_if.h" @@ -169,14 +170,17 @@ static void test_sysmobts_cipher(void) /* Handle message sent before ciphering was received */ memcpy(&unit.u8Buffer[0], too_early_classmark, ARRAY_SIZE(too_early_classmark)); unit.u8Size = ARRAY_SIZE(too_early_classmark); - bts_check_for_first_ciphrd(&fl1h, &unit, &lchan); + rc = bts_check_for_first_ciphrd(&lchan, unit.u8Buffer, unit.u8Size); + OSMO_ASSERT(rc == 0); OSMO_ASSERT(lchan.ciph_state == LCHAN_CIPH_RX_CONF); /* Now send the first ciphered message */ memcpy(&unit.u8Buffer[0], first_ciphered_cipher_cmpl, ARRAY_SIZE(first_ciphered_cipher_cmpl)); unit.u8Size = ARRAY_SIZE(first_ciphered_cipher_cmpl); - bts_check_for_first_ciphrd(&fl1h, &unit, &lchan); - OSMO_ASSERT(lchan.ciph_state == LCHAN_CIPH_TXRX_REQ); + rc = bts_check_for_first_ciphrd(&lchan, unit.u8Buffer, unit.u8Size); + OSMO_ASSERT(rc == 1); + /* we cannot test for lchan.ciph_state == * LCHAN_CIPH_RX_CONF_TX_REQ, as + * this happens asynchronously on the other side of the l1sap queue */ } int main(int argc, char **argv) -- 2.1.0 --PMULwz+zIGJzpDN9 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-Add-MEAS-MPH_INFO-IND-message-to-PH-MPH-TCH-SAP-inte.patch"

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC August 2014