OpenBSC July 2014

openbsc@lists.osmocom.org

14 participants
19 discussions

by Alexander Chemeris

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? - Do you run it on a real hardware or in a VM? - Is your host system powerful enough? -- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. https://fairwaves.co

10 years, 11 months

OpenBSC unsubscribe notification

by mailman-bounces＠lists.osmocom.org

mki(a)mki-consult.de has been removed from OpenBSC.

10 years, 11 months

[RFC/PATCH] tlv/msgb: Be able to generate and parse TLV as used by LLDP

by Holger Hans Peter Freyther

Hi! we have the need to generate and parse LLDP frames and would like to use the TLV infrastructure of libosmocore for it. In LLDP the tag is only 7bit and the length is 9bit long. To make this work with the tlv parsing routines we need to shift the tag. But this means that when somebody is a tlv_definition with the T7L9 type and others we might match the wrong thing. I would like to include the feature as it is right now. The alternative would be to create a separate tlv_parse and tlv_parse_one routine for the other type. comments? holger

10 years, 11 months

Re: Re: Need help with configuration of Timeslots and of multible USRPs

by Alexander Chemeris

Norbert, On Thu, Jul 10, 2014 at 11:01 AM, Norbert Englberger <Norbert.Englberger(a)unibw.de> wrote: > Alexander Chemeris wrote: >>Just for the sake of full understanding, what you're asking for is called "Late Assignment". Check the specs for the exact details or Wikipedia for a brief explanation: >>http://en.m.wikipedia.org/wiki/Um_interface#Mobile-Originating_Call_.28MOC.… >>I don't have the code near me at the moment, but this might be implemented in the "jolly" branch. > > i was already using the jolly/testing branch. > > Now that you hinted me to the "Late Assignment" I googled that and found that there is a "jolly/new_handover" branch using it. > Is this still the branch I should use, because when I tried to compile it, make failed. (I am right now trying to google if there are > other dependencies I have to change the branch and to recompile) I have never worked with this branch, so can't comment unfortunately. AFAIK, this branch is not being used in real environments, so it's most likely bit-rotten. My suggestion is to take the implementation there as an inspiration and re-implement it for master. That would make a good work for one of your students probably. Please don't move the conversation into private and keep the mailing list CC'ed. -- Regards, Alexander Chemeris. CEO, Fairwaves, Inc. https://fairwaves.co

10 years, 11 months

Need help with configuration of Timeslots and of multible USRPs

by Norbert Englberger

Hello everybody, after starting on my new Job at an University I have been tasked to build up an BTS for our students. Being a complete noob to both Linux and GSM it took me some time, but I finally got OpenBSC and Osmo-BTS up and running on Ubuntu Linux 12.04 with our ETTUS N210. After doing some experiments with this setup, our students now ask me to do some changes which I couldn't figure out yet, how to do. 1. The students told me, that OpenBSC doesn't behave like all the BTS from commercial Providers they analysed: The say that on commercial nets at the beginning of a phone call there will be send an "Immediate assignment" sending the MS always to a SDCCH on TS 1 or TS2 where the encryption will be startet. After establishing the encryption another "Immediate assignment" will occour and send the MS to a Traffic Channel (which also contains the FACCH / SACCH) for the actual Communication. OpenBSC also sends the "Immediate assignment" on TS0 but sends the MS directly to Timeslot with a Traffic Channel where all the signalling, like encryption, will be done in the SACCH. Is there any way to configure OsmoBSC to behave like the commercial BTS the students described? 2. I have been asked if I could enable "Frequency Hopping" Right now I already fail to bring up a second TRX with OpenBSC. I start 2 instances of "osmo-trx" with 2 differents IP-Addresses but the same port, after that I start "osmobts-trx" with the "-t 2" parameter. OpenBSC seems to see both USRPs but the LED'S an the USRPs indicate that only one is completely powered up and transmitting (a quick check with an Motorola with RSSI also shows only one ARFC). So how do I have to start "osmo-trx" to enable transmitting on both URSPs as TRX0 and TRX1 in one BTS? After that, is it possible to configure "Frequency hopping" with this setup? (Because when I changed the value "hopping enabled" of the timeslots in open-bts.cfg to "1" I get a message that this type of BTS does not support hopping) I hope that anyone can clarify those two points to me. Thanks in advance Norbie

10 years, 11 months

Re:Re: Need help with configuration of Timeslots and of multible USRPs

by Alexander Chemeris

Hi Norbert, 08 июля 2014 г. 16:34 пользователь "Norbert Englberger" < Norbert.Englberger(a)unibw.de> написал: > > > Hello again, > > Holger Hans Peter Freyther wrote: > > > it is not a question of BTS but the BSC. The role of the BSC is to manage > the > > channels. Inside src/libbsc/gsm_04_08_utils.c you will see a table that > > determines how the BSC/NITB will respond to "channel request" inside the > > RACH request by the phone. > > > > E.g. if you change get_ctype_by_chreq to always return LCHAN_SDCCH you > > should be close to the behavior you have described. > > > > First off all: Thank you for your fast response. > > I was hoping that it would be enough to change the settings in the > open-bsc.cfg and I wouldn't have to temper the source code, as I said, I'm > new to all the GSM stuff and Linux. Just for the sake of full understanding, what you're asking for is called "Late Assignment". Check the specs for the exact details or Wikipedia for a brief explanation: http://en.m.wikipedia.org/wiki/Um_interface#Mobile-Originating_Call_.28MOC.… I don't have the code near me at the moment, but this might be implemented in the "jolly" branch. Please excuse typos. Written with a touchscreen keyboard. -- Regards, Alexander Chemeris CEO Fairwaves, Inc. https://fairwaves.co

10 years, 11 months

Re:Re: Need help with configuration of Timeslots and of multible USRPs

by Norbert Englberger

Hello again, Holger Hans Peter Freyther wrote: > it is not a question of BTS but the BSC. The role of the BSC is to manage the > channels. Inside src/libbsc/gsm_04_08_utils.c you will see a table that > determines how the BSC/NITB will respond to "channel request" inside the > RACH request by the phone. > > E.g. if you change get_ctype_by_chreq to always return LCHAN_SDCCH you > should be close to the behavior you have described. > First off all: Thank you for your fast response. I was hoping that it would be enough to change the settings in the open-bsc.cfg and I wouldn't have to temper the source code, as I said, I'm new to all the GSM stuff and Linux. I had a quick look at the code and just tried to comment out everything in "get_ctype_by_chreq" and always return LCHAN_SDCCH as you suggested. While testing this setup I saw, that The "Immediate assignment" now sends the calling MS to TS 1 (which is configured as SDCCH/8) subslot 0 and starts encryption and sends SI5 and SI6 messages on this timeslot/subslot. Also the called MS gets "Immediate assignment" and is sent to TS 1 subslot 1, encryption starts and so on. Now the called MS sends "Call Confirmed", but shortly after this the channels are released. (The called MS wasn't ringing at all) Am I right, that this is because both MS are yet sticking on the SDCCH and are not going to a Transport channel? (would make sense, because I always return SDCCH when the BSC wants to change channel) I think I have to change the Table " ctype_by_chreq" or to find a way to insert another "Immediate Assignmend" between "encryption" and "call confirmed" So I think I'll have to study the source code for a while, Again thanks for the hint where to start. [Norbert Englberger]

10 years, 11 months

[PATCH 1/6] gprs/test: Add additional gbproxy tests

by Jacob Erlbeck

This adds a test case with several messages to test BSSGP patching. New messages: - BSSGP/DTAP Attach Request - BSSGP/DTAP Attach Accept - BSSGP/DTAP Routing Area Update Request - BSSGP/DTAP Routing Area Update Accept - BSSGP/DTAP Activate PDP Context Request - BSSGP SUSPEND - BSSGP SUSPEND ACK Sponsored-by: On-Waves ehf --- openbsc/tests/gbproxy/gbproxy_test.c | 199 ++++++++++++++++++++++++- openbsc/tests/gbproxy/gbproxy_test.ok | 268 ++++++++++++++++++++++++++++++++++ 2 files changed, 466 insertions(+), 1 deletion(-) diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c index ea07a77..c372af1 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.c +++ b/openbsc/tests/gbproxy/gbproxy_test.c @@ -28,13 +28,88 @@ #include <osmocom/gprs/gprs_bssgp.h> #include <openbsc/gb_proxy.h> +#include <openbsc/debug.h> #define REMOTE_BSS_ADDR 0x01020304 #define REMOTE_SGSN_ADDR 0x05060708 #define SGSN_NSEI 0x0100 -struct gbproxy_config gbcfg; +struct gbproxy_config gbcfg = {0}; + +/* Base Station Subsystem GPRS Protocol: GSM A-I/F DTAP - Attach Request */ +static const unsigned char bssgp_attach_req[75] = { + 0x01, 0xbb, 0xc5, 0x46, 0x79, 0x00, 0x00, 0x04, + 0x08, 0x88, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, + 0x75, 0x30, 0x00, 0x80, 0x0e, 0x00, 0x34, 0x01, + 0xc0, 0x01, 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, + 0x08, 0x02, 0x05, 0xf4, 0xfb, 0xc5, 0x46, 0x79, + 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x19, 0x18, + 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, 0x60, + 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, 0x80, + 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, 0x00, + 0x16, 0x6d, 0x01 +}; + +/* Base Station Subsystem GPRS Protocol: GSM A-I/F DTAP - Attach Accept */ +static const unsigned char bssgp_attach_acc[88] = { + 0x00, 0xbb, 0xc5, 0x46, 0x79, 0x00, 0x50, 0x20, + 0x16, 0x82, 0x02, 0x58, 0x13, 0x99, 0x18, 0xb3, + 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, 0x60, 0x80, + 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, 0x80, 0xba, + 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, 0x00, 0x0a, + 0x82, 0x08, 0x02, 0x0d, 0x88, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x18, 0x00, 0x81, 0x00, + 0x0e, 0x9e, 0x41, 0xc0, 0x05, 0x08, 0x02, 0x01, + 0x49, 0x04, 0x21, 0x63, 0x54, 0x40, 0x50, 0x60, + 0x19, 0xcd, 0xd7, 0x08, 0x17, 0x16, 0x18, 0x05, + 0xf4, 0xfb, 0xc5, 0x47, 0x22, 0x42, 0x67, 0x9a +}; + +/* Base Station Subsystem GPRS Protocol: GSM A-I/F DTAP - Routing Area Update Request */ +static const unsigned char bssgp_ra_upd_req[85] = { + 0x01, 0xaf, 0xe2, 0x80, 0x6e, 0x00, 0x00, 0x04, + 0x08, 0x88, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, + 0x70, 0x80, 0x00, 0x80, 0x0e, 0x00, 0x3e, 0x01, + 0xc0, 0x15, 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, + 0x40, 0x50, 0x60, 0x1d, 0x19, 0x13, 0x42, 0x33, + 0x57, 0x2b, 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, + 0x50, 0xc8, 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, + 0x48, 0x02, 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, + 0x00, 0x19, 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, + 0x07, 0x04, 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, + 0x20, 0x00, 0x96, 0x3e, 0x97 +}; + +/* Base Station Subsystem GPRS Protocol: GSM A-I/F DTAP - Routing Area Update Accept */ +static const unsigned char bssgp_ra_upd_acc[91] = { + 0x00, 0xaf, 0xe2, 0x80, 0x6e, 0x00, 0x50, 0x20, + 0x16, 0x82, 0x02, 0x58, 0x13, 0x9d, 0x19, 0x13, + 0x42, 0x33, 0x57, 0x2b, 0xf7, 0xc8, 0x48, 0x02, + 0x13, 0x48, 0x50, 0xc8, 0x48, 0x02, 0x14, 0x48, + 0x50, 0xc8, 0x48, 0x02, 0x17, 0x49, 0x10, 0xc8, + 0x48, 0x02, 0x00, 0x0a, 0x82, 0x07, 0x04, 0x0d, + 0x88, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x00, 0x81, 0x00, 0x0e, 0x9d, 0x41, 0xc0, + 0x19, 0x08, 0x09, 0x00, 0x49, 0x21, 0x63, 0x54, + 0x40, 0x50, 0x60, 0x19, 0x54, 0xab, 0xb3, 0x18, + 0x05, 0xf4, 0xef, 0xe2, 0x81, 0x17, 0x17, 0x16, + 0xc3, 0xbf, 0xcc +}; + +/* Base Station Subsystem GPRS Protocol: GSM A-I/F DTAP - Activate PDP Context Request */ +static const unsigned char bssgp_act_pdp_ctx_req[76] = { + 0x01, 0xef, 0xe2, 0xb7, 0x00, 0x00, 0x00, 0x04, + 0x08, 0x88, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, + 0x75, 0x30, 0x00, 0x80, 0x0e, 0x00, 0x35, 0x01, + 0xc0, 0x0d, 0x0a, 0x41, 0x05, 0x03, 0x0c, 0x00, + 0x00, 0x1f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x01, 0x21, 0x28, 0x03, + 0x02, 0x61, 0x62, 0x27, 0x14, 0x80, 0x80, 0x21, + 0x10, 0x01, 0x00, 0x00, 0x10, 0x81, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x83, 0x06, 0x00, 0x00, 0x00, + 0x00, 0x5a, 0xff, 0x02 +}; static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, struct sockaddr_in *peer, const unsigned char* data, @@ -168,6 +243,39 @@ static void send_bssgp_reset_ack(struct gprs_ns_inst *nsi, send_ns_unitdata(nsi, "BVC_RESET_ACK", src_addr, 0, msg, sizeof(msg)); } +static void send_bssgp_suspend(struct gprs_ns_inst *nsi, + struct sockaddr_in *src_addr, + struct gprs_ra_id *raid) +{ + /* Base Station Subsystem GPRS Protocol, BSSGP SUSPEND */ + unsigned char msg[15] = { + 0x0b, 0x1f, 0x84, 0xcc, 0xd1, 0x75, 0x8b, 0x1b, + 0x86, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60 + }; + + if (raid) + gsm48_construct_ra(msg + 9, raid); + + send_ns_unitdata(nsi, "BVC_SUSPEND", src_addr, 0, msg, sizeof(msg)); +} + +static void send_bssgp_suspend_ack(struct gprs_ns_inst *nsi, + struct sockaddr_in *src_addr, + struct gprs_ra_id *raid) +{ + /* Base Station Subsystem GPRS Protocol, BSSGP SUSPEND ACK */ + unsigned char msg[18] = { + 0x0c, 0x1f, 0x84, 0xcc, 0xd1, 0x75, 0x8b, 0x1b, + 0x86, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x1d, + 0x81, 0x01 + }; + + if (raid) + gsm48_construct_ra(msg + 9, raid); + + send_ns_unitdata(nsi, "BVC_SUSPEND_ACK", src_addr, 0, msg, sizeof(msg)); +} + static void setup_ns(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, uint16_t nsvci, uint16_t nsei) { @@ -686,6 +794,94 @@ static void test_gbproxy_ident_changes() gbprox_reset(); } +static void test_gbproxy_ra_patching() +{ + struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); + struct sockaddr_in bss_peer[1] = {{0},}; + struct sockaddr_in sgsn_peer= {0}; + struct gprs_ra_id rai_bss = + {.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96}; + struct gprs_ra_id rai_sgsn = + {.mcc = 123, .mnc = 456, .lac = 16464, .rac = 96}; + struct gprs_ra_id rai_unknown = + {.mcc = 1, .mnc = 99, .lac = 99, .rac = 96}; + + bssgp_nsi = nsi; + gbcfg.nsi = bssgp_nsi; + gbcfg.nsip_sgsn_nsei = SGSN_NSEI; + + sgsn_peer.sin_family = AF_INET; + sgsn_peer.sin_port = htons(32000); + sgsn_peer.sin_addr.s_addr = htonl(REMOTE_SGSN_ADDR); + + bss_peer[0].sin_family = AF_INET; + bss_peer[0].sin_port = htons(1111); + bss_peer[0].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR); + + printf("--- Initialise SGSN ---\n\n"); + + gprs_ns_nsip_connect(nsi, &sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); + send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); + send_ns_alive_ack(nsi, &sgsn_peer); + send_ns_unblock_ack(nsi, &sgsn_peer); + send_ns_alive(nsi, &sgsn_peer); + gprs_dump_nsi(nsi); + + printf("--- Initialise BSS 1 ---\n\n"); + + setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000); + setup_bssgp(nsi, &bss_peer[0], 0x1002); + gprs_dump_nsi(nsi); + gbprox_dump_peers(stdout, 0, 1); + + send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002); + + send_bssgp_suspend(nsi, &bss_peer[0], &rai_bss); + send_bssgp_suspend_ack(nsi, &sgsn_peer, &rai_sgsn); + + gbprox_dump_global(stdout, 0, 1); + gbprox_dump_peers(stdout, 0, 1); + + printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n"); + + send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002, + bssgp_attach_req, sizeof(bssgp_attach_req)); + + send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1002, + bssgp_attach_acc, sizeof(bssgp_attach_acc)); + + send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002, + bssgp_ra_upd_req, sizeof(bssgp_ra_upd_req)); + + send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1002, + bssgp_ra_upd_acc, sizeof(bssgp_ra_upd_acc)); + + /* Replace APN */ + send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002, + bssgp_act_pdp_ctx_req, sizeof(bssgp_act_pdp_ctx_req)); + + /* TODO: Re-configure to test APN IE removal */ + + /* Remove APN */ + send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002, + bssgp_act_pdp_ctx_req, sizeof(bssgp_act_pdp_ctx_req)); + + gbprox_dump_global(stdout, 0, 1); + gbprox_dump_peers(stdout, 0, 1); + + printf("--- Bad cases ---\n\n"); + + send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1eee); + send_bssgp_suspend_ack(nsi, &sgsn_peer, &rai_unknown); + + gbprox_dump_global(stdout, 0, 1); + gbprox_dump_peers(stdout, 0, 1); + + gprs_ns_destroy(nsi); + nsi = NULL; + gbprox_reset(); +} + static struct log_info info = {}; @@ -706,6 +902,7 @@ int main(int argc, char **argv) printf("===== GbProxy test START\n"); test_gbproxy(); test_gbproxy_ident_changes(); + test_gbproxy_ra_patching(); printf("===== GbProxy test END\n\n"); exit(EXIT_SUCCESS); diff --git a/openbsc/tests/gbproxy/gbproxy_test.ok b/openbsc/tests/gbproxy/gbproxy_test.ok index 3b25922..58add97 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.ok +++ b/openbsc/tests/gbproxy/gbproxy_test.ok @@ -1518,5 +1518,273 @@ Peers: NS Transmission error : 2 NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96 NSEI mismatch : 1 +--- Initialise SGSN --- + +MESSAGE to SGSN at 0x05060708:32000, msg length 12 +02 00 81 01 01 82 01 01 04 82 01 00 + +PROCESSING RESET_ACK from 0x05060708:32000 +03 01 82 01 01 04 82 01 00 + +MESSAGE to SGSN at 0x05060708:32000, msg length 1 +0a + +result (RESET_ACK) = 1 + +PROCESSING ALIVE_ACK from 0x05060708:32000 +0b + +MESSAGE to SGSN at 0x05060708:32000, msg length 1 +06 + +result (ALIVE_ACK) = 1 + +PROCESSING UNBLOCK_ACK from 0x05060708:32000 +07 + +==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000 + +result (UNBLOCK_ACK) = 0 + +PROCESSING ALIVE from 0x05060708:32000 +0a + +MESSAGE to SGSN at 0x05060708:32000, msg length 1 +0b + +result (ALIVE) = 1 + +Current NS-VCIs: + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000 + NS-VC Block count : 1 + +--- Initialise BSS 1 --- + +Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096) + +PROCESSING RESET from 0x01020304:1111 +02 00 81 01 01 82 10 01 04 82 10 00 + +==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111 + +MESSAGE to BSS at 0x01020304:1111, msg length 9 +03 01 82 10 01 04 82 10 00 + +MESSAGE to BSS at 0x01020304:1111, msg length 1 +0a + +result (RESET) = 9 + +PROCESSING ALIVE from 0x01020304:1111 +0a + +MESSAGE to BSS at 0x01020304:1111, msg length 1 +0b + +result (ALIVE) = 1 + +PROCESSING UNBLOCK from 0x01020304:1111 +06 + +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + +MESSAGE to BSS at 0x01020304:1111, msg length 1 +07 + +result (UNBLOCK) = 1 + +PROCESSING ALIVE_ACK from 0x01020304:1111 +0b + +result (ALIVE_ACK) = 0 + +Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098) + +PROCESSING BVC_RESET from 0x01020304:1111 +00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 + +CALLBACK, event 0, msg length 22, bvci 0x0000 +22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 +22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 + +MESSAGE to SGSN at 0x05060708:32000, msg length 26 +00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 + +result (BVC_RESET) = 26 + +Current NS-VCIs: + VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111 + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000 + NS-VC Block count : 1 + +Peers: + NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96 +PROCESSING BVC_RESET_ACK from 0x05060708:32000 +00 00 00 00 23 04 82 10 02 + +CALLBACK, event 0, msg length 5, bvci 0x0000 +23 04 82 10 02 + +NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 +23 04 82 10 02 + +MESSAGE to BSS at 0x01020304:1111, msg length 9 +00 00 00 00 23 04 82 10 02 + +result (BVC_RESET_ACK) = 9 + +PROCESSING BVC_SUSPEND from 0x01020304:1111 +00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 + +CALLBACK, event 0, msg length 15, bvci 0x0000 +0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 15 +0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 + +MESSAGE to SGSN at 0x05060708:32000, msg length 19 +00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 + +result (BVC_SUSPEND) = 19 + +PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000 +00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 + +CALLBACK, event 0, msg length 18, bvci 0x0000 +0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24 +41 07 81 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 + +MESSAGE to SGSN at 0x05060708:32000, msg length 28 +00 00 00 00 41 07 81 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 + +result (BVC_SUSPEND_ACK) = 28 + +Gbproxy global: + Invalid Routing Area Identifier : 1 +Peers: + NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96 +--- Send message from BSS 1 to SGSN, BVCI 0x1002 --- + +PROCESSING UNITDATA from 0x01020304:1111 +00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 + +CALLBACK, event 0, msg length 75, bvci 0x1002 +01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 +01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 + +MESSAGE to SGSN at 0x05060708:32000, msg length 79 +00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 + +result (UNITDATA) = 79 + +PROCESSING UNITDATA from 0x05060708:32000 +00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 fb c5 47 22 42 67 9a + +CALLBACK, event 0, msg length 88, bvci 0x1002 +00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 fb c5 47 22 42 67 9a + +NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 +00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 fb c5 47 22 42 67 9a + +MESSAGE to BSS at 0x01020304:1111, msg length 92 +00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 fb c5 47 22 42 67 9a + +result (UNITDATA) = 92 + +PROCESSING UNITDATA from 0x01020304:1111 +00 00 10 02 01 af e2 80 6e 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 + +CALLBACK, event 0, msg length 85, bvci 0x1002 +01 af e2 80 6e 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 +01 af e2 80 6e 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 + +MESSAGE to SGSN at 0x05060708:32000, msg length 89 +00 00 10 02 01 af e2 80 6e 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 + +result (UNITDATA) = 89 + +PROCESSING UNITDATA from 0x05060708:32000 +00 00 10 02 00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 81 17 17 16 c3 bf cc + +CALLBACK, event 0, msg length 91, bvci 0x1002 +00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 81 17 17 16 c3 bf cc + +NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 91 +00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 81 17 17 16 c3 bf cc + +MESSAGE to BSS at 0x01020304:1111, msg length 95 +00 00 10 02 00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 81 17 17 16 c3 bf cc + +result (UNITDATA) = 95 + +PROCESSING UNITDATA from 0x01020304:1111 +00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +CALLBACK, event 0, msg length 76, bvci 0x1002 +01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 76 +01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +MESSAGE to SGSN at 0x05060708:32000, msg length 80 +00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +result (UNITDATA) = 80 + +PROCESSING UNITDATA from 0x01020304:1111 +00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +CALLBACK, event 0, msg length 76, bvci 0x1002 +01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 76 +01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +MESSAGE to SGSN at 0x05060708:32000, msg length 80 +00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 + +result (UNITDATA) = 80 + +Gbproxy global: + Invalid Routing Area Identifier : 1 +Peers: + NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96 +--- Bad cases --- + +PROCESSING BVC_RESET_ACK from 0x05060708:32000 +00 00 00 00 23 04 82 1e ee + +CALLBACK, event 0, msg length 5, bvci 0x0000 +23 04 82 1e ee + +result (BVC_RESET_ACK) = -2 + +PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000 +00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 + +CALLBACK, event 0, msg length 18, bvci 0x0000 +0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 + +NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24 +41 07 81 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 + +MESSAGE to SGSN at 0x05060708:32000, msg length 28 +00 00 00 00 41 07 81 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 + +result (BVC_SUSPEND_ACK) = 28 + +Gbproxy global: + Invalid BVC Identifier : 1 + Invalid Routing Area Identifier : 2 +Peers: + NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96 ===== GbProxy test END -- 1.9.1

10 years, 11 months

[osmo-pcu 1/3] bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup

by Daniel Willmann

In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf --- src/bts.cpp | 24 +++++++++++++++++------- src/bts.h | 4 +++- src/tbf.cpp | 18 +++++++++--------- tests/tbf/TbfTest.cpp | 12 ++++++------ 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 3dd5705..51be2d9 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -216,6 +216,18 @@ int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv) return 0; } +/* search for active downlink tbf */ +gprs_rlcmac_tbf *BTS::dl_tbf_by_tlli(uint32_t tlli) +{ + return tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF); +} + +/* search for active uplink tbf */ +gprs_rlcmac_tbf *BTS::ul_tbf_by_tlli(uint32_t tlli) +{ + return tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF); +} + /* search for active downlink or uplink tbf */ gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir) { @@ -360,7 +372,7 @@ int BTS::rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn) tlli |= (*data++) << 4; tlli |= (*data++) >> 4; - tbf = tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF); + tbf = dl_tbf_by_tlli(tlli); if (!tbf) { LOGP(DRLCMAC, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI=%08x " "does not exit\n", tlli); @@ -725,8 +737,7 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, tbf->n3105 = 0; tbf->dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE; if (tbf->direction == GPRS_RLCMAC_UL_TBF) - tbf = bts()->tbf_by_tlli(tbf->tlli(), - GPRS_RLCMAC_DL_TBF); + tbf = bts()->dl_tbf_by_tlli(tbf->tlli()); #warning "TBF is changing on the way... *sigh*" if (!tbf) { LOGP(DRLCMAC, LOGL_ERROR, "Got ACK, but DL " @@ -753,8 +764,7 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE; #warning "TBF is changing on the way... *sigh*" if (tbf->direction == GPRS_RLCMAC_DL_TBF) - tbf = bts()->tbf_by_tlli(tbf->tlli(), - GPRS_RLCMAC_UL_TBF); + tbf = bts()->ul_tbf_by_tlli(tbf->tlli()); if (!tbf) { LOGP(DRLCMAC, LOGL_ERROR, "Got ACK, but UL " "TBF is gone TLLI=0x%08x\n", tlli); @@ -836,7 +846,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, struct gprs_rlcmac_tbf *dl_tbf; uint8_t ta; - tbf = bts()->tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF); + tbf = bts()->ul_tbf_by_tlli(tlli); if (tbf) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still " @@ -846,7 +856,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, tbf = NULL; } - if ((dl_tbf = bts()->tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF))) { + if ((dl_tbf = bts()->dl_tbf_by_tlli(tlli))) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still exists. " "Killing pending DL TBF\n", tlli, diff --git a/src/bts.h b/src/bts.h index aa68ed7..c83bb18 100644 --- a/src/bts.h +++ b/src/bts.h @@ -192,7 +192,8 @@ public: /** add paging to paging queue(s) */ int add_paging(uint8_t chan_needed, uint8_t *identity_lv); - gprs_rlcmac_tbf *tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir); + gprs_rlcmac_tbf *dl_tbf_by_tlli(uint32_t tlli); + gprs_rlcmac_tbf *ul_tbf_by_tlli(uint32_t tlli); gprs_rlcmac_tbf *tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts); gprs_rlcmac_tbf *tbf_by_tfi(uint8_t tfi, uint8_t trx, enum gprs_rlcmac_tbf_direction dir); @@ -238,6 +239,7 @@ private: SBAController m_sba; TimingAdvance m_ta; struct rate_ctr_group *m_ratectrs; + gprs_rlcmac_tbf *tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir); private: /* disable copying to avoid slicing */ diff --git a/src/tbf.cpp b/src/tbf.cpp index 5943674..f913f97 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -82,7 +82,7 @@ static struct gprs_rlcmac_tbf *tbf_lookup_dl(BTS *bts, const uint32_t tlli, const char *imsi) { /* TODO: look up by IMSI first, then tlli, then old_tlli */ - return bts->tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF); + return bts->dl_tbf_by_tlli(tlli); } int gprs_rlcmac_tbf::append_data(const uint8_t ms_class, @@ -130,7 +130,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, /* check for uplink data, so we copy our informations */ #warning "Do the same look up for IMSI, TLLI and OLD_TLLI" #warning "Refactor the below lines... into a new method" - tbf = bts->bts->tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF); + tbf = bts->bts->ul_tbf_by_tlli(tlli); if (tbf && tbf->dir.ul.contention_resolution_done && !tbf->dir.ul.final_ack_sent) { use_trx = tbf->trx->trx_no; @@ -308,7 +308,7 @@ int gprs_rlcmac_tbf::update() if (direction != GPRS_RLCMAC_DL_TBF) return -EINVAL; - ul_tbf = bts->tbf_by_tlli(m_tlli, GPRS_RLCMAC_UL_TBF); + ul_tbf = bts->ul_tbf_by_tlli(m_tlli); tbf_unlink_pdch(this); rc = bts_data->alloc_algorithm(bts_data, ul_tbf, this, bts_data->alloc_algorithm_curst, 0); @@ -1182,7 +1182,7 @@ struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn) return NULL; } #warning "THIS should probably go over the IMSI too" - new_tbf = bts->tbf_by_tlli(m_tlli, GPRS_RLCMAC_DL_TBF); + new_tbf = bts->dl_tbf_by_tlli(m_tlli); } else new_tbf = this; if (!new_tbf) { @@ -1252,7 +1252,7 @@ struct msgb *gprs_rlcmac_tbf::create_ul_ass(uint32_t fn) /* on down TBF we get the uplink TBF to be assigned. */ #warning "Probably want to find by IMSI too" if (direction == GPRS_RLCMAC_DL_TBF) - new_tbf = bts->tbf_by_tlli(m_tlli, GPRS_RLCMAC_UL_TBF); + new_tbf = bts->ul_tbf_by_tlli(m_tlli); else new_tbf = this; @@ -1497,7 +1497,7 @@ void gprs_rlcmac_tbf::update_tlli(uint32_t tlli) */ if (m_tlli_valid && direction == GPRS_RLCMAC_DL_TBF) { gprs_rlcmac_tbf *ul_tbf; - ul_tbf = bts->tbf_by_tlli(m_tlli, GPRS_RLCMAC_UL_TBF); + ul_tbf = bts->ul_tbf_by_tlli(m_tlli); if (ul_tbf) { ul_tbf->m_tlli = tlli; @@ -1537,7 +1537,7 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len) update_tlli(new_tlli); LOGP(DRLCMACUL, LOGL_INFO, "Decoded premier TLLI=0x%08x of " "UL DATA TFI=%d.\n", tlli(), rh->tfi); - if ((dl_tbf = bts->tbf_by_tlli(tlli(), GPRS_RLCMAC_DL_TBF))) { + if ((dl_tbf = bts->dl_tbf_by_tlli(tlli()))) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still exists. " "Killing pending DL TBF\n", tlli(), @@ -1545,9 +1545,9 @@ int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len) tbf_free(dl_tbf); dl_tbf = NULL; } - /* tbf_by_tlli will not find your TLLI, because it is not + /* ul_tbf_by_tlli will not find your TLLI, because it is not * yet marked valid */ - if ((ul_tbf = bts->tbf_by_tlli(tlli(), GPRS_RLCMAC_UL_TBF))) { + if ((ul_tbf = bts->ul_tbf_by_tlli(tlli()))) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still exists. " "Killing pending UL TBF\n", tlli(), diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 86c5bbd..38975f9 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -59,8 +59,8 @@ static void test_tbf_tlli_update() ul_tbf->tlli_mark_valid(); - OSMO_ASSERT(the_bts.tbf_by_tlli(0x2342, GPRS_RLCMAC_DL_TBF) == dl_tbf); - OSMO_ASSERT(the_bts.tbf_by_tlli(0x2342, GPRS_RLCMAC_UL_TBF) == ul_tbf); + OSMO_ASSERT(the_bts.dl_tbf_by_tlli(0x2342) == dl_tbf); + OSMO_ASSERT(the_bts.ul_tbf_by_tlli(0x2342) == ul_tbf); /* @@ -68,12 +68,12 @@ static void test_tbf_tlli_update() * has changed. */ dl_tbf->update_tlli(0x4232); - OSMO_ASSERT(!the_bts.tbf_by_tlli(0x2342, GPRS_RLCMAC_DL_TBF)); - OSMO_ASSERT(!the_bts.tbf_by_tlli(0x2342, GPRS_RLCMAC_UL_TBF)); + OSMO_ASSERT(!the_bts.dl_tbf_by_tlli(0x2342)); + OSMO_ASSERT(!the_bts.ul_tbf_by_tlli(0x2342)); - OSMO_ASSERT(the_bts.tbf_by_tlli(0x4232, GPRS_RLCMAC_DL_TBF) == dl_tbf); - OSMO_ASSERT(the_bts.tbf_by_tlli(0x4232, GPRS_RLCMAC_UL_TBF) == ul_tbf); + OSMO_ASSERT(the_bts.dl_tbf_by_tlli(0x4232) == dl_tbf); + OSMO_ASSERT(the_bts.ul_tbf_by_tlli(0x4232) == ul_tbf); OSMO_ASSERT(the_bts.timing_advance()->recall(0x4232) == 4); } -- 1.8.4.2

10 years, 11 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC July 2014