cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity
osmo-pcu/src/tbf.cpp

874 lines
24 KiB
C++
Raw Normal View History

tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
/* Copied from gprs_bssgp_pcu.cpp
*
* Copyright (C) 2012 Ivan Klyuchnikov
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
* Copyright (C) 2012 Andreas Eversberg <jolly@eversberg.eu>
tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
* Copyright (C) 2013 by Holger Hans Peter Freyther
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
bts: Move struct gprs_rlcmac_bts and other structs into a bts.h Begin to make the BTS a real C++ object with real responsibilities. The biggest issue will be the pcu_vty.c that might not like C++ at all.
2013-10-17 15:01:54 +00:00
#include <bts.h>
tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
#include <tbf.h>
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
#include <rlc.h>
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
#include <encoding.h>
tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
#include <gprs_rlcmac.h>
#include <gprs_debug.h>
tbf: Move gprs_rlcmac_send_packet_uplink_assignment into the tbf
2013-10-26 19:38:30 +00:00
#include <gprs_bssgp_pcu.h>
tbf: Move the llc handling into the tbf (from the bts) This will be moved to a LLC class in the future but after this we can make the sns/ws private now and have little to update outside the tbf.
2013-11-06 18:16:43 +00:00
#include <decoding.h>
tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
extern "C" {
#include <osmocom/core/msgb.h>
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
#include <osmocom/core/talloc.h>
tbf: Begin to add some structure to the tbf code The TBF should use the IMSI to identify a block flow but all handling is spread across the entire code. Start to clean this up by moving relevant code into the tbf file. Afterwards one can clean up and add more internal structure.
2013-08-24 16:31:27 +00:00
}
#include <errno.h>
#include <string.h>
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
extern void *tall_pcu_ctx;
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
static void tbf_timer_cb(void *_tbf);
tbf: Split out UL/DL TBF methods into separate files tbf_ul.cpp for UL TBF methods tbf_dl.cpp for DL TBF methods This commit contains no code changes. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 10:14:12 +00:00
gprs_rlcmac_bts *gprs_rlcmac_tbf::bts_data() const
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
{
return bts->bts_data();
}
tbf: Have one imsi field and assign it through a function Have one IMSI field per TBF and assign through a function call. The IMSI should be used to look-up the TBF on the SGSN->PCU direction.
2013-10-27 19:57:35 +00:00
void gprs_rlcmac_tbf::assign_imsi(const char *imsi)
tbf: Create an assign method for IMSI. This will allow us to set flags (like IMSI) present and will be of help when fixing the tbf lookup.
2013-08-24 18:51:06 +00:00
{
tbf: Have one imsi field and assign it through a function Have one IMSI field per TBF and assign through a function call. The IMSI should be used to look-up the TBF on the SGSN->PCU direction.
2013-10-27 19:57:35 +00:00
strncpy(m_imsi, imsi, sizeof(m_imsi));
m_imsi[sizeof(m_imsi) - 1] = '\0';
tbf: Create an assign method for IMSI. This will allow us to set flags (like IMSI) present and will be of help when fixing the tbf lookup.
2013-08-24 18:51:06 +00:00
}
tbf,bts: Keep track of new TBF for dl/ul assignment in m_new_tbf There are a couple of possibilities where one TBF is used to assign a new one: 1. Assign a DL TBF from a UL TBF 2. Assign a UL TBF from a DL TBF 3. Assign a DL TBF from a DL TBF which is in wait-release state (T3193 is running) In these cases the assignment is sent on the existing TBF and triggers the assignement of the new TBF (with different TFI/direction). The current code detects these situations by looking at dl/ul_ass_state and then chosing the TBF with the opposite direction (DL/UL) that has the same TLLI. This does not work in the case 3 above where a new DL TBF is triggered for a DL TBF. The current code reuses the old TBF (and TFI), but this violates the spec. This patch introduces a m_new_tbf member which is set to the new TBF to be assigned. When receiving a control ack the code looks up the n_new_tbf member of the tbf that requested the control ack and completes the ul/dl assignment. If the old TBF was in the wait release state (T3193 is running) it is released. From 3GPP TS 04.60 9.3.2.6: """ If the network has received the PACKET DOWNLINK ACK/NACK message with the Final Ack Indicator bit set to '1' and has new data to transmit for the mobile station, the network may establish a new downlink TBF for the mobile station by sending the PACKET DOWNLINK ASSIGNMENT or PACKET TIMESLOT RECONFIGURE message with the Control Ack bit set to '1' on PACCH. In case the network establishes a new downlink TBF for the mobile station, the network shall stop timer T3193. """ reuse_tbf() is modified to allocate a new TBF with a new TFI and trigger a dl assignment for that TBF on the old TBF. All pending data is moved to the new TBF. Ticket: SYS#382 Sponsored-by: On-Waves ehf
2014-08-15 14:52:09 +00:00
void gprs_rlcmac_tbf::set_new_tbf(gprs_rlcmac_tbf *tbf)
{
tbf: Fix dangling m_new_tbf pointer Currently if a 'new' TBF is freed before the 'old' one (where old_tbf->m_new_tbf == new_tbf), the old_tbf->m_new_tbf is not cleared and can be accessed later on. This can lead to inconsistencies or segmentation faults. This commit adds m_old_tbf which points back from new_tbf to old_pdf. m_new_tbf and m_old_tbf are either both set to NULL or one is the reverse pointer of the other (tbf->m_new_tbf->m_old_tbf == tbf and tbf->m_old_tbf->m_new_tbf == tbf). It extends set_new_tbf and tbf_free to update the pointee accordingly. The TBF test is extended to check this invariant at several places. Sponsored-by: On-Waves ehf
2015-02-23 14:10:20 +00:00
if (m_new_tbf) {
if (m_new_tbf == tbf) {
LOGP(DRLCMAC, LOGL_NOTICE,
"%s reassigning %s to m_new_tbf\n",
tbf_name(this), tbf_name(tbf));
return;
}
LOGP(DRLCMAC, LOGL_NOTICE,
"%s m_new_tbf is already assigned to %s, "
"overwriting the old value with %s\n",
tbf_name(this), tbf_name(m_new_tbf), tbf_name(tbf));
/* Detach from other TBF */
m_new_tbf->m_old_tbf = NULL;
}
tbf,bts: Keep track of new TBF for dl/ul assignment in m_new_tbf There are a couple of possibilities where one TBF is used to assign a new one: 1. Assign a DL TBF from a UL TBF 2. Assign a UL TBF from a DL TBF 3. Assign a DL TBF from a DL TBF which is in wait-release state (T3193 is running) In these cases the assignment is sent on the existing TBF and triggers the assignement of the new TBF (with different TFI/direction). The current code detects these situations by looking at dl/ul_ass_state and then chosing the TBF with the opposite direction (DL/UL) that has the same TLLI. This does not work in the case 3 above where a new DL TBF is triggered for a DL TBF. The current code reuses the old TBF (and TFI), but this violates the spec. This patch introduces a m_new_tbf member which is set to the new TBF to be assigned. When receiving a control ack the code looks up the n_new_tbf member of the tbf that requested the control ack and completes the ul/dl assignment. If the old TBF was in the wait release state (T3193 is running) it is released. From 3GPP TS 04.60 9.3.2.6: """ If the network has received the PACKET DOWNLINK ACK/NACK message with the Final Ack Indicator bit set to '1' and has new data to transmit for the mobile station, the network may establish a new downlink TBF for the mobile station by sending the PACKET DOWNLINK ASSIGNMENT or PACKET TIMESLOT RECONFIGURE message with the Control Ack bit set to '1' on PACCH. In case the network establishes a new downlink TBF for the mobile station, the network shall stop timer T3193. """ reuse_tbf() is modified to allocate a new TBF with a new TFI and trigger a dl assignment for that TBF on the old TBF. All pending data is moved to the new TBF. Ticket: SYS#382 Sponsored-by: On-Waves ehf
2014-08-15 14:52:09 +00:00
m_new_tbf = tbf;
tbf: Fix dangling m_new_tbf pointer Currently if a 'new' TBF is freed before the 'old' one (where old_tbf->m_new_tbf == new_tbf), the old_tbf->m_new_tbf is not cleared and can be accessed later on. This can lead to inconsistencies or segmentation faults. This commit adds m_old_tbf which points back from new_tbf to old_pdf. m_new_tbf and m_old_tbf are either both set to NULL or one is the reverse pointer of the other (tbf->m_new_tbf->m_old_tbf == tbf and tbf->m_old_tbf->m_new_tbf == tbf). It extends set_new_tbf and tbf_free to update the pointee accordingly. The TBF test is extended to check this invariant at several places. Sponsored-by: On-Waves ehf
2015-02-23 14:10:20 +00:00
tbf->m_old_tbf = this;
tbf,bts: Keep track of new TBF for dl/ul assignment in m_new_tbf There are a couple of possibilities where one TBF is used to assign a new one: 1. Assign a DL TBF from a UL TBF 2. Assign a UL TBF from a DL TBF 3. Assign a DL TBF from a DL TBF which is in wait-release state (T3193 is running) In these cases the assignment is sent on the existing TBF and triggers the assignement of the new TBF (with different TFI/direction). The current code detects these situations by looking at dl/ul_ass_state and then chosing the TBF with the opposite direction (DL/UL) that has the same TLLI. This does not work in the case 3 above where a new DL TBF is triggered for a DL TBF. The current code reuses the old TBF (and TFI), but this violates the spec. This patch introduces a m_new_tbf member which is set to the new TBF to be assigned. When receiving a control ack the code looks up the n_new_tbf member of the tbf that requested the control ack and completes the ul/dl assignment. If the old TBF was in the wait release state (T3193 is running) it is released. From 3GPP TS 04.60 9.3.2.6: """ If the network has received the PACKET DOWNLINK ACK/NACK message with the Final Ack Indicator bit set to '1' and has new data to transmit for the mobile station, the network may establish a new downlink TBF for the mobile station by sending the PACKET DOWNLINK ASSIGNMENT or PACKET TIMESLOT RECONFIGURE message with the Control Ack bit set to '1' on PACCH. In case the network establishes a new downlink TBF for the mobile station, the network shall stop timer T3193. """ reuse_tbf() is modified to allocate a new TBF with a new TFI and trigger a dl assignment for that TBF on the old TBF. All pending data is moved to the new TBF. Ticket: SYS#382 Sponsored-by: On-Waves ehf
2014-08-15 14:52:09 +00:00
}
bts, tbf: Change the TBF return type of functions to the ul/dl version Many functions only ever deal with or return a UL or a DL TBF. Explicitly change the type to reflect which TBF is used where. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-10 15:44:07 +00:00
gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts,
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
int8_t use_trx, uint8_t ms_class,
uint32_t tlli, uint8_t ta, struct gprs_rlcmac_tbf *dl_tbf)
{
uint8_t trx;
bts, tbf: Change the TBF return type of functions to the ul/dl version Many functions only ever deal with or return a UL or a DL TBF. Explicitly change the type to reflect which TBF is used where. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-10 15:44:07 +00:00
struct gprs_rlcmac_ul_tbf *tbf;
tbf: Make sure that tfi is signed so we can make a < 0 check For the failure check we need this variable to be < 0. Fixes: Coverity CID 1107941
2013-11-11 15:22:39 +00:00
int8_t tfi; /* must be signed */
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
#warning "Copy and paste with tbf_new_dl_assignment"
tbf: Fix typo and call it same
2013-12-25 18:15:57 +00:00
/* create new TBF, use same TRX as DL TBF */
tbf/bts: Move the tfi_find_free into the bts
2013-10-26 17:17:58 +00:00
tfi = bts->bts->tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx, use_trx);
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
if (tfi < 0) {
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
/* FIXME: send reject */
return NULL;
}
/* use multislot class of downlink TBF */
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
tbf = tbf_alloc_ul_tbf(bts, dl_tbf, tfi, trx, ms_class, 0);
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
if (!tbf) {
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
/* FIXME: send reject */
return NULL;
}
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
tbf->m_tlli = tlli;
tbf->m_tlli_valid = 1; /* no contention resolution */
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
tbf->m_contention_resolution_done = 1;
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
tbf->ta = ta; /* use current TA */
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
tbf->set_state(GPRS_RLCMAC_ASSIGN);
tbf: Move the alloc_ul_tbf into tbf.c and change signature Add the bts parameter to the method list. This would be a static method of the class (in case the TBF would be a class)
2013-08-24 19:26:42 +00:00
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_PACCH);
tbf_timer_start(tbf, 3169, bts->t3169, 0);
return tbf;
}
tbf: Move the code to close all timeslots into the tbf class Move the code out of the sysmocom_socket (as this is only required to talk to our hardware) and into the TBF class that actually knows what a TBF is.
2013-10-16 15:53:23 +00:00
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
static void tbf_unlink_pdch(struct gprs_rlcmac_tbf *tbf)
{
int ts;
if (tbf->direction == GPRS_RLCMAC_UL_TBF) {
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf->trx->ul_tbf[tbf->tfi()] = NULL;
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
for (ts = 0; ts < 8; ts++)
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf->pdch[ts] = NULL;
} else {
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf->trx->dl_tbf[tbf->tfi()] = NULL;
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
for (ts = 0; ts < 8; ts++)
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf->pdch[ts] = NULL;
}
}
void tbf_free(struct gprs_rlcmac_tbf *tbf)
{
/* Give final measurement report */
gprs_rlcmac_rssi_rep(tbf);
tbf, gprs_rlcmac_meas: Move the DL bandwidth variables to the DL TBF The bandwidth calculation as well as loss report is only done for DL TBF so move everything related to that in there. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:21:04 +00:00
if (tbf->direction == GPRS_RLCMAC_DL_TBF) {
gprs_rlcmac_dl_tbf *dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(tbf);
gprs_rlcmac_lost_rep(dl_tbf);
}
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_INFO, "%s free\n", tbf_name(tbf));
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
if (tbf->ul_ass_state != GPRS_RLCMAC_UL_ASS_NONE)
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_ERROR, "%s Software error: Pending uplink "
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
"assignment. This may not happen, because the "
"assignment message never gets transmitted. Please "
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"be sure not to free in this state. PLEASE FIX!\n",
tbf_name(tbf));
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
if (tbf->dl_ass_state != GPRS_RLCMAC_DL_ASS_NONE)
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_ERROR, "%s Software error: Pending downlink "
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
"assignment. This may not happen, because the "
"assignment message never gets transmitted. Please "
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"be sure not to free in this state. PLEASE FIX!\n",
tbf_name(tbf));
tbf: Move the timer routine into the class The timer is used for various timeouts and there is still external client code that is calling it. In a perfect world the client code would indicate that an event has happened and the internal timer will be stopped. The best compromise is the "stop_t3191" method. It allows to add semantic verification that the timer has been running.
2013-10-26 16:01:35 +00:00
tbf->stop_timer();
tbf: Add todo item tht could help improving debugging
2013-10-26 16:31:51 +00:00
#warning "TODO: Could/Should generate bssgp_tx_llc_discarded"
llc: First routines moved from the TBF into the LLC
2013-11-06 19:39:45 +00:00
tbf->m_llc.clear(tbf->bts);
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf_unlink_pdch(tbf);
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_del(&tbf->list.list);
bts: Provide the first set of counters
2013-10-27 08:50:15 +00:00
if (tbf->direction == GPRS_RLCMAC_UL_TBF)
tbf->bts->tbf_ul_freed();
else
tbf->bts->tbf_dl_freed();
tbf: Fix dangling m_new_tbf pointer Currently if a 'new' TBF is freed before the 'old' one (where old_tbf->m_new_tbf == new_tbf), the old_tbf->m_new_tbf is not cleared and can be accessed later on. This can lead to inconsistencies or segmentation faults. This commit adds m_old_tbf which points back from new_tbf to old_pdf. m_new_tbf and m_old_tbf are either both set to NULL or one is the reverse pointer of the other (tbf->m_new_tbf->m_old_tbf == tbf and tbf->m_old_tbf->m_new_tbf == tbf). It extends set_new_tbf and tbf_free to update the pointee accordingly. The TBF test is extended to check this invariant at several places. Sponsored-by: On-Waves ehf
2015-02-23 14:10:20 +00:00
if (tbf->m_old_tbf) {
LOGP(DRLCMAC, LOGL_INFO, "%s Old TBF %s still exists, detaching\n",
tbf_name(tbf), tbf_name(tbf->m_old_tbf));
if (tbf->m_old_tbf->m_new_tbf == tbf)
tbf->m_old_tbf->m_new_tbf = NULL;
else
LOGP(DRLCMAC, LOGL_ERROR, "%s Software error: "
"tbf->m_old_tbf->m_new_tbf != tbf\n",
tbf_name(tbf));
}
if (tbf->m_new_tbf) {
LOGP(DRLCMAC, LOGL_INFO, "%s New TBF %s still exists, detaching\n",
tbf_name(tbf), tbf_name(tbf->m_new_tbf));
if (tbf->m_new_tbf->m_old_tbf == tbf)
tbf->m_new_tbf->m_old_tbf = NULL;
else
LOGP(DRLCMAC, LOGL_ERROR, "%s Software error: "
"tbf->m_new_tbf->m_old_tbf != tbf\n",
tbf_name(tbf));
}
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "********** TBF ends here **********\n");
talloc_free(tbf);
}
tbf: Move the updating of the data into the tbf class
2013-10-26 15:49:36 +00:00
int gprs_rlcmac_tbf::update()
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
{
struct gprs_rlcmac_tbf *ul_tbf = NULL;
tbf: Move the updating of the data into the tbf class
2013-10-26 15:49:36 +00:00
struct gprs_rlcmac_bts *bts_data = bts->bts_data();
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
int rc;
LOGP(DRLCMAC, LOGL_DEBUG, "********** TBF update **********\n");
tbf: Move the updating of the data into the tbf class
2013-10-26 15:49:36 +00:00
if (direction != GPRS_RLCMAC_DL_TBF)
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
return -EINVAL;
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup 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
2014-07-02 15:58:14 +00:00
ul_tbf = bts->ul_tbf_by_tlli(m_tlli);
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf: Move the updating of the data into the tbf class
2013-10-26 15:49:36 +00:00
tbf_unlink_pdch(this);
rc = bts_data->alloc_algorithm(bts_data, ul_tbf, this, bts_data->alloc_algorithm_curst, 0);
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
/* if no resource */
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
if (rc < 0) {
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
LOGP(DRLCMAC, LOGL_ERROR, "No resource after update???\n");
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
return -rc;
}
return 0;
}
int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf)
{
if (tbf->control_ts == 0xff)
LOGP(DRLCMAC, LOGL_INFO, "- Setting Control TS %d\n",
tbf->first_common_ts);
else if (tbf->control_ts != tbf->first_common_ts)
LOGP(DRLCMAC, LOGL_INFO, "- Changing Control TS %d\n",
tbf->first_common_ts);
tbf->control_ts = tbf->first_common_ts;
return 0;
}
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
const char *gprs_rlcmac_tbf::tbf_state_name[] = {
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
"NULL",
"ASSIGN",
"FLOW",
"FINISHED",
"WAIT RELEASE",
"RELEASING",
};
void tbf_timer_start(struct gprs_rlcmac_tbf *tbf, unsigned int T,
unsigned int seconds, unsigned int microseconds)
{
if (!osmo_timer_pending(&tbf->timer))
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "%s starting timer %u.\n",
tbf_name(tbf), T);
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
else
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "%s restarting timer %u "
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
"while old timer %u pending \n",
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
tbf_name(tbf), T, tbf->T);
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
tbf->T = T;
tbf->num_T_exp = 0;
/* Tunning timers can be safely re-scheduled. */
tbf->timer.data = tbf;
tbf->timer.cb = &tbf_timer_cb;
osmo_timer_schedule(&tbf->timer, seconds, microseconds);
}
tbf: Move the timer routine into the class The timer is used for various timeouts and there is still external client code that is calling it. In a perfect world the client code would indicate that an event has happened and the internal timer will be stopped. The best compromise is the "stop_t3191" method. It allows to add semantic verification that the timer has been running.
2013-10-26 16:01:35 +00:00
void gprs_rlcmac_tbf::stop_t3191()
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
{
tbf: Move the timer routine into the class The timer is used for various timeouts and there is still external client code that is calling it. In a perfect world the client code would indicate that an event has happened and the internal timer will be stopped. The best compromise is the "stop_t3191" method. It allows to add semantic verification that the timer has been running.
2013-10-26 16:01:35 +00:00
return stop_timer();
}
void gprs_rlcmac_tbf::stop_timer()
{
if (osmo_timer_pending(&timer)) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "%s stopping timer %u.\n",
tbf_name(this), T);
tbf: Move the timer routine into the class The timer is used for various timeouts and there is still external client code that is calling it. In a perfect world the client code would indicate that an event has happened and the internal timer will be stopped. The best compromise is the "stop_t3191" method. It allows to add semantic verification that the timer has been running.
2013-10-26 16:01:35 +00:00
osmo_timer_del(&timer);
tbf: Move many routines related to the tbf from gprs_rlcmac to tbf.c
2013-10-16 15:55:57 +00:00
}
}
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
void gprs_rlcmac_tbf::poll_timeout()
{
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "%s poll timeout\n",
tbf_name(this));
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
poll_state = GPRS_RLCMAC_POLL_NONE;
if (ul_ack_state == GPRS_RLCMAC_UL_ACK_WAIT_ACK) {
if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK))) {
LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling "
"PACKET CONTROL ACK for PACKET UPLINK ACK\n");
rlcmac_diag();
state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK);
}
ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE;
if (state_is(GPRS_RLCMAC_FINISHED)) {
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
gprs_rlcmac_ul_tbf *ul_tbf = static_cast<gprs_rlcmac_ul_tbf *>(this);
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
ul_tbf->m_n3103++;
if (ul_tbf->m_n3103 == ul_tbf->bts->bts_data()->n3103) {
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
LOGP(DRLCMAC, LOGL_NOTICE,
"- N3103 exceeded\n");
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
ul_tbf->set_state(GPRS_RLCMAC_RELEASING);
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
tbf_timer_start(ul_tbf, 3169, ul_tbf->bts->bts_data()->t3169, 0);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
return;
}
/* reschedule UL ack */
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
ul_tbf->ul_ack_state = GPRS_RLCMAC_UL_ACK_SEND_ACK;
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
}
} else if (ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) {
if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) {
LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling "
"PACKET CONTROL ACK for PACKET UPLINK "
"ASSIGNMENT.\n");
rlcmac_diag();
state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS);
}
ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE;
n3105++;
if (n3105 == bts_data()->n3105) {
LOGP(DRLCMAC, LOGL_NOTICE, "- N3105 exceeded\n");
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
set_state(GPRS_RLCMAC_RELEASING);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
tbf_timer_start(this, 3195, bts_data()->t3195, 0);
return;
}
/* reschedule UL assignment */
ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS;
} else if (dl_ass_state == GPRS_RLCMAC_DL_ASS_WAIT_ACK) {
if (!(state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS))) {
LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling "
"PACKET CONTROL ACK for PACKET DOWNLINK "
"ASSIGNMENT.\n");
rlcmac_diag();
state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS);
}
dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE;
n3105++;
if (n3105 == bts->bts_data()->n3105) {
LOGP(DRLCMAC, LOGL_NOTICE, "- N3105 exceeded\n");
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
set_state(GPRS_RLCMAC_RELEASING);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
tbf_timer_start(this, 3195, bts_data()->t3195, 0);
return;
}
/* reschedule DL assignment */
dl_ass_state = GPRS_RLCMAC_DL_ASS_SEND_ASS;
} else if (direction == GPRS_RLCMAC_DL_TBF) {
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
gprs_rlcmac_dl_tbf *dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(this);
if (!(dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) {
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling "
"PACKET DOWNLINK ACK.\n");
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
dl_tbf->rlcmac_diag();
dl_tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
}
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
dl_tbf->n3105++;
if (dl_tbf->n3105 == dl_tbf->bts->bts_data()->n3105) {
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "- N3105 exceeded\n");
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
dl_tbf->set_state(GPRS_RLCMAC_RELEASING);
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
tbf_timer_start(dl_tbf, 3195, dl_tbf->bts_data()->t3195, 0);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
return;
}
/* resend IMM.ASS on CCCH on timeout */
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
if ((dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))
&& !(dl_tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))) {
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "Re-send dowlink assignment "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"for %s on PCH (IMSI=%s)\n",
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
tbf_name(dl_tbf),
tbf: Have one imsi field and assign it through a function Have one IMSI field per TBF and assign through a function call. The IMSI should be used to look-up the TBF on the SGSN->PCU direction.
2013-10-27 19:57:35 +00:00
m_imsi);
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
/* send immediate assignment */
tbf: Use DL/UL TBFs in poll_timeout codepaths that deal only with one type Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 11:03:35 +00:00
dl_tbf->bts->snd_dl_ass(dl_tbf, 0, m_imsi);
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
dl_tbf->m_wait_confirm = 1;
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
}
} else
LOGP(DRLCMAC, LOGL_ERROR, "- Poll Timeout, but no event!\n");
}
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
static int setup_tbf(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *old_tbf, uint8_t tfi, uint8_t trx,
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
uint8_t ms_class, uint8_t single_slot)
{
int rc;
if (trx >= 8 || tfi >= 32)
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
return -1;
tbf: Add ul and dl TBF types and allocate them in tbf_alloc() Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-10 15:44:06 +00:00
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
if (!tbf)
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
return -1;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
/* Back pointer for PODS llist compatibility */
tbf->list.back = tbf;
tbf: Use past-tense and call it created_ts
2014-01-16 09:07:20 +00:00
tbf->m_created_ts = time(NULL);
tbf: Keep a pointer from the tbf to the BTS This is preparing the next commits and will ease working with the debug_diagram when the global lists are killed. It will simplify the APIin the long run.
2013-10-19 19:24:34 +00:00
tbf->bts = bts->bts;
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf->m_tfi = tfi;
alloc: Introduce a backpointer from the tbf to the trx and simplify code Kill all the level of indirections where one needs to have the BTS the TBF to find the TRX.
2013-09-29 05:50:50 +00:00
tbf->trx = &bts->trx[trx];
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf->ms_class = ms_class;
/* select algorithm */
rc = bts->alloc_algorithm(bts, old_tbf, tbf, bts->alloc_algorithm_curst,
single_slot);
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
/* if no resource */
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
if (rc < 0) {
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
return -1;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
}
/* assign control ts */
tbf->control_ts = 0xff;
rc = tbf_assign_control_ts(tbf);
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
/* if no resource */
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
if (rc < 0) {
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
return -1;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
}
/* set timestamp */
gettimeofday(&tbf->meas.rssi_tv, NULL);
llc: First routines moved from the TBF into the LLC
2013-11-06 19:39:45 +00:00
tbf->m_llc.init();
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
return 0;
}
struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *old_tbf, uint8_t tfi, uint8_t trx,
uint8_t ms_class, uint8_t single_slot)
{
struct gprs_rlcmac_ul_tbf *tbf;
int rc;
LOGP(DRLCMAC, LOGL_DEBUG, "********** TBF starts here **********\n");
LOGP(DRLCMAC, LOGL_INFO, "Allocating %s TBF: TFI=%d TRX=%d "
"MS_CLASS=%d\n", "UL", tfi, trx, ms_class);
if (trx >= 8 || tfi >= 32)
return NULL;
tbf = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);
if (!tbf)
return NULL;
tbf->direction = GPRS_RLCMAC_UL_TBF;
rc = setup_tbf(tbf, bts, old_tbf, tfi, trx, ms_class, single_slot);
/* if no resource */
if (rc < 0) {
talloc_free(tbf);
return NULL;
}
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_add(&tbf->list.list, &bts->ul_tbfs);
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
tbf->bts->tbf_ul_created();
return tbf;
}
struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts,
struct gprs_rlcmac_tbf *old_tbf, uint8_t tfi, uint8_t trx,
uint8_t ms_class, uint8_t single_slot)
{
struct gprs_rlcmac_dl_tbf *tbf;
int rc;
LOGP(DRLCMAC, LOGL_DEBUG, "********** TBF starts here **********\n");
LOGP(DRLCMAC, LOGL_INFO, "Allocating %s TBF: TFI=%d TRX=%d "
"MS_CLASS=%d\n", "DL", tfi, trx, ms_class);
if (trx >= 8 || tfi >= 32)
return NULL;
tbf = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_dl_tbf);
if (!tbf)
return NULL;
tbf->direction = GPRS_RLCMAC_DL_TBF;
rc = setup_tbf(tbf, bts, old_tbf, tfi, trx, ms_class, single_slot);
/* if no resource */
if (rc < 0) {
talloc_free(tbf);
return NULL;
bts: Provide the first set of counters
2013-10-27 08:50:15 +00:00
}
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_add(&tbf->list.list, &bts->dl_tbfs);
bts, tbf: Split alloc_tbf function into separate UL and DL versions UL and DL tbfs are used in very separate parts and are not the same thing so split the alloc function and use the UL/DL version throughout the code. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-16 16:54:10 +00:00
tbf->bts->tbf_dl_created();
tbf, gprs_rlcmac_meas: Move the DL bandwidth variables to the DL TBF The bandwidth calculation as well as loss report is only done for DL TBF so move everything related to that in there. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:21:04 +00:00
gettimeofday(&tbf->m_bw.dl_bw_tv, NULL);
gettimeofday(&tbf->m_bw.dl_loss_tv, NULL);
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
return tbf;
}
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
static void tbf_timer_cb(void *_tbf)
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
{
struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)_tbf;
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
tbf->handle_timeout();
}
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
void gprs_rlcmac_tbf::handle_timeout()
{
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "%s timer %u expired.\n",
tbf_name(this), T);
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
num_T_exp++;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
switch (T) {
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
case 0: /* assignment */
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))) {
if (state_is(GPRS_RLCMAC_ASSIGN)) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "%s releasing due to "
"PACCH assignment timeout.\n", tbf_name(this));
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
tbf_free(this);
tbf: Make finding use-after-free more easy and set to NULL or return Make finding use-after-free more easy by setting things to NULL or simply return after tbf_free(this) has been called.
2014-01-16 09:09:42 +00:00
return;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
} else
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_ERROR, "Error: %s is not "
"in assign state\n", tbf_name(this));
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
}
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) {
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
gprs_rlcmac_dl_tbf *dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(this);
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
dl_tbf->m_wait_confirm = 0;
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
if (dl_tbf->state_is(GPRS_RLCMAC_ASSIGN)) {
tbf_assign_control_ts(dl_tbf);
tbf: Re-send dl assignment if we can upgrade to multislot The current code would only ever assign one PDCH for the initial assignment (from CCCH). Only if reuse_tbf is called the algorithm would actually use multiple DL PDCHs if possible. This patch introduced a tbf attribute upgrade_to_multislot that is set if we have multiple PDCH configured, and support multislot assignment, but can only assign a single PDCH (alloc_algorithm_b, parameter single is set). In this case after the assignment completes (and the MS is listening on a PDCH) we resend a DL assignment though the PACCH and this time we can assign multiple timeslots.
2014-05-30 15:58:01 +00:00
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
if (!dl_tbf->upgrade_to_multislot) {
tbf: Re-send dl assignment if we can upgrade to multislot The current code would only ever assign one PDCH for the initial assignment (from CCCH). Only if reuse_tbf is called the algorithm would actually use multiple DL PDCHs if possible. This patch introduced a tbf attribute upgrade_to_multislot that is set if we have multiple PDCH configured, and support multislot assignment, but can only assign a single PDCH (alloc_algorithm_b, parameter single is set). In this case after the assignment completes (and the MS is listening on a PDCH) we resend a DL assignment though the PACCH and this time we can assign multiple timeslots.
2014-05-30 15:58:01 +00:00
/* change state to FLOW, so scheduler
* will start transmission */
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
dl_tbf->set_state(GPRS_RLCMAC_FLOW);
tbf: Re-send dl assignment if we can upgrade to multislot The current code would only ever assign one PDCH for the initial assignment (from CCCH). Only if reuse_tbf is called the algorithm would actually use multiple DL PDCHs if possible. This patch introduced a tbf attribute upgrade_to_multislot that is set if we have multiple PDCH configured, and support multislot assignment, but can only assign a single PDCH (alloc_algorithm_b, parameter single is set). In this case after the assignment completes (and the MS is listening on a PDCH) we resend a DL assignment though the PACCH and this time we can assign multiple timeslots.
2014-05-30 15:58:01 +00:00
break;
}
/* This tbf can be upgraded to use multiple DL
* timeslots and now that there is already one
* slot assigned send another DL assignment via
* PDCH. */
/* keep to flags */
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
dl_tbf->state_flags &= GPRS_RLCMAC_FLAG_TO_MASK;
dl_tbf->state_flags &= ~(1 << GPRS_RLCMAC_FLAG_CCCH);
tbf: Re-send dl assignment if we can upgrade to multislot The current code would only ever assign one PDCH for the initial assignment (from CCCH). Only if reuse_tbf is called the algorithm would actually use multiple DL PDCHs if possible. This patch introduced a tbf attribute upgrade_to_multislot that is set if we have multiple PDCH configured, and support multislot assignment, but can only assign a single PDCH (alloc_algorithm_b, parameter single is set). In this case after the assignment completes (and the MS is listening on a PDCH) we resend a DL assignment though the PACCH and this time we can assign multiple timeslots.
2014-05-30 15:58:01 +00:00
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
dl_tbf->update();
tbf: Re-send dl assignment if we can upgrade to multislot The current code would only ever assign one PDCH for the initial assignment (from CCCH). Only if reuse_tbf is called the algorithm would actually use multiple DL PDCHs if possible. This patch introduced a tbf attribute upgrade_to_multislot that is set if we have multiple PDCH configured, and support multislot assignment, but can only assign a single PDCH (alloc_algorithm_b, parameter single is set). In this case after the assignment completes (and the MS is listening on a PDCH) we resend a DL assignment though the PACCH and this time we can assign multiple timeslots.
2014-05-30 15:58:01 +00:00
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
dl_tbf->bts->trigger_dl_ass(dl_tbf, dl_tbf, NULL);
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
} else
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "%s Continue flow after "
bts: Change parameter in BTS::trigger_dl_ass() to DL TBF This method is always called with a DL TBF as argument so make it clear. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 10:39:26 +00:00
"IMM.ASS confirm\n", tbf_name(dl_tbf));
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
}
break;
case 3169:
case 3191:
case 3195:
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "%s T%d timeout during "
"transsmission\n", tbf_name(this), T);
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
rlcmac_diag();
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
/* fall through */
case 3193:
tbf: Log the TFI and TLLI so we can try to figure out more from logs <0002> tbf.cpp:444 Poll timeout for DL TBF=0 <0002> tbf.cpp:513 - Timeout for polling PACKET DOWNLINK ACK. <0002> tbf.cpp:688 - Assignment was on PACCH <0002> tbf.cpp:694 - Downlink ACK was received <0008> gprs_bssgp_pcu.cpp:154 LLC [SGSN -> PCU] = TLLI: 0xd6942c78 IMSI: 274080000004765 len: 506 <0002> bts.cpp:974 PACKET DOWNLINK ACK with unknown FN=2213128 TFI=0 (TRX 0 TS 6)
2013-10-27 11:42:58 +00:00
LOGP(DRLCMAC, LOGL_DEBUG,
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"%s will be freed due to timeout\n", tbf_name(this));
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
/* free TBF */
tbf: Move the handle tineout into the tbf class
2013-10-26 15:56:15 +00:00
tbf_free(this);
tbf: Make finding use-after-free more easy and set to NULL or return Make finding use-after-free more easy by setting things to NULL or simply return after tbf_free(this) has been called.
2014-01-16 09:09:42 +00:00
return;
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
break;
default:
tbf: Log the TFI and TLLI so we can try to figure out more from logs <0002> tbf.cpp:444 Poll timeout for DL TBF=0 <0002> tbf.cpp:513 - Timeout for polling PACKET DOWNLINK ACK. <0002> tbf.cpp:688 - Assignment was on PACCH <0002> tbf.cpp:694 - Downlink ACK was received <0008> gprs_bssgp_pcu.cpp:154 LLC [SGSN -> PCU] = TLLI: 0xd6942c78 IMSI: 274080000004765 len: 506 <0002> bts.cpp:974 PACKET DOWNLINK ACK with unknown FN=2213128 TFI=0 (TRX 0 TS 6)
2013-10-27 11:42:58 +00:00
LOGP(DRLCMAC, LOGL_ERROR,
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"%s timer expired in unknown mode: %u\n", tbf_name(this), T);
tbf: Move the tbf_timer_cb into the tbf class Introduce the first instance method for printing out diagonistic about itself and create a jump function for it.
2013-10-16 16:09:19 +00:00
}
}
int gprs_rlcmac_tbf::rlcmac_diag()
{
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on CCCH\n");
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on PACCH\n");
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Uplink data was received\n");
else if (direction == GPRS_RLCMAC_UL_TBF)
LOGP(DRLCMAC, LOGL_NOTICE, "- No uplink data received yet\n");
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Downlink ACK was received\n");
else if (direction == GPRS_RLCMAC_DL_TBF)
LOGP(DRLCMAC, LOGL_NOTICE, "- No downlink ACK received yet\n");
return 0;
}
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn)
{
struct msgb *msg;
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
struct gprs_rlcmac_dl_tbf *new_dl_tbf;
tbf: Reduce complexity and deal with only one way of assignment The normal mode of the PCU doesn't really work right now. There is no place to have certain kind of features that are not built and not unit-tested.
2013-11-24 21:52:10 +00:00
int poll_ass_dl = 1;
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
tbf: Reduce complexity and deal with only one way of assignment The normal mode of the PCU doesn't really work right now. There is no place to have certain kind of features that are not built and not unit-tested.
2013-11-24 21:52:10 +00:00
if (direction == GPRS_RLCMAC_DL_TBF && control_ts != first_common_ts) {
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "Cannot poll for downlink "
"assigment, because MS cannot reply. (control TS=%d, "
"first common TS=%d)\n", control_ts,
first_common_ts);
poll_ass_dl = 0;
}
if (poll_ass_dl) {
if (poll_state != GPRS_RLCMAC_POLL_NONE) {
LOGP(DRLCMAC, LOGL_DEBUG, "Polling is already sheduled "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"for %s, so we must wait for downlink "
"assignment...\n", tbf_name(this));
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
return NULL;
}
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
if (bts->sba()->find(trx->trx_no, control_ts, (fn + 13) % 2715648)) {
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
LOGP(DRLCMACUL, LOGL_DEBUG, "Polling is already "
"scheduled for single block allocation...\n");
return NULL;
}
}
/* on uplink TBF we get the downlink TBF to be assigned. */
if (direction == GPRS_RLCMAC_UL_TBF) {
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
gprs_rlcmac_ul_tbf *ul_tbf = static_cast<gprs_rlcmac_ul_tbf *>(this);
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
/* be sure to check first, if contention resolution is done,
* otherwise we cannot send the assignment yet */
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
if (!ul_tbf->m_contention_resolution_done) {
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "Cannot assign DL TBF now, "
"because contention resolution is not "
"finished.\n");
return NULL;
}
tbf,bts: Keep track of new TBF for dl/ul assignment in m_new_tbf There are a couple of possibilities where one TBF is used to assign a new one: 1. Assign a DL TBF from a UL TBF 2. Assign a UL TBF from a DL TBF 3. Assign a DL TBF from a DL TBF which is in wait-release state (T3193 is running) In these cases the assignment is sent on the existing TBF and triggers the assignement of the new TBF (with different TFI/direction). The current code detects these situations by looking at dl/ul_ass_state and then chosing the TBF with the opposite direction (DL/UL) that has the same TLLI. This does not work in the case 3 above where a new DL TBF is triggered for a DL TBF. The current code reuses the old TBF (and TFI), but this violates the spec. This patch introduces a m_new_tbf member which is set to the new TBF to be assigned. When receiving a control ack the code looks up the n_new_tbf member of the tbf that requested the control ack and completes the ul/dl assignment. If the old TBF was in the wait release state (T3193 is running) it is released. From 3GPP TS 04.60 9.3.2.6: """ If the network has received the PACKET DOWNLINK ACK/NACK message with the Final Ack Indicator bit set to '1' and has new data to transmit for the mobile station, the network may establish a new downlink TBF for the mobile station by sending the PACKET DOWNLINK ASSIGNMENT or PACKET TIMESLOT RECONFIGURE message with the Control Ack bit set to '1' on PACCH. In case the network establishes a new downlink TBF for the mobile station, the network shall stop timer T3193. """ reuse_tbf() is modified to allocate a new TBF with a new TFI and trigger a dl assignment for that TBF on the old TBF. All pending data is moved to the new TBF. Ticket: SYS#382 Sponsored-by: On-Waves ehf
2014-08-15 14:52:09 +00:00
}
new_dl_tbf = static_cast<gprs_rlcmac_dl_tbf *>(m_new_tbf);
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
if (!new_dl_tbf) {
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
LOGP(DRLCMACDL, LOGL_ERROR, "We have a schedule for downlink "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"assignment at uplink %s, but there is no downlink "
"TBF\n", tbf_name(this));
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE;
return NULL;
}
tbf: Fix dereference before null check m_new_tbf might be NULL. Assign was_releasing _after_ we have done the NULL check. Related: Coverity CID#1238847
2014-12-26 17:32:00 +00:00
new_dl_tbf->was_releasing = was_releasing;
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
msg = msgb_alloc(23, "rlcmac_dl_ass");
if (!msg)
return NULL;
bitvec *ass_vec = bitvec_alloc(23);
if (!ass_vec) {
msgb_free(msg);
return NULL;
}
bitvec_unhex(ass_vec,
"2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
LOGP(DRLCMAC, LOGL_INFO, "%s start Packet Downlink Assignment (PACCH)\n", tbf_name(new_dl_tbf));
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
Encoding::write_packet_downlink_assignment(mac_control_block, m_tfi,
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
(direction == GPRS_RLCMAC_DL_TBF), new_dl_tbf,
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
poll_ass_dl, bts_data()->alpha, bts_data()->gamma, -1, 0);
LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n");
encode_gsm_rlcmac_downlink(ass_vec, mac_control_block);
LOGPC(DCSN1, LOGL_NOTICE, "\n");
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- TX : Packet Downlink Assignment -------------------------\n");
bitvec_pack(ass_vec, msgb_put(msg, 23));
bitvec_free(ass_vec);
talloc_free(mac_control_block);
if (poll_ass_dl) {
poll_state = GPRS_RLCMAC_POLL_SCHED;
poll_fn = (fn + 13) % 2715648;
dl_ass_state = GPRS_RLCMAC_DL_ASS_WAIT_ACK;
} else {
dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE;
tbf, bts: Use tbf set_state method instead of tbf_new_state function All the function did was add debug output and call the set_state method. Move the debugging into the method and remove the function. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-08 09:43:53 +00:00
new_dl_tbf->set_state(GPRS_RLCMAC_FLOW);
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
tbf_assign_control_ts(new_dl_tbf);
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
/* stop pending assignment timer */
tbf: Split UL and DL TBFs up in create_dl_ass() Explicitly use UL and DL TBFs where they are needed. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:48:20 +00:00
new_dl_tbf->stop_timer();
tbf: Move gprs_rlcmac_send_packet_downlink_assignment into the tbf This method was called _send_packet_ but actually didn't do any sending at all. It just formated the right assignment. I replaced tbf-> with nothing.
2013-10-26 18:45:35 +00:00
}
return msg;
}
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
struct msgb *gprs_rlcmac_tbf::create_ul_ass(uint32_t fn)
{
struct msgb *msg;
tbf: Move UL TBF methods from base class into UL TBF The methods create_ul_ack(), rcv_data_block_acknowledged(), maybe_schedule_uplink_acknack() are only used for UL TBFs so make them methods of that class instead of the base class. Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 12:54:11 +00:00
struct gprs_rlcmac_ul_tbf *new_tbf;
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
if (poll_state != GPRS_RLCMAC_POLL_NONE) {
LOGP(DRLCMACUL, LOGL_DEBUG, "Polling is already "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"sheduled for %s, so we must wait for uplink "
"assignment...\n", tbf_name(this));
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
return NULL;
}
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
if (bts->sba()->find(trx->trx_no, control_ts, (fn + 13) % 2715648)) {
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
LOGP(DRLCMACUL, LOGL_DEBUG, "Polling is already scheduled for "
"single block allocation...\n");
return NULL;
}
tbf,bts: Keep track of new TBF for dl/ul assignment in m_new_tbf There are a couple of possibilities where one TBF is used to assign a new one: 1. Assign a DL TBF from a UL TBF 2. Assign a UL TBF from a DL TBF 3. Assign a DL TBF from a DL TBF which is in wait-release state (T3193 is running) In these cases the assignment is sent on the existing TBF and triggers the assignement of the new TBF (with different TFI/direction). The current code detects these situations by looking at dl/ul_ass_state and then chosing the TBF with the opposite direction (DL/UL) that has the same TLLI. This does not work in the case 3 above where a new DL TBF is triggered for a DL TBF. The current code reuses the old TBF (and TFI), but this violates the spec. This patch introduces a m_new_tbf member which is set to the new TBF to be assigned. When receiving a control ack the code looks up the n_new_tbf member of the tbf that requested the control ack and completes the ul/dl assignment. If the old TBF was in the wait release state (T3193 is running) it is released. From 3GPP TS 04.60 9.3.2.6: """ If the network has received the PACKET DOWNLINK ACK/NACK message with the Final Ack Indicator bit set to '1' and has new data to transmit for the mobile station, the network may establish a new downlink TBF for the mobile station by sending the PACKET DOWNLINK ASSIGNMENT or PACKET TIMESLOT RECONFIGURE message with the Control Ack bit set to '1' on PACCH. In case the network establishes a new downlink TBF for the mobile station, the network shall stop timer T3193. """ reuse_tbf() is modified to allocate a new TBF with a new TFI and trigger a dl assignment for that TBF on the old TBF. All pending data is moved to the new TBF. Ticket: SYS#382 Sponsored-by: On-Waves ehf
2014-08-15 14:52:09 +00:00
new_tbf = static_cast<gprs_rlcmac_ul_tbf *>(m_new_tbf);
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
if (!new_tbf) {
LOGP(DRLCMACUL, LOGL_ERROR, "We have a schedule for uplink "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"assignment at downlink %s, but there is no uplink "
"TBF\n", tbf_name(this));
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE;
return NULL;
}
msg = msgb_alloc(23, "rlcmac_ul_ass");
if (!msg)
return NULL;
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
LOGP(DRLCMAC, LOGL_INFO, "%ss start Packet Uplink Assignment (PACCH)\n", tbf_name(new_tbf));
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
bitvec *ass_vec = bitvec_alloc(23);
if (!ass_vec) {
msgb_free(msg);
return NULL;
}
bitvec_unhex(ass_vec,
"2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
Encoding::write_packet_uplink_assignment(bts_data(), ass_vec, m_tfi,
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
(direction == GPRS_RLCMAC_DL_TBF), m_tlli,
tbf: Reduce complexity and deal with only one way of assignment The normal mode of the PCU doesn't really work right now. There is no place to have certain kind of features that are not built and not unit-tested.
2013-11-24 21:52:10 +00:00
m_tlli_valid, new_tbf, 1, bts_data()->alpha,
tbf: Move gprs_rlcmac_send_packet_uplink_assignment to the tbf Again the function was called send but didn't do any sending
2013-10-26 19:20:51 +00:00
bts_data()->gamma, -1);
bitvec_pack(ass_vec, msgb_put(msg, 23));
RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);
LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n");
decode_gsm_rlcmac_downlink(ass_vec, mac_control_block);
LOGPC(DCSN1, LOGL_NOTICE, "\n");
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- TX : Packet Uplink Assignment -------------------------\n");
bitvec_free(ass_vec);
talloc_free(mac_control_block);
poll_state = GPRS_RLCMAC_POLL_SCHED;
poll_fn = (fn + 13) % 2715648;
ul_ass_state = GPRS_RLCMAC_UL_ASS_WAIT_ACK;
return msg;
}
tbf: Move the code to close all timeslots into the tbf class Move the code out of the sysmocom_socket (as this is only required to talk to our hardware) and into the TBF class that actually knows what a TBF is.
2013-10-16 15:53:23 +00:00
void gprs_rlcmac_tbf::free_all(struct gprs_rlcmac_trx *trx)
{
for (uint8_t tfi = 0; tfi < 32; tfi++) {
struct gprs_rlcmac_tbf *tbf;
tbf = trx->ul_tbf[tfi];
if (tbf)
tbf_free(tbf);
tbf = trx->dl_tbf[tfi];
if (tbf)
tbf_free(tbf);
}
}
tbf: Add another variant of the free_all now by pdch
2013-10-16 15:58:46 +00:00
void gprs_rlcmac_tbf::free_all(struct gprs_rlcmac_pdch *pdch)
{
for (uint8_t tfi = 0; tfi < 32; tfi++) {
struct gprs_rlcmac_tbf *tbf;
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
tbf = pdch->ul_tbf_by_tfi(tfi);
tbf: Add another variant of the free_all now by pdch
2013-10-16 15:58:46 +00:00
if (tbf)
tbf_free(tbf);
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
tbf = pdch->dl_tbf_by_tfi(tfi);
tbf: Add another variant of the free_all now by pdch
2013-10-16 15:58:46 +00:00
if (tbf)
tbf_free(tbf);
}
}
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
void gprs_rlcmac_tbf::tlli_mark_valid()
{
m_tlli_valid = true;
}
void gprs_rlcmac_tbf::update_tlli(uint32_t tlli)
{
if (tlli == m_tlli)
return;
tbf: Learn and propagate the TLLI changes due a new P-TMSI During a routing area update a new P-TMSI was assigned. During the PACKET CONTROL ACK on the DL we notice the change of TLLI but didn't propagate this. This means that a Routing Area Update Complete was only sent after a new RACH request. Addresses: <0007> gprs_rlcmac_meas.cpp:103 UL RSSI of TLLI=0x88661bc6: -67 dBm <0002> bts.cpp:945 Got ACK, but UL TBF is gone TLLI=0xe512eba3 <0007> gprs_rlcmac_meas.cpp:158 DL packet loss of IMSI=274080000004765 / TLLI=0xe512eba3: 0% <0002> tbf.cpp:668 TBF TFI=0 TLLI=0x88661bc6 T3169 timeout during transsmission <0002> tbf.cpp:690 - Assignment was on PACCH <0002> tbf.cpp:694 - No uplink data received yet
2013-10-30 13:50:17 +00:00
bool changedUl = false;
/*
* During a Routing Area Update (due the assignment of a new
* P-TMSI) the tlli can change. We notice this when receiving
* a PACKET CONTROL ACK.
* When we get a TLLI change on the DL we will look if there
* is a UL TBF and change the tlli there as well.
*
* TODO: There could be multiple DL and UL TBFs and we should
* have a proper way to link all the related TBFs so we can do
* a group update.
*/
if (m_tlli_valid && direction == GPRS_RLCMAC_DL_TBF) {
gprs_rlcmac_tbf *ul_tbf;
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup 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
2014-07-02 15:58:14 +00:00
ul_tbf = bts->ul_tbf_by_tlli(m_tlli);
tbf: Learn and propagate the TLLI changes due a new P-TMSI During a routing area update a new P-TMSI was assigned. During the PACKET CONTROL ACK on the DL we notice the change of TLLI but didn't propagate this. This means that a Routing Area Update Complete was only sent after a new RACH request. Addresses: <0007> gprs_rlcmac_meas.cpp:103 UL RSSI of TLLI=0x88661bc6: -67 dBm <0002> bts.cpp:945 Got ACK, but UL TBF is gone TLLI=0xe512eba3 <0007> gprs_rlcmac_meas.cpp:158 DL packet loss of IMSI=274080000004765 / TLLI=0xe512eba3: 0% <0002> tbf.cpp:668 TBF TFI=0 TLLI=0x88661bc6 T3169 timeout during transsmission <0002> tbf.cpp:690 - Assignment was on PACCH <0002> tbf.cpp:694 - No uplink data received yet
2013-10-30 13:50:17 +00:00
if (ul_tbf) {
ul_tbf->m_tlli = tlli;
changedUl = true;
}
}
tbf: Update the timing advance for the new tlli based on the old one
2013-10-30 18:50:49 +00:00
/* update the timing advance for the new tlli */
bts->timing_advance()->update(m_tlli, tlli, ta);
tbf: Learn and propagate the TLLI changes due a new P-TMSI During a routing area update a new P-TMSI was assigned. During the PACKET CONTROL ACK on the DL we notice the change of TLLI but didn't propagate this. This means that a Routing Area Update Complete was only sent after a new RACH request. Addresses: <0007> gprs_rlcmac_meas.cpp:103 UL RSSI of TLLI=0x88661bc6: -67 dBm <0002> bts.cpp:945 Got ACK, but UL TBF is gone TLLI=0xe512eba3 <0007> gprs_rlcmac_meas.cpp:158 DL packet loss of IMSI=274080000004765 / TLLI=0xe512eba3: 0% <0002> tbf.cpp:668 TBF TFI=0 TLLI=0x88661bc6 T3169 timeout during transsmission <0002> tbf.cpp:690 - Assignment was on PACCH <0002> tbf.cpp:694 - No uplink data received yet
2013-10-30 13:50:17 +00:00
LOGP(DRLCMAC, LOGL_NOTICE,
"%s changing tlli from TLLI=0x%08x TLLI=0x%08x ul_changed=%d\n",
tbf_name(this), m_tlli, tlli, changedUl);
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
m_tlli = tlli;
}
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
int gprs_rlcmac_tbf::extract_tlli(const uint8_t *data, const size_t len)
{
struct gprs_rlcmac_tbf *dl_tbf, *ul_tbf;
struct rlc_ul_header *rh = (struct rlc_ul_header *)data;
uint32_t new_tlli;
int rc;
/* no TLLI yet */
if (!rh->ti) {
LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA TFI=%d without "
"TLLI, but no TLLI received yet\n", rh->tfi);
return 0;
}
rc = Decoding::tlli_from_ul_data(data, len, &new_tlli);
if (rc) {
bts->decode_error();
LOGP(DRLCMACUL, LOGL_NOTICE, "Failed to decode TLLI "
"of UL DATA TFI=%d.\n", rh->tfi);
return 0;
}
update_tlli(new_tlli);
LOGP(DRLCMACUL, LOGL_INFO, "Decoded premier TLLI=0x%08x of "
"UL DATA TFI=%d.\n", tlli(), rh->tfi);
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup 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
2014-07-02 15:58:14 +00:00
if ((dl_tbf = bts->dl_tbf_by_tlli(tlli()))) {
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
"TLLI=0x%08x while %s still exists. "
"Killing pending DL TBF\n", tlli(),
tbf_name(dl_tbf));
tbf_free(dl_tbf);
tbf: Make finding use-after-free more easy and set to NULL or return Make finding use-after-free more easy by setting things to NULL or simply return after tbf_free(this) has been called.
2014-01-16 09:09:42 +00:00
dl_tbf = NULL;
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
}
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup 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
2014-07-02 15:58:14 +00:00
/* ul_tbf_by_tlli will not find your TLLI, because it is not
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
* yet marked valid */
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup 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
2014-07-02 15:58:14 +00:00
if ((ul_tbf = bts->ul_tbf_by_tlli(tlli()))) {
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
"TLLI=0x%08x while %s still exists. "
"Killing pending UL TBF\n", tlli(),
tbf_name(ul_tbf));
tbf_free(ul_tbf);
tbf: Make finding use-after-free more easy and set to NULL or return Make finding use-after-free more easy by setting things to NULL or simply return after tbf_free(this) has been called.
2014-01-16 09:09:42 +00:00
ul_tbf = NULL;
tbf: Move the extraction of the TLLI into a separate method
2013-11-25 22:05:26 +00:00
}
/* mark TLLI valid now */
tlli_mark_valid();
/* store current timing advance */
bts->timing_advance()->remember(tlli(), ta);
return 1;
}
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
const char *tbf_name(gprs_rlcmac_tbf *tbf)
{
tbf: Include TBF state in tbf_name output Sponsored-by: On-Waves ehf
2014-08-15 16:11:57 +00:00
static char buf[60];
snprintf(buf, sizeof(buf), "TBF(TFI=%d TLLI=0x%08x DIR=%s STATE=%s)",
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf->m_tfi, tbf->m_tlli,
tbf: Include TBF state in tbf_name output Sponsored-by: On-Waves ehf
2014-08-15 16:11:57 +00:00
tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL",
tbf->state_name()
);
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
buf[sizeof(buf) - 1] = '\0';
return buf;
}
llc: First routines moved from the TBF into the LLC
2013-11-06 19:39:45 +00:00
tbf/sched: We pick the _last_ entry, rotate the lists We always pick the _last_ entry from the lists. Let's rotate so we make it a bit more fair.
2013-11-26 12:08:12 +00:00
void gprs_rlcmac_tbf::rotate_in_list()
{
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_del(&list.list);
tbf/sched: We pick the _last_ entry, rotate the lists We always pick the _last_ entry from the lists. Let's rotate so we make it a bit more fair.
2013-11-26 12:08:12 +00:00
if (direction == GPRS_RLCMAC_UL_TBF)
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_add(&list.list, &bts->bts_data()->ul_tbfs);
tbf/sched: We pick the _last_ entry, rotate the lists We always pick the _last_ entry from the lists. Let's rotate so we make it a bit more fair.
2013-11-26 12:08:12 +00:00
else
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
llist_add(&list.list, &bts->bts_data()->dl_tbfs);
tbf/sched: We pick the _last_ entry, rotate the lists We always pick the _last_ entry from the lists. Let's rotate so we make it a bit more fair.
2013-11-26 12:08:12 +00:00
}
tbf: Kill the tsc member as it duplicates data We can just use first_ts and the trx/pdch to extract this information. Avoid duplication of data.
2013-12-25 19:22:35 +00:00
uint8_t gprs_rlcmac_tbf::tsc() const
{
return trx->pdch[first_ts].tsc;
}
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
void tbf_print_vty_info(struct vty *vty, llist_head *ltbf)
{
tbf: Use plain old data structure (PODS) for llist management The PODS struct has a back pointer to access the actual object. llist_pods_for_each_entry traverses the list of struct llist_pods and makes the entry available (through the back pointer). Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-30 11:25:19 +00:00
gprs_rlcmac_tbf *tbf = llist_pods_entry(ltbf, gprs_rlcmac_tbf);
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
pcu_vty: Add a command to print info about all TBFs
2014-01-15 16:06:51 +00:00
vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) DIR=%s IMSI=%s%s", tbf->tfi(),
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid",
tbf->direction == GPRS_RLCMAC_UL_TBF ? "UL" : "DL",
tbf->imsi(), VTY_NEWLINE);
tbf: Save a timestamp at tbf allocation and print it in the VTY
2014-01-15 16:40:28 +00:00
vty_out(vty, " created=%lu state=%08x 1st_TS=%d 1st_cTS=%d ctrl_TS=%d "
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
"MS_CLASS=%d%s",
tbf: Use past-tense and call it created_ts
2014-01-16 09:07:20 +00:00
tbf->created_ts(), tbf->state_flags, tbf->first_ts,
tbf: Save a timestamp at tbf allocation and print it in the VTY
2014-01-15 16:40:28 +00:00
tbf->first_common_ts, tbf->control_ts, tbf->ms_class,
VTY_NEWLINE);
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
vty_out(vty, " TS_alloc=");
for (int i = 0; i < 8; i++) {
if (tbf->pdch[i])
vty_out(vty, "%d ", i);
}
pcu_vty: Add a command to print info about all TBFs
2014-01-15 16:06:51 +00:00
vty_out(vty, " CS=%d%s%s", tbf->cs, VTY_NEWLINE, VTY_NEWLINE);
tbf: Add a function to output tbf info to VTY
2014-01-15 16:06:19 +00:00
}