diff options
| -rw-r--r-- | src/bts.cpp | 21 | ||||
| -rw-r--r-- | src/bts.h | 2 | ||||
| -rw-r--r-- | src/tbf.h | 4 | ||||
| -rw-r--r-- | src/tbf_ul.cpp | 302 |
4 files changed, 0 insertions, 329 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 54cf6b2e..5e29364e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -723,27 +723,6 @@ void gprs_rlcmac_pdch::add_paging(struct gprs_rlcmac_paging *pag) llist_add(&pag->list, &paging_list); } -/* receive UL data block - * - * The blocks are defragmented and forwarded as LLC frames, if complete. - */ -int gprs_rlcmac_pdch::rcv_data_block_acknowledged_gprs(uint8_t *data, uint8_t len, - struct pcu_l1_meas *meas) -{ - struct gprs_rlcmac_ul_tbf *tbf; - struct rlc_ul_header *rh = (struct rlc_ul_header *)data; - - /* find TBF inst from given TFI */ - tbf = ul_tbf_by_tfi(rh->tfi); - if (!tbf) { - LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA unknown TFI=%d\n", - rh->tfi); - return 0; - } - - return tbf->rcv_data_block_acknowledged_gprs(data, len, meas); -} - void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, uint32_t fn) { struct gprs_rlcmac_tbf *tbf, *new_tbf; @@ -103,8 +103,6 @@ struct gprs_rlcmac_pdch { #ifdef __cplusplus private: - int rcv_data_block_acknowledged_gprs(uint8_t *data, uint8_t len, - struct pcu_l1_meas *meas); int rcv_control_block(bitvec *rlc_block, uint32_t fn); void rcv_control_ack(Packet_Control_Acknowledgement_t *, uint32_t fn); @@ -422,15 +422,12 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { struct msgb *create_ul_ack(uint32_t fn); /* blocks were acked */ - int rcv_data_block_acknowledged_gprs(const uint8_t *data, size_t len, - struct pcu_l1_meas *meas); int rcv_data_block_acknowledged( const struct gprs_rlc_ul_header_egprs *rlc, uint8_t *data, uint8_t len, struct pcu_l1_meas *meas); /* TODO: extract LLC class? */ - int assemble_forward_llc_gprs(const gprs_rlc_data *data); int assemble_forward_llc(const gprs_rlc_data *data); int snd_ul_ud(); @@ -447,7 +444,6 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { uint8_t m_final_ack_sent; /* set if we sent final ack */ protected: - void maybe_schedule_uplink_acknack(const rlc_ul_header *rh); void maybe_schedule_uplink_acknack(const gprs_rlc_ul_header_egprs *rlc); }; diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index f2cd4771..a133d3e7 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -42,173 +42,6 @@ extern "C" { extern void *tall_pcu_ctx; - -/* - * Store received block data in LLC message(s) and forward to SGSN - * if complete. - */ -int gprs_rlcmac_ul_tbf::assemble_forward_llc_gprs(const gprs_rlc_data *_data) -{ - const uint8_t *data = _data->block; - uint8_t len = _data->len; - const struct rlc_ul_header *rh = (const struct rlc_ul_header *) data; - uint8_t e, m; - struct rlc_li_field *li; - uint8_t frame_offset[16], offset = 0, chunk; - int i, frames = 0; - - LOGP(DRLCMACUL, LOGL_DEBUG, "- Assembling frames: (len=%d)\n", len); - - data += 3; - len -= 3; - e = rh->e; /* if extended */ - m = 1; /* more frames, that means: the first frame */ - - /* Parse frame offsets from length indicator(s), if any. */ - while (1) { - if (frames == (int)sizeof(frame_offset)) { - LOGP(DRLCMACUL, LOGL_ERROR, "%s too many frames in " - "block\n", tbf_name(this)); - return -EINVAL; - } - frame_offset[frames++] = offset; - LOGP(DRLCMACUL, LOGL_DEBUG, "-- Frame %d starts at offset " - "%d\n", frames, offset); - if (!len) - break; - /* M == 0 and E == 0 is not allowed in this version. */ - if (!m && !e) { - LOGP(DRLCMACUL, LOGL_NOTICE, "%s UL DATA " - "ignored, because M='0' and E='0'.\n", - tbf_name(this)); - return 0; - } - /* no more frames in this segment */ - if (e) { - break; - } - /* There is a new frame and an LI that delimits it. */ - if (m) { - li = (struct rlc_li_field *)data; - LOGP(DRLCMACUL, LOGL_DEBUG, "-- Delimiter len=%d\n", - li->li); - /* Special case: LI == 0 - * If the last segment would fit precisely into the - * rest of the RLC MAC block, there would be no way - * to delimit that this segment ends and is not - * continued in the next block. - * The special LI (0) is used to force the segment to - * extend into the next block, so it is delimited there. - * This LI must be skipped. Also it is the last LI. - */ - if (li->li == 0) { - data++; - len--; - m = 1; /* M is ignored, we know there is more */ - break; /* handle E as '1', so we break! */ - } - e = li->e; - m = li->m; - offset += li->li; - data++; - len--; - continue; - } - } - if (!m) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- Last frame carries spare " - "data\n"); - } - - LOGP(DRLCMACUL, LOGL_DEBUG, "- Data length after length fields: %d\n", - len); - /* TLLI */ - if (rh->ti) { - if (len < 4) { - LOGP(DRLCMACUL, LOGL_NOTICE, "%s UL DATA TLLI out of " - "frame border\n", tbf_name(this)); - return -EINVAL; - } - data += 4; - len -= 4; - LOGP(DRLCMACUL, LOGL_DEBUG, "- Length after skipping TLLI: " - "%d\n", len); - } - - /* PFI */ - if (rh->pi) { - LOGP(DRLCMACUL, LOGL_ERROR, "ERROR: PFI not supported, " - "please disable in SYSTEM INFORMATION\n"); - if (len < 1) { - LOGP(DRLCMACUL, LOGL_NOTICE, "%s UL DATA PFI out of " - "frame border\n", tbf_name(this)); - return -EINVAL; - } - data++; - len--; - LOGP(DRLCMACUL, LOGL_DEBUG, "- Length after skipping PFI: " - "%d\n", len); - } - - /* Now we have: - * - a list of frames offsets: frame_offset[] - * - number of frames: i - * - m == 0: Last frame carries spare data (end of TBF). - */ - - /* Check if last offset would exceed frame. */ - if (offset > len) { - LOGP(DRLCMACUL, LOGL_NOTICE, "%s UL DATA ignored, " - "because LI delimits data that exceeds block size.\n", - tbf_name(this)); - return -EINVAL; - } - - /* create LLC frames */ - for (i = 0; i < frames; i++) { - /* last frame ? */ - if (i == frames - 1) { - /* no more data in last frame */ - if (!m) - break; - /* data until end of frame */ - chunk = len - frame_offset[i]; - } else { - /* data until next frame */ - chunk = frame_offset[i + 1] - frame_offset[i]; - } - if (!m_llc.fits_in_current_frame(chunk)) { - LOGP(DRLCMACUL, LOGL_NOTICE, "%s LLC frame exceeds " - "maximum size %u.\n", tbf_name(this), - m_llc.remaining_space()); - chunk = m_llc.remaining_space(); - } - m_llc.append_frame(data + frame_offset[i], chunk); - m_llc.consume(chunk); - /* not last frame. */ - if (i != frames - 1) { - /* send frame to SGSN */ - LOGP(DRLCMACUL, LOGL_INFO, "%s complete UL frame len=%d\n", - tbf_name(this) , m_llc.frame_length()); - snd_ul_ud(); - m_llc.reset(); - /* also check if CV==0, because the frame may fill up the - * block precisely, then it is also complete. normally the - * frame would be extended into the next block with a 0-length - * delimiter added to this block. */ - } else if (rh->cv == 0) { - /* send frame to SGSN */ - LOGP(DRLCMACUL, LOGL_INFO, "%s complete UL frame " - "that fits precisely in last block: " - "len=%d\n", tbf_name(this), m_llc.frame_length()); - snd_ul_ud(); - m_llc.reset(); - } - } - - return 0; -} - /* * Store received block data in LLC message(s) and forward to SGSN * if complete. @@ -491,109 +324,6 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( return 0; } -int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged_gprs(const uint8_t *data, - size_t len, struct pcu_l1_meas *meas) -{ - struct rlc_ul_header *rh = (struct rlc_ul_header *)data; - int rc; - int8_t rssi = meas->have_rssi ? meas->rssi : 0; - - const uint16_t mod_sns = m_window.mod_sns(); - const uint16_t ws = m_window.ws(); - - this->state_flags |= (1 << GPRS_RLCMAC_FLAG_UL_DATA); - - LOGP(DRLCMACUL, LOGL_DEBUG, "UL DATA TFI=%d received (V(Q)=%d .. " - "V(R)=%d)\n", rh->tfi, this->m_window.v_q(), - this->m_window.v_r()); - - /* process RSSI */ - gprs_rlcmac_rssi(this, rssi); - - /* store measurement values */ - if (ms()) - ms()->update_l1_meas(meas); - - /* get TLLI */ - if (!this->is_tlli_valid()) { - if (!extract_tlli(data, len)) - return 0; - /* already have TLLI, but we stille get another one */ - } else if (rh->ti) { - uint32_t tlli; - rc = Decoding::tlli_from_ul_data(data, len, &tlli); - if (rc) { - LOGP(DRLCMACUL, LOGL_NOTICE, "Failed to decode TLLI " - "of UL DATA TFI=%d.\n", rh->tfi); - return 0; - } - if (tlli != this->tlli()) { - LOGP(DRLCMACUL, LOGL_NOTICE, "TLLI mismatch on UL " - "DATA TFI=%d. (Ignoring due to contention " - "resolution)\n", rh->tfi); - return 0; - } - } - - /* restart T3169 */ - tbf_timer_start(this, 3169, bts_data()->t3169, 0); - - /* Increment RX-counter */ - this->m_rx_counter++; - - if (!m_window.is_in_window(rh->bsn)) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- BSN %d out of window " - "%d..%d (it's normal)\n", rh->bsn, - m_window.v_q(), - (m_window.v_q() + ws - 1) & mod_sns); - maybe_schedule_uplink_acknack(rh); - return 0; - } - - /* Write block to buffer and set receive state array. */ - m_rlc.block(rh->bsn)->put_data(data, len); - LOGP(DRLCMACUL, LOGL_DEBUG, "- BSN %d storing in window (%d..%d)\n", - rh->bsn, m_window.v_q(), - (m_window.v_q() + ws - 1) & mod_sns); - - /* Raise V(Q) if possible, and retrieve LLC frames from blocks. - * This is looped until there is a gap (non received block) or - * the window is empty.*/ - const uint16_t v_q_beg = m_window.v_q(); - - m_window.receive_bsn(rh->bsn); - const uint16_t count = m_window.raise_v_q(); - - /* Retrieve LLC frames from blocks that are ready */ - for (uint16_t i = 0; i < count; ++i) { - uint16_t index = (v_q_beg + i) & mod_sns; - assemble_forward_llc_gprs(m_rlc.block(index)); - } - - /* Check CV of last frame in buffer */ - if (this->state_is(GPRS_RLCMAC_FLOW) /* still in flow state */ - && this->m_window.v_q() == this->m_window.v_r()) { /* if complete */ - struct rlc_ul_header *last_rh = (struct rlc_ul_header *) - m_rlc.block((m_window.v_r() - 1) & mod_sns)->block; - LOGP(DRLCMACUL, LOGL_DEBUG, "- No gaps in received block, " - "last block: BSN=%d CV=%d\n", last_rh->bsn, - last_rh->cv); - if (last_rh->cv == 0) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- Finished with UL " - "TBF\n"); - set_state(GPRS_RLCMAC_FINISHED); - /* Reset N3103 counter. */ - this->m_n3103 = 0; - } - } - - /* If TLLI is included or if we received half of the window, we send - * an ack/nack */ - maybe_schedule_uplink_acknack(rh); - - return 0; -} - void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack( const gprs_rlc_ul_header_egprs *rlc) { @@ -631,38 +361,6 @@ void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack( } } -void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack(const rlc_ul_header *rh) -{ - if (rh->si || rh->ti || state_is(GPRS_RLCMAC_FINISHED) - || (m_rx_counter % SEND_ACK_AFTER_FRAMES) == 0) { - if (rh->si) { - LOGP(DRLCMACUL, LOGL_NOTICE, "- Scheduling Ack/Nack, " - "because MS is stalled.\n"); - } - if (rh->ti) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- Scheduling Ack/Nack, " - "because TLLI is included.\n"); - } - if (state_is(GPRS_RLCMAC_FINISHED)) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- Scheduling Ack/Nack, " - "because last block has CV==0.\n"); - } - if ((m_rx_counter % SEND_ACK_AFTER_FRAMES) == 0) { - LOGP(DRLCMACUL, LOGL_DEBUG, "- Scheduling Ack/Nack, " - "because %d frames received.\n", - SEND_ACK_AFTER_FRAMES); - } - if (ul_ack_state == GPRS_RLCMAC_UL_ACK_NONE) { - /* trigger sending at next RTS */ - ul_ack_state = GPRS_RLCMAC_UL_ACK_SEND_ACK; - } else { - /* already triggered */ - LOGP(DRLCMACUL, LOGL_DEBUG, "- Sending Ack/Nack is " - "already triggered, don't schedule!\n"); - } - } -} - /* Send Uplink unit-data to SGSN. */ int gprs_rlcmac_ul_tbf::snd_ul_ud() { |