OpenBSC July 2014

openbsc@lists.osmocom.org

14 participants
20 discussions

by Martin Nagy

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

1 month, 4 weeks

Re: Help with sccp library

by mosbah abdelkader

> 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.

3 months, 1 week

[PATCH 0/4] core/conv: Fast Viterbi decoding

by Thomas Tsou

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

9 years, 5 months

Request for the Network Measurement Report info

by Ravi Shankar

Dear Sir Is it possible to get the Network Measurement Reports (NMRs) (This report comprises of Serving and neighboring cell-id , received signal strengths, timing advance, time of arrival values etc) of a particular Number/IMSI using OpenBSC. I am aware that we get these fields from the normal BSC. Regards. Ravi

11 years, 1 month

[osmo-pcu 1/5] bts: Ensure tbf direction with OSMO_ASSERT()

by Daniel Willmann

In the lookup functions make sure that we are actually returning tbfs with the expected direction. Ticket: SYS#389 Sponsored-by: On-Waves ehf --- src/bts.cpp | 22 ++++++++++++++++------ src/bts.h | 3 ++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 08baee0..f614dab 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -234,12 +234,14 @@ gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction struct gprs_rlcmac_tbf *tbf; if (dir == GPRS_RLCMAC_UL_TBF) { llist_for_each_entry(tbf, &m_bts.ul_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli && tbf->is_tlli_valid()) return tbf; } } else { llist_for_each_entry(tbf, &m_bts.dl_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli) return tbf; @@ -258,8 +260,10 @@ gprs_rlcmac_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_DL_TBF); return tbf; + } } return NULL; } @@ -273,8 +277,10 @@ gprs_rlcmac_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_UL_TBF); return tbf; + } } return NULL; } @@ -307,8 +313,10 @@ gprs_rlcmac_tbf *BTS::tbf_by_tfi(uint8_t tfi, uint8_t trx, if (!tbf) return NULL; - if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) + if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) { + OSMO_ASSERT(tbf->direction == dir); return tbf; + } return NULL; } @@ -1023,11 +1031,13 @@ int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t return rc; } -gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi) +gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir) { gprs_rlcmac_tbf *tbf; llist_for_each_entry(tbf, tbf_list, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->tfi() != tfi) continue; if (!tbf->pdch[ts_no]) @@ -1039,10 +1049,10 @@ gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_l gprs_rlcmac_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi, GPRS_RLCMAC_UL_TBF); } gprs_rlcmac_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi, GPRS_RLCMAC_DL_TBF); } diff --git a/src/bts.h b/src/bts.h index 621bcba..a0b808e 100644 --- a/src/bts.h +++ b/src/bts.h @@ -87,7 +87,8 @@ private: void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn); void rcv_resource_request(Packet_Resource_Request_t *t, uint32_t fn); void rcv_measurement_report(Packet_Measurement_Report_t *t, uint32_t fn); - gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi); + gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir); #endif }; -- 1.8.4.2

11 years, 2 months

[PATCH] Fix some packaging mistakes detected by lintian.

by Max Suraev

Signed-off-by: Max Suraev <max.suraev(a)fairwaves.co> --- debian/changelog | 2 +- debian/control | 9 ++++++++- debian/copyright | 5 +---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 815d30b..bd2c2b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,6 @@ openbsc (0.9.13.115.eb113-1) natty; urgency=low openbsc (0.9.4-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release -- Harald Welte <laforge(a)gnumonks.org> Tue, 24 Aug 2010 13:34:24 +0200 diff --git a/debian/control b/debian/control index 7576455..fc7c8ba 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Harald Welte <laforge(a)gnumonks.org> Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, libgtp-dev, libosmocore-dev, libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, libosmo-abis-dev, libdbd-sqlite3 -Standards-Version: 3.8.4 +Standards-Version: 3.9.5 Homepage: http://openbsc.osmocom.org/ Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser @@ -12,36 +12,43 @@ Package: osmocom-bsc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libosmo-sccp Description: GSM Base Station Controller; BSC-only version of OpenBSC. Needs a real MSC! + Classical BSC which requires MSC to operate. Package: osmocom-nitb Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libdbd-sqlite3, libdbi1 Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR + All the GSM network components bundled together. Package: osmocom-ipaccess-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Command line utilities for ip.access nanoBTS + Utilities specific for ip.access unit. Package: osmocom-bs11-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Command line utilities for Siemens BS-11 BTS + Utilities specific for BS-11 unit. Package: osmocom-sgsn Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libgtp Description: Osmocom Serving GPRS Support Node + SGSN implementation. Package: osmocom-gbproxy Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Osmocom GPRS Gb Interface Proxy + Proxy for Gb interface. Package: osmocom-bsc-nat Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Osmocom Base Station Controller Network Address Translation + Network address translation for BSC. Package: osmocom-bsc-dbg Architecture: any diff --git a/debian/copyright b/debian/copyright index 09693c9..fbac90c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from: git://bs11-abis.gnumonks.org/openbsc.git -Upstream Author(s): +Upstream Authors: Harald Welte <laforge(a)gnumonks.org> Dieter Spaar <spaar(a)mirider.augusta.de> @@ -45,6 +45,3 @@ The Debian packaging is: and is licensed under the GPL version 3, see "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -- 1.9.1

11 years, 2 months

OsmoSGSN [PATCH], Network Service

by Michal Grznár

Hi, I am using OsmoSGSN in topology with OpenGGSN and proprietary simulator of BSS. There was a problem with an implementation of Network service, cause Network Service implementation in the simulator of BSS is based on different release of 3GPP standard (3GPP TS 48. 016 v7. 4. 0 (2008-04)/Network service (Release 7))...and the problem is that in IP-subnetwork, which I am using there is no use for RESET or UNBLOCK procedure, so I had to do a PATCH in gprs_ns.c, which was needed to complete succesful connection between sim-bss and OsmoSGSN: switch (nsh->pdu_type) { case NS_PDUT_ALIVE: +++ LOGP(DNS, LOGL_INFO, "Rx NS ALIVE\n"); +++ /*mark NS-VC as alive*/ +++ (*nsvc)->state = NSE_S_ALIVE; +++ (*nsvc)->remote_state = NSE_S_ALIVE; +++ /*initiate TEST procedure: Send ALIVE_ACK and start timer*/ +++ rc = gprs_ns_tx_simple((*nsvc), NS_PDUT_ALIVE_ACK); +++ nsvc_start_timer((*nsvc), NSVC_TIMER_TNS_TEST); +++ break; . . . } another PATCH I needed to do was to change a little bit procedure for allocation of P-TMSI in procedure uint32_t sgsn_alloc_ptmsi(void) in gprs_sgsn.c uint32_t sgsn_alloc_ptmsi(void) { struct sgsn_mm_ctx *mm; uint32_t ptmsi; restart: +++ ptmsi = rand() | 0xc0000000; /*because of GPRS IMSI ATTACH*/ llist_for_each_entry(mm, &sgsn_mm_ctxts, list) { if (mm->p_tmsi == ptmsi) goto restart; } return ptmsi; } because in GPRS IMSI ATTACH in message ATTACH COMPLETE (3GPP 24.008, 23.003, 48.018) there is new TLLI==new allocated P-TMSI and I need local TLLI, so I had to do it this way regards Michal

11 years, 2 months

Re: TRX Clock calibration

by choukoumoun

-------- Message original -------- Sujet: Re: TRX Clock calibration Date : Wed, 16 Jul 2014 02:52:33 +0200 De : choukoumoun <choukoumoun(a)gmail.com> Pour : Alexander Chemeris <alexander.chemeris(a)gmail.com> Le 16/07/2014 02:46, Alexander Chemeris a écrit : > Choukoumoun, > > The question is related to the osmo-trx more than to UmTRX, so I'm > moving it to the Osmocom mailing list: > > On Tue, Jul 15, 2014 at 8:17 PM, choukoumoun <choukoumoun(a)gmail.com> wrote: >> Hello guys. >> >> I have a UMTRX my UHD/OPENBTS or UHD/OSMO-TRX same working fine but wen i >> start osmo-trx and openbts i have this error > Could you specify where did you get sources and which exact versions > and commit numbers do you use? > > Did you try to use osmo-trx with Osmocom software rather than with OpenBTS? > >> Osmo-trx : >> >> linux; GNU C++ version 4.8.1; Boost_105300; UHD_003.004.000-4fa97a1 >> >> Config Settings >> Log Level............... NOTICE >> Device args............. addr=192.168.10.2 >> TRX Base Port........... 5700 >> TRX Address............. 127.0.0.1 >> Channels................ 1 >> Samples-per-Symbol...... 4 >> External Reference...... Disabled >> C0 Filler Table......... Disabled >> Diversity............... Disabled >> Tuning offset........... 0 >> >> -- Opening a UmTRX device... >> -- Current recv frame size: 1472 bytes >> -- Current send frame size: 1472 bytes >> -- Setting UmTRX 4 SPS >> -- Transceiver active with 1 channel(s) >> >> ALERT 139940970051328 02:13:33.7 UHDDevice.cpp:993:writeSamples: UHD: Device >> send timed out >> "Constantely" ..... >> >> >> anybody have a idea ? >> >> >> my usrp probe out : >> >> linux; GNU C++ version 4.8.1; Boost_105300; UHD_003.004.000-4fa97a1 >> >> -- Opening a UmTRX device... >> -- Current recv frame size: 1472 bytes >> -- Current send frame size: 1472 bytes >> _____________________________________________________ >> / >> | Device: UmTRX Device >> | _____________________________________________________ >> | / >> | | Mboard: UMTRX-REV0 >> | | hardware: 64000 >> | | mac-addr: 00:50:c2:85:3f:ff >> | | ip-addr: 192.168.10.2 >> | | gpsdo: none >> | | serial: 7 >> | | name: UmTRX >> | | tcxo-dac: 2048 >> | | >> | | Time sources: none, external, _external_, mimo >> | | Clock sources: internal, external, mimo >> | | Sensors: ref_locked >> | | _____________________________________________________ >> | | / >> | | | RX DSP: 0 >> | | | Freq range: -6.500 to 6.500 Mhz >> | | _____________________________________________________ >> | | / >> | | | RX DSP: 1 >> | | | Freq range: -6.500 to 6.500 Mhz >> | | _____________________________________________________ >> | | / >> | | | RX Dboard: A >> | | | ID: LMS6002D (0xfa07) >> | | | Serial: 7.A >> | | | _____________________________________________________ >> | | | / >> | | | | RX Subdev: 0 >> | | | | Name: LMS6002D (0xfa07) - 0 >> | | | | Antennas: RX0, RX1, RX2, RX3, CAL >> | | | | Sensors: lo_locked >> | | | | Freq range: 232.500 to 3720.000 Mhz >> | | | | Gain range VGA1: 0.0 to 126.0 step 1.0 dB >> | | | | Gain range VGA2: 0.0 to 30.0 step 3.0 dB >> | | | | Connection Type: IQ >> | | | | Uses LO offset: No >> | | | _____________________________________________________ >> | | | / >> | | | | RX Codec: A >> | | | | Name: LMS_RX >> | | | | Gain Elements: None >> | | _____________________________________________________ >> | | / >> | | | RX Dboard: B >> | | | ID: LMS6002D (0xfa07) >> | | | Serial: 7.B >> | | | _____________________________________________________ >> | | | / >> | | | | RX Subdev: 0 >> | | | | Name: LMS6002D (0xfa07) - 0 >> | | | | Antennas: RX0, RX1, RX2, RX3, CAL >> | | | | Sensors: lo_locked >> | | | | Freq range: 232.500 to 3720.000 Mhz >> | | | | Gain range VGA1: 0.0 to 126.0 step 1.0 dB >> | | | | Gain range VGA2: 0.0 to 30.0 step 3.0 dB >> | | | | Connection Type: IQ >> | | | | Uses LO offset: No >> | | | _____________________________________________________ >> | | | / >> | | | | RX Codec: B >> | | | | Name: LMS_RX >> | | | | Gain Elements: None >> | | _____________________________________________________ >> | | / >> | | | TX DSP: 0 >> | | | Freq range: -6.500 to 6.500 Mhz >> | | _____________________________________________________ >> | | / >> | | | TX DSP: 1 >> | | | Freq range: -6.500 to 6.500 Mhz >> | | _____________________________________________________ >> | | / >> | | | TX Dboard: A >> | | | ID: LMS6002D (0xfa09) >> | | | Serial: 7.A >> | | | _____________________________________________________ >> | | | / >> | | | | TX Subdev: 0 >> | | | | Name: LMS6002D (0xfa09) - 0 >> | | | | Antennas: TX0, TX1, TX2, CAL >> | | | | Sensors: lo_locked >> | | | | Freq range: 232.500 to 3720.000 Mhz >> | | | | Gain range VGA1: -35.0 to -4.0 step 1.0 dB >> | | | | Gain range VGA2: 0.0 to 25.0 step 1.0 dB >> | | | | Connection Type: IQ >> | | | | Uses LO offset: No >> | | | _____________________________________________________ >> | | | / >> | | | | TX Codec: A >> | | | | Name: LMS_TX >> | | | | Gain Elements: None >> | | _____________________________________________________ >> | | / >> | | | TX Dboard: B >> | | | ID: LMS6002D (0xfa09) >> | | | Serial: 7.B >> | | | _____________________________________________________ >> | | | / >> | | | | TX Subdev: 0 >> | | | | Name: LMS6002D (0xfa09) - 0 >> | | | | Antennas: TX0, TX1, TX2, CAL >> | | | | Sensors: lo_locked >> | | | | Freq range: 232.500 to 3720.000 Mhz >> | | | | Gain range VGA1: -35.0 to -4.0 step 1.0 dB >> | | | | Gain range VGA2: 0.0 to 25.0 step 1.0 dB >> | | | | Connection Type: IQ >> | | | | Uses LO offset: No >> | | | _____________________________________________________ >> | | | / >> | | | | TX Codec: B >> | | | | Name: LMS_TX >> | | | | Gain Elements: None >> >> >> I make the VCXO configuration procedure with the GPS but no success... > The issue with "UHD: Device send timed out" have nothing to do with > the VCXO calibration. The issue is because of a issue in communication > between the host system and the UmTRX. > > What is your hardware setup? Particularly: > - Do you use a switch between the UmTRX and the host system? Nop my laptop is connected directly of the umtrx > - Do you run it on a real hardware or in a VM? real ubuntu 13.04 64 bits > - Is your host system powerful enough? Intel Core I5, 8Gb ram >

11 years, 2 months

[PATCH] use osmocom auth API instead of direct calls

by Max Suraev

--- openbsc/src/libmsc/auth.c | 68 +++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c index 10d8edf..ab84975 100644 --- a/openbsc/src/libmsc/auth.c +++ b/openbsc/src/libmsc/auth.c @@ -25,46 +25,11 @@ #include <openbsc/auth.h> #include <openbsc/gsm_data.h> -#include <osmocom/gsm/comp128.h> +#include <osmocom/crypt/auth.h> #include <stdlib.h> -static int -_use_xor(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple) -{ - int i, l = ainfo->a3a8_ki_len; - - if ((l > A38_XOR_MAX_KEY_LEN) || (l < A38_XOR_MIN_KEY_LEN)) { - LOGP(DMM, LOGL_ERROR, "Invalid XOR key (len=%d) %s\n", - ainfo->a3a8_ki_len, - osmo_hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); - return -1; - } - - for (i=0; i<4; i++) - atuple->sres[i] = atuple->rand[i] ^ ainfo->a3a8_ki[i]; - for (i=4; i<12; i++) - atuple->kc[i-4] = atuple->rand[i] ^ ainfo->a3a8_ki[i]; - - return 0; -} - -static int -_use_comp128_v1(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple) -{ - if (ainfo->a3a8_ki_len != A38_COMP128_KEY_LEN) { - LOGP(DMM, LOGL_ERROR, "Invalid COMP128v1 key (len=%d) %s\n", - ainfo->a3a8_ki_len, - osmo_hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len)); - return -1; - } - - comp128(ainfo->a3a8_ki, atuple->rand, atuple->sres, atuple->kc); - - return 0; -} - /* Return values * -1 -> Internal error * 0 -> Not available @@ -76,6 +41,11 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple *atuple, { struct gsm_auth_info ainfo; int i, rc; + static struct osmo_sub_auth_data auth = { + .type = OSMO_AUTH_TYPE_GSM + }; + struct osmo_auth_vector _vec; + struct osmo_auth_vector *vec = &_vec; /* Get subscriber info (if any) */ rc = db_get_authinfo_for_subscr(&ainfo, subscr); @@ -109,13 +79,23 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple *atuple, return 0; case AUTH_ALGO_XOR: - if (_use_xor(&ainfo, atuple)) - return 0; + auth.algo = OSMO_AUTH_ALG_XOR; + if ((ainfo.a3a8_ki_len > A38_XOR_MAX_KEY_LEN) || (ainfo.a3a8_ki_len < A38_XOR_MIN_KEY_LEN)) { + LOGP(DMM, LOGL_ERROR, "Invalid XOR key (len=%d) %s\n", + ainfo.a3a8_ki_len, + osmo_hexdump(ainfo.a3a8_ki, ainfo.a3a8_ki_len)); + return -1; + } break; case AUTH_ALGO_COMP128v1: - if (_use_comp128_v1(&ainfo, atuple)) - return 0; + auth.algo = OSMO_AUTH_ALG_COMP128v1; + if (ainfo.a3a8_ki_len != A38_COMP128_KEY_LEN) { + LOGP(DMM, LOGL_ERROR, "Invalid COMP128v1 key (len=%d) %s\n", + ainfo.a3a8_ki_len, + osmo_hexdump(ainfo.a3a8_ki, ainfo.a3a8_ki_len)); + return -1; + } break; default: @@ -124,6 +104,14 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple *atuple, return 0; } + memcpy(auth.u.gsm.ki, ainfo.a3a8_ki, sizeof(auth.u.gsm.ki)); + + if (osmo_auth_gen_vec(vec, &auth, atuple->rand) < 0) + return -1; + + memcpy(atuple->sres, vec->sres, 4); + memcpy(atuple->kc, vec->kc, 8); + db_sync_lastauthtuple_for_subscr(atuple, subscr); DEBUGP(DMM, "Need to do authentication and ciphering\n"); -- 1.9.1

11 years, 2 months

[osmo-pcu v2 1/1] bts: Return the special type for {ul, dl}_tbf_by_* functions

by Daniel Willmann

Start returning the special type instead of the base gprs_rlcmac_tbf when retrieving a TBF. Ticket: SYS#389 Sponsored-by: On-Waves ehf --- src/bts.cpp | 36 ++++++++++++++++++------------------ src/bts.h | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index f614dab..79cae4c 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -217,15 +217,15 @@ int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv) } /* search for active downlink tbf */ -gprs_rlcmac_tbf *BTS::dl_tbf_by_tlli(uint32_t tlli) +gprs_rlcmac_dl_tbf *BTS::dl_tbf_by_tlli(uint32_t tlli) { - return tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF); + return static_cast<gprs_rlcmac_dl_tbf *>(tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF)); } /* search for active uplink tbf */ -gprs_rlcmac_tbf *BTS::ul_tbf_by_tlli(uint32_t tlli) +gprs_rlcmac_ul_tbf *BTS::ul_tbf_by_tlli(uint32_t tlli) { - return tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF); + return static_cast<gprs_rlcmac_ul_tbf *>(tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF)); } /* search for active downlink or uplink tbf */ @@ -250,9 +250,9 @@ gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction return NULL; } -gprs_rlcmac_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) +gprs_rlcmac_dl_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) { - struct gprs_rlcmac_tbf *tbf; + struct gprs_rlcmac_dl_tbf *tbf; /* only one TBF can poll on specific TS/FN, because scheduler can only * schedule one downlink control block (with polling) at a FN per TS */ @@ -262,14 +262,14 @@ gprs_rlcmac_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) && tbf->poll_fn == fn && tbf->trx->trx_no == trx && tbf->control_ts == ts) { OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_DL_TBF); - return tbf; + return static_cast<gprs_rlcmac_dl_tbf *>(tbf); } } return NULL; } -gprs_rlcmac_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) +gprs_rlcmac_ul_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) { - struct gprs_rlcmac_tbf *tbf; + struct gprs_rlcmac_ul_tbf *tbf; /* only one TBF can poll on specific TS/FN, because scheduler can only * schedule one downlink control block (with polling) at a FN per TS */ @@ -279,22 +279,22 @@ gprs_rlcmac_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) && tbf->poll_fn == fn && tbf->trx->trx_no == trx && tbf->control_ts == ts) { OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_UL_TBF); - return tbf; + return static_cast<gprs_rlcmac_ul_tbf *>(tbf); } } return NULL; } /* lookup downlink TBF Entity (by TFI) */ -gprs_rlcmac_tbf *BTS::dl_tbf_by_tfi(uint8_t tfi, uint8_t trx) +gprs_rlcmac_dl_tbf *BTS::dl_tbf_by_tfi(uint8_t tfi, uint8_t trx) { - return tbf_by_tfi(tfi, trx, GPRS_RLCMAC_DL_TBF); + return static_cast<gprs_rlcmac_dl_tbf *>(tbf_by_tfi(tfi, trx, GPRS_RLCMAC_DL_TBF)); } /* lookup uplink TBF Entity (by TFI) */ -gprs_rlcmac_tbf *BTS::ul_tbf_by_tfi(uint8_t tfi, uint8_t trx) +gprs_rlcmac_ul_tbf *BTS::ul_tbf_by_tfi(uint8_t tfi, uint8_t trx) { - return tbf_by_tfi(tfi, trx, GPRS_RLCMAC_UL_TBF); + return static_cast<gprs_rlcmac_ul_tbf *>(tbf_by_tfi(tfi, trx, GPRS_RLCMAC_UL_TBF)); } /* lookup TBF Entity (by TFI) */ @@ -1047,12 +1047,12 @@ gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_l return NULL; } -gprs_rlcmac_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) +gprs_rlcmac_ul_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi, GPRS_RLCMAC_UL_TBF); + return static_cast<gprs_rlcmac_ul_tbf *>(tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi, GPRS_RLCMAC_UL_TBF)); } -gprs_rlcmac_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) +gprs_rlcmac_dl_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi, GPRS_RLCMAC_DL_TBF); + return static_cast<gprs_rlcmac_dl_tbf *>(tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi, GPRS_RLCMAC_DL_TBF)); } diff --git a/src/bts.h b/src/bts.h index a0b808e..8f99942 100644 --- a/src/bts.h +++ b/src/bts.h @@ -62,8 +62,8 @@ struct gprs_rlcmac_pdch { BTS *bts() const; uint8_t trx_no() const; - struct gprs_rlcmac_tbf *ul_tbf_by_tfi(uint8_t tfi); - struct gprs_rlcmac_tbf *dl_tbf_by_tfi(uint8_t tfi); + struct gprs_rlcmac_ul_tbf *ul_tbf_by_tfi(uint8_t tfi); + struct gprs_rlcmac_dl_tbf *dl_tbf_by_tfi(uint8_t tfi); #endif uint8_t m_is_enabled; /* TS is enabled */ @@ -193,12 +193,12 @@ public: /** add paging to paging queue(s) */ int add_paging(uint8_t chan_needed, uint8_t *identity_lv); - gprs_rlcmac_tbf *dl_tbf_by_tlli(uint32_t tlli); - gprs_rlcmac_tbf *ul_tbf_by_tlli(uint32_t tlli); - gprs_rlcmac_tbf *dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); - gprs_rlcmac_tbf *ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); - gprs_rlcmac_tbf *dl_tbf_by_tfi(uint8_t tfi, uint8_t trx); - gprs_rlcmac_tbf *ul_tbf_by_tfi(uint8_t tfi, uint8_t trx); + gprs_rlcmac_dl_tbf *dl_tbf_by_tlli(uint32_t tlli); + gprs_rlcmac_ul_tbf *ul_tbf_by_tlli(uint32_t tlli); + gprs_rlcmac_dl_tbf *dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); + gprs_rlcmac_ul_tbf *ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); + gprs_rlcmac_dl_tbf *dl_tbf_by_tfi(uint8_t tfi, uint8_t trx); + gprs_rlcmac_ul_tbf *ul_tbf_by_tfi(uint8_t tfi, uint8_t trx); int tfi_find_free(enum gprs_rlcmac_tbf_direction dir, uint8_t *_trx, int8_t use_trx); -- 1.8.4.2

11 years, 2 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC July 2014